@uipath/apollo-react 4.12.0 → 4.12.1

package/dist/canvas/components/Toolbox/ListView.cjs

@@ -167,7 +167,7 @@ const ListViewRow = /*#__PURE__*/ (0, external_react_namespaceObject.memo)(({ in
         ]
     });
 });
-const ListViewInner = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef)(function({ items, activeIndex = -1, listRef, onItemClick, onItemHover, emptyStateMessage = 'No items found', emptyStateIcon = 'search-x', isLoading = false, enableSections = true }, ref) {
+const ListViewInner = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef)(function({ items, activeIndex = -1, listRef, onItemClick, onItemHover, onScroll, emptyStateMessage = 'No items found', emptyStateIcon = 'search-x', isLoading = false, enableSections = true }, ref) {
     const { isDarkMode } = (0, CanvasThemeContext_cjs_namespaceObject.useCanvasTheme)();
     const renderedItems = (0, external_react_namespaceObject.useMemo)(()=>buildRenderedItems(items, enableSections), [
         items,
@@ -229,7 +229,8 @@ const ListViewInner = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRe
         rowComponent: ListViewRow,
         rowCount: renderedItems.length,
         rowHeight: 40,
-        overscanCount: 20
+        overscanCount: 20,
+        onScroll: onScroll
     });
 });
 const ListView_ListView = /*#__PURE__*/ (0, external_react_namespaceObject.memo)(ListViewInner);

package/dist/canvas/components/Toolbox/ListView.d.ts

@@ -40,6 +40,7 @@ interface ListViewProps<T extends ListItem> {
     listRef?: React.RefObject<ListImperativeAPI | null>;
     onItemClick: (item: T, index: number) => void;
     onItemHover?: (item: T) => void;
+    onScroll?: React.UIEventHandler<HTMLDivElement>;
     emptyStateMessage?: string;
     emptyStateIcon?: string;
     isLoading?: boolean;

package/dist/canvas/components/Toolbox/ListView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ListView.d.ts","sourceRoot":"","sources":["../../../../src/canvas/components/Toolbox/ListView.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAqB,MAAM,cAAc,CAAC;AAKzE,MAAM,WAAW,YAAY;IAI3B,IAAI,CAAC,EAAE,MAAM,CAAC;IAId,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACjC;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,GAAG,GAAG,IAAI;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CACnF,CAAC;AAEF,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,QAAQ,IACrC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC;AAE9B,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,QAAQ,EACnD,KAAK,EAAE,CAAC,EAAE,EACV,cAAc,EAAE,OAAO,GACtB,UAAU,CAAC,CAAC,CAAC,EAAE,CAqCjB;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,QAAQ;IAClD,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;CACjC;AA8FD,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IAC3D,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;CAChC;AAED,UAAU,aAAa,CAAC,CAAC,SAAS,QAAQ;IACxC,KAAK,EAAE,CAAC,EAAE,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IACpD,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;IAChC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAiED,eAAO,MAAM,QAAQ,EAA0B,CAAC,CAAC,SAAS,QAAQ,EAChE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;CAAE,KAC7D,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC"}
+{"version":3,"file":"ListView.d.ts","sourceRoot":"","sources":["../../../../src/canvas/components/Toolbox/ListView.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAqB,MAAM,cAAc,CAAC;AAKzE,MAAM,WAAW,YAAY;IAI3B,IAAI,CAAC,EAAE,MAAM,CAAC;IAId,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACjC;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,GAAG,GAAG,IAAI;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CACnF,CAAC;AAEF,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,QAAQ,IACrC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC;AAE9B,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,QAAQ,EACnD,KAAK,EAAE,CAAC,EAAE,EACV,cAAc,EAAE,OAAO,GACtB,UAAU,CAAC,CAAC,CAAC,EAAE,CAqCjB;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,QAAQ;IAClD,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;CACjC;AA8FD,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IAC3D,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;CAChC;AAED,UAAU,aAAa,CAAC,CAAC,SAAS,QAAQ;IACxC,KAAK,EAAE,CAAC,EAAE,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IACpD,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;IAChC,QAAQ,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;IAChD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAmED,eAAO,MAAM,QAAQ,EAA0B,CAAC,CAAC,SAAS,QAAQ,EAChE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;CAAE,KAC7D,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC"}

package/dist/canvas/components/Toolbox/ListView.js

@@ -138,7 +138,7 @@ const ListViewRow = /*#__PURE__*/ memo(({ index, style, ariaAttributes, rendered
         ]
     });
 });
-const ListViewInner = /*#__PURE__*/ forwardRef(function({ items, activeIndex = -1, listRef, onItemClick, onItemHover, emptyStateMessage = 'No items found', emptyStateIcon = 'search-x', isLoading = false, enableSections = true }, ref) {
+const ListViewInner = /*#__PURE__*/ forwardRef(function({ items, activeIndex = -1, listRef, onItemClick, onItemHover, onScroll, emptyStateMessage = 'No items found', emptyStateIcon = 'search-x', isLoading = false, enableSections = true }, ref) {
     const { isDarkMode } = useCanvasTheme();
     const renderedItems = useMemo(()=>buildRenderedItems(items, enableSections), [
         items,
@@ -200,7 +200,8 @@ const ListViewInner = /*#__PURE__*/ forwardRef(function({ items, activeIndex = -
         rowComponent: ListViewRow,
         rowCount: renderedItems.length,
         rowHeight: 40,
-        overscanCount: 20
+        overscanCount: 20,
+        onScroll: onScroll
     });
 });
 const ListView_ListView = /*#__PURE__*/ memo(ListViewInner);

package/dist/canvas/components/Toolbox/Toolbox.cjs

@@ -100,6 +100,10 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
     const listViewRef = (0, external_react_namespaceObject.useRef)(null);
     const searchInputRef = (0, external_react_namespaceObject.useRef)(null);
     const clearButtonRef = (0, external_react_namespaceObject.useRef)(null);
+    const lastScrollTopRef = (0, external_react_namespaceObject.useRef)(0);
+    const handleListScroll = (0, external_react_namespaceObject.useCallback)((e)=>{
+        lastScrollTopRef.current = e.currentTarget.scrollTop;
+    }, []);
     const isSearching = (0, external_react_namespaceObject.useMemo)(()=>search.length > 0, [
         search
     ]);
@@ -185,31 +189,45 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
         setSearchLoading(false);
         setIsSearchingInitialItems(true);
         const restoredIndex = previousState?.data.activeIndex ?? SEARCH_BAR_INDEX;
-        navigateToIndex(restoredIndex);
+        const restoredScrollTop = previousState?.data.scrollTop ?? 0;
+        setActiveIndex(restoredIndex);
+        searchInputRef.current?.focus();
+        requestAnimationFrame(()=>{
+            const element = listRef.current?.element;
+            if (element) element.scrollTop = restoredScrollTop;
+            lastScrollTopRef.current = restoredScrollTop;
+        });
         onBack?.();
     }, [
         navigationStack,
         onBack,
         startTransition,
-        navigateToIndex
+        listRef
     ]);
     const handleItemSelect = (0, external_react_namespaceObject.useCallback)(async (item, index)=>{
         if (!item.children) return void onItemSelect(item);
         setChildrenLoading(true);
         const nestedItems = 'function' == typeof item.children ? await item.children(item.id, item.name) : item.children;
         const savedIndex = isSearching ? SEARCH_BAR_INDEX : index ?? activeIndex;
+        const savedScrollTop = isSearching ? 0 : lastScrollTopRef.current;
         navigationStack.push({
             title: currentParentItem?.name || title,
             data: {
                 items,
                 parentItem: currentParentItem,
-                activeIndex: savedIndex
+                activeIndex: savedIndex,
+                scrollTop: savedScrollTop
             }
         });
         setItems(nestedItems);
         setCurrentParentItem(item);
         clearSearch();
         setActiveIndex(SEARCH_BAR_INDEX);
+        requestAnimationFrame(()=>{
+            const element = listRef.current?.element;
+            if (element) element.scrollTop = 0;
+            lastScrollTopRef.current = 0;
+        });
         startTransition('forward');
         setChildrenLoading(false);
     }, [
@@ -221,7 +239,8 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
         isSearching,
         clearSearch,
         startTransition,
-        onItemSelect
+        onItemSelect,
+        listRef
     ]);
     (0, external_react_namespaceObject.useEffect)(()=>()=>{
             if (transitionTimeoutRef.current) clearTimeout(transitionTimeoutRef.current);
@@ -242,7 +261,8 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
                 data: {
                     items: newInitialItems,
                     parentItem: null,
-                    activeIndex: stackItem.data.activeIndex
+                    activeIndex: stackItem.data.activeIndex,
+                    scrollTop: stackItem.data.scrollTop
                 }
             };
             const updatedParentItem = findItemById(newInitialItems, stackItem.data.parentItem.id);
@@ -253,7 +273,8 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
                 data: {
                     items: updatedItems,
                     parentItem: updatedParentItem,
-                    activeIndex: stackItem.data.activeIndex
+                    activeIndex: stackItem.data.activeIndex,
+                    scrollTop: stackItem.data.scrollTop
                 }
             };
         });
@@ -360,6 +381,13 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
         handleItemSelect,
         handleBackTransition
     ]);
