@studysync/draft-js-modifiers 0.4.6 → 0.4.9

package/es/getSimilarAdjacentBlocks.js

@@ -18,13 +18,14 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 var getSimilarAdjacentBlocks = function getSimilarAdjacentBlocks(editorState, block) {
+  var includeDepth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var blockType = block.getType();
   var depth = block.getDepth();
   var variant = block.getData().get('variant');
   var contentState = editorState.getCurrentContent();
 
   var matches = function matches(aBlock) {
-    return aBlock.getType() === blockType && aBlock.getDepth() === depth && aBlock.getData().get('variant') === variant;
+    return aBlock && aBlock.getType() === blockType && (!includeDepth || aBlock.getDepth() === depth) && aBlock.getData().get('variant') === variant;
   };
 
   var before = [];

package/es/index.js

@@ -226,6 +226,12 @@ Object.defineProperty(exports, "toggleInlineStyle", {
     return _toggleInlineStyle["default"];
   }
 });
+Object.defineProperty(exports, "trimEditorState", {
+  enumerable: true,
+  get: function get() {
+    return _trimEditorState["default"];
+  }
+});
 
 var _addBlock = _interopRequireDefault(require("./addBlock"));
 
@@ -301,6 +307,8 @@ var _toggleEntity = _interopRequireDefault(require("./toggleEntity"));
 
 var _toggleInlineStyle = _interopRequireDefault(require("./toggleInlineStyle"));
 
+var _trimEditorState = _interopRequireDefault(require("./trimEditorState"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var DRAFTJS_BLOCK_KEY = 'DRAFTJS_BLOCK_KEY';

package/es/trimEditorState.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _draftJs = require("draft-js");
+
+/**
+ * Taken from:
+ *    https://stackoverflow.com/questions/46802855/draft-js-how-to-trim-contents
+ *
+ * This *might* mess up entities, but so far I haven't seen any issues
+ */
+var trimEditorState = function trimEditorState(currentEditorState) {
+  var currentContent = currentEditorState.getCurrentContent();
+  var newContent = currentContent.getBlockMap().reduce(function (accumulator, block) {
+    var key = block.getKey();
+    var text = block.getText();
+    var trimmedLeft = text.trimLeft();
+    var trimmedRight = text.trimRight();
+    var offset = text.length - trimmedLeft.length;
+    var textToReplaceLeft = new _draftJs.SelectionState({
+      anchorKey: key,
+      focusKey: key,
+      anchorOffset: 0,
+      focusOffset: offset
+    });
+
+    var leftTrimmedContent = _draftJs.Modifier.replaceText(accumulator, textToReplaceLeft, '');
+
+    var textToReplaceRight = new _draftJs.SelectionState({
+      anchorKey: key,
+      focusKey: key,
+      anchorOffset: trimmedRight.length - offset,
+      focusOffset: text.length - offset
+    });
+    return _draftJs.Modifier.replaceText(leftTrimmedContent, textToReplaceRight, '');
+  }, currentContent);
+  return _draftJs.EditorState.push(currentEditorState, newContent, 'remove-range');
+};
+
+var _default = trimEditorState;
+exports["default"] = _default;

package/getSimilarAdjacentBlocks.js

@@ -18,13 +18,14 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 var getSimilarAdjacentBlocks = function getSimilarAdjacentBlocks(editorState, block) {
+  var includeDepth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var blockType = block.getType();
   var depth = block.getDepth();
   var variant = block.getData().get('variant');
   var contentState = editorState.getCurrentContent();
 
   var matches = function matches(aBlock) {
-    return aBlock.getType() === blockType && aBlock.getDepth() === depth && aBlock.getData().get('variant') === variant;
+    return aBlock && aBlock.getType() === blockType && (!includeDepth || aBlock.getDepth() === depth) && aBlock.getData().get('variant') === variant;
   };
 
   var before = [];

package/index.js

@@ -226,6 +226,12 @@ Object.defineProperty(exports, "toggleInlineStyle", {
     return _toggleInlineStyle["default"];
   }
 });
+Object.defineProperty(exports, "trimEditorState", {
+  enumerable: true,
+  get: function get() {
+    return _trimEditorState["default"];
+  }
+});
 
 var _addBlock = _interopRequireDefault(require("./addBlock"));
 
@@ -301,6 +307,8 @@ var _toggleEntity = _interopRequireDefault(require("./toggleEntity"));
 
 var _toggleInlineStyle = _interopRequireDefault(require("./toggleInlineStyle"));
 
+var _trimEditorState = _interopRequireDefault(require("./trimEditorState"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var DRAFTJS_BLOCK_KEY = 'DRAFTJS_BLOCK_KEY';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studysync/draft-js-modifiers",
-  "version": "0.4.6",
+  "version": "0.4.9",
   "description": "Modular state modifiers for Draft.js",
   "main": "index.js",
   "module": "es/index.js",

package/trimEditorState.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _draftJs = require("draft-js");
+
+/**
+ * Taken from:
+ *    https://stackoverflow.com/questions/46802855/draft-js-how-to-trim-contents
+ *
+ * This *might* mess up entities, but so far I haven't seen any issues
+ */
+var trimEditorState = function trimEditorState(currentEditorState) {
+  var currentContent = currentEditorState.getCurrentContent();
+  var newContent = currentContent.getBlockMap().reduce(function (accumulator, block) {
+    var key = block.getKey();
+    var text = block.getText();
+    var trimmedLeft = text.trimLeft();
+    var trimmedRight = text.trimRight();
+    var offset = text.length - trimmedLeft.length;
+    var textToReplaceLeft = new _draftJs.SelectionState({
+      anchorKey: key,
+      focusKey: key,
+      anchorOffset: 0,
+      focusOffset: offset
+    });
+
+    var leftTrimmedContent = _draftJs.Modifier.replaceText(accumulator, textToReplaceLeft, '');
+
+    var textToReplaceRight = new _draftJs.SelectionState({
+      anchorKey: key,
+      focusKey: key,
+      anchorOffset: trimmedRight.length - offset,
+      focusOffset: text.length - offset
+    });
+    return _draftJs.Modifier.replaceText(leftTrimmedContent, textToReplaceRight, '');
+  }, currentContent);
+  return _draftJs.EditorState.push(currentEditorState, newContent, 'remove-range');
+};
+
+var _default = trimEditorState;
+exports["default"] = _default;