@atlaskit/editor-core 172.1.2 → 172.2.0

package/dist/cjs/plugins/selection/gap-cursor/selection.js

@@ -1,196 +1,31 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Side = exports.JSON_ID = exports.GapCursorSelection = exports.GapBookmark = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _prosemirrorState = require("prosemirror-state");
-
-var _prosemirrorModel = require("prosemirror-model");
-
-var _isValidTargetNode = require("./utils/is-valid-target-node");
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-var Side;
-exports.Side = Side;
-
-(function (Side) {
-  Side["LEFT"] = "left";
-  Side["RIGHT"] = "right";
-})(Side || (exports.Side = Side = {}));
-
-var JSON_ID = 'gapcursor';
-exports.JSON_ID = JSON_ID;
-
-var GapCursorSelection = /*#__PURE__*/function (_Selection) {
-  (0, _inherits2.default)(GapCursorSelection, _Selection);
-
-  var _super = _createSuper(GapCursorSelection);
-
-  /**
-   * Construct a GapCursorSelection
-   * @param {ResolvedPos} $pos resolved position
-   * @param {Side} side side where the gap cursor is drawn
-   */
-  function GapCursorSelection($pos) {
-    var _this;
-
-    var side = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Side.LEFT;
-    (0, _classCallCheck2.default)(this, GapCursorSelection);
-    _this = _super.call(this, $pos, $pos);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "visible", false);
-    _this.side = side;
-    return _this;
+Object.defineProperty(exports, "GapBookmark", {
+  enumerable: true,
+  get: function get() {
+    return _selection.GapBookmark;
   }
-
-  (0, _createClass2.default)(GapCursorSelection, [{
-    key: "map",
-    value: function map(doc, mapping) {
-      var $pos = doc.resolve(mapping.map(this.head));
-      return GapCursorSelection.valid($pos) ? new GapCursorSelection($pos, this.side) : _prosemirrorState.Selection.near($pos);
-    }
-  }, {
-    key: "eq",
-    value: function eq(other) {
-      return other instanceof GapCursorSelection && other.head === this.head;
-    }
-  }, {
-    key: "content",
-    value: function content() {
-      return _prosemirrorModel.Slice.empty;
-    }
-  }, {
-    key: "getBookmark",
-    value: function getBookmark() {
-      return new GapBookmark(this.anchor);
-    }
-  }, {
-    key: "toJSON",
-    value: function toJSON() {
-      return {
-        pos: this.head,
-        type: JSON_ID,
-        side: this.side
-      };
-    }
-  }], [{
-    key: "valid",
-    value: function valid($pos) {
-      var parent = $pos.parent,
-          nodeBefore = $pos.nodeBefore,
-          nodeAfter = $pos.nodeAfter;
-      var targetNode = (0, _isValidTargetNode.isValidTargetNode)(nodeBefore) ? nodeBefore : (0, _isValidTargetNode.isValidTargetNode)(nodeAfter) ? nodeAfter : null;
-
-      if (!targetNode || parent.isTextblock) {
-        return false;
-      }
-
-      var deflt = parent.contentMatchAt($pos.index()).defaultType;
-      return deflt && deflt.isTextblock;
-    }
-  }, {
-    key: "findFrom",
-    value: function findFrom($pos, dir) {
-      var mustMove = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      var side = dir === 1 ? Side.RIGHT : Side.LEFT;
-
-      if (!mustMove && GapCursorSelection.valid($pos)) {
-        return new GapCursorSelection($pos, side);
-      }
-
-      var pos = $pos.pos; // TODO: Fix any, potential issue. ED-5048
-
-      var next = null; // Scan up from this position
-
-      for (var d = $pos.depth;; d--) {
-        var parent = $pos.node(d);
-
-        if (side === Side.RIGHT ? $pos.indexAfter(d) < parent.childCount : $pos.index(d) > 0) {
-          next = parent.maybeChild(side === Side.RIGHT ? $pos.indexAfter(d) : $pos.index(d) - 1);
-          break;
-        } else if (d === 0) {
-          return null;
-        }
-
-        pos += dir;
-        var $cur = $pos.doc.resolve(pos);
-
-        if (GapCursorSelection.valid($cur)) {
-          return new GapCursorSelection($cur, side);
-        }
-      } // And then down into the next node
-
-
-      for (;;) {
-        next = side === Side.RIGHT ? next.firstChild : next.lastChild;
-
-        if (next === null) {
-          break;
-        }
-
-        pos += dir;
-
-        var _$cur = $pos.doc.resolve(pos);
-
-        if (GapCursorSelection.valid(_$cur)) {
-          return new GapCursorSelection(_$cur, side);
-        }
-      }
-
-      return null;
-    }
-  }, {
-    key: "fromJSON",
-    value: function fromJSON(doc, json) {
-      return new GapCursorSelection(doc.resolve(json.pos), json.side);
-    }
-  }]);
-  return GapCursorSelection;
-}(_prosemirrorState.Selection);
-
-exports.GapCursorSelection = GapCursorSelection;
-
-_prosemirrorState.Selection.jsonID(JSON_ID, GapCursorSelection);
-
-var GapBookmark = /*#__PURE__*/function () {
-  function GapBookmark(pos) {
-    (0, _classCallCheck2.default)(this, GapBookmark);
-    this.pos = pos;
+});
+Object.defineProperty(exports, "GapCursorSelection", {
+  enumerable: true,
+  get: function get() {
+    return _selection.GapCursorSelection;
   }
+});
+Object.defineProperty(exports, "JSON_ID", {
+  enumerable: true,
+  get: function get() {
+    return _selection.JSON_ID;
+  }
+});
+Object.defineProperty(exports, "Side", {
+  enumerable: true,
+  get: function get() {
+    return _selection.Side;
+  }
+});
 
-  (0, _createClass2.default)(GapBookmark, [{
-    key: "map",
-    value: function map(mapping) {
-      return new GapBookmark(mapping.map(this.pos));
-    }
-  }, {
-    key: "resolve",
-    value: function resolve(doc) {
-      var $pos = doc.resolve(this.pos);
-      return GapCursorSelection.valid($pos) ? new GapCursorSelection($pos) : _prosemirrorState.Selection.near($pos);
-    }
-  }]);
-  return GapBookmark;
-}();
-
-exports.GapBookmark = GapBookmark;
+var _selection = require("@atlaskit/editor-common/selection");

package/dist/cjs/plugins/selection/gap-cursor/utils/is-ignored.js

@@ -3,12 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isIgnored = void 0;
-// we don't show gap cursor for those nodes
-var IGNORED_NODES = ['paragraph', 'bulletList', 'orderedList', 'listItem', 'taskItem', 'decisionItem', 'heading', 'blockquote', 'layoutColumn', 'caption', 'media'];
-
-var isIgnored = function isIgnored(node) {
-  return !!node && IGNORED_NODES.indexOf(node.type.name) !== -1;
-};
+Object.defineProperty(exports, "isIgnored", {
+  enumerable: true,
+  get: function get() {
+    return _selection.isIgnored;
+  }
+});
 
-exports.isIgnored = isIgnored;
+var _selection = require("@atlaskit/editor-common/selection");

package/dist/cjs/plugins/selection/gap-cursor/utils/is-valid-target-node.js

@@ -3,12 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isValidTargetNode = void 0;
-
-var _isIgnored = require("./is-ignored");
-
-var isValidTargetNode = function isValidTargetNode(node) {
-  return !!node && !(0, _isIgnored.isIgnored)(node);
-};
+Object.defineProperty(exports, "isValidTargetNode", {
+  enumerable: true,
+  get: function get() {
+    return _selection.isValidTargetNode;
+  }
+});
 
-exports.isValidTargetNode = isValidTargetNode;
+var _selection = require("@atlaskit/editor-common/selection");

package/dist/cjs/plugins/selection/gap-cursor/utils.js

@@ -7,11 +7,11 @@ exports.getBreakoutModeFromTargetNode = getBreakoutModeFromTargetNode;
 exports.getMediaNearPos = getMediaNearPos;
 exports.isTextBlockNearPos = exports.isLeftCursor = exports.isIgnoredClick = void 0;
 
-var _types = require("../../table/types");
+var _styles = require("@atlaskit/editor-common/styles");
 
 var _selection = require("./selection");
 
-var _styles = require("../../unsupported-content/styles");
+var _styles2 = require("../../unsupported-content/styles");
 
 var _CaptionPlaceholder = require("../../media/ui/CaptionPlaceholder");
 
@@ -131,7 +131,7 @@ var isIgnoredClick = function isIgnoredClick(elem) {
   var node = elem;
 
   while (node) {
-    if (node.className && (node.getAttribute('class') || '').indexOf(_types.TableCssClassName.TABLE_CONTAINER) > -1) {
+    if (node.className && (node.getAttribute('class') || '').indexOf(_styles.TableSharedCssClassName.TABLE_CONTAINER) > -1) {
       tableWrap = node;
       break;
     }
@@ -140,14 +140,14 @@ var isIgnoredClick = function isIgnoredClick(elem) {
   }
 
   if (tableWrap) {
-    var rowControls = tableWrap.querySelector(".".concat(_types.TableCssClassName.ROW_CONTROLS_WRAPPER));
-    var isColumnControlsDecoration = elem && elem.classList && elem.classList.contains(_types.TableCssClassName.COLUMN_CONTROLS_DECORATIONS);
+    var rowControls = tableWrap.querySelector(".".concat(_styles.TableSharedCssClassName.TABLE_ROW_CONTROLS_WRAPPER));
+    var isColumnControlsDecoration = elem && elem.classList && elem.classList.contains(_styles.TableSharedCssClassName.TABLE_COLUMN_CONTROLS_DECORATIONS);
     return rowControls && rowControls.contains(elem) || isColumnControlsDecoration;
   } // Check if unsupported node selection
   // (without this, selection requires double clicking in FF due to posAtCoords differences)
 
 
-  if (elem.closest(".".concat(_styles.UnsupportedSharedCssClassName.BLOCK_CONTAINER))) {
+  if (elem.closest(".".concat(_styles2.UnsupportedSharedCssClassName.BLOCK_CONTAINER))) {
     return true;
   }
 

package/dist/cjs/plugins/selection/gap-cursor-selection.js

@@ -34,6 +34,6 @@ Object.defineProperty(exports, "setSelectionTopLevelBlocks", {
   }
 });
 
-var _selection = require("./gap-cursor/selection");
+var _selection = require("@atlaskit/editor-common/selection");
 
 var _actions = require("./gap-cursor/actions");

package/dist/cjs/plugins/selection/types.js

@@ -3,22 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.selectionPluginKey = exports.SelectionDirection = exports.RelativeSelectionPos = void 0;
+Object.defineProperty(exports, "RelativeSelectionPos", {
+  enumerable: true,
+  get: function get() {
+    return _selection.RelativeSelectionPos;
+  }
+});
+exports.selectionPluginKey = exports.SelectionDirection = void 0;
 
 var _prosemirrorState = require("prosemirror-state");
 
+var _selection = require("@atlaskit/editor-common/selection");
+
 var selectionPluginKey = new _prosemirrorState.PluginKey('selection');
 exports.selectionPluginKey = selectionPluginKey;
-var RelativeSelectionPos;
-exports.RelativeSelectionPos = RelativeSelectionPos;
-
-(function (RelativeSelectionPos) {
-  RelativeSelectionPos["Before"] = "Before";
-  RelativeSelectionPos["Start"] = "Start";
-  RelativeSelectionPos["Inside"] = "Inside";
-  RelativeSelectionPos["End"] = "End";
-})(RelativeSelectionPos || (exports.RelativeSelectionPos = RelativeSelectionPos = {}));
-
 var SelectionDirection;
 exports.SelectionDirection = SelectionDirection;
 

package/dist/cjs/plugins/selection/utils.js

@@ -26,12 +26,12 @@ var _prosemirrorUtils = require("prosemirror-utils");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
+var _selection = require("@atlaskit/editor-common/selection");
+
 var _commands = require("../../utils/commands");
 
 var _document = require("../../utils/document");
 
-var _selection = require("../../utils/selection");
-
 var _analytics = require("../analytics");
 
 var _isIgnored = require("../selection/gap-cursor/utils/is-ignored");

package/dist/cjs/plugins/table/commands/go-to-next-cell.js

@@ -11,7 +11,7 @@ var _tableMap = require("@atlaskit/editor-tables/table-map");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
-var _types = require("../../analytics/types");
+var _analytics = require("@atlaskit/editor-common/analytics");
 
 var _commandsWithAnalytics = require("../commands-with-analytics");
 
@@ -19,45 +19,47 @@ var _commandsWithAnalytics = require("../commands-with-analytics");
 var TAB_FORWARD_DIRECTION = 1;
 var TAB_BACKWARD_DIRECTION = -1;
 
-var goToNextCell = function goToNextCell(direction) {
-  return function (state, dispatch) {
-    var table = (0, _utils.findTable)(state.selection);
+var goToNextCell = function goToNextCell(editorAnalyticsAPI) {
+  return function (direction) {
+    return function (state, dispatch) {
+      var table = (0, _utils.findTable)(state.selection);
+
+      if (!table) {
+        return false;
+      }
+
+      var map = _tableMap.TableMap.get(table.node);
+
+      var _state$schema$nodes = state.schema.nodes,
+          tableCell = _state$schema$nodes.tableCell,
+          tableHeader = _state$schema$nodes.tableHeader;
+      var cell = (0, _prosemirrorUtils.findParentNodeOfType)([tableCell, tableHeader])(state.selection);
+      var firstCellPos = map.positionAt(0, 0, table.node) + table.start;
+      var lastCellPos = map.positionAt(map.height - 1, map.width - 1, table.node) + table.start; // when tabbing backwards at first cell (top left), insert row at the start of table
+
+      if (firstCellPos === cell.pos && direction === TAB_BACKWARD_DIRECTION) {
+        (0, _commandsWithAnalytics.insertRowWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD, {
+          index: 0,
+          moveCursorToInsertedRow: true
+        })(state, dispatch);
+        return true;
+      } // when tabbing forwards at last cell (bottom right), insert row at the end of table
+
+
+      if (lastCellPos === cell.pos && direction === TAB_FORWARD_DIRECTION) {
+        (0, _commandsWithAnalytics.insertRowWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD, {
+          index: map.height,
+          moveCursorToInsertedRow: true
+        })(state, dispatch);
+        return true;
+      }
+
+      if (dispatch) {
+        return (0, _utils.goToNextCell)(direction)(state, dispatch);
+      }
 
-    if (!table) {
-      return false;
-    }
-
-    var map = _tableMap.TableMap.get(table.node);
-
-    var _state$schema$nodes = state.schema.nodes,
-        tableCell = _state$schema$nodes.tableCell,
-        tableHeader = _state$schema$nodes.tableHeader;
-    var cell = (0, _prosemirrorUtils.findParentNodeOfType)([tableCell, tableHeader])(state.selection);
-    var firstCellPos = map.positionAt(0, 0, table.node) + table.start;
-    var lastCellPos = map.positionAt(map.height - 1, map.width - 1, table.node) + table.start; // when tabbing backwards at first cell (top left), insert row at the start of table
-
-    if (firstCellPos === cell.pos && direction === TAB_BACKWARD_DIRECTION) {
-      (0, _commandsWithAnalytics.insertRowWithAnalytics)(_types.INPUT_METHOD.KEYBOARD, {
-        index: 0,
-        moveCursorToInsertedRow: true
-      })(state, dispatch);
-      return true;
-    } // when tabbing forwards at last cell (bottom right), insert row at the end of table
-
-
-    if (lastCellPos === cell.pos && direction === TAB_FORWARD_DIRECTION) {
-      (0, _commandsWithAnalytics.insertRowWithAnalytics)(_types.INPUT_METHOD.KEYBOARD, {
-        index: map.height,
-        moveCursorToInsertedRow: true
-      })(state, dispatch);
       return true;
-    }
-
-    if (dispatch) {
-      return (0, _utils.goToNextCell)(direction)(state, dispatch);
-    }
-
-    return true;
+    };
   };
 };
 

package/dist/cjs/plugins/table/commands/insert.js

@@ -37,85 +37,93 @@ function addColumnAtCustomStep(column) {
   };
 }
 
-function addColumnAt(column) {
-  var allowAddColumnCustomStep = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var view = arguments.length > 2 ? arguments[2] : undefined;
-  return function (tr) {
-    var updatedTr = tr;
-
-    if (allowAddColumnCustomStep) {
-      updatedTr = addColumnAtCustomStep(column)(updatedTr);
-    } else {
-      updatedTr = (0, _utils.addColumnAt)(column)(updatedTr);
-    }
+function addColumnAt(getEditorContainerWidth) {
+  return function (column) {
+    var allowAddColumnCustomStep = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var view = arguments.length > 2 ? arguments[2] : undefined;
+    return function (tr) {
+      var updatedTr = tr;
+
+      if (allowAddColumnCustomStep) {
+        updatedTr = addColumnAtCustomStep(column)(updatedTr);
+      } else {
+        updatedTr = (0, _utils.addColumnAt)(column)(updatedTr);
+      }
 
-    var table = (0, _utils.findTable)(updatedTr.selection);
+      var table = (0, _utils.findTable)(updatedTr.selection);
 
-    if (table) {
-      // [ED-8288] Update colwidths manually to avoid multiple dispatch in TableComponent
-      updatedTr = (0, _columnWidth.rescaleColumns)(table, view)(updatedTr);
-    }
+      if (table) {
+        // [ED-8288] Update colwidths manually to avoid multiple dispatch in TableComponent
+        updatedTr = (0, _columnWidth.rescaleColumns)(getEditorContainerWidth)(table, view)(updatedTr);
+      }
 
-    return updatedTr;
+      return updatedTr;
+    };
   };
 } // :: (EditorState, dispatch: ?(tr: Transaction)) → bool
 // Command to add a column before the column with the selection.
 
 
-var addColumnBefore = function addColumnBefore(state, dispatch, view) {
-  var table = (0, _utils.findTable)(state.selection);
+var addColumnBefore = function addColumnBefore(getEditorContainerWidth) {
+  return function (state, dispatch, view) {
+    var table = (0, _utils.findTable)(state.selection);
 
-  if (!table) {
-    return false;
-  }
+    if (!table) {
+      return false;
+    }
 
-  if (dispatch) {
-    var rect = (0, _utils.selectedRect)(state);
-    dispatch(addColumnAt(rect.left, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
-  }
+    if (dispatch) {
+      var rect = (0, _utils.selectedRect)(state);
+      dispatch(addColumnAt(getEditorContainerWidth)(rect.left, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
+    }
 
-  return true;
+    return true;
+  };
 }; // :: (EditorState, dispatch: ?(tr: Transaction)) → bool
 // Command to add a column after the column with the selection.
 
 
 exports.addColumnBefore = addColumnBefore;
 
-var addColumnAfter = function addColumnAfter(state, dispatch, view) {
-  var table = (0, _utils.findTable)(state.selection);
+var addColumnAfter = function addColumnAfter(getEditorContainerWidth) {
+  return function (state, dispatch, view) {
+    var table = (0, _utils.findTable)(state.selection);
 
-  if (!table) {
-    return false;
-  }
+    if (!table) {
+      return false;
+    }
 
-  if (dispatch) {
-    var rect = (0, _utils.selectedRect)(state);
-    dispatch(addColumnAt(rect.right, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
-  }
+    if (dispatch) {
+      var rect = (0, _utils.selectedRect)(state);
+      dispatch(addColumnAt(getEditorContainerWidth)(rect.right, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
+    }
 
-  return true;
+    return true;
+  };
 }; // #region Commands
 
 
 exports.addColumnAfter = addColumnAfter;
 
-var insertColumn = function insertColumn(column) {
-  return function (state, dispatch, view) {
-    var tr = addColumnAt(column, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr);
-    var table = (0, _utils.findTable)(tr.selection);
+var insertColumn = function insertColumn(getEditorContainerWidth) {
+  return function (column) {
+    return function (state, dispatch, view) {
+      var tr = addColumnAt(getEditorContainerWidth)(column, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr);
+      var table = (0, _utils.findTable)(tr.selection);
 
-    if (!table) {
-      return false;
-    } // move the cursor to the newly created column
+      if (!table) {
+        return false;
+      } // move the cursor to the newly created column
 
 
-    var pos = _tableMap.TableMap.get(table.node).positionAt(0, column, table.node);
+      var pos = _tableMap.TableMap.get(table.node).positionAt(0, column, table.node);
 
-    if (dispatch) {
-      dispatch(tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(table.start + pos))));
-    }
+      if (dispatch) {
+        dispatch(tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(table.start + pos))));
+      }
 
-    return true;
+      return true;
+    };
   };
 };