fix delete highlight crash when search term matches highlight (#2796)

* fix delete highlight crash when search term matches highlight

* fix type

* fix highlighter errors when highlighting inside search highlight

* Revert "fix delete highlight crash when search term matches highlight"

This reverts commit 52d285d.

* recreate the highlighter if it crashes while erasing

* add coverage

* just use services

---------

Co-authored-by: staxly[bot] <35789409+staxly[bot]@users.noreply.github.com>

Author: jivey

src/app/content/components/Page/searchHighlightManager.spec.ts

@@ -107,4 +107,29 @@ describe('searchHighlightManager', () => {
     options.formatMessage({ id: 'asdfg' });
     expect(intl.formatMessage).toHaveBeenCalledWith({ id: 'asdfg:search' });
   });
+
+  it('recreates highlighter when eraseAll throws', () => {
+    const firstHighlighterInstance = Highlighter.mock.instances[0];
+    firstHighlighterInstance.eraseAll.mockImplementation(() => { throw new Error('orphaned span'); });
+    firstHighlighterInstance.unmount = jest.fn();
+
+    const newSearchResults = [
+      makeSearchResultHit({book, page, highlights: ['highlight <strong>number</strong> 4']}),
+    ];
+
+    attachedManager.update(
+      {searchResults, selectedResult: null},
+      {searchResults: newSearchResults, selectedResult: null},
+      {forceRedraw: false, onSelect: onHighlightSelect}
+    );
+
+    expect(firstHighlighterInstance.unmount).toHaveBeenCalled();
+    // A new Highlighter instance should have been created to replace the broken one
+    expect(Highlighter).toHaveBeenCalledTimes(2);
+    // The replacement highlighter should be used for subsequent highlightResults calls
+    expect(utils.highlightResults).toHaveBeenCalledWith(
+      Highlighter.mock.instances[1],
+      newSearchResults
+    );
+  });
 });

src/app/content/components/Page/searchHighlightManager.ts

@@ -12,6 +12,7 @@ import allImagesLoaded from '../utils/allImagesLoaded';
 interface Services {
   highlighter: Highlighter;
   container: HTMLElement;
+  intl: IntlShape;
   searchResultMap: ReturnType<typeof highlightResults>;
 }
 
@@ -33,6 +34,19 @@ export interface UpdateOptions {
   onSelect: (selectedHighlight?: Highlight) => void;
 }
 
+const safeEraseAll = (services: Services) => {
+  try {
+    services.highlighter.eraseAll();
+  } catch {
+    // User highlight DOM mutations can orphan search highlight spans (parentNode
+    // becomes null), making eraseAll crash on insertBefore. When that happens,
+    // discard the broken instance and create a fresh one — the orphaned spans
+    // are already detached from the DOM so there is nothing left to unwrap.
+    services.highlighter.unmount();
+    services.highlighter = createHighlighter(services.container, services.intl);
+  }
+};
+
 const updateResults = (
   services: Services,
   previous: HighlightProp | null,
@@ -42,7 +56,7 @@ const updateResults = (
     return;
   }
 
-  services.highlighter.eraseAll();
+  safeEraseAll(services);
   services.searchResultMap = highlightResults(services.highlighter, current.searchResults);
 };
 
@@ -99,14 +113,18 @@ const handleUpdate = (services: Services) => (
   selectResult(services, previous, current, options);
 };
 
+const createHighlighter = (container: HTMLElement, intl: IntlShape) =>
+  new Highlighter(container, {
+    className: 'search-highlight',
+    formatMessage: ({ id }) => intl.formatMessage({ id: `${id}:search` }),
+    tabbable: false,
+  });
+
 const searchHighlightManager = (container: HTMLElement, intl: IntlShape) => {
-  const services = {
+  const services: Services = {
     container,
-    highlighter: new Highlighter(container, {
-      className: 'search-highlight',
-      formatMessage: ({ id }) => intl.formatMessage({ id: `${id}:search` }),
-      tabbable: false,
-    }),
+    highlighter: createHighlighter(container, intl),
+    intl,
     searchResultMap: [],
   };