Fix range selection by using view hash list (#19)

aminpaks · Feb 2, 2021 · c90360a · c90360a
1 parent d9da9e2
commit c90360a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/components/state/server-state.tsx b/src/components/state/server-state.tsx
@@ -31,6 +31,7 @@ const initialTorrentSortFilterState: SortFilterStateValue = {
 const ServerContext = createContext(initialServerState);
 const TorrentsContext = createContext(initialTorrentsState);
 const TorrentHashListContext = createContext(initialTorrentsState.hashList);
+const TorrentViewHashListContext = createContext(initialTorrentsState.viewHashList);
 const TorrentSortFilterContext = createContext(([
   initialTorrentSortFilterState,
   undefined,
@@ -238,9 +239,11 @@ export const AppContextProvider: FC = ({ children }) => {
     <ServerContext.Provider value={serverState}>
       <TorrentsContext.Provider value={torrentsState}>
         <TorrentHashListContext.Provider value={torrentsState.hashList}>
-          <TorrentSortFilterContext.Provider value={[torrentSortFilterState, handleListSortFilter]}>
-            {children}
-          </TorrentSortFilterContext.Provider>
+          <TorrentViewHashListContext.Provider value={torrentsState.viewHashList}>
+            <TorrentSortFilterContext.Provider value={[torrentSortFilterState, handleListSortFilter]}>
+              {children}
+            </TorrentSortFilterContext.Provider>
+          </TorrentViewHashListContext.Provider>
         </TorrentHashListContext.Provider>
       </TorrentsContext.Provider>
     </ServerContext.Provider>
@@ -259,6 +262,10 @@ export const useTorrentList = () => {
   return useContext(TorrentHashListContext);
 };
 
+export const useTorrentViewList = () => {
+  return useContext(TorrentViewHashListContext);
+};
+
 export const useTorrentSortFilterState = () => {
   return useContext(TorrentSortFilterContext);
 };
diff --git a/src/components/torrents/selection.tsx b/src/components/torrents/selection.tsx
@@ -1,6 +1,6 @@
 import produce from 'immer';
 import { useEffect, useRef, useState } from 'react';
-import { useTorrentList, useUiState } from '../state';
+import { useTorrentViewList, useUiState } from '../state';
 import { ROW_CELL_HEIGHT } from './list';
 import { color, getElementAttr } from '../../utils';
 import { mStyles } from '../common';
@@ -36,7 +36,7 @@ const initialState = {
 
 export const TorrentListSelection = () => {
   const classes = useStyles();
-  const hashList = useTorrentList();
+  const hashList = useTorrentViewList();
   const [{ torrentListSelection }, { updateTorrentSelectionList, updateContextMenuIsOpen }] = useUiState();
   const [state, setState] = useState(initialState);
   const isUpdatingEndRef = useRef(false);
@@ -199,5 +199,3 @@ function getRectBound(state: typeof initialState) {
 
   return result;
 }
-
-function getSelectionRange() {}