From 600973fa22beb0b1b4b791fece9e8f66ab79472d Mon Sep 17 00:00:00 2001
From: Peter Hudec <peterhudec@peterhudec.com>
Date: Thu, 25 Jan 2024 17:18:34 +0000
Subject: [PATCH] Fixed a bug when WatchTextContent didnt work with a routed
 component

---
 src/client/components/WatchTextContent.jsx    | 49 +++++++++++++------
 .../cypress/specs/WatchTextContent.cy.jsx     | 29 ++++++++++-
 2 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/client/components/WatchTextContent.jsx b/src/client/components/WatchTextContent.jsx
index 1d22264a1ac..e81ceae4043 100644
--- a/src/client/components/WatchTextContent.jsx
+++ b/src/client/components/WatchTextContent.jsx
@@ -1,12 +1,12 @@
-import { useEffect, useRef } from 'react'
-import ReactDOM from 'react-dom'
+import React, { useEffect, useRef } from 'react'
 
 /**
  * @function WatchTextContent
  * @description Calls {onTextContentChange} anytime the `textContent`
- * of {children} changes. The {children} won't be rendered.
+ * of {children} changes. The {children} will be rendered hidden.
  * @param {Object} props
- * @param {React.Children} props.children - Children
+ * @param {React.Children} props.children - Vdom to whose changes the component subscribes to.
+ * It will be rendered in a hidden div.
  * @param {(textContent: string) => void} props.onTextContentChange - A callback that will
  * be called anytime the `textContent` of this component changes with the value
  * of the current `textContent`.
@@ -16,24 +16,41 @@ const WatchTextContent = ({ onTextContentChange, ...props }) => {
   const previousTextContent = useRef()
 
   useEffect(() => {
-    ref.current = document.createElement('div')
-    return () => {
-      ref.current.remove()
-    }
-  }, [])
+    // Detach the element so that the content is not searchable by Cypress tests.
+    // This is the only way to make an element really hidden from Cypress.
+    ref.current.remove()
 
-  useEffect(() => {
-    ReactDOM.render(props.children, ref.current)
-    // The most recent update only takes effect in the next event tick
-    setTimeout(() => {
+    onTextContentChange(ref.current.textContent)
+    previousTextContent.current = ref.current.textContent
+
+    const observer = new MutationObserver(() => {
       if (ref.current.textContent !== previousTextContent.current) {
         onTextContentChange(ref.current.textContent)
         previousTextContent.current = ref.current.textContent
       }
-    }, 0)
-  })
+    })
+
+    if (ref.current) {
+      observer.observe(ref.current, {
+        childList: true,
+        subtree: true,
+        attributes: true,
+        characterData: true,
+      })
+    }
+
+    return () => {
+      observer.disconnect()
+    }
+  }, [])
 
-  return null
+  return (
+    // This wrapper is necessary because if we remove topmost element returned from render,
+    // React would throw a NotFoundError.
+    <div hidden={true}>
+      <div ref={ref} {...props} />
+    </div>
+  )
 }
 
 export default WatchTextContent
diff --git a/test/component/cypress/specs/WatchTextContent.cy.jsx b/test/component/cypress/specs/WatchTextContent.cy.jsx
index 24637b5190a..df8f5f8f9af 100644
--- a/test/component/cypress/specs/WatchTextContent.cy.jsx
+++ b/test/component/cypress/specs/WatchTextContent.cy.jsx
@@ -15,9 +15,32 @@ const Counter = ({ children }) => {
 }
 
 describe('WatchTextContent', () => {
-  it("calls onTextContentChange when it's text content changes", () => {
+  it('can be unmounted', () => {
     const onTextContentChange = cy.stub()
+    cy.mount(
+      <>
+        First render
+        <WatchTextContent onTextContentChange={onTextContentChange}>
+          <ul>
+            <li>foo</li>
+            <li>bar</li>
+            <li>baz</li>
+          </ul>
+        </WatchTextContent>
+      </>
+    )
+
+    cy.contains('First render').then(() =>
+      expect(onTextContentChange.args).to.deep.eq([['foobarbaz']])
+    )
 
+    cy.mount(<div>Second render</div>)
+    cy.contains('First render').should('not.exist')
+    cy.contains('Second render')
+  })
+
+  it("calls onTextContentChange when it's text content changes", () => {
+    const onTextContentChange = cy.stub()
     cy.mount(
       <Counter>
         {(count) => (
@@ -37,11 +60,15 @@ describe('WatchTextContent', () => {
       </Counter>
     )
 
+    cy.contains('Headingfoobar0baz').should('not.exist')
     cy.get('.counter').click()
+    cy.contains('Headingfoobar1baz').should('not.exist')
     cy.get('.counter').click()
+    cy.contains('Headingfoobar2baz').should('not.exist')
     cy.get('.counter')
       .click()
       .then(() => {
+        cy.contains('Headingfoobar3baz').should('not.exist')
         expect(onTextContentChange.args).to.deep.eq([
           ['Headingfoobar0baz'],
           ['Headingfoobar1baz'],