From 47d4594e3dccfe67596b8fe4939acd5a615c8682 Mon Sep 17 00:00:00 2001 From: josc146 Date: Mon, 20 Mar 2023 09:21:31 +0800 Subject: [PATCH] fix: custom input for any element and mount query --- src/content-script/index.jsx | 12 +++++++----- src/utils/get-possible-element-by-query-selector.mjs | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/content-script/index.jsx b/src/content-script/index.jsx index cd985e3..6df0695 100644 --- a/src/content-script/index.jsx +++ b/src/content-script/index.jsx @@ -23,9 +23,10 @@ async function mountComponent(siteConfig, userConfig) { const retry = 10 for (let i = 1; i <= retry; i++) { const e = - getPossibleElementByQuerySelector(siteConfig.sidebarContainerQuery) || - getPossibleElementByQuerySelector(siteConfig.appendContainerQuery) || - getPossibleElementByQuerySelector(siteConfig.resultsContainerQuery) || + (siteConfig && + (getPossibleElementByQuerySelector(siteConfig.sidebarContainerQuery) || + getPossibleElementByQuerySelector(siteConfig.appendContainerQuery) || + getPossibleElementByQuerySelector(siteConfig.resultsContainerQuery))) || getPossibleElementByQuerySelector([userConfig.prependQuery]) || getPossibleElementByQuerySelector([userConfig.appendQuery]) if (e) { @@ -75,8 +76,9 @@ async function getInput(inputQuery) { return input } const searchInput = getPossibleElementByQuerySelector(inputQuery) - if (searchInput && searchInput.value) { - return searchInput.value + if (searchInput) { + if (searchInput.value) return searchInput.value + else if (searchInput.textContent) return searchInput.textContent } } diff --git a/src/utils/get-possible-element-by-query-selector.mjs b/src/utils/get-possible-element-by-query-selector.mjs index 988848f..3d65228 100644 --- a/src/utils/get-possible-element-by-query-selector.mjs +++ b/src/utils/get-possible-element-by-query-selector.mjs @@ -1,4 +1,5 @@ export function getPossibleElementByQuerySelector(queryArray) { + if (!queryArray) return for (const query of queryArray) { if (query) { try {