diff --git a/package.json b/package.json index 7ddd359b..f5528ccf 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "5.6.27", + "version": "5.6.28", "description": "", "author": "", "license": "ISC", diff --git a/src/co/bookmarks/edit/form/collection/suggested.module.styl b/src/co/bookmarks/edit/form/collection/suggested.module.styl index 7f5e173e..eb19ce2b 100644 --- a/src/co/bookmarks/edit/form/collection/suggested.module.styl +++ b/src/co/bookmarks/edit/form/collection/suggested.module.styl @@ -4,7 +4,7 @@ overflow: hidden min-height: calc(var(--icon-size) + var(--padding-small)) max-height: calc(var(--icon-size) + var(--padding-small)) - transition: opacity .3s ease-in, max-height .2s ease-out, min-height .2s ease-out + transition: opacity .15s ease-in, max-height .2s ease-out, min-height .2s ease-out &:hover:not(:empty) { transition-delay: .2s diff --git a/src/co/bookmarks/edit/form/tags/suggested.module.styl b/src/co/bookmarks/edit/form/tags/suggested.module.styl index dbfd68be..1d54e05e 100644 --- a/src/co/bookmarks/edit/form/tags/suggested.module.styl +++ b/src/co/bookmarks/edit/form/tags/suggested.module.styl @@ -4,7 +4,7 @@ overflow: hidden min-height: calc(var(--icon-size) + var(--padding-small)) max-height: calc(var(--icon-size) + var(--padding-small)) - transition: opacity .3s ease-in, max-height .2s ease-out, min-height .2s ease-out + transition: opacity .15s ease-in, max-height .2s ease-out, min-height .2s ease-out &:hover:not(:empty) { transition-delay: .2s diff --git a/src/routes/_app/extension/useExternalLinks.js b/src/routes/_app/extension/useExternalLinks.js index 06033184..1353fb98 100644 --- a/src/routes/_app/extension/useExternalLinks.js +++ b/src/routes/_app/extension/useExternalLinks.js @@ -1,5 +1,6 @@ import { useMemo } from 'react' import browser from '~target/extension/browser' +import { environment } from '~target' export default function useExternalLinks() { useMemo(()=>{ @@ -34,7 +35,8 @@ export default function useExternalLinks() { }) //close popover - window.close() + if (!environment.includes('sidepanel')) + window.close() } //very important to bind to window insted of document, to be sure that it happen after all other event listeners diff --git a/src/routes/my/space/bookmarks.js b/src/routes/my/space/bookmarks.js index 931071d4..cef9cfa7 100644 --- a/src/routes/my/space/bookmarks.js +++ b/src/routes/my/space/bookmarks.js @@ -1,7 +1,7 @@ import React, { useCallback, useMemo } from 'react' import { useSelector } from 'react-redux' import { useNavigate, useLocation } from 'react-router-dom' -import { target } from '~target' +import { target, environment } from '~target' import Bookmarks from '~co/bookmarks' export default function PageMySpaceBookmarks({ cId, search, itemId }) { @@ -20,7 +20,7 @@ export default function PageMySpaceBookmarks({ cId, search, itemId }) { case 'new_tab': window.open(item.link) - if (target == 'extension') + if (target == 'extension' && !environment.includes('sidepanel')) window.close() return true diff --git a/src/target/extension/getMeta/parse.js b/src/target/extension/getMeta/parse.js index aad24c87..951b9272 100644 --- a/src/target/extension/getMeta/parse.js +++ b/src/target/extension/getMeta/parse.js @@ -1,9 +1,9 @@ function getMeta() { - const elem = document.querySelector( + const elem = [...document.querySelectorAll( [...arguments] .map(key=>`meta[name="${key}"], meta[property="${key}"]`) .join(', ') - ) + )].at(-1) //last occurrence if (!elem) return null const value = elem.value || elem.content