⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
Commit
stuzer058efdf6d87b13
diff --git a/components/CollectionListing.tsx b/components/CollectionListing.tsxindex 6504dd65..f9ae0472 100644--- a/components/CollectionListing.tsx+++ b/components/CollectionListing.tsx@@ -112,6 +112,67 @@ const CollectionListing = () => {);};+ function reorderTreeItems(tree, movedCollectionId, source, destination) {+ // Same parent reordering+ if (source.parentId === destination.parentId) {+ const parent = tree.items[source.parentId];+ const children = [...parent.children];++ // Remove from source index+ children.splice(source.index, 1);+ // Insert at destination index+ children.splice(destination.index, 0, movedCollectionId);++ parent.children = children;+ return tree;+ }++ // Different parent move+ const sourceParent = tree.items[source.parentId];+ const destinationParent = tree.items[destination.parentId];++ // Remove from source parent+ sourceParent.children = sourceParent.children.filter(id => id !== movedCollectionId);++ // Initialize children array if it doesn't exist+ if (!destinationParent.children) {+ destinationParent.children = [];+ }++ // If destination index is not specified, add to the end+ const destinationIndex = destination.index !== undefined ?+ destination.index :+ destinationParent.children.length;++ // Add to destination parent+ destinationParent.children.splice(destinationIndex, 0, movedCollectionId);++ // Update destination parent properties+ destinationParent.hasChildren = true;+ destinationParent.isExpanded = true;++ // Update the moved item's parent ID+ tree.items[movedCollectionId].data.parentId = destination.parentId;++ return tree;+ }++ function flattenTreeIds(tree, nodeId = 'root', result = []) {+ const node = tree.items[nodeId];++ if (nodeId !== 'root') {+ result.push(node.id);+ }++ if (node.children && node.children.length > 0) {+ node.children.forEach(childId => {+ flattenTreeIds(tree, childId, result);+ });+ }++ return result;+ }+const onDragEnd = async (source: TreeSourcePosition,destination: TreeDestinationPosition | undefined@@ -148,7 +209,7 @@ const CollectionListing = () => {setTree((currentTree) => moveItemOnTree(currentTree!, source, destination));- const updatedCollectionOrder = [...user.collectionOrder];+ const newTree = reorderTreeItems(tree, movedCollectionId, source, destination);if (source.parentId !== destination.parentId) {await updateCollection.mutateAsync(@@ -169,42 +230,10 @@ const CollectionListing = () => {);}- if (- destination.index !== undefined &&- destination.parentId === source.parentId &&- source.parentId === "root"- ) {- updatedCollectionOrder.includes(movedCollectionId) &&- updatedCollectionOrder.splice(source.index, 1);-- updatedCollectionOrder.splice(destination.index, 0, movedCollectionId);-- await updateUser.mutateAsync({- ...user,- collectionOrder: updatedCollectionOrder,- });- } else if (- destination.index !== undefined &&- destination.parentId === "root"- ) {- updatedCollectionOrder.splice(destination.index, 0, movedCollectionId);-- updateUser.mutate({- ...user,- collectionOrder: updatedCollectionOrder,- });- } else if (- source.parentId === "root" &&- destination.parentId &&- destination.parentId !== "root"- ) {- updatedCollectionOrder.splice(source.index, 1);-- await updateUser.mutateAsync({- ...user,- collectionOrder: updatedCollectionOrder,- });- }+ await updateUser.mutateAsync({+ ...user,+ collectionOrder: flattenTreeIds(newTree),+ });};if (isLoading) {