feat: add removeNodes method

Author: SSShooter

src/nodeOperation.ts

@@ -14,7 +14,7 @@ import {
   moveNodeBeforeObj,
   moveNodeAfterObj,
 } from './utils/objectManipulation'
-import { addChildDom, judgeDirection } from './utils/domManipulation'
+import { addChildDom, judgeDirection, removeNodeDom } from './utils/domManipulation'
 
 const mainToSub = function (tpc: Topic) {
   const mainNode = tpc.parentElement.parentElement
@@ -256,9 +256,9 @@ export const copyNode = function (this: MindElixirInstance, node: Topic, to: Top
 export const moveUpNode = function (this: MindElixirInstance, el?: Topic) {
   const nodeEle = el || this.currentNode
   if (!nodeEle) return
-  const grp = nodeEle.parentNode.parentNode
   const obj = nodeEle.nodeObj
   moveUpObj(obj)
+  const grp = nodeEle.parentNode.parentNode
   grp.parentNode.insertBefore(grp, grp.previousSibling)
   this.linkDiv()
   this.bus.fire('operation', {
@@ -280,9 +280,9 @@ export const moveUpNode = function (this: MindElixirInstance, el?: Topic) {
 export const moveDownNode = function (this: MindElixirInstance, el?: Topic) {
   const nodeEle = el || this.currentNode
   if (!nodeEle) return
-  const grp = nodeEle.parentNode.parentNode
   const obj = nodeEle.nodeObj
   moveDownObj(obj)
+  const grp = nodeEle.parentNode.parentNode
   if (grp.nextSibling) {
     grp.nextSibling.insertAdjacentElement('afterend', grp)
   } else {
@@ -306,25 +306,17 @@ export const moveDownNode = function (this: MindElixirInstance, el?: Topic) {
  * removeNode(E('bd4313fbac40284b'))
  */
 export const removeNode = function (this: MindElixirInstance, el?: Topic) {
-  const nodeEle = el || this.currentNode
-  if (!nodeEle) return
-  const nodeObj = nodeEle.nodeObj
+  const tpc = el || this.currentNode
+  if (!tpc) return
+  const nodeObj = tpc.nodeObj
   if (nodeObj.root === true) {
     throw new Error('Can not remove root node')
   }
   const siblings = nodeObj.parent!.children!
   const i = siblings.findIndex(node => node === nodeObj)
   const siblingLength = removeNodeObj(nodeObj)
+  removeNodeDom(tpc, siblingLength)
 
-  const t = nodeEle.parentNode
-  if (siblingLength === 0) {
-    // remove epd when children length === 0
-    const c = t.parentNode.parentNode
-    // root doesn't have epd
-    if (c.tagName !== 'ME-MAIN') {
-      c.previousSibling.children[1].remove()
-    }
-  }
   // automatically select sibling or parent
   if (siblings.length !== 0) {
     const sibling = siblings[i] || siblings[i - 1]
@@ -333,7 +325,6 @@ export const removeNode = function (this: MindElixirInstance, el?: Topic) {
     this.selectNode(findEle(nodeObj.parent!.id))
   }
 
-  t.parentNode.remove()
   this.linkDiv()
   this.bus.fire('operation', {
     name: 'removeNode',
@@ -343,6 +334,21 @@ export const removeNode = function (this: MindElixirInstance, el?: Topic) {
   })
 }
 
+export const removeNodes = function (this: MindElixirInstance, tpcs: Topic[]) {
+  for (const tpc of tpcs) {
+    const nodeObj = tpc.nodeObj
+    if (nodeObj.root === true) {
+      continue
+    }
+    const siblingLength = removeNodeObj(nodeObj)
+    removeNodeDom(tpc, siblingLength)
+  }
+  this.linkDiv()
+  this.bus.fire('operation', {
+    name: 'removeNodes',
+    objs: tpcs.map(tpc => tpc.nodeObj),
+  })
+}
 /**
  * @function
  * @instance

src/plugin/keypress.ts

@@ -150,7 +150,13 @@ export default function (mind: MindElixirInstance) {
       // bug
       if (mind.currentLink) mind.removeLink()
       else if (mind.currentSummary) mind.removeSummary(mind.currentSummary.summaryObj.id)
-      else mind.removeNode()
+      else {
+        if (mind.currentNode) {
+          mind.removeNode()
+        } else if (mind.currentNodes) {
+          mind.removeNodes(mind.currentNodes)
+        }
+      }
     } else {
       const keyHandler = key2func[e.keyCode]
       keyHandler && keyHandler(e)

src/plugin/operationHistory.ts

@@ -5,7 +5,7 @@ import type { Operation } from '../utils/pubsub'
 
 type History = {
   prev: MindElixirData
-  currentNodeId: string
+  currentNodeId: string | undefined
   next: MindElixirData
 }
 
@@ -17,17 +17,19 @@ export default function (mei: MindElixirInstance) {
     if (operation.name === 'beginEdit') return
     history = history.slice(0, currentIndex + 1)
     const next = mei.getData()
-    history.push({ prev: current, currentNodeId: operation.obj.id, next })
+    let currentNodeId = undefined
+    if ('obj' in operation) currentNodeId = operation.obj.id
+    history.push({ prev: current, currentNodeId, next })
     current = next
     currentIndex = history.length - 1
-    console.log('operation', operation.obj.id, history)
+    // console.log('operation', operation.obj.id, history)
   })
   mei.undo = function () {
     if (currentIndex > -1) {
       const h = history[currentIndex]
       current = h.prev
       mei.refresh(h.prev)
-      mei.selectNode(findEle(h.currentNodeId))
+      if (h.currentNodeId) mei.selectNode(findEle(h.currentNodeId))
       currentIndex--
       console.log('current', current)
     }
@@ -38,7 +40,7 @@ export default function (mei: MindElixirInstance) {
       const h = history[currentIndex]
       current = h.next
       mei.refresh(h.next)
-      mei.selectNode(findEle(h.currentNodeId))
+      if (h.currentNodeId) mei.selectNode(findEle(h.currentNodeId))
     }
   }
   mei.map.addEventListener('keydown', (e: KeyboardEvent) => {

src/utils/domManipulation.ts

@@ -23,20 +23,20 @@ export const judgeDirection = function (direction: number, obj: NodeObj) {
   }
 }
 
-export const addChildDom = function (this: MindElixirInstance, nodeEle: Topic, node?: NodeObj) {
-  if (!nodeEle) return null
-  const nodeObj = nodeEle.nodeObj
+export const addChildDom = function (this: MindElixirInstance, tpc: Topic, node?: NodeObj) {
+  if (!tpc) return null
+  const nodeObj = tpc.nodeObj
   if (nodeObj.expanded === false) {
-    this.expandNode(nodeEle, true)
+    this.expandNode(tpc, true)
     // dom had resetted
-    nodeEle = findEle(nodeObj.id) as Topic
+    tpc = findEle(nodeObj.id) as Topic
   }
   const newNodeObj = node || this.generateNewObj()
   if (nodeObj.children) nodeObj.children.push(newNodeObj)
   else nodeObj.children = [newNodeObj]
   fillParent(this.nodeData)
 
-  const top = nodeEle.parentElement
+  const top = tpc.parentElement
 
   const { grp, top: newTop } = this.createWrapper(newNodeObj)
   if (top.tagName === 'ME-PARENT') {
@@ -59,3 +59,16 @@ export const addChildDom = function (this: MindElixirInstance, nodeEle: Topic, n
   }
   return { newTop, newNodeObj }
 }
+
+export const removeNodeDom = function (tpc: Topic, siblingLength: number) {
+  const p = tpc.parentNode
+  if (siblingLength === 0) {
+    // remove epd when children length === 0
+    const c = p.parentNode.parentNode
+    // root doesn't have epd
+    if (c.tagName !== 'ME-MAIN') {
+      c.previousSibling.children[1].remove()
+    }
+  }
+  p.parentNode.remove()
+}

src/utils/pubsub.ts

@@ -5,6 +5,7 @@ export type OperationType =
   | 'moveNodeAfter'
   | 'moveNodeBefore'
   | 'removeNode'
+  | 'removeNodes'
   | 'addChild'
   | 'copyNode'
   | 'reshapeNode'
@@ -48,6 +49,10 @@ export type Operation =
       originIndex?: number
       originParentId?: string
     }
+  | {
+      name: 'removeNodes'
+      objs: NodeObj[]
+    }
 
 export type EventMap = {
   operation: (info: Operation) => void