Update sort order logic to consider search state
This commit is contained in:
@@ -394,22 +394,24 @@ export default function App() {
|
|||||||
|
|
||||||
const getNextTextSortOrder = useCallback(
|
const getNextTextSortOrder = useCallback(
|
||||||
(folderId: string | null) => {
|
(folderId: string | null) => {
|
||||||
|
if (hasSearch) return null;
|
||||||
const list = textsByFolder.get(folderId ?? null) ?? [];
|
const list = textsByFolder.get(folderId ?? null) ?? [];
|
||||||
const hasManualOrder = list.some((text) => text.sort_order !== null);
|
const hasManualOrder = list.some((text) => text.sort_order !== null);
|
||||||
if (!hasManualOrder) return null;
|
if (!hasManualOrder) return null;
|
||||||
return list.length;
|
return list.length;
|
||||||
},
|
},
|
||||||
[textsByFolder]
|
[hasSearch, textsByFolder]
|
||||||
);
|
);
|
||||||
|
|
||||||
const getNextFolderSortOrder = useCallback(
|
const getNextFolderSortOrder = useCallback(
|
||||||
(parentId: string | null) => {
|
(parentId: string | null) => {
|
||||||
|
if (hasSearch) return null;
|
||||||
const list = foldersByParent.get(parentId ?? null) ?? [];
|
const list = foldersByParent.get(parentId ?? null) ?? [];
|
||||||
const hasManualOrder = list.some((folder) => folder.sort_order !== null);
|
const hasManualOrder = list.some((folder) => folder.sort_order !== null);
|
||||||
if (!hasManualOrder) return null;
|
if (!hasManualOrder) return null;
|
||||||
return list.length;
|
return list.length;
|
||||||
},
|
},
|
||||||
[foldersByParent]
|
[foldersByParent, hasSearch]
|
||||||
);
|
);
|
||||||
|
|
||||||
const isFolderExpanded = useCallback(
|
const isFolderExpanded = useCallback(
|
||||||
|
|||||||
Reference in New Issue
Block a user