don't throw in spotlight.destroy() (#5017)

* assert lastVisibleItem before computedHidden * console.error instead of throw when spotlight destroy called and spotlight is not attached
voxel51 · Oct 31, 2024 · 1a9c5d5 · 1a9c5d5
1 parent 1ecde84
commit 1a9c5d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/packages/components/src/components/AdaptiveMenu/index.tsx b/app/packages/components/src/components/AdaptiveMenu/index.tsx
@@ -53,8 +53,10 @@ export default function AdaptiveMenu(props: AdaptiveMenuPropsType) {
     if (!containerElem) return;
     hideOverflowingNodes(containerElem, (_: number, lastVisibleItemId) => {
       const lastVisibleItem = itemsById[lastVisibleItemId];
-      const computedHidden = items.length - lastVisibleItem.index - 1;
-      setHidden(computedHidden);
+      if (lastVisibleItem?.index) {
+        const computedHidden = items.length - lastVisibleItem.index - 1;
+        setHidden(computedHidden);
+      }
     });
   }
 

diff --git a/app/packages/spotlight/src/index.ts b/app/packages/spotlight/src/index.ts
@@ -104,7 +104,8 @@ export default class Spotlight<K, V> extends EventTarget {
 
   destroy(): void {
     if (!this.attached) {
-      throw new Error("spotlight is not attached");
+      console.error("spotlight is not attached");
+      return;
     }
 
     this.#backward?.remove();