fix: fix selections sets instability (#27)

jaredLunde · Jul 28, 2022 · f2ea209 · f2ea209
1 parent 3b3296e
commit f2ea209
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/use-selections.ts b/src/use-selections.ts
@@ -21,19 +21,15 @@ export function useSelections<Meta>(
   const visibleNodes_ = useVisibleNodes(fileTree);
   const visibleNodes = nodes ?? visibleNodes_;
   const prevSelectionsSet = React.useRef<SubjectRange<number> | null>(null);
-  const selectionsSet = React.useMemo(() => {
-    const next = createSelectionsSet(fileTree, visibleNodes);
+  const selectionsSet = createSelectionsSet(fileTree, nodes ?? emptyArray);
 
+  React.useEffect(() => {
     if (prevSelectionsSet.current) {
       for (const nodeId of prevSelectionsSet.current) {
-        next.add(nodeId);
+        selectionsSet.add(nodeId);
       }
     }
 
-    return next;
-  }, [fileTree, visibleNodes]);
-
-  React.useEffect(() => {
     prevSelectionsSet.current = selectionsSet;
   }, [selectionsSet]);
 
@@ -99,6 +95,8 @@ export function useSelections<Meta>(
   };
 }
 
+const emptyArray: number[] = [];
+
 const createProps = trieMemoize(
   [WeakMap, WeakMap, Map],
   (