+    const handleClose = (0, external_react_namespaceObject.useCallback)(()=>{
+        navigationStack.clear();
+        onClose();
+    }, [
+        navigationStack,
+        onClose
+    ]);
     (0, external_react_namespaceObject.useEffect)(()=>{
         const handleKeyDown = (e)=>{
             if ('Escape' === e.key) if (isSearching) {
@@ -367,10 +395,10 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
                 startTransition('back');
                 clearSearch();
             } else if (navigationStack.canGoBack) handleBackTransition();
-            else onClose();
+            else handleClose();
         };
         const handleClickOutside = (e)=>{
-            if (containerRef.current && !containerRef.current.contains(e.target)) onClose();
+            if (containerRef.current && !containerRef.current.contains(e.target)) handleClose();
         };
         document.addEventListener('keydown', handleKeyDown);
         document.addEventListener('mousedown', handleClickOutside);
@@ -381,7 +409,7 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
     }, [
         isSearching,
         navigationStack.canGoBack,
-        onClose,
+        handleClose,
         clearSearch,
         startTransition,
         handleBackTransition
@@ -425,6 +453,7 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
                             emptyStateMessage: isSearching ? 'No matching nodes found' : 'No nodes found',
                             onItemClick: handleItemSelect,
                             onItemHover: onItemHover,
+                            onScroll: handleListScroll,
                             enableSections: !isSearching
                         })
                     })

