Return the parent node in insertNode util

Author: fritz-c

src/utils/tree-data-utils.js

@@ -620,6 +620,7 @@ function addNodeAtDepthAndIndex({
                 nextIndex: currentIndex + 2,
                 insertedTreeIndex: currentIndex + 1,
                 parentPath: selfPath(nextNode),
+                parentNode: isPseudoRoot ? null : nextNode,
             };
         }
     }
@@ -682,6 +683,7 @@ function addNodeAtDepthAndIndex({
             nextIndex: childIndex,
             insertedTreeIndex,
             parentPath: selfPath(nextNode),
+            parentNode: isPseudoRoot ? null : nextNode,
         };
     }
 
@@ -696,6 +698,7 @@ function addNodeAtDepthAndIndex({
     // Get all descendants
     let insertedTreeIndex = null;
     let pathFragment      = null;
+    let parentNode        = null;
     let childIndex        = currentIndex + 1;
     let newChildren       = node.children;
     if (typeof newChildren !== 'function') {
@@ -719,7 +722,9 @@ function addNodeAtDepthAndIndex({
             });
 
             if ('insertedTreeIndex' in mapResult) {
-                ({ insertedTreeIndex, parentPath: pathFragment } = mapResult);
+                insertedTreeIndex = mapResult.insertedTreeIndex;
+                pathFragment      = mapResult.parentPath;
+                parentNode        = mapResult.parentNode;
             }
 
             childIndex = mapResult.nextIndex;
@@ -737,6 +742,7 @@ function addNodeAtDepthAndIndex({
     if (insertedTreeIndex !== null) {
         result.insertedTreeIndex = insertedTreeIndex;
         result.parentPath        = [ ...selfPath(nextNode), ...pathFragment ];
+        result.parentNode        = parentNode;
     }
 
     return result;
@@ -757,6 +763,7 @@ function addNodeAtDepthAndIndex({
  * @return {Object[]} result.treeData - The tree data with the node added
  * @return {number} result.treeIndex - The tree index at which the node was inserted
  * @return {number[]|string[]} result.path - Array of keys leading to the node location after insertion
+ * @return {Object} result.parentNode - The parent node of the inserted node
  */
 export function insertNode({
     treeData,
@@ -769,9 +776,10 @@ export function insertNode({
 }) {
     if (!treeData && targetDepth === 0) {
         return {
-            treeData:  [newNode],
-            treeIndex: 0,
-            path:      [getNodeKey({ node: newNode, treeIndex: 0 })],
+            treeData:   [newNode],
+            treeIndex:  0,
+            path:       [getNodeKey({ node: newNode, treeIndex: 0 })],
+            parentNode: null,
         };
     }
 
@@ -798,6 +806,7 @@ export function insertNode({
         treeData: insertResult.node.children,
         treeIndex,
         path:     [ ...insertResult.parentPath, getNodeKey({ node: newNode, treeIndex }) ],
+        parentNode: insertResult.parentNode,
     };
 }
 

src/utils/tree-data-utils.test.js

@@ -1063,21 +1063,21 @@ describe('insertNode', () => {
             minimumTreeIndex: 0,
             newNode: {},
             getNodeKey: keyFromTreeIndex,
-        })).toEqual({ treeData: [{}], treeIndex: 0, path: [0] });
+        })).toEqual({ parentNode: null, treeData: [{}], treeIndex: 0, path: [0] });
         expect(insertNode({
             treeData: null,
             depth: 0,
             minimumTreeIndex: 0,
             newNode: {},
             getNodeKey: keyFromTreeIndex,
-        })).toEqual({ treeData: [{}], treeIndex: 0, path: [0] });
+        })).toEqual({ parentNode: null, treeData: [{}], treeIndex: 0, path: [0] });
         expect(insertNode({
             treeData: undefined,
             depth: 0,
             minimumTreeIndex: 0,
             newNode: {},
             getNodeKey: keyFromTreeIndex,
-        })).toEqual({ treeData: [{}], treeIndex: 0, path: [0] });
+        })).toEqual({ parentNode: null, treeData: [{}], treeIndex: 0, path: [0] });
     });
 
     it('should handle a depth that is deeper than any branch in the tree', () => {
@@ -1158,6 +1158,7 @@ describe('insertNode', () => {
             newNode: { key: 1 },
             getNodeKey: keyFromKey,
         })).toEqual({
+            parentNode: null,
             treeData: [{ key: 1 }, { key: 0 }],
             treeIndex: 0,
             path: [1],
@@ -1172,6 +1173,7 @@ describe('insertNode', () => {
             newNode: { key: 1 },
             getNodeKey: keyFromKey,
         })).toEqual({
+            parentNode: null,
             treeData: [{ key: 0 }, { key: 1 }],
             treeIndex: 1,
             path: [1],
@@ -1186,6 +1188,7 @@ describe('insertNode', () => {
             newNode: { key: 1 },
             getNodeKey: keyFromKey,
         })).toEqual({
+            parentNode: { key: 0, children: [{ key: 1 }] },
             treeData: [{ key: 0, children: [{ key: 1 }] }],
             treeIndex: 1,
             path: [0, 1],
@@ -1291,6 +1294,7 @@ describe('insertNode', () => {
             minimumTreeIndex: 3,
             getNodeKey: keyFromTreeIndex,
         })).toEqual({
+            parentNode: { key: 2, children: [{ key: 'new' }] },
             treeData: [
                 { key: 0, expanded: true, children: [{ key: 1 }] },
                 { key: 2, children: [{ key: 'new' }] },
@@ -1308,6 +1312,7 @@ describe('insertNode', () => {
             minimumTreeIndex: 3,
             getNodeKey: keyFromTreeIndex,
         })).toEqual({
+            parentNode: { expanded: true, children: [{}, { key: 'new' }, {}] },
             treeData: [
                 { children: [{}] },
                 { expanded: true, children: [{}, { key: 'new' }, {}] },
@@ -1325,6 +1330,7 @@ describe('insertNode', () => {
             minimumTreeIndex: 4,
             getNodeKey: keyFromTreeIndex,
         })).toEqual({
+            parentNode: { children: [{ key: 'new' }] },
             treeData: [
                 { children: [{}] },
                 { expanded: true, children: [{}, { children: [{ key: 'new' }] }] },
@@ -1342,6 +1348,7 @@ describe('insertNode', () => {
             minimumTreeIndex: 4,
             getNodeKey: keyFromTreeIndex,
         })).toEqual({
+            parentNode: { children: [{ key: 'new' }] },
             treeData: [
                 { children: [{}, {}, {}, {}] },
                 { expanded: true, children: [{}, { children: [{ key: 'new' }] }] },
@@ -1371,6 +1378,7 @@ describe('insertNode', () => {
             minimumTreeIndex: 2,
             getNodeKey: keyFromTreeIndex,
         })).toEqual({
+            parentNode: { expanded: true, children: [{ key: 'new' }, { children: [] }] },
             treeData: [
                 {
                     expanded: true,