feat: update calcRange for single selected node

Author: SSShooter

.eslintrc.cjs

@@ -11,5 +11,6 @@ module.exports = {
   },
   rules: {
     '@typescript-eslint/consistent-type-imports': 'error',
+    '@typescript-eslint/no-non-null-assertion': 'off',
   },
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mind-elixir",
-  "version": "3.0.5-beta.1",
+  "version": "3.0.5-beta.2",
   "type": "module",
   "description": "Mind elixir is a free open source mind map core.",
   "keywords": [

src/index.ts

@@ -130,7 +130,7 @@ MindElixir.DARK_THEME = DARK_THEME
  * @memberof MindElixir
  * @static
  */
-MindElixir.version = '3.0.5-beta.1'
+MindElixir.version = '3.0.5-beta.2'
 /**
  * @function
  * @memberof MindElixir

src/mouse.ts

@@ -9,11 +9,13 @@ const isTopic = (target: HTMLElement) => {
 
 export default function (mind: MindElixirInstance) {
   mind.map.addEventListener('click', e => {
-    console.log('click', e)
     if (dragMoveHelper.moved) {
       dragMoveHelper.clear()
       return
     }
+    mind.unselectNode()
+    mind.unselectNodes()
+    mind.unselectSummary()
     // e.preventDefault() // can cause <a /> tags don't work
     const target = e.target as any
     if (target.tagName === 'ME-EPD') {
@@ -22,22 +24,15 @@ export default function (mind: MindElixirInstance) {
       return
     } else if (isTopic(target)) {
       mind.selectNode(target as Topic, false, e)
-      mind.unselectNodes()
-      mind.unselectSummary()
     } else if (target.tagName === 'text') {
       mind.selectSummary(target.parentElement as unknown as SummarySvgGroup)
-      mind.unselectNode()
-      mind.unselectNodes()
     } else if (target.tagName === 'path') {
       if (target?.parentElement?.tagName === 'g') {
         mind.selectLink(target.parentElement as CustomSvg)
       }
     } else if (target.className === 'circle') {
       // skip circle
     } else {
-      mind.unselectNode()
-      mind.unselectNodes()
-      mind.unselectSummary()
       // lite version doesn't have hideLinkController
       mind.hideLinkController && mind.hideLinkController()
     }

src/plugin/contextMenu.ts

@@ -89,7 +89,7 @@ export default function (mind: MindElixirInstance, option: any) {
         add_sibling.className = ''
         remove_child.className = ''
       }
-      mind.selectNode(target)
+      if (!mind.currentNodes) mind.selectNode(target)
       menuContainer.hidden = false
       const height = menuUl.offsetHeight
       const width = menuUl.offsetWidth
@@ -175,9 +175,7 @@ export default function (mind: MindElixirInstance, option: any) {
   }
   summary.onclick = () => {
     menuContainer.hidden = true
-    if (mind.currentNodes && mind.currentNodes.length > 1) {
-      mind.createSummary()
-      mind.unselectNodes()
-    }
+    mind.createSummary()
+    mind.unselectNodes()
   }
 }

src/plugin/selection.ts

@@ -22,16 +22,6 @@ export default function (mei: MindElixirInstance) {
         startScrollMargins: { x: 10, y: 10 },
       },
     },
-    features: {
-      // Configuration in case a selectable gets just clicked.
-      singleTap: {
-        // Enable single-click selection (Also disables range-selection via shift + ctrl).
-        allow: true,
-
-        // 'native' (element was mouse-event target) or 'touch' (element visually touched).
-        intersect: 'native',
-      },
-    },
   })
     .on('beforestart', ({ event }) => {
       if ((event as MouseEvent).button !== 0) return false
@@ -41,6 +31,7 @@ export default function (mei: MindElixirInstance) {
     })
     .on('start', ({ event }) => {
       if (!(event as MouseEvent).ctrlKey && !(event as MouseEvent).metaKey) {
+        mei.unselectNode()
         mei.unselectNodes()
         mei.unselectSummary()
         selection.clearSelection(true, true)

src/summary.ts

@@ -15,9 +15,21 @@ export type SummarySvgGroup = SVGGElement & {
   summaryObj: Summary
 }
 
-const calcRange = function (currentNodes: Topic[]) {
+const calcRange = function (nodes: Topic[]) {
+  if (nodes.length === 0) throw new Error('No selected node.')
+  if (nodes.length === 1) {
+    const obj = nodes[0].nodeObj
+    const parent = nodes[0].nodeObj.parent
+    if (!parent) throw new Error('Can not select root node.')
+    const i = parent.children!.findIndex(child => obj === child)
+    return {
+      parent: parent.id,
+      start: i,
+      end: i,
+    }
+  }
   let maxLen = 0
-  const parentChains = currentNodes.map(item => {
+  const parentChains = nodes.map(item => {
     let node = item.nodeObj
     const parentChain = []
     while (node.parent) {
@@ -34,7 +46,6 @@ const calcRange = function (currentNodes: Topic[]) {
   // find minimum common parent
   findMcp: for (; index < maxLen; index++) {
     const base = parentChains[0][index]?.node
-    console.log(base)
     for (let i = 1; i < parentChains.length; i++) {
       const parentChain = parentChains[i]
       if (parentChain[index]?.node !== base) {
@@ -43,12 +54,10 @@ const calcRange = function (currentNodes: Topic[]) {
     }
   }
   const range = parentChains.map(chain => chain[index - 1].index).sort()
-  console.log(parentChains, 'parentChains')
   const min = range[0] || 0
   const max = range[range.length - 1] || 0
   const parent = parentChains[0][index - 1].node
-  console.log(parent)
-  // if (parent.root) throw new Error('Please select nodes in the same main topic.')
+  if (parent.root) throw new Error('Please select nodes in the same main topic.')
 
   // const start = parent.children![min].id
   // const end = parent.children![max].id
@@ -137,8 +146,13 @@ const drawSummary = function (mei: MindElixirInstance, summary: Summary) {
 }
 
 export const createSummary = function (this: MindElixirInstance) {
-  if (!this.currentNodes) return
-  const { parent, start, end } = calcRange(this.currentNodes)
+  let nodes: Topic[] = []
+  if (this.currentNode) {
+    nodes = [this.currentNode]
+  } else if (this.currentNodes) {
+    nodes = this.currentNodes
+  }
+  const { parent, start, end } = calcRange(nodes)
   const summary = { id: generateUUID(), parent, start, end, text: 'summary' }
   const g = drawSummary(this, summary) as SummarySvgGroup
   this.summaries.push(summary)
@@ -227,7 +241,6 @@ export const editSummary = function (this: MindElixirInstance, el: SummarySvgGro
     if (!div) return
     const node = el.summaryObj
     const text = div.textContent?.trim() || ''
-    console.log(text)
     if (text === '') node.text = origin
     else node.text = text
     div.remove()