From 91a519d57717287c4ed81986bec30bad741e3146 Mon Sep 17 00:00:00 2001
From: Chris Taylor <forgetso86@gmail.com>
Date: Tue, 23 Jan 2024 12:56:20 +0000
Subject: [PATCH 1/3] Fixes to search count

---
 src/searchreplace.ts | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/searchreplace.ts b/src/searchreplace.ts
index 1f23b78..12c40b5 100644
--- a/src/searchreplace.ts
+++ b/src/searchreplace.ts
@@ -124,7 +124,10 @@ function containsAncestor(element: Element, results: Map<Element, SearchReplaceR
 }
 
 function countOccurrences(el: HTMLElement, config: SearchReplaceConfig): number {
-    const matches = el[config.searchTarget].match(config.globalSearchPattern) || []
+    let matches = el[config.searchTarget].match(config.globalSearchPattern) || []
+    if (config.hiddenContent && config.searchTarget === 'innerText' && 'textContent' in el) {
+        matches = (el as HTMLElement).textContent?.match(config.globalSearchPattern) || []
+    }
     return matches.length
 }
 
@@ -282,10 +285,20 @@ function replaceInner(
     elementsChecked = updateResults(elementsChecked, element, false, occurrences, 0)
 
     const ancestorChecked = containsAncestor(element, elementsChecked)
-    searchReplaceResult.count.original =
-        ancestorChecked && elementIsVisible(element, false, true)
-            ? searchReplaceResult.count.original
-            : searchReplaceResult.count.original + occurrences
+
+    if (config.searchTarget === 'innerHTML') {
+        // We can reliably add the occurrences as any hidden elements will have been removed from the cloned element
+        searchReplaceResult.count.original = searchReplaceResult.count.original + occurrences
+    } else if (config.searchTarget === 'innerText') {
+        // We have to check if an ancestor has been checked as the innerText of the ancestor will contain the innerText
+        // of the element. We also need to check if the element is visible as we will have used textContent in this
+        // case, which does contain the hidden text.
+        if (!ancestorChecked && !config.hiddenContent) {
+            searchReplaceResult.count.original = searchReplaceResult.count.original + occurrences
+        } else if (!ancestorChecked && config.hiddenContent) {
+            searchReplaceResult.count.original = searchReplaceResult.count.original + occurrences
+        }
+    }
 
     // cycle through nodes, replacing in text or the innerHTML
     if (config.replace) {

From 803ca08ed5243cb731188c37b04e57be6e4b855d Mon Sep 17 00:00:00 2001
From: Chris Taylor <forgetso86@gmail.com>
Date: Tue, 23 Jan 2024 12:56:54 +0000
Subject: [PATCH 2/3] version

---
 manifest.json | 2 +-
 package.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index daf2135..4e6bd93 100644
--- a/manifest.json
+++ b/manifest.json
@@ -31,7 +31,7 @@
     "permissions": ["activeTab", "storage", "notifications"],
     "host_permissions": ["http://*/*", "https://*/*"],
     "update_url": "http://clients2.google.com/service/update2/crx",
-    "version":"2.0.0",
+    "version":"2.0.2",
     "options_page": "assets/options.html",
     "icons": {
         "16": "assets/icon-16.png",
diff --git a/package.json b/package.json
index 677e195..8b4f5a1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "search_and_replace",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "resolutions": {
     "author": "Chris Taylor <cjtaylor38@gmail.com>"
   },

From 48d57db91892fd506b6eda6004dadd1bf50c029d Mon Sep 17 00:00:00 2001
From: Chris Taylor <forgetso86@gmail.com>
Date: Wed, 24 Jan 2024 09:18:40 +0000
Subject: [PATCH 3/3] Fix search count when elements have script tags, style
 tags and other elements in-between them that are removed by the cloning
 operation

---
 src/cypress/e2e/searchreplace.cy.ts |  2 +-
 src/elements.ts                     | 15 ++++++---------
 src/searchreplace.ts                | 23 ++++++++++++++++-------
 tests/test.html                     |  7 ++++---
 webpack/webpack.prod.js             |  4 ++--
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/cypress/e2e/searchreplace.cy.ts b/src/cypress/e2e/searchreplace.cy.ts
index d4e323a..7b78663 100644
--- a/src/cypress/e2e/searchreplace.cy.ts
+++ b/src/cypress/e2e/searchreplace.cy.ts
@@ -18,7 +18,7 @@ describe('Search Replace ', () => {
             })
             const hidden = copy.clonedElementRemoved.querySelectorAll('.hidden')
             expect(hidden.length).to.equal(0)
-            expect(copy.clonedElementRemoved.children.length).to.be.eq(1)
+            expect(copy.clonedElementRemoved.children.length).to.be.eq(2)
         })
     })
 
