slate-react 0.117.1 → 0.117.2

package/dist/index.js

@@ -490,34 +490,44 @@ function createAndroidInputManager(_ref) {
     // schedule an action to let Slate normalize the editor state.
     var canStoreDiff = true;
     if (type.startsWith('delete')) {
+      var direction = type.endsWith('Backward') ? 'backward' : 'forward';
+      var _Range$edges = slate.Range.edges(targetRange),
+        _Range$edges2 = _slicedToArray(_Range$edges, 2),
+        start = _Range$edges2[0],
+        end = _Range$edges2[1];
+      var _Editor$leaf = slate.Editor.leaf(editor, start.path),
+        _Editor$leaf2 = _slicedToArray(_Editor$leaf, 2),
+        leaf = _Editor$leaf2[0],
+        path = _Editor$leaf2[1];
       if (slate.Range.isExpanded(targetRange)) {
-        var _Range$edges = slate.Range.edges(targetRange),
-          _Range$edges2 = _slicedToArray(_Range$edges, 2),
-          _start = _Range$edges2[0],
-          _end = _Range$edges2[1];
-        var _leaf = slate.Node.leaf(editor, _start.path);
-        if (_leaf.text.length === _start.offset && _end.offset === 0) {
+        if (leaf.text.length === start.offset && end.offset === 0) {
           var next = slate.Editor.next(editor, {
-            at: _start.path,
+            at: start.path,
             match: slate.Text.isText
           });
-          if (next && slate.Path.equals(next[1], _end.path)) {
-            targetRange = {
-              anchor: _end,
-              focus: _end
-            };
+          if (next && slate.Path.equals(next[1], end.path)) {
+            // when deleting a linebreak, targetRange will span across the break (ie start in the node before and end in the node after)
+            // if the node before is empty, this will look like a hanging range and get unhung later--which will take the break we want to remove out of the range
+            // so to avoid this we collapse the target range to default to single character deletion
+            if (direction === 'backward') {
+              targetRange = {
+                anchor: end,
+                focus: end
+              };
+              start = end;
+              var _next = _slicedToArray(next, 2);
+              leaf = _next[0];
+              path = _next[1];
+            } else {
+              targetRange = {
+                anchor: start,
+                focus: start
+              };
+              end = start;
+            }
           }
         }
       }
-      var direction = type.endsWith('Backward') ? 'backward' : 'forward';
-      var _Range$edges3 = slate.Range.edges(targetRange),
-        _Range$edges4 = _slicedToArray(_Range$edges3, 2),
-        start = _Range$edges4[0],
-        end = _Range$edges4[1];
-      var _Editor$leaf = slate.Editor.leaf(editor, start.path),
-        _Editor$leaf2 = _slicedToArray(_Editor$leaf, 2),
-        leaf = _Editor$leaf2[0],
-        path = _Editor$leaf2[1];
       var diff = {
         text: '',
         start: start.offset,
@@ -747,13 +757,13 @@ function createAndroidInputManager(_ref) {
             });
           }
           if (slate.Path.equals(targetRange.anchor.path, targetRange.focus.path)) {
-            var _Range$edges5 = slate.Range.edges(targetRange),
-              _Range$edges6 = _slicedToArray(_Range$edges5, 2),
-              _start2 = _Range$edges6[0],
-              _end2 = _Range$edges6[1];
+            var _Range$edges3 = slate.Range.edges(targetRange),
+              _Range$edges4 = _slicedToArray(_Range$edges3, 2),
+              _start = _Range$edges4[0],
+              _end = _Range$edges4[1];
             var _diff = {
-              start: _start2.offset,
-              end: _end2.offset,
+              start: _start.offset,
+              end: _end.offset,
               text: _text
             };
             // COMPAT: Swiftkey has a weird bug where the target range of the 2nd word
@@ -775,7 +785,7 @@ function createAndroidInputManager(_ref) {
             } else if (type === 'insertText') {
               if (insertPositionHint === null) {
                 insertPositionHint = _diff;
-              } else if (insertPositionHint && slate.Range.isCollapsed(targetRange) && insertPositionHint.end + insertPositionHint.text.length === _start2.offset) {
+              } else if (insertPositionHint && slate.Range.isCollapsed(targetRange) && insertPositionHint.end + insertPositionHint.text.length === _start.offset) {
                 insertPositionHint = _objectSpread$7(_objectSpread$7({}, insertPositionHint), {}, {
                   text: insertPositionHint.text + _text
                 });
@@ -786,7 +796,7 @@ function createAndroidInputManager(_ref) {
               insertPositionHint = false;
             }
             if (canStoreDiff) {
-              storeDiff(_start2.path, _diff);
+              storeDiff(_start.path, _diff);
               return;
             }
           }