@atlaskit/editor-core 153.1.4 → 154.0.0

package/dist/esm/plugins/table/nodeviews/TableComponent.js

@@ -18,7 +18,8 @@ import React from 'react';
 import classnames from 'classnames';
 import { isTableSelected } from '@atlaskit/editor-tables/utils';
 import rafSchedule from 'raf-schd';
-import { browser, calcTableWidth, tableMarginSides } from '@atlaskit/editor-common';
+import { calcTableWidth, tableMarginSides } from '@atlaskit/editor-common/styles';
+import { browser } from '@atlaskit/editor-common/utils';
 import { akEditorMobileBreakoutPoint, akEditorTableToolbarSize as tableToolbarSize } from '@atlaskit/editor-shared-styles';
 import { isValidPosition } from '../../../utils';
 import { getParentNodeWidth } from '../../../utils/node-width';
@@ -223,9 +224,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       var domAtPos = view.domAtPos.bind(view);
       var width = containerWidth.width;
 
-      if (_this.frameId && window) {
-        window.cancelAnimationFrame(_this.frameId);
-      }
+      _this.scaleTableDebounced.cancel();
 
       scaleTable(_this.table, _objectSpread(_objectSpread({}, scaleOptions), {}, {
         node: node,
@@ -271,7 +270,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
 
       var parentWidth = _this.getParentNodeWidth();
 
-      _this.frameId = _this.scaleTableDebounced(parentWidth);
+      _this.scaleTableDebounced(parentWidth);
     });
 
     _defineProperty(_assertThisInitialized(_this), "updateTableContainerWidth", function () {
@@ -395,7 +394,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
          */
         window.addEventListener('resize', this.handleWindowResizeDebounced);
         this.updateTableContainerWidth();
-        this.frameId = this.handleTableResizingDebounced(this.props);
+        this.handleTableResizingDebounced();
       }
 
       var currentStickyState = stickyHeadersPluginKey.getState(this.props.view.state);
@@ -414,15 +413,15 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       }
 
       this.handleScrollDebounced.cancel();
+      this.scaleTableDebounced.cancel();
+      this.handleTableResizingDebounced.cancel();
+      this.handleAutoSizeDebounced.cancel();
+      this.handleWindowResizeDebounced.cancel();
 
       if (this.props.allowColumnResizing) {
         window.removeEventListener('resize', this.handleWindowResizeDebounced);
       }
 
-      if (this.frameId && window) {
-        window.cancelAnimationFrame(this.frameId);
-      }
-
       if (this.overflowShadowsObserver) {
         this.overflowShadowsObserver.dispose();
       }
@@ -471,7 +470,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           updateControls(_view2.state);
         }
 
-        this.frameId = this.handleTableResizingDebounced(prevProps);
+        this.handleTableResizingDebounced();
       }
     }
   }, {

package/dist/esm/plugins/table/nodeviews/table.js

@@ -28,6 +28,7 @@ import { pluginConfig as getPluginConfig } from '../create-plugin-config';
 import { getPluginState, pluginKey } from '../pm-plugins/plugin-factory';
 import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizing';
 import { generateColgroup } from '../pm-plugins/table-resizing/utils';
+import { TableMap } from '@atlaskit/editor-tables/table-map';
 import TableComponent from './TableComponent';
 import { setTableSize } from '../commands';
 import { getFeatureFlags } from '../../feature-flags-context';
@@ -189,6 +190,13 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
           return true;
         }
 
+        var tableMap = TableMap.get(node);
+        var nextTableMap = TableMap.get(nextNode);
+
+        if (tableMap.width !== nextTableMap.width) {
+          return true;
+        }
+
         return attrKeys.some(function (key) {
           return node.attrs[key] !== nextNode.attrs[key];
         });

package/dist/esm/plugins/table/pm-plugins/main.js

