Merge pull request #280 from laws-africa/query-selector-bug

tolerate bad query selectors
laws-africa · Jul 4, 2024 · e7bc599 · e7bc599
2 parents 240bc0b + 8fe9b5b
commit e7bc599
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/core/src/components/decorate-internal-refs/decorate-internal-refs.tsx b/core/src/components/decorate-internal-refs/decorate-internal-refs.tsx
@@ -109,7 +109,14 @@ export class DecorateInternalRefs {
     if (this.akomaNtosoElement) {
       const href: string = tippy.reference.getAttribute('href') || '';
       let html: string | null = '';
-      const provision: HTMLElement | null = this.akomaNtosoElement.querySelector(href);
+      let provision: HTMLElement | null = null;
+
+      try {
+        provision = this.akomaNtosoElement.querySelector(href);
+      } catch (e) {
+        // ignore query selector errors
+        console.log(e);
+      }
 
       if (provision) {
         html = provision.outerHTML;

diff --git a/core/src/components/decorate-terms/decorate-terms.tsx b/core/src/components/decorate-terms/decorate-terms.tsx
@@ -129,7 +129,12 @@ export class DecorateTerms {
     const term = reference.getAttribute('data-refersto');
     // find where the term is defined
     if (this.akomaNtosoElement) {
-      return this.akomaNtosoElement.querySelector(`[data-defines="${term}"]`);
+      try {
+        return this.akomaNtosoElement.querySelector(`[data-defines="${term}"]`);
+      } catch (e) {
+        // ignore query selector errors
+        console.log(e);
+      }
     }
     return null;
   }

diff --git a/core/src/components/gutter/layout.ts b/core/src/components/gutter/layout.ts
@@ -143,7 +143,12 @@ export class GutterLayout {
       if (item.anchor instanceof HTMLElement) {
         return this.root.contains(item.anchor) ? item.anchor : null;
       } else {
-        return this.root.querySelector(item.anchor);
+        try {
+          return this.root.querySelector(item.anchor);
+        } catch (e) {
+          // ignore query selector errors
+          console.log(e);
+        }
       }
     }
     return null;

diff --git a/core/src/utils/linking.ts b/core/src/utils/linking.ts
@@ -55,9 +55,15 @@ export class AkomaNtosoTarget {
 
   findElement(): HTMLElement | null {
     if (this.selector) {
-      return this.selector instanceof HTMLElement
-        ? this.selector
-        : this.component.ownerDocument.querySelector(this.selector);
+      try {
+        return this.selector instanceof HTMLElement
+          ? this.selector
+          : this.component.ownerDocument.querySelector(this.selector);
+      } catch (e) {
+        // fail on query selector errors
+        console.log(e);
+        return null;
+      }
     }
 
     // try the nearest ancestor