@stoplight/elements-core 9.0.13 → 9.0.14

package/index.esm.js

@@ -3535,6 +3535,38 @@ const TableOfContents = React.memo(({ tree, activeId, Link, maxDepthOpenByDefaul
         });
     }, []);
     const updatedTree = updateTocTree(tree, '');
+    const findFirstMatchAndIndexMatch = React.useCallback((items, id) => {
+        let firstMatch;
+        let hasAnyLastIndexMatch = false;
+        if (!id)
+            return [firstMatch, hasAnyLastIndexMatch];
+        const walk = (arr, stack) => {
+            for (const itm of arr) {
+                const newStack = stack.concat(itm);
+                const matches = ('slug' in itm && itm.slug === id) || ('id' in itm && itm.id === id);
+                if (matches) {
+                    if (!firstMatch)
+                        firstMatch = itm;
+                    const hasLastIndexMatch = newStack.some(el => 'index' in el && el.index === lastActiveIndex);
+                    if (hasLastIndexMatch)
+                        hasAnyLastIndexMatch = true;
+                }
+                if ('items' in itm && Array.isArray(itm.items)) {
+                    if (walk(itm.items, newStack))
+                        return true;
+                }
+            }
+            return false;
+        };
+        walk(items, []);
+        return [firstMatch, hasAnyLastIndexMatch];
+    }, [lastActiveIndex]);
+    const [firstMatchItem, hasAnyLastIndexMatch] = React.useMemo(() => findFirstMatchAndIndexMatch(updatedTree, activeId), [updatedTree, activeId, findFirstMatchAndIndexMatch]);
+    React.useEffect(() => {
+        if (!hasAnyLastIndexMatch && firstMatchItem && 'index' in firstMatchItem && firstMatchItem.index) {
+            setLastActiveIndex(firstMatchItem.index);
+        }
+    }, [firstMatchItem, hasAnyLastIndexMatch]);
     const container = React.useRef(null);
     const child = React.useRef(null);
     const firstRender = useFirstRender();

package/index.js

@@ -3556,6 +3556,38 @@ const TableOfContents = React__namespace.memo(({ tree, activeId, Link, maxDepthO
         });
     }, []);
     const updatedTree = updateTocTree(tree, '');
+    const findFirstMatchAndIndexMatch = React__namespace.useCallback((items, id) => {
+        let firstMatch;
+        let hasAnyLastIndexMatch = false;
+        if (!id)
+            return [firstMatch, hasAnyLastIndexMatch];
+        const walk = (arr, stack) => {
+            for (const itm of arr) {
+                const newStack = stack.concat(itm);
+                const matches = ('slug' in itm && itm.slug === id) || ('id' in itm && itm.id === id);
+                if (matches) {
+                    if (!firstMatch)
+                        firstMatch = itm;
+                    const hasLastIndexMatch = newStack.some(el => 'index' in el && el.index === lastActiveIndex);
+                    if (hasLastIndexMatch)
+                        hasAnyLastIndexMatch = true;
+                }
+                if ('items' in itm && Array.isArray(itm.items)) {
+                    if (walk(itm.items, newStack))
+                        return true;
+                }
+            }
+            return false;
+        };
+        walk(items, []);
+        return [firstMatch, hasAnyLastIndexMatch];
+    }, [lastActiveIndex]);
+    const [firstMatchItem, hasAnyLastIndexMatch] = React__namespace.useMemo(() => findFirstMatchAndIndexMatch(updatedTree, activeId), [updatedTree, activeId, findFirstMatchAndIndexMatch]);
+    React__namespace.useEffect(() => {
+        if (!hasAnyLastIndexMatch && firstMatchItem && 'index' in firstMatchItem && firstMatchItem.index) {
+            setLastActiveIndex(firstMatchItem.index);
+        }
+    }, [firstMatchItem, hasAnyLastIndexMatch]);
     const container = React__namespace.useRef(null);
     const child = React__namespace.useRef(null);
     const firstRender = useFirstRender();

package/index.mjs

@@ -3535,6 +3535,38 @@ const TableOfContents = React.memo(({ tree, activeId, Link, maxDepthOpenByDefaul
         });
     }, []);
     const updatedTree = updateTocTree(tree, '');
+    const findFirstMatchAndIndexMatch = React.useCallback((items, id) => {
+        let firstMatch;
+        let hasAnyLastIndexMatch = false;
+        if (!id)
+            return [firstMatch, hasAnyLastIndexMatch];
+        const walk = (arr, stack) => {
+            for (const itm of arr) {
+                const newStack = stack.concat(itm);
+                const matches = ('slug' in itm && itm.slug === id) || ('id' in itm && itm.id === id);
+                if (matches) {
+                    if (!firstMatch)
+                        firstMatch = itm;
+                    const hasLastIndexMatch = newStack.some(el => 'index' in el && el.index === lastActiveIndex);
+                    if (hasLastIndexMatch)
+                        hasAnyLastIndexMatch = true;
+                }
+                if ('items' in itm && Array.isArray(itm.items)) {
+                    if (walk(itm.items, newStack))
+                        return true;
+                }
+            }
+            return false;
+        };
+        walk(items, []);
+        return [firstMatch, hasAnyLastIndexMatch];
+    }, [lastActiveIndex]);
+    const [firstMatchItem, hasAnyLastIndexMatch] = React.useMemo(() => findFirstMatchAndIndexMatch(updatedTree, activeId), [updatedTree, activeId, findFirstMatchAndIndexMatch]);
+    React.useEffect(() => {
+        if (!hasAnyLastIndexMatch && firstMatchItem && 'index' in firstMatchItem && firstMatchItem.index) {
+            setLastActiveIndex(firstMatchItem.index);
+        }
+    }, [firstMatchItem, hasAnyLastIndexMatch]);
     const container = React.useRef(null);
     const child = React.useRef(null);
     const firstRender = useFirstRender();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/elements-core",
-  "version": "9.0.13",
+  "version": "9.0.14",
   "main": "./index.js",
   "sideEffects": [
     "web-components.min.js",