2.0.2

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)
         })
     })
 

src/elements.ts

@@ -58,17 +58,14 @@ 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()
     }
 
     // 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)
                     }
                 }
             }

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

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>

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,
                     },
                 },
             }),