Only allow moving of bookmarks in custom order

3 files changed, 3 insertions, 5 deletions

diff --git a/extension/src/components/Bookmark.tsx b/extension/src/components/Bookmark.tsx
index bf075a3..0951b8c 100644
--- a/extension/src/components/Bookmark.tsx
+++ b/extension/src/components/Bookmark.tsx
@@ -84,7 +84,7 @@ function Bookmark(props: {id: string}) {
 
     return(
         <div className={"bookmark"} id={bmData.id}>
-            <a href={bmData.url} draggable={settings.editMode} onDrag={handleDrag} onDragEnd={handleDragEnd}>
+            <a href={bmData.url} draggable={settings.editMode && settings.sort === "from-bookmarks"} onDrag={handleDrag} onDragEnd={handleDragEnd}>
                 <IconPre bmData={bmData}/>
                 <span>{bmData.title}</span>
             </a>
diff --git a/extension/src/components/FolderButton.tsx b/extension/src/components/FolderButton.tsx
index 30093fd..47c0c2f 100644
--- a/extension/src/components/FolderButton.tsx
+++ b/extension/src/components/FolderButton.tsx
@@ -95,7 +95,7 @@ function FolderButton(props: {id: string}) {
     return(
         <>
             <div className={"bookmark"} id={bmData.id}>
-                <a onClick={() => setFolderOpen(!folderOpen)} draggable={settings.editMode} onDrag={handleDrag}
+                <a onClick={() => setFolderOpen(!folderOpen)} draggable={settings.editMode && settings.sort === "from-bookmarks"} onDrag={handleDrag}
                    onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
                     <div className="icon-box">
                         {folderOpen ? <FolderIconOpen/> : <FolderIcon/>}
diff --git a/extension/src/components/SettingsEditor.tsx b/extension/src/components/SettingsEditor.tsx
index 362e774..cdb2894 100644
--- a/extension/src/components/SettingsEditor.tsx
+++ b/extension/src/components/SettingsEditor.tsx
@@ -34,7 +34,7 @@ function SettingsEditor(props: {isOpen: [boolean,  React.Dispatch<React.SetState
                               onChange={e => {
                                   setSettings({...settings, sort: e})
                               }}>
-                <option value={"from-bookmarks"}>From Bookmarks</option>
+                <option value={"from-bookmarks"}>Custom Order</option>
                 <option value={"alphabetical"}>Alphabetical</option>
                 <option value={"recent"}>Recently used</option>
             </RadioButtonGroup>
@@ -113,8 +113,6 @@ function SettingsEditor(props: {isOpen: [boolean,  React.Dispatch<React.SetState
 
 /**
  * Walks the tree and creates a list of the folders
- *
- * @param tree The full tree to walk through
  */
 async function getFoldersFromTree() {
     let tree = await getBrowser().bookmarks.getTree();