package/dist/canvas/components/Toolbox/Toolbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Toolbox.d.ts","sourceRoot":"","sources":["../../../../src/canvas/components/Toolbox/Toolbox.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,QAAQ,EAAkD,MAAM,YAAY,CAAC;AAwC3F,MAAM,MAAM,oBAAoB,CAAC,CAAC,GAAG,GAAG,IAAI,CAC1C,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,OAAO,EACzB,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE;IAAE,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,KAC5E,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAE5B,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,YAAY,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1D,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IAC1C,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;CACpC;AAgDD,wBAAgB,OAAO,CAAC,CAAC,EAAE,EACzB,OAAO,EACP,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,KAAK,EACL,YAAY,EACZ,OAAO,EACP,SAAiB,EACjB,UAAkB,GACnB,EAAE,YAAY,CAAC,CAAC,CAAC,2CA0cjB"}
+{"version":3,"file":"Toolbox.d.ts","sourceRoot":"","sources":["../../../../src/canvas/components/Toolbox/Toolbox.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,QAAQ,EAAkD,MAAM,YAAY,CAAC;AAwC3F,MAAM,MAAM,oBAAoB,CAAC,CAAC,GAAG,GAAG,IAAI,CAC1C,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,OAAO,EACzB,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE;IAAE,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,KAC5E,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAE5B,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,YAAY,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1D,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IAC1C,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;CACpC;AAgDD,wBAAgB,OAAO,CAAC,CAAC,EAAE,EACzB,OAAO,EACP,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,KAAK,EACL,YAAY,EACZ,OAAO,EACP,SAAiB,EACjB,UAAkB,GACnB,EAAE,YAAY,CAAC,CAAC,CAAC,2CAwfjB"}

package/dist/canvas/components/Toolbox/Toolbox.js

@@ -72,6 +72,10 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
     const listViewRef = useRef(null);
     const searchInputRef = useRef(null);
     const clearButtonRef = useRef(null);
+    const lastScrollTopRef = useRef(0);
+    const handleListScroll = useCallback((e)=>{
+        lastScrollTopRef.current = e.currentTarget.scrollTop;
+    }, []);
     const isSearching = useMemo(()=>search.length > 0, [
         search
     ]);
@@ -157,31 +161,45 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
         setSearchLoading(false);
         setIsSearchingInitialItems(true);
         const restoredIndex = previousState?.data.activeIndex ?? SEARCH_BAR_INDEX;
-        navigateToIndex(restoredIndex);
+        const restoredScrollTop = previousState?.data.scrollTop ?? 0;
+        setActiveIndex(restoredIndex);
+        searchInputRef.current?.focus();
+        requestAnimationFrame(()=>{
+            const element = listRef.current?.element;
+            if (element) element.scrollTop = restoredScrollTop;
+            lastScrollTopRef.current = restoredScrollTop;
+        });
         onBack?.();
     }, [
         navigationStack,
         onBack,
         startTransition,
-        navigateToIndex
+        listRef
     ]);
     const handleItemSelect = useCallback(async (item, index)=>{
         if (!item.children) return void onItemSelect(item);
         setChildrenLoading(true);
         const nestedItems = 'function' == typeof item.children ? await item.children(item.id, item.name) : item.children;
         const savedIndex = isSearching ? SEARCH_BAR_INDEX : index ?? activeIndex;
+        const savedScrollTop = isSearching ? 0 : lastScrollTopRef.current;
         navigationStack.push({
             title: currentParentItem?.name || title,
             data: {
                 items,
                 parentItem: currentParentItem,
-                activeIndex: savedIndex
+                activeIndex: savedIndex,
+                scrollTop: savedScrollTop
             }
         });
         setItems(nestedItems);
         setCurrentParentItem(item);
         clearSearch();
         setActiveIndex(SEARCH_BAR_INDEX);
+        requestAnimationFrame(()=>{
+            const element = listRef.current?.element;
+            if (element) element.scrollTop = 0;
+            lastScrollTopRef.current = 0;
+        });
         startTransition('forward');
         setChildrenLoading(false);
     }, [
@@ -193,7 +211,8 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
         isSearching,
         clearSearch,
         startTransition,
-        onItemSelect
+        onItemSelect,
+        listRef
     ]);
     useEffect(()=>()=>{
             if (transitionTimeoutRef.current) clearTimeout(transitionTimeoutRef.current);
@@ -214,7 +233,8 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
                 data: {
                     items: newInitialItems,
                     parentItem: null,
-                    activeIndex: stackItem.data.activeIndex
+                    activeIndex: stackItem.data.activeIndex,
+                    scrollTop: stackItem.data.scrollTop
                 }
             };
             const updatedParentItem = findItemById(newInitialItems, stackItem.data.parentItem.id);
@@ -225,7 +245,8 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
                 data: {
                     items: updatedItems,
                     parentItem: updatedParentItem,
-                    activeIndex: stackItem.data.activeIndex
+                    activeIndex: stackItem.data.activeIndex,
+                    scrollTop: stackItem.data.scrollTop
                 }
             };
         });
