From 4c7e1bc2bf7ed97d93649e40351b048a06b5d0fd Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 6 Dec 2024 18:36:12 -0500 Subject: improve drag n drop and refactor --- extension/src/components/FolderButton.tsx | 58 ++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 8 deletions(-) (limited to 'extension/src/components/FolderButton.tsx') diff --git a/extension/src/components/FolderButton.tsx b/extension/src/components/FolderButton.tsx index 2b59d56..b1a8a64 100644 --- a/extension/src/components/FolderButton.tsx +++ b/extension/src/components/FolderButton.tsx @@ -2,8 +2,10 @@ import BookmarkTreeNode = browser.bookmarks.BookmarkTreeNode; import FolderBody from "./FolderBody.tsx"; import FolderIcon from "../assets/folder.svg?react" import FolderIconOpen from "../assets/folder_open.svg?react" -import {useState} from "react"; -import bookmark from "./Bookmark.tsx"; +import React, {useState} from "react"; +import DropTargets from "./DropTargets.tsx"; +import {ActiveDrag, Settings} from "./Body.tsx"; +import {getBrowser} from "../main.tsx"; /** * A component for the button used to open a bookmark folder. @@ -12,24 +14,64 @@ import bookmark from "./Bookmark.tsx"; * @param props.data The BookmarkTreeNode containing the data of the folder */ function FolderButton(props: {data: BookmarkTreeNode}) { + let [settings, _] = React.useContext(Settings); + let [activeDrag, setActiveDrag] = React.useContext(ActiveDrag); + const [folderOpen, setFolderOpen] = useState(false); + // Dragging + function handleDrag() { + setActiveDrag(props.data); + } + + function handleDragEnd() { + console.log("drop end") + setActiveDrag(null); + } + + // Dropping + function handleDropLeft() { + console.log("drop left folder") + getBrowser().bookmarks.move(activeDrag!.id, { + parentId: props.data.parentId, + index: props.data.index + }) + location.reload() + } + + function handleDropRight() { + console.log("drop right folder") + getBrowser().bookmarks.move(activeDrag!.id, { + parentId: props.data.parentId, + index: (props.data.index! + 1) + }) + location.reload(); + } + + function handleDropCenter() { + console.log("drop center folder") + getBrowser().bookmarks.move(activeDrag!.id, { + parentId: props.data.id + }); + location.reload() + } + return( <>
- setFolderOpen(!folderOpen)}> + setFolderOpen(!folderOpen)} draggable={settings.editMode} onDrag={handleDrag} onDragEnd={handleDragEnd}>
{folderOpen ? : }
{props.data.title}
+ {activeDrag && activeDrag !== props.data && + }
- {folderOpen - && props.data.children - && props.data.children.length > 0 - && ()} + {folderOpen && props.data.children && props.data.children.length > 0 && + } -); + ); } export default FolderButton \ No newline at end of file -- cgit v1.2.3