@@ -7,7 +7,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { Plugin } from 'prosemirror-state';
 import { findParentDomRefOfType, findParentNodeOfType } from 'prosemirror-utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import { closestElement } from '../../../utils/dom';
 import { addBoldInEmptyHeaderCells, clearHoverSelection, setTableRef } from '../commands';
 import { handleBlur, handleClick, handleCut, handleFocus, handleMouseDown, handleMouseLeave, handleMouseMove, handleMouseOut, handleMouseOver, handleTripleClick, whenTableInFocus } from '../event-handlers';

package/dist/esm/plugins/table/pm-plugins/sticky-headers/nodeviews/tableRow.js

@@ -1,7 +1,7 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { findOverflowScrollParent } from '@atlaskit/editor-common';
+import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { pluginKey as widthPluginKey } from '../../../../../plugins/width';
 import { mapChildren } from '../../../../../utils/slice';
 import { TableCssClassName as ClassName, TableCssClassName } from '../../../types';
@@ -217,7 +217,9 @@ export var TableRowNodeView = /*#__PURE__*/function () {
     });
 
     _defineProperty(this, "makeRowHeaderNotSticky", function (table) {
-      if (!_this.isSticky) {
+      var isEditorDestroyed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+      if (!_this.isSticky || !table || !_this.dom) {
         return;
       }
 
@@ -230,7 +232,7 @@ export var TableRowNodeView = /*#__PURE__*/function () {
       _this.dom.style.top = '';
       table.style.removeProperty('margin-top');
 
-      _this.emitOff();
+      _this.emitOff(isEditorDestroyed);
     });
 
     _defineProperty(this, "padding", 0);
@@ -252,19 +254,22 @@ export var TableRowNodeView = /*#__PURE__*/function () {
       })(_this.view.state, _this.view.dispatch, _this.view);
     });
 