diff --git a/src/elements.ts b/src/elements.ts
index cd25406..5daeabe 100644
--- a/src/elements.ts
+++ b/src/elements.ts
@@ -58,8 +58,6 @@ export function isHidden(element: HTMLElement | Element, cloned = false) {
 
     // clones are not visible so we can't use checkVisibility
     if (!cloned && 'checkVisibility' in element && typeof element.checkVisibility === 'function') {
-        if (element.classList.contains('interface-complementary-area-header__small-title')) {
-        }
         // use the relatively new checkVisibility method, which returns `true` if the element is visible
         return !element.checkVisibility()
     }
@@ -67,8 +65,7 @@ export function isHidden(element: HTMLElement | Element, cloned = false) {
     // This method is not as accurate as checkVisibility
     // compute the style as its not immediately obvious if the element is hidden
     const computedStyle = getComputedStyle(element)
-    if (element.classList.contains('interface-complementary-area-header__small-title')) {
-    }
+
     if (computedStyle.display === 'none') {
         return true
     }
@@ -112,8 +109,8 @@ export function copyElementAndRemoveSelectedElements(
     function removeSelectedElements(element: HTMLElement) {
         if (element) {
             const childNodes = <HTMLElement[]>Array.from(element.children)
-            // eslint-disable-next-line prefer-const
-            for (let [childIndex, child] of childNodes.entries()) {
+
+            for (const child of childNodes) {
                 if (child.isEqualNode(element)) {
                     continue
                 }
@@ -127,9 +124,9 @@ export function copyElementAndRemoveSelectedElements(
                     }
                 } else {
                     // Recursively process visible child elements
-                    child = removeSelectedElements(child as HTMLElement)
-                    if (element.children[childIndex] && !child.isEqualNode(element.children[childIndex])) {
-                        element.replaceChild(child, element.children[childIndex])
+                    const newChild = removeSelectedElements(child as HTMLElement)
+                    if (element.contains(child) && !newChild.isEqualNode(child)) {
+                        element.replaceChild(newChild, child)
                     }
                 }
             }
diff --git a/src/searchreplace.ts b/src/searchreplace.ts
index 12c40b5..4985835 100644
--- a/src/searchreplace.ts
+++ b/src/searchreplace.ts
@@ -124,10 +124,14 @@ function containsAncestor(element: Element, results: Map<Element, SearchReplaceR
 }
 
 function countOccurrences(el: HTMLElement, config: SearchReplaceConfig): number {
-    let matches = el[config.searchTarget].match(config.globalSearchPattern) || []
+    let target = el[config.searchTarget]
+
     if (config.hiddenContent && config.searchTarget === 'innerText' && 'textContent' in el) {
-        matches = (el as HTMLElement).textContent?.match(config.globalSearchPattern) || []
+        // textContent contains text of visible and hidden elements
+        target = (el as HTMLElement).textContent
     }
+
+    const matches = target.match(config.globalSearchPattern) || []
     return matches.length
 }
 
@@ -178,18 +182,21 @@ function getElementFromNode(node: Node): Element {
 
 function isIgnored(ignoredElements: Set<Element>, node: Node, hiddenContent: boolean, elementFilter: RegExp): number {
     const toCheck = getElementFromNode(node)
+    // if a script or an iframe that is not a blob iframe, reject
     if (toCheck.tagName.match(elementFilter) && !isBlobIframe(toCheck)) {
         return NodeFilter.FILTER_REJECT
     }
-
+    // if an ignored element, reject
     if (ignoredElements.has(toCheck)) {
         return NodeFilter.FILTER_REJECT
     }
 
+    // if the equivalent of an ignored element (e.g. ignored are clones), reject
     if (equivalentInIgnoredElements(ignoredElements, toCheck)) {
         return NodeFilter.FILTER_REJECT
     }
 
+    // if we're not checking hidden content and the element is hidden, reject
     if (!hiddenContent) {
         if (!elementIsVisible(toCheck as HTMLElement)) {
             return NodeFilter.FILTER_REJECT
@@ -396,6 +403,7 @@ function equivalentInIgnoredElements(ignoredElements: Set<Element>, element: Ele
             return true
         }
     }
+
     return false
 }
 
@@ -407,7 +415,6 @@ function replaceInHTML(
     elementsChecked: Map<Element, SearchReplaceResult>
 ): ReplaceFunctionReturnType {
     for (const [originalIndex, originalElement] of originalElements.entries()) {
-        let ignoredElements = new Set<Element>()
         let clonedElement = originalElement.cloneNode(true) as HTMLElement
 
         const { clonedElementRemoved, removedSet } = copyElementAndRemoveSelectedElements(
@@ -417,13 +424,16 @@ function replaceInHTML(
             false
         )
         clonedElement = clonedElementRemoved as HTMLElement
-        ignoredElements = removedSet
+        let ignoredElements = removedSet
         if (!config.hiddenContent) {
             // We have to check the visibility of the original elements as the cloned ones are all invisible
             if (!elementIsVisible(originalElements[originalIndex])) {
                 continue
             }
-            ignoredElements = new Set([...ignoredElements, ...getHiddenElements(originalElement, config)])
+            ignoredElements = new Set([
+                ...ignoredElements,
+                ...(getHiddenElements(originalElement, config) as Set<HTMLElement>),
+            ])
             // the above works if an ancestor of the element is hidden, but not if the element contains descendants that
             // are hidden. To check for this, we need to check the relatives of the element to see if they are hidden
             // and if so, create a copy of the element with the hidden elements removed, storing a map of the hidden
@@ -519,7 +529,6 @@ export async function searchReplace(
         usesKnockout: usesKnockout(window.document),
         searchTarget,
     }
-    console.log('Search replace config', config)
 
     // we check other places if text was not replaced in a text editor
     let result: ReplaceFunctionReturnType
diff --git a/tests/test.html b/tests/test.html
index 0eb4af0..d3149ea 100644
--- a/tests/test.html
+++ b/tests/test.html
@@ -48,16 +48,17 @@ <h2>7 Hidden Nested Div</h2>
             <div class="hidden">This is a test!!! ¹² - hidden</div>
         </div>
     </div>
+    <script type="text/javascript">
+        console.log("This is a test!!! ¹²")
+    </script>
     <div>
         <h2>8 Plain old div</h2>
         <div>This is a test!!! ¹²</div>
     </div>
     <iframe src="iframe.html"></iframe>
-    <script type="text/javascript">
-        console.log("This is a test!!! ¹²")
-    </script>
 </div>
 <div style="display: none;" class="hidden">Hidden Sibling</div>
+<style></style>
 <div style="display: none;">
     <div>
         <div class="hidden">Hidden Nested Sibling</div>
diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js
index f077128..304d613 100644
--- a/webpack/webpack.prod.js
+++ b/webpack/webpack.prod.js
@@ -5,12 +5,12 @@ const TerserPlugin = require('terser-webpack-plugin')
 module.exports = merge(common, {
     mode: 'production',
     optimization: {
-        minimize: false,
+        minimize: true,
         minimizer: [
             new TerserPlugin({
                 terserOptions: {
                     compress: {
-                        drop_console: false,
+                        drop_console: true,
                     },
                 },
             }),