[PickerInput]: reset scrollTo value on picker close.

[VirtualList]: fixed crashes in case of absence of scroll container ref on first mount.
epam · Oct 1, 2024 · c2480ab · c2480ab
1 parent 0a282e3
commit c2480ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/uui-components/src/pickers/hooks/usePickerInput.ts b/uui-components/src/pickers/hooks/usePickerInput.ts
@@ -93,13 +93,14 @@ export function usePickerInput<TItem, TId, TProps>(props: UsePickerInputProps<TI
             document.body.style.overflow = !newOpened && modals.length === 0 ? '' : 'hidden';
         }
 
-        handleDataSourceValueChange({
-            ...dataSourceState,
+        handleDataSourceValueChange((prevState) => ({
+            ...prevState,
             topIndex: 0,
             visibleCount: initialRowsVisible,
             focusedIndex: 0,
+            scrollTo: undefined,
             search: '',
-        });
+        }));
 
         setIsSearchChanged(false);
         setOpened(newOpened);

diff --git a/uui-core/src/hooks/useVirtualList/utils.ts b/uui-core/src/hooks/useVirtualList/utils.ts
@@ -113,7 +113,7 @@ const getRealBottomIndex = ({ rowsCount, scrollContainer, rowOffsets, value: { t
     let bottomIndex = topIndex;
     const containerScrollTop = scrollContainer?.scrollTop ?? 0;
 
-    const containerScrollBottom = containerScrollTop + scrollContainer.clientHeight ?? 0;
+    const containerScrollBottom = containerScrollTop + scrollContainer?.clientHeight ?? 0;
     while (bottomIndex < rowsCount && rowOffsets[bottomIndex] < containerScrollBottom) {
         bottomIndex++;
     }