[LazyDataSource]: fixed reload data on DS deps change and fixed fetch…

…ing minus count on scroll up.
epam · Jun 21, 2024 · 8ea0e83 · 8ea0e83
1 parent a213010
commit 8ea0e83
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/uui-core/src/data/processing/views/tree/hooks/strategies/lazyTree/useLazyFetchingAdvisor.ts b/uui-core/src/data/processing/views/tree/hooks/strategies/lazyTree/useLazyFetchingAdvisor.ts
@@ -3,6 +3,7 @@ import { usePrevious } from '../../../../../../../hooks/usePrevious';
 import { DataSourceState } from '../../../../../../../types';
 import { isQueryChanged } from './helpers';
 import { useCallback, useMemo } from 'react';
+import { useDepsChanged } from '../../common/useDepsChanged';
 
 export interface UseLazyFetchingAdvisorProps<TId, TFilter = any> {
     dataSourceState: DataSourceState<TFilter, TId>;
@@ -12,13 +13,17 @@ export interface UseLazyFetchingAdvisorProps<TId, TFilter = any> {
     showSelectedOnly?: boolean;
 }
 
-export function useLazyFetchingAdvisor<TId, TFilter = any>({
-    dataSourceState,
-    filter,
-    forceReload,
-    backgroundReload,
-    showSelectedOnly,
-}: UseLazyFetchingAdvisorProps<TId, TFilter>) {
+export function useLazyFetchingAdvisor<TId, TFilter = any>(
+    {
+        dataSourceState,
+        filter,
+        forceReload,
+        backgroundReload,
+        showSelectedOnly,
+    }: UseLazyFetchingAdvisorProps<TId, TFilter>,
+    deps: any[] = [],
+) {
+    const depsChanged = useDepsChanged(deps);
     const areMoreRowsNeeded = useCallback((
         prevValue?: DataSourceState<TFilter, TId>,
         newValue?: DataSourceState<TFilter, TId>,
@@ -40,8 +45,9 @@ export function useLazyFetchingAdvisor<TId, TFilter = any>({
             || !isEqual(prevFilter, filter)
             || isQueryChanged(prevDataSourceState, dataSourceState)
             || (prevShowSelectedOnly !== showSelectedOnly && !showSelectedOnly)
-            || forceReload,
-        [dataSourceState, filter, forceReload],
+            || forceReload
+            || depsChanged,
+        [dataSourceState, filter, forceReload, depsChanged],
     );
 
     const moreRowsNeeded = areMoreRowsNeeded(prevDataSourceState, dataSourceState);

diff --git a/uui-core/src/data/processing/views/tree/hooks/strategies/lazyTree/useLazyTree.ts b/uui-core/src/data/processing/views/tree/hooks/strategies/lazyTree/useLazyTree.ts
@@ -94,7 +94,7 @@ export function useLazyTree<TItem, TId, TFilter = any>(
         forceReload: isForceReload,
         backgroundReload,
         showSelectedOnly,
-    });
+    }, [...deps]);
 
     useEffect(() => {
         if (showSelectedOnly && isSelectedOrCheckedChanged(dataSourceState, prevDataSourceState)) {

diff --git a/uui-core/src/data/processing/views/tree/treeStructure/helpers/FetchingHelper.ts b/uui-core/src/data/processing/views/tree/treeStructure/helpers/FetchingHelper.ts
@@ -280,7 +280,7 @@ export class FetchingHelper {
             remainingRowsCount = Number.MAX_SAFE_INTEGER;
         }
 
-        const missingCount = remainingRowsCount - ids.length;
+        const missingCount = Math.max(0, remainingRowsCount - ids.length);
 
         const availableCount = childrenCount != null ? childrenCount - ids.length : missingCount;