Bug Fix - Remove deleted block from its parent's children

Summary:
Forgot to update this parent-child pointer & didn't have a test for it, so the invariant threw an error for untab in production.

https://pxl.cl/hFG6

Reviewed By: vdurmont

Differential Revision: D9982548

fbshipit-source-id: 7d97bdcea15d23f3d4fcd1a64d00e12587b76549

Author: niveditc

src/model/modifier/exploration/DraftTreeOperations.js

@@ -426,6 +426,17 @@ const moveChildUp = (blockMap: BlockMap, key: string): BlockMap => {
         newBlockMap.get(prevSiblingKey).merge({nextSibling: null}),
       );
     }
+    if (grandparentKey != null) {
+      const grandparent = newBlockMap.get(grandparentKey);
+      const oldChildren = grandparent.getChildKeys();
+      newBlockMap = newBlockMap.set(
+        grandparentKey,
+        grandparent.merge({
+          children: oldChildren.delete(oldChildren.indexOf(parentKey)),
+        }),
+      );
+    }
+
     newBlockMap = newBlockMap.delete(parentKey);
   }
 

src/model/modifier/exploration/__tests__/DraftTreeOperations-test.js

@@ -546,6 +546,53 @@ test('test moving only child up deletes parent 3', () => {
 });
 
 const blockMap11 = Immutable.OrderedMap({
+  A: new ContentBlockNode({
+    key: 'A',
+    parent: null,
+    text: 'alpha',
+    children: Immutable.List([]),
+    prevSibling: null,
+    nextSibling: 'X',
+  }),
+  X: new ContentBlockNode({
+    key: 'X',
+    parent: null,
+    text: '',
+    children: Immutable.List(['B', 'Y']),
+    prevSibling: 'A',
+    nextSibling: null,
+  }),
+  B: new ContentBlockNode({
+    key: 'B',
+    parent: 'X',
+    text: 'beta',
+    children: Immutable.List([]),
+    prevSibling: null,
+    nextSibling: 'Y',
+  }),
+  Y: new ContentBlockNode({
+    key: 'Y',
+    parent: 'X',
+    text: '',
+    children: Immutable.List(['C']),
+    prevSibling: 'B',
+    nextSibling: null,
+  }),
+  C: new ContentBlockNode({
+    key: 'C',
+    parent: 'Y',
+    text: 'charlie',
+    children: Immutable.List([]),
+    prevSibling: null,
+    nextSibling: null,
+  }),
+});
+
+test('test moving only child up deletes parent 4', () => {
+  expect(DraftTreeOperations.moveChildUp(blockMap11, 'C')).toMatchSnapshot();
+});
+
+const blockMap12 = Immutable.OrderedMap({
   A: new ContentBlockNode({
     key: 'A',
     parent: null,
@@ -605,5 +652,5 @@ const blockMap11 = Immutable.OrderedMap({
 });
 
 test('test merging blocks', () => {
-  expect(DraftTreeOperations.mergeBlocks(blockMap11, 'X')).toMatchSnapshot();
+  expect(DraftTreeOperations.mergeBlocks(blockMap12, 'X')).toMatchSnapshot();
 });

src/model/modifier/exploration/__tests__/__snapshots__/DraftTreeOperations-test.js.snap

@@ -2947,6 +2947,129 @@ Immutable.OrderedMap {
 }
 `;
 
+exports[`test moving only child up deletes parent 4 1`] = `
+Immutable.OrderedMap {
+  "A": Immutable.Record {
+    "parent": null,
+    "characterList": Immutable.List [
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+    ],
+    "data": Immutable.Map {},
+    "depth": 0,
+    "key": "A",
+    "text": "alpha",
+    "type": "unstyled",
+    "children": Immutable.List [],
+    "prevSibling": null,
+    "nextSibling": "X",
+  },
+  "X": Immutable.Record {
+    "parent": null,
+    "characterList": Immutable.List [],
+    "data": Immutable.Map {},
+    "depth": 0,
+    "key": "X",
+    "text": "",
+    "type": "unstyled",
+    "children": Immutable.List [
+      "B",
+      "C",
+    ],
+    "prevSibling": "A",
+    "nextSibling": null,
+  },
+  "B": Immutable.Record {
+    "parent": "X",
+    "characterList": Immutable.List [
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+    ],
+    "data": Immutable.Map {},
+    "depth": 0,
+    "key": "B",
+    "text": "beta",
+    "type": "unstyled",
+    "children": Immutable.List [],
+    "prevSibling": null,
+    "nextSibling": "C",
+  },
+  "C": Immutable.Record {
+    "parent": "X",
+    "characterList": Immutable.List [
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+      Immutable.Record {
+        "style": Immutable.OrderedSet [],
+        "entity": null,
+      },
+    ],
+    "data": Immutable.Map {},
+    "depth": 0,
+    "key": "C",
+    "text": "charlie",
+    "type": "unstyled",
+    "children": Immutable.List [],
+    "prevSibling": "B",
+    "nextSibling": null,
+  },
+}
+`;
+
 exports[`test replacing a parent's child 1`] = `
 Immutable.OrderedMap {
   "A": Immutable.Record {