@electerm/electerm-react 1.60.29 → 1.60.32

package/client/components/bookmark-form/tree-delete.jsx

@@ -5,7 +5,6 @@ import {
 } from 'antd'
 import { defaultBookmarkGroupId, settingMap } from '../../common/constants'
 import deepCopy from 'json-deep-copy'
-import { action } from 'manate'
 
 const e = window.translate
 
@@ -24,10 +23,8 @@ export default class BookmarkTreeDelete extends StartSessionSelect {
       checkedKeys
     } = this.props
     const arr = checkedKeys.filter(d => d !== defaultBookmarkGroupId)
-    action(() => {
-      store.delItems(arr, settingMap.bookmarks)
-      store.delItems(arr, settingMap.bookmarkGroups)
-    })
+    store.delItems(arr, settingMap.bookmarks)
+    store.delItems(arr, settingMap.bookmarkGroups)
     store.checkedKeys = []
   }
 

package/client/components/sidebar/bookmark-select.jsx

@@ -4,6 +4,7 @@
 
 import { auto } from 'manate/react'
 import TreeList from '../tree-list/tree-list'
+import deepCopy from 'json-deep-copy'
 
 export default auto(function BookmarkSelect (props) {
   const { store, from } = props
@@ -11,7 +12,8 @@ export default auto(function BookmarkSelect (props) {
     listStyle,
     openedSideBar,
     leftSidebarWidth,
-    expandedKeys
+    expandedKeys,
+    bookmarks
   } = store
   if (from === 'sidebar' && openedSideBar !== 'bookmarks') {
     return null
@@ -23,7 +25,7 @@ export default auto(function BookmarkSelect (props) {
     store.onSelectBookmark(item.id)
   }
   const base = {
-    bookmarks: store.bookmarks || [],
+    bookmarks: deepCopy(bookmarks || []),
     type: 'bookmarks',
     onClickItem,
     listStyle,
@@ -32,7 +34,7 @@ export default auto(function BookmarkSelect (props) {
   const propsTree = {
     ...base,
     shouldConfirmDel: true,
-    bookmarkGroups: store.getBookmarkGroupsTotal(),
+    bookmarkGroups: deepCopy(store.getBookmarkGroupsTotal()),
     expandedKeys,
     leftSidebarWidth,
     bookmarkGroupTree: store.bookmarkGroupTree

package/client/components/tree-list/tree-expander.jsx

@@ -2,9 +2,8 @@ import {
   CaretDownOutlined,
   CaretRightOutlined
 } from '@ant-design/icons'
-import { memo } from 'react'
 
-export default memo(function TreeExpander (props) {
+export default function TreeExpander (props) {
   function onExpand () {
     props.onExpand(group)
   }
@@ -33,4 +32,4 @@ export default memo(function TreeExpander (props) {
       <Icon />
     </div>
   )
-})
+}

package/client/components/tree-list/tree-list-item.jsx

@@ -21,12 +21,11 @@ import {
 } from '../../common/constants'
 import highlight from '../common/highlight'
 import uid from '../../common/uid'
-import { memo } from 'react'
 import './tree-list.styl'
 
 const e = window.translate
 
-export default memo(function TreeListItem (props) {
+export default function TreeListItem (props) {
   const handleDel = (e) => {
     props.del(props.item, e)
   }
@@ -254,4 +253,4 @@ export default memo(function TreeListItem (props) {
       {renderEditBtn()}
     </div>
   )
-})
+}

package/client/components/tree-list/tree-list.jsx

@@ -22,6 +22,7 @@ import NewButtonsGroup from './bookmark-toolbar'
 import findBookmarkGroupId from '../../common/find-bookmark-group-id'
 import getInitItem from '../../common/init-setting-item'
 import uid from '../../common/uid'
+import { action } from 'manate'
 import deepEqual from 'fast-deep-equal'
 import './tree-list.styl'
 import TreeExpander from './tree-expander'
@@ -223,34 +224,37 @@ export default class ItemListTree extends Component {
       return
     }
     this.onSubmit = true
-    const id = this.state.parentId
+    this.parentId = this.state.parentId
     this.setState({
       showNewBookmarkGroupForm: false,
       parentId: ''
-    }, () => {
-      this.onSubmit = false
-      const { bookmarkGroups } = window.store
-      const newCat = {
-        id: uid(),
-        title: this.state.bookmarkGroupTitle,
-        level: 2,
-        bookmarkIds: []
-      }
-      bookmarkGroups.unshift(newCat)
-      const cat = find(
-        bookmarkGroups,
-        d => d.id === id
-      )
-      if (!cat) {
-        return
-      }
-      cat.bookmarkGroupIds = [
-        ...(cat.bookmarkGroupIds || []),
-        newCat.id
-      ]
-    })
+    }, this.afterSubmitSub)
   }
 
+  afterSubmitSub = action(() => {
+    const id = this.parentId
+    this.onSubmit = false
+    const { bookmarkGroups } = window.store
+    const newCat = {
+      id: uid(),
+      title: this.state.bookmarkGroupTitle,
+      level: 2,
+      bookmarkIds: []
+    }
+    bookmarkGroups.unshift(newCat)
+    const cat = find(
+      bookmarkGroups,
+      d => d.id === id
+    )
+    if (!cat) {
+      return
+    }
+    cat.bookmarkGroupIds = [
+      ...(cat.bookmarkGroupIds || []),
+      newCat.id
+    ]
+  })
+
   handleNewBookmarkGroup = () => {
     this.setState({
       showNewBookmarkGroupForm: true,
@@ -391,7 +395,7 @@ export default class ItemListTree extends Component {
     target.classList.add('item-dragover')
   }
 
-  onDrop = e => {
+  onDrop = action(e => {
     e.preventDefault()
     const elems = document.querySelectorAll('.tree-item.item-dragover')
     elems.forEach(elem => {
@@ -533,7 +537,7 @@ export default class ItemListTree extends Component {
         item.level = 2
       }
     }
-  }
+  })
 
   editCategory = () => {
     const {

package/client/store/bookmark-group.js

@@ -47,44 +47,63 @@ export default Store => {
 
   Store.prototype.delBookmarkGroup = action(function ({ id }) {
     const { store } = window
+
+    // Cannot delete default group
     if (id === defaultBookmarkGroupId) {
       return
     }
-    let { bookmarkGroups } = store
-    const tobeDel = find(bookmarkGroups, bg => bg.id === id)
-    if (!tobeDel) {
+
+    const { bookmarkGroups } = store
+    const index = bookmarkGroups.findIndex(bg => bg.id === id)
+
+    // If group not found, return
+    if (index === -1) {
       return
     }
-    const groups = [tobeDel]
-    if (
-      tobeDel.level !== 2 &&
-      tobeDel.bookmarkGroupIds &&
-      tobeDel.bookmarkGroupIds.length > 0
-    ) {
-      const childs = bookmarkGroups.filter(
-        bg => tobeDel.bookmarkGroupIds.includes(bg.id)
+
+    const tobeDel = bookmarkGroups[index]
+
+    // Find parent group
+    let parentGroup = null
+    if (tobeDel.level === 2) {
+      parentGroup = bookmarkGroups.find(bg =>
+        (bg.bookmarkGroupIds || []).includes(tobeDel.id)
       )
-      groups.push(...childs)
     }
-    const groupIds = groups.map(g => g.id)
-    const defaultCatIndex = tobeDel.level !== 2
-      ? bookmarkGroups.findIndex(
-        g => g.id === defaultBookmarkGroupId
-      )
-      : bookmarkGroups.findIndex(
-        g => (g.bookmarkGroupIds || []).includes(tobeDel.id)
-      )
-    for (const g of groups) {
-      if (g.bookmarkIds.length) {
-        const def = bookmarkGroups[defaultCatIndex]
-        def.bookmarkIds.push(...g.bookmarkIds)
-      }
+
+    // If no parent found, use default group
+    if (!parentGroup) {
+      parentGroup = bookmarkGroups.find(bg => bg.id === defaultBookmarkGroupId)
+    }
+
+    // Ensure parent group has bookmarkIds and bookmarkGroupIds arrays
+    if (!parentGroup.bookmarkIds) {
+      parentGroup.bookmarkIds = []
+    }
+    if (!parentGroup.bookmarkGroupIds) {
+      parentGroup.bookmarkGroupIds = []
+    }
+
+    // Transfer bookmarkIds to parent
+    if (tobeDel.bookmarkIds && tobeDel.bookmarkIds.length) {
+      parentGroup.bookmarkIds = [
+        ...new Set([...parentGroup.bookmarkIds, ...tobeDel.bookmarkIds])
+      ]
     }
-    bookmarkGroups = bookmarkGroups.filter(t => {
-      return !groupIds.includes(t.id)
-    })
+
+    // Transfer child groups to parent
+    if (tobeDel.bookmarkGroupIds && tobeDel.bookmarkGroupIds.length) {
+      parentGroup.bookmarkGroupIds = [
+        ...new Set([...parentGroup.bookmarkGroupIds, ...tobeDel.bookmarkGroupIds])
+      ]
+    }
+
+    // Remove the group from bookmarkGroups
+    bookmarkGroups.splice(index, 1)
+
+    // Reset current group if it was deleted
     if (id === store.currentBookmarkGroupId) {
-      store.currentBookmarkGroupId = ''
+      store.currentBookmarkGroupId = parentGroup.id
     }
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "1.60.29",
+  "version": "1.60.32",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",