@@ -332,6 +353,13 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
         handleItemSelect,
         handleBackTransition
     ]);
+    const handleClose = useCallback(()=>{
+        navigationStack.clear();
+        onClose();
+    }, [
+        navigationStack,
+        onClose
+    ]);
     useEffect(()=>{
         const handleKeyDown = (e)=>{
             if ('Escape' === e.key) if (isSearching) {
@@ -339,10 +367,10 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
                 startTransition('back');
                 clearSearch();
             } else if (navigationStack.canGoBack) handleBackTransition();
-            else onClose();
+            else handleClose();
         };
         const handleClickOutside = (e)=>{
-            if (containerRef.current && !containerRef.current.contains(e.target)) onClose();
+            if (containerRef.current && !containerRef.current.contains(e.target)) handleClose();
         };
         document.addEventListener('keydown', handleKeyDown);
         document.addEventListener('mousedown', handleClickOutside);
@@ -353,7 +381,7 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
     }, [
         isSearching,
         navigationStack.canGoBack,
-        onClose,
+        handleClose,
         clearSearch,
         startTransition,
         handleBackTransition
@@ -397,6 +425,7 @@ function Toolbox({ onClose, onBack, onItemSelect, onSearch, onItemHover, title,
                             emptyStateMessage: isSearching ? 'No matching nodes found' : 'No nodes found',
                             onItemClick: handleItemSelect,
                             onItemHover: onItemHover,
+                            onScroll: handleListScroll,
                             enableSections: !isSearching
                         })
                     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uipath/apollo-react",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "description": "Apollo Design System - React component library with Material UI theming",
   "repository": {
     "type": "git",