feat: v0.19.4 add insertParent

Author: SSShooter

global.d.ts

@@ -7,6 +7,7 @@ interface Window {
     currentOperation: any;
     m: any;
     M: any;
+    E: any;
     exportSvg: any;
     exportPng: any;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mind-elixir",
-  "version": "0.19.3",
+  "version": "0.19.4",
   "description": "Mind elixir is a free open source mind map core.",
   "main": "dist/MindElixir.js",
   "scripts": {

src/__tests__/nodeOperation.js

@@ -23,7 +23,7 @@ beforeAll(async() => {
 describe('nodeOperation', () => {
   it('addChild"', async() => {
     await page.evaluate(`m.addChild(E('bd1f07c598e729dc'))`)
-    await page.waitFor('#input-box')
+    await page.waitForSelector('#input-box')
     await page.keyboard.press('Enter')
     const id = await page.evaluate(() => {
       return E('bd1f07c598e729dc').nodeObj.children[0].parent.id
@@ -33,7 +33,7 @@ describe('nodeOperation', () => {
   it('insertSibling"', async() => {
     await page.evaluate(`m.insertSibling(E('bd1f07c598e729dc'))`)
     const newId = await page.evaluate(`currentOperation.obj.id`)
-    await page.waitFor('#input-box')
+    await page.waitForSelector('#input-box')
     await page.keyboard.press('Enter')
     const res = await page.evaluate(newId => {
       const newNode = E(newId).nodeObj

src/dev.ts

@@ -45,7 +45,7 @@ const mind = new MindElixir({
       return true
     },
   },
-  primaryLinkStyle: 2,
+  primaryLinkStyle: 1,
   primaryNodeVerticalGap: 15, // 25
   primaryNodeHorizontalGap: 15, // 65
 })
@@ -89,5 +89,6 @@ mind.bus.addListener('expandNode', node => {
 window.m = mind
 // window.m2 = mind2
 window.M = MindElixir
+window.E = MindElixir.E
 window.exportSvg = exportSvg
 window.exportPng = exportPng

src/index.lite.ts

@@ -297,7 +297,7 @@ MindElixir.SIDE = SIDE
  * @memberof MindElixir
  * @static
  */
-MindElixir.version = '0.17.0'
+MindElixir.version = '0.19.4'
 MindElixir.E = findEle
 
 export default MindElixir

src/nodeOperation.ts

@@ -136,6 +136,17 @@ export const insertSibling = function(el, node) {
   })
 }
 
+/**
+ * @function
+ * @instance
+ * @name insertBefore
+ * @memberof NodeOperation
+ * @description Create a sibling node before the selected node.
+ * @param {TargetElement} el - Target element return by E('...'), default value: currentTarget.
+ * @param {node} node - New node information.
+ * @example
+ * insertBefore(E('bd4313fbac40284b'))
+ */
 export const insertBefore = function(el, node) {
   const nodeEle = el || this.currentNode
   if (!nodeEle) return
@@ -171,6 +182,17 @@ export const insertBefore = function(el, node) {
   })
 }
 
+/**
+ * @function
+ * @instance
+ * @name insertParent
+ * @memberof NodeOperation
+ * @description Create a parent node of the selected node.
+ * @param {TargetElement} el - Target element return by E('...'), default value: currentTarget.
+ * @param {node} node - New node information.
+ * @example
+ * insertParent(E('bd4313fbac40284b'))
+ */
 export const insertParent = function(el, node) {
   const nodeEle = el || this.currentNode
   if (!nodeEle) return
@@ -183,18 +205,19 @@ export const insertParent = function(el, node) {
   addParentLink(this.nodeData)
   const grp0 = nodeEle.parentElement.parentElement
   console.time('insertParent_DOM')
-  const { grp, top } = this.createGroup(newNodeObj)
-  // console.log(grp)
+  const { grp, top } = this.createGroup(newNodeObj, true)
   const children = grp0.parentNode
   children.insertBefore(grp, grp0.nextSibling)
 
-  // const c = $d.createElement('children')
-  // c.appendChild(grp0)
-  // top.appendChild(createExpander(true))
-  // top.parentElement.insertBefore(c, top.nextSibling)
-  grp0.remove()
+  const c = $d.createElement('children')
+  c.appendChild(grp0)
+  top.appendChild(createExpander(true))
+  top.parentElement.insertBefore(c, top.nextSibling)
+
   if (children.className === 'box') {
-    this.processPrimaryNode(grp, newNodeObj)
+    grp.className = grp0.className
+    grp0.className = ''
+    grp0.querySelector('.svg3rd').remove()
     this.linkDiv()
   } else {
     this.linkDiv(grp.offsetParent)
@@ -421,7 +444,7 @@ export const removeNode = function(el) {
  * @instance
  * @name moveNode
  * @memberof NodeOperation
- * @description Move the target node to another node (as child node).
+ * @description Move a node to another node (as child node).
  * @param {TargetElement} from - The target you want to move.
  * @param {TargetElement} to - The target(as parent node) you want to move to.
  * @example
@@ -479,6 +502,17 @@ export const moveNode = function(from, to) {
   console.timeEnd('moveNode')
 }
 
+/**
+ * @function
+ * @instance
+ * @name moveNodeBefore
+ * @memberof NodeOperation
+ * @description Move a node and become previous node of another node.
+ * @param {TargetElement} from
+ * @param {TargetElement} to
+ * @example
+ * moveNodeBefore(E('bd4313fbac402842'),E('bd4313fbac402839'))
+ */
 export const moveNodeBefore = function(from, to) {
   const fromObj = from.nodeObj
   const toObj = to.nodeObj
@@ -498,6 +532,17 @@ export const moveNodeBefore = function(from, to) {
   })
 }
 
+/**
+ * @function
+ * @instance
+ * @name moveNodeAfter
+ * @memberof NodeOperation
+ * @description Move a node and become next node of another node.
+ * @param {TargetElement} from
+ * @param {TargetElement} to
+ * @example
+ * moveNodeAfter(E('bd4313fbac402842'),E('bd4313fbac402839'))
+ */
 export const moveNodeAfter = function(from, to) {
   const fromObj = from.nodeObj
   const toObj = to.nodeObj

src/utils/dom.ts

@@ -63,11 +63,11 @@ export const shapeTpc = function(tpc: Topic, nodeObj: NodeObj) {
   }
 }
 
-export const createGroup = function(nodeObj: NodeObj) {
+export const createGroup = function(nodeObj: NodeObj, omitChildren?: boolean) {
   const grp: Group = $d.createElement('GRP')
   const top: Top = this.createTop(nodeObj)
   grp.appendChild(top)
-  if (nodeObj.children && nodeObj.children.length > 0) {
+  if (!omitChildren && nodeObj.children && nodeObj.children.length > 0) {
     top.appendChild(createExpander(nodeObj.expanded))
     if (nodeObj.expanded !== false) {
       const children = this.createChildren(nodeObj.children)