-    _defineProperty(this, "emitOff", function () {
+    _defineProperty(this, "emitOff", function (isEditorDestroyed) {
       if (_this.top === 0 && _this.padding === 0) {
         return;
       }
 
       _this.top = 0;
       _this.padding = 0;
-      updateStickyState({
-        pos: _this.getPos(),
-        sticky: false,
-        top: _this.top,
-        padding: _this.padding
-      })(_this.view.state, _this.view.dispatch, _this.view);
+
+      if (!isEditorDestroyed) {
+        updateStickyState({
+          pos: _this.getPos(),
+          sticky: false,
+          top: _this.top,
+          padding: _this.padding
+        })(_this.view.state, _this.view.dispatch, _this.view);
+      }
     });
 
     this.view = view;
@@ -485,10 +490,10 @@ export var TableRowNodeView = /*#__PURE__*/function () {
       this.unsubscribe();
 
       if (this.tree) {
-        this.makeRowHeaderNotSticky(this.tree.table);
+        this.makeRowHeaderNotSticky(this.tree.table, true);
       }
 
-      this.emitOff();
+      this.emitOff(true);
     }
   }, {
     key: "ignoreMutation",

package/dist/esm/plugins/table/pm-plugins/table-local-id.js

@@ -19,7 +19,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { Plugin, PluginKey } from 'prosemirror-state';
 import rafSchedule from 'raf-schd';
 import { uuid } from '@atlaskit/adf-schema';
-import { stepAdds } from '../../../utils/step';
+import { stepAddsOneOf } from '../../../utils/step';
 var pluginKey = new PluginKey('tableLocalIdPlugin');
 
 var getPluginState = function getPluginState(state) {
@@ -32,7 +32,7 @@ var getPluginState = function getPluginState(state) {
 
 var checkIsAddingTable = function checkIsAddingTable(transaction, nodeType) {
   return transaction.steps.some(function (step) {
-    return stepAdds(step, nodeType);
+    return stepAddsOneOf(step, new Set([nodeType]));
   });
 };
 /**

package/dist/esm/plugins/table/pm-plugins/table-resizing/event-handlers.js

@@ -1,6 +1,6 @@
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { tableCellMinWidth } from '@atlaskit/editor-common';
+import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { getParentNodeWidth } from '../../../../utils/node-width';
 import { pluginKey as editorDisabledPluginKey } from '../../../editor-disabled';

package/dist/esm/plugins/table/pm-plugins/table-resizing/utils/column-state.js

@@ -1,6 +1,6 @@
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findDomRefAtPos } from 'prosemirror-utils';
-import { tableNewColumnMinWidth } from '@atlaskit/editor-common';
+import { tableNewColumnMinWidth } from '@atlaskit/editor-common/styles';
 import { contentWidth } from './content-width';
 import { unitToNumber } from './unit-to-number';
 // Reads `width` and `minWidth` of each column from DOM and returns `ColumnState` containing those values

package/dist/esm/plugins/table/pm-plugins/table-resizing/utils/dom.js

@@ -1,4 +1,5 @@
-import { browser, tableCellBorderWidth, tableCellPadding, tableMarginTop } from '@atlaskit/editor-common';
+import { tableCellBorderWidth, tableCellPadding, tableMarginTop } from '@atlaskit/editor-common/styles';
+import { browser } from '@atlaskit/editor-common/utils';
 import { closestElement, containsClassName, parsePx } from '../../../../../utils/dom';
 import { updateOverflowShadows } from '../../../nodeviews/update-overflow-shadows';
 import { TableCssClassName as ClassName } from '../../../types';

package/dist/esm/plugins/table/pm-plugins/table-resizing/utils/misc.js

@@ -1,4 +1,5 @@
-import { calcTableWidth, getBreakpoint, mapBreakpointToLayoutMaxWidth } from '@atlaskit/editor-common';
+import { calcTableWidth } from '@atlaskit/editor-common/styles';
+import { getBreakpoint, mapBreakpointToLayoutMaxWidth } from '@atlaskit/editor-common/ui';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorWideLayoutWidth, akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { containsClassName } from '../../../../../utils';
 import { pluginKey as widthPluginKey } from '../../../../width';

package/dist/esm/plugins/table/pm-plugins/table-resizing/utils/resize-state.js

@@ -4,7 +4,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { calcTableColumnWidths, tableCellMinWidth, tableNewColumnMinWidth } from '@atlaskit/editor-common';
+import { tableCellMinWidth, tableNewColumnMinWidth } from '@atlaskit/editor-common/styles';
+import { calcTableColumnWidths } from '@atlaskit/editor-common/utils';
 import { hasTableBeenResized, insertColgroupFromNode } from './colgroup';
 import { getCellsRefsInColumn, getColumnStateFromDOM } from './column-state';
 import { syncStickyRowToTable } from './dom';

package/dist/esm/plugins/table/pm-plugins/table-resizing/utils/scale-table.js

@@ -4,7 +4,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { tableCellMinWidth } from '@atlaskit/editor-common';
+import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { getTableWidth } from '../../../utils';
 import { getLayoutSize } from '../utils/misc';

package/dist/esm/plugins/table/transforms/column-width.js

@@ -5,12 +5,12 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import { TableMap } from '@atlaskit/editor-tables/table-map';
-import { tableNewColumnMinWidth } from '@atlaskit/editor-common';
+import { tableNewColumnMinWidth } from '@atlaskit/editor-common/styles';
 import { hasTableBeenResized } from '../pm-plugins/table-resizing/utils';
 import { setMeta } from './metadata';
 import { getResizeState, normaliseTableLayout } from '../pm-plugins/table-resizing/utils/resize-state';
 import { getTableMaxWidth } from '../pm-plugins/table-resizing/utils/misc';
-import { tableCellMinWidth } from '@atlaskit/editor-common';
+import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { scaleTableTo } from '../pm-plugins/table-resizing/utils/scale-table';
 export var updateColumnWidths = function updateColumnWidths(resizeState, table, start) {
   return function (tr) {

package/dist/esm/plugins/table/transforms/fix-tables.js

@@ -4,7 +4,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { tableCellMinWidth } from '@atlaskit/editor-common';
+import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorDefaultLayoutWidth, akEditorWideLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { sendLogs } from '../../../utils/sendLogs';
 import { calculateColumnWidth, contentWidth, getCellsRefsInColumn, getLayoutSize } from '../pm-plugins/table-resizing/utils';

package/dist/esm/plugins/table/types.js

@@ -5,7 +5,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import { tableCellSelector, tableHeaderSelector, tablePrefixSelector } from '@atlaskit/adf-schema';
-import { TableSharedCssClassName } from '@atlaskit/editor-common';
+import { TableSharedCssClassName } from '@atlaskit/editor-common/styles';
 export var RESIZE_HANDLE_AREA_DECORATION_GAP = 30;
 export var TableDecorations;
 

package/dist/esm/plugins/table/ui/FloatingContextualButton/index.js

@@ -17,7 +17,7 @@ import React from 'react';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { injectIntl } from 'react-intl-next';
 import styled from 'styled-components';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorFloatingOverlapPanelZIndex, akEditorSmallZIndex } from '@atlaskit/editor-shared-styles';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ToolbarButton from '../../../../ui/ToolbarButton';

package/dist/esm/plugins/table/ui/FloatingContextualMenu/index.js

@@ -6,7 +6,7 @@ import React from 'react';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { findCellRectClosestToPos, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 import styled from 'styled-components';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { getPluginState, pluginKey } from '../../pm-plugins/plugin-factory';
 import { contextualMenuDropdownWidth, contextualMenuTriggerSize } from '../consts';

package/dist/esm/plugins/table/ui/FloatingDeleteButton/index.js

@@ -19,7 +19,7 @@ import React, { Component } from 'react';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getSelectionRect, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { createPortal } from 'react-dom';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { closestElement } from '../../../../utils/dom';
 import { INPUT_METHOD } from '../../../analytics';

package/dist/esm/plugins/table/ui/FloatingInsertButton/InsertButton.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { injectIntl } from 'react-intl-next';
-import { tableMarginTop } from '@atlaskit/editor-common';
+import { tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import Tooltip from '@atlaskit/tooltip';
 import * as keymaps from '../../../../keymaps';

package/dist/esm/plugins/table/ui/FloatingInsertButton/index.js

@@ -17,7 +17,7 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { injectIntl } from 'react-intl-next';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { closestElement } from '../../../../utils/dom';
 import { INPUT_METHOD } from '../../../analytics';
 import { insertColumnWithAnalytics, insertRowWithAnalytics } from '../../commands-with-analytics';

package/dist/esm/plugins/table/ui/LayoutButton/index.js

@@ -17,7 +17,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React from 'react';
 import classnames from 'classnames';
 import { injectIntl } from 'react-intl-next';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
 import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 import commonMessages from '../../../../messages';

package/dist/esm/plugins/table/ui/TableFloatingControls/index.js

@@ -17,7 +17,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import React, { Component } from 'react';
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import { hoverRows, selectRow } from '../../commands';
 import { isSelectionUpdated } from '../../utils';
 import CornerControls from './CornerControls';

package/dist/esm/plugins/table/ui/common-styles.css.js

@@ -3,7 +3,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2, _templateObject3;
 
 import { css } from 'styled-components';
-import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common';
+import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common/styles';
 import { fontSize } from '@atlaskit/theme/constants';
 import { N40A, B300, N300, N20A, N0, R500 } from '@atlaskit/theme/colors';
 import { SelectionStyle, getSelectionStyles, akEditorSmallZIndex, akEditorTableNumberColumnWidth, akEditorStickyHeaderZIndex, akEditorTableToolbarSize, akEditorUnitZIndex, akEditorSelectedNodeClassName, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';

package/dist/esm/plugins/table/ui/consts.js

@@ -1,5 +1,5 @@
-import { B100, B300, B75, N0, N20, R50, R400, R75, DN400, N200, DN30 } from '@atlaskit/theme/colors';
-import { tableCellBorderWidth, tableMarginTop } from '@atlaskit/editor-common';
+import { B200, B300, B75, N0, N20, R50, R400, R75, DN400, N200, DN30 } from '@atlaskit/theme/colors';
+import { tableCellBorderWidth, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorTableBorder, akEditorTableBorderDark, akEditorTableToolbar, akEditorTableToolbarDark, akEditorTableToolbarSize, akEditorUnitZIndex, akRichMediaResizeZIndex } from '@atlaskit/editor-shared-styles';
 import { RESIZE_HANDLE_AREA_DECORATION_GAP } from '../types';
 import { themed } from '@atlaskit/theme/components';
@@ -25,7 +25,7 @@ export var tableBorderColor = themed({
 });
 export var tableFloatingControlsColor = N20;
 export var tableCellSelectedColor = B75;
-export var tableToolbarSelectedColor = B100;
+export var tableToolbarSelectedColor = B200;
 export var tableBorderSelectedColor = B300;
 export var tableCellDeleteColor = R50;
 export var tableBorderDeleteColor = R400;

package/dist/esm/plugins/table/ui/ui-styles.css.js

@@ -3,7 +3,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21;
 
 import { css } from 'styled-components';
-import { tableCellBorderWidth, tableMarginBottom, tableMarginTop } from '@atlaskit/editor-common';
+import { tableCellBorderWidth, tableMarginBottom, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorShadowZIndex, akEditorTableNumberColumnWidth, akEditorUnitZIndex } from '@atlaskit/editor-shared-styles';
 import { N40A, B300, N300, R300, N20A, N60A, N0, Y50, Y200 } from '@atlaskit/theme/colors';
 import { tableToolbarColor, tableBorderColor, tableToolbarSelectedColor, tableBorderSelectedColor, tableCellDeleteColor, tableBorderDeleteColor, tableToolbarDeleteColor, lineMarkerOffsetFromColumnControls, lineMarkerSize, columnControlsDecorationHeight, columnControlsZIndex, columnControlsSelectedZIndex, resizeHandlerAreaWidth, resizeLineWidth, resizeHandlerZIndex, tableToolbarSize, tableInsertColumnButtonSize, tableDeleteButtonSize, tableControlsSpacing } from './consts';

package/dist/esm/plugins/table/utils/collapse.js

@@ -1,42 +1,84 @@
 import { NodeRange } from 'prosemirror-model';
+import { findWrapping } from 'prosemirror-transform';
 import { findTable } from '@atlaskit/editor-tables/utils';
+
+var bail = function bail() {
+  return {
+    tableIsCollapsible: false
+  };
+};
 /**
- * Collapses the selected table into an expand given a transaction.
- *
- * Will return undefined if it cannot determine the relevant table from a
- * selection,
- *
- * Or if wrapping it in an expand results in any errors
- *
- * @param tr
- * @returns Transaction | undefined
+ * Checks whether we can wrap the selected table into an expand via
+ * prosemirror-transform's `findWrapping` helper
  */
 
-export var collapseSelectedTable = function collapseSelectedTable(tr) {
+
+export var isTableCollapsible = function isTableCollapsible(tr) {
   var selection = tr.selection;
   var schema = tr.doc.type.schema;
   var nodePos = findTable(selection);
 
   if (!nodePos) {
-    return undefined;
+    return bail();
   }
 
+  var expand = schema.nodes.expand;
   var node = nodePos.node,
       pos = nodePos.pos;
   var $pos = tr.doc.resolve(pos);
-  var expand = schema.nodes.expand;
-  var range = new NodeRange($pos, tr.doc.resolve(pos + node.nodeSize), $pos.depth); // Check if result of this transaction would result in an invalid document
-
-  try {
-    // TODO: add attrs: { __expanded: false } when it is working with new collab (CEMS-1204)
-    tr.wrap(range, [{
-      type: expand
-    }]).setMeta('scrollIntoView', true);
-    tr.doc.check();
-  } catch (err) {
-    // Don't care why it failed, only that we couldn't do so without issue
+  var range = new NodeRange($pos, tr.doc.resolve(pos + node.nodeSize), $pos.depth);
+
+  if (!range) {
+    return bail();
+  }
+
+  var canWrap = findWrapping(range, expand);
+
+  if (canWrap === null) {
+    return bail();
+  }
+
+  return {
+    tableIsCollapsible: true,
+    range: range,
+
+    /**
+     * Do we ever want to deal with the result of `findWrapping`? Probably not,
+     * but we have it anyway.
+     */
+    findWrappingRes: canWrap
+  };
+};
+/**
+ * Collapses the selected table into an expand given a transaction via
+ * `Transform.wrap`.
+ *
+ * Will return undefined if it cannot determine the relevant table from a
+ * selection, or if the table itself isn't collapsible.
+ *
+ * @param tr
+ * @returns Transaction | undefined
+ */
+
+export var collapseSelectedTable = function collapseSelectedTable(tr) {
+  var canCollapse = isTableCollapsible(tr);
+  var expand = tr.doc.type.schema.nodes.expand;
+
+  if (!canCollapse.range || !canCollapse.tableIsCollapsible) {
     return undefined;
   }
+  /**
+   * TODO: add attrs: { __expanded: false } when
+   * - it is working with new collab (CEMS-1204)
+   * - synchrony is no longer used
+   *
+   *   (via confluence-frontend, "this feature" referencing allowInteractiveExpand)
+   *   `we can NEVER allow this feature to be enabled for the synchrony-powered editor
+   */
+
 
+  tr.wrap(canCollapse.range, [{
+    type: expand
+  }]).setMeta('scrollIntoView', true);
   return tr;
 };

package/dist/esm/plugins/tasks-and-decisions/commands.js

@@ -88,13 +88,14 @@ export var insertTaskDecision = function insertTaskDecision(view, listType) {
         item = _ref2.item,
         itemLocalId = _ref2.itemLocalId;
     var $to = state.selection.$to;
-    var pos = $to.end($to.depth);
-    return tr.split(pos, 1, [{
+    var endPos = $to.end($to.depth);
+    var newItemParagraphPos = endPos + 2;
+    return tr.split(endPos, 1, [{
       type: item,
       attrs: {
         localId: itemLocalId
       }
-    }]).setSelection(new TextSelection(tr.doc.resolve(pos + $to.depth)));
+    }]).setSelection(new TextSelection(tr.doc.resolve(newItemParagraphPos)));
   };
 
   var tr = insertTaskDecisionWithAnalytics(state, listType, inputMethod, addAndCreateList, addToList, listLocalId, itemLocalId);

package/dist/esm/plugins/tasks-and-decisions/pm-plugins/helpers.js

@@ -1,5 +1,5 @@
 import { liftTarget } from 'prosemirror-transform';
-import { hasParentNodeOfType } from 'prosemirror-utils';
+import { findParentNodeClosestToPos, hasParentNodeOfType } from 'prosemirror-utils';
 import { findFarthestParentNode } from '../../../utils';
 export var isInsideTaskOrDecisionItem = function isInsideTaskOrDecisionItem(state) {
   var _state$schema$nodes = state.schema.nodes,
@@ -23,6 +23,10 @@ export var isInsideTask = function isInsideTask(state) {
   var taskItem = state.schema.nodes.taskItem;
   return hasParentNodeOfType([taskItem])(state.selection);
 };
+export var isInsideDecision = function isInsideDecision(state) {
+  var decisionItem = state.schema.nodes.decisionItem;
+  return hasParentNodeOfType([decisionItem])(state.selection);
+};
 export var isTable = function isTable(node) {
   if (!node) {
     return false;
@@ -71,6 +75,20 @@ export var getCurrentIndentLevel = function getCurrentIndentLevel(selection) {
 
   return $from.depth - furthestParent.depth;
 };
+/**
+ * Finds the index of the current task item in relation to the closest taskList
+ */
+
+export var getTaskItemIndex = function getTaskItemIndex(state) {
+  var $pos = state.selection.$from;
+
+  var isTaskList = function isTaskList(node) {
+    return (node === null || node === void 0 ? void 0 : node.type.name) === 'taskList';
+  };
+
+  var itemAtPos = findParentNodeClosestToPos($pos, isTaskList);
+  return $pos.index(itemAtPos ? itemAtPos.depth : undefined);
+};
 /**
  * Walk outwards from a position until we encounter the (inside) start of
  * the next node, or reach the end of the document.