Fixed bugs with deletion between blocks and atomic block deletion test case (facebookarchive#1108)

mmmoussa · flarnie · commit 8cd420bc881b · 2017-04-03T15:15:03.000-07:00
diff --git a/src/model/modifier/DraftModifier.js b/src/model/modifier/DraftModifier.js
@@ -140,12 +140,17 @@ var DraftModifier = {
     removalDirection: DraftRemovalDirection,
   ): ContentState {
     let startKey, endKey, startBlock, endBlock;
-    startKey = removalDirection === 'forward'
-      ? rangeToRemove.getAnchorKey()
-      : rangeToRemove.getFocusKey();
-    endKey = removalDirection === 'forward'
-      ? rangeToRemove.getFocusKey()
-      : rangeToRemove.getAnchorKey();
+    if (rangeToRemove.getIsBackward()) {
+      rangeToRemove = rangeToRemove.merge({
+        anchorKey: rangeToRemove.getFocusKey(),
+        anchorOffset: rangeToRemove.getFocusOffset(),
+        focusKey: rangeToRemove.getAnchorKey(),
+        focusOffset: rangeToRemove.getAnchorOffset(),
+        isBackward: false,
+      });
+    }
+    startKey = rangeToRemove.getAnchorKey();
+    endKey = rangeToRemove.getFocusKey();
     startBlock = contentState.getBlockForKey(startKey);
     endBlock = contentState.getBlockForKey(endKey);
     const startOffset = rangeToRemove.getStartOffset();
diff --git a/src/model/modifier/__tests__/RichTextEditorUtil-test.js b/src/model/modifier/__tests__/RichTextEditorUtil-test.js
@@ -23,7 +23,11 @@ describe('RichTextEditorUtil', () => {
   const {editorState, selectionState} = getSampleStateForTesting();
 
   function insertAtomicBlock(targetEditorState) {
-    const entityKey = 'foo';
+    const entityKey = targetEditorState.getCurrentContent().createEntity(
+      'TEST',
+      'IMMUTABLE',
+      null,
+    ).getLastCreatedEntityKey();
     const character = ' ';
     const movedSelection = EditorState.moveSelectionToEnd(targetEditorState);
     return AtomicBlockUtils.insertAtomicBlock(
diff --git a/src/model/modifier/getCharacterRemovalRange.js b/src/model/modifier/getCharacterRemovalRange.js
@@ -47,22 +47,15 @@ function getCharacterRemovalRange(
     return selectionState;
   }
   var newSelectionState = selectionState;
-  if (selectionState.getIsBackward()) {
-    newSelectionState = selectionState.merge({
-      anchorKey: selectionState.getFocusKey(),
-      anchorOffset: selectionState.getFocusOffset(),
-      focusKey: selectionState.getAnchorKey(),
-      focusOffset: selectionState.getAnchorOffset(),
-      isBackward: false,
-    });
-  }
   if (startEntityKey && (startEntityKey === endEntityKey)) {
     newSelectionState = getEntityRemovalRange(
       entityMap,
       startBlock,
       newSelectionState,
       direction,
       startEntityKey,
+      true,
+      true,
     );
   } else if (startEntityKey && endEntityKey) {
     const startSelectionState = getEntityRemovalRange(
@@ -71,13 +64,17 @@ function getCharacterRemovalRange(
       newSelectionState,
       direction,
       startEntityKey,
+      false,
+      true,
     );
     const endSelectionState = getEntityRemovalRange(
       entityMap,
       endBlock,
       newSelectionState,
       direction,
       endEntityKey,
+      false,
+      false,
     );
     newSelectionState = newSelectionState.merge({
       anchorOffset: startSelectionState.getAnchorOffset(),
@@ -91,6 +88,8 @@ function getCharacterRemovalRange(
       newSelectionState,
       direction,
       startEntityKey,
+      false,
+      true,
     );
     newSelectionState = newSelectionState.merge({
       anchorOffset: startSelectionState.getStartOffset(),
@@ -103,6 +102,8 @@ function getCharacterRemovalRange(
       newSelectionState,
       direction,
       endEntityKey,
+      false,
+      false,
     );
     newSelectionState = newSelectionState.merge({
       focusOffset: endSelectionState.getEndOffset(),
@@ -118,11 +119,14 @@ function getEntityRemovalRange(
   selectionState: SelectionState,
   direction: DraftRemovalDirection,
   entityKey: string,
+  isEntireSelectionWithinEntity: boolean,
+  isEntityAtStart: boolean,
 ): SelectionState {
   var start = selectionState.getStartOffset();
   var end = selectionState.getEndOffset();
   var entity = entityMap.__get(entityKey);
   var mutability = entity.getMutability();
+  const sideToConsider = isEntityAtStart ? start : end;
 
   // `MUTABLE` entities can just have the specified range of text removed
   // directly. No adjustments are needed.
@@ -132,7 +136,7 @@ function getEntityRemovalRange(
 
   // Find the entity range that overlaps with our removal range.
   var entityRanges = getRangesForDraftEntity(block, entityKey).filter(
-    (range) => start < range.end && end > range.start,
+    (range) => sideToConsider <= range.end && sideToConsider >= range.start,
   );
 
   invariant(
@@ -153,6 +157,14 @@ function getEntityRemovalRange(
 
   // For `SEGMENTED` entity types, determine the appropriate segment to
   // remove.
+  if (!isEntireSelectionWithinEntity) {
+    if (isEntityAtStart) {
+      end = entityRange.end;
+    } else {
+      start = entityRange.start;
+    }
+  }
+
   var removalRange = DraftEntitySegments.getRemovalRange(
     start,
     end,
