@atlaskit/editor-plugin-expand 27.0.4 → 27.0.7

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-expand
 
+## 27.0.7
+
+### Patch Changes
+
+- Updated dependencies
+
+## 27.0.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 27.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 27.0.4
 
 ### Patch Changes

package/dist/cjs/legacyExpand/commands.js

@@ -7,15 +7,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.updateExpandTitle = exports.toggleExpandWithMatch = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.setExpandRef = exports.insertExpandWithInputMethod = exports.insertExpand = exports.focusTitle = exports.focusIcon = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _setAttrs = require("@atlaskit/adf-schema/steps/set-attrs");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _generalEvents = require("@atlaskit/editor-common/analytics/types/general-events");
 var _selection2 = require("@atlaskit/editor-common/selection");
-var _styles = require("@atlaskit/editor-common/styles");
+var _selection3 = require("@atlaskit/editor-common/selection/gap-cursor/selection");
+var _expand = require("@atlaskit/editor-common/styles/expand");
 var _transforms = require("@atlaskit/editor-common/transforms");
-var _utils = require("@atlaskit/editor-common/utils");
+var _createWrapSelectionTransaction = require("@atlaskit/editor-common/utils/create-wrap-selection-transaction");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
-var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _utils3 = require("@atlaskit/editor-tables/utils");
-var _utils4 = require("../utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils2 = require("@atlaskit/editor-tables/utils");
+var _utils3 = require("../utils");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -36,12 +38,12 @@ var deleteExpandAtPos = exports.deleteExpandAtPos = function deleteExpandAtPos(e
         return false;
       }
       var payload = {
-        action: _analytics.ACTION.DELETED,
-        actionSubject: expandNode.type === state.schema.nodes.expand ? _analytics.ACTION_SUBJECT.EXPAND : _analytics.ACTION_SUBJECT.NESTED_EXPAND,
+        action: _enums.ACTION.DELETED,
+        actionSubject: expandNode.type === state.schema.nodes.expand ? _enums.ACTION_SUBJECT.EXPAND : _enums.ACTION_SUBJECT.NESTED_EXPAND,
         attributes: {
-          inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+          inputMethod: _enums.INPUT_METHOD.FLOATING_TB
         },
-        eventType: _analytics.EVENT_TYPE.TRACK
+        eventType: _enums.EVENT_TYPE.TRACK
       };
       if (expandNode && dispatch) {
         var tr = state.tr;
@@ -115,20 +117,20 @@ var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandE
       // Move to a right gap cursor, if the toolbar is interacted (or an API),
       // it will insert below rather than inside (which will be invisible).
       if (__livePage ? isExpandedNext === true : isExpandedNext === false && (0, _transforms.findExpand)(state)) {
-        tr.setSelection(new _selection2.GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), _selection2.Side.RIGHT));
+        tr.setSelection(new _selection3.GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), _selection2.Side.RIGHT));
       }
 
       // log when people open/close expands
       // TODO: ED-8523 - make platform/mode global attributes?
       var payload = {
-        action: _analytics.ACTION.TOGGLE_EXPAND,
-        actionSubject: nodeType === state.schema.nodes.expand ? _analytics.ACTION_SUBJECT.EXPAND : _analytics.ACTION_SUBJECT.NESTED_EXPAND,
+        action: _enums.ACTION.TOGGLE_EXPAND,
+        actionSubject: nodeType === state.schema.nodes.expand ? _enums.ACTION_SUBJECT.EXPAND : _enums.ACTION_SUBJECT.NESTED_EXPAND,
         attributes: {
-          platform: _analytics.PLATFORMS.WEB,
-          mode: _analytics.MODE.EDITOR,
+          platform: _generalEvents.PLATFORMS.WEB,
+          mode: _generalEvents.MODE.EDITOR,
           expanded: __livePage ? !isExpandedNext : isExpandedNext
         },
-        eventType: _analytics.EVENT_TYPE.TRACK
+        eventType: _enums.EVENT_TYPE.TRACK
       };
 
       // `isRemote` meta prevents this step from being
@@ -146,8 +148,8 @@ var createExpandNode = exports.createExpandNode = function createExpandNode(stat
   var _state$schema$nodes = state.schema.nodes,
     expand = _state$schema$nodes.expand,
     nestedExpand = _state$schema$nodes.nestedExpand;
-  var isSelectionInTable = !!(0, _utils3.findTable)(state.selection);
-  var isSelectionInExpand = (0, _utils4.isNestedInExpand)(state);
+  var isSelectionInTable = !!(0, _utils2.findTable)(state.selection);
+  var isSelectionInExpand = (0, _utils3.isNestedInExpand)(state);
   var expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   return expandType.createAndFill({});
 };
@@ -158,18 +160,18 @@ var insertExpandWithInputMethod = exports.insertExpandWithInputMethod = function
       if (!expandNode) {
         return false;
       }
-      var tr = state.selection.empty ? (0, _utils2.safeInsert)(expandNode)(state.tr).scrollIntoView() : (0, _utils.createWrapSelectionTransaction)({
+      var tr = state.selection.empty ? (0, _utils.safeInsert)(expandNode)(state.tr).scrollIntoView() : (0, _createWrapSelectionTransaction.createWrapSelectionTransaction)({
         state: state,
         type: expandNode.type
       });
       var payload = {
-        action: _analytics.ACTION.INSERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? _analytics.ACTION_SUBJECT_ID.EXPAND : _analytics.ACTION_SUBJECT_ID.NESTED_EXPAND,
+        action: _enums.ACTION.INSERTED,
+        actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? _enums.ACTION_SUBJECT_ID.EXPAND : _enums.ACTION_SUBJECT_ID.NESTED_EXPAND,
         attributes: {
           inputMethod: inputMethod
         },
-        eventType: _analytics.EVENT_TYPE.TRACK
+        eventType: _enums.EVENT_TYPE.TRACK
       };
       if (dispatch && expandNode) {
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
@@ -181,7 +183,7 @@ var insertExpandWithInputMethod = exports.insertExpandWithInputMethod = function
 };
 var insertExpand = exports.insertExpand = function insertExpand(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    return insertExpandWithInputMethod(editorAnalyticsAPI)(_analytics.INPUT_METHOD.INSERT_MENU)(state, dispatch);
+    return insertExpandWithInputMethod(editorAnalyticsAPI)(_enums.INPUT_METHOD.INSERT_MENU)(state, dispatch);
   };
 };
 var focusTitle = exports.focusTitle = function focusTitle(pos) {
@@ -206,7 +208,7 @@ var focusIcon = exports.focusIcon = function focusIcon(expand) {
     if (!(expand instanceof HTMLElement)) {
       return false;
     }
-    var iconContainer = expand.querySelector(".".concat(_styles.expandClassNames.iconContainer));
+    var iconContainer = expand.querySelector(".".concat(_expand.expandClassNames.iconContainer));
     if (iconContainer && iconContainer.focus) {
       var tr = state.tr;
       var pos = state.selection.from;

package/dist/cjs/legacyExpand/nodeviews/index.js

@@ -15,10 +15,13 @@ var _uuid = require("uuid");
 var _w3cKeyname = require("w3c-keyname");
 var _surfaceKeys = require("@atlaskit/editor-common/block-controls/surface-keys");
 var _selection = require("@atlaskit/editor-common/selection");
-var _styles = require("@atlaskit/editor-common/styles");
-var _ui = require("@atlaskit/editor-common/ui");
+var _selection2 = require("@atlaskit/editor-common/selection/gap-cursor/selection");
+var _types = require("@atlaskit/editor-common/selection/types");
+var _expand = require("@atlaskit/editor-common/styles/expand");
+var _uiExpand = require("@atlaskit/editor-common/ui-expand");
 var _utils = require("@atlaskit/editor-common/utils");
 var _contentVisibility = require("@atlaskit/editor-common/utils/content-visibility");
+var _dom2 = require("@atlaskit/editor-common/utils/dom");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
@@ -31,13 +34,13 @@ var _ExpandIconButton = require("../ui/ExpandIconButton");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 function buildExpandClassName(type, expanded) {
-  return "".concat(_styles.expandClassNames.prefix, " ").concat(_styles.expandClassNames.type(type), " ").concat(expanded ? _styles.expandClassNames.expanded : '');
+  return "".concat(_expand.expandClassNames.prefix, " ").concat(_expand.expandClassNames.type(type), " ").concat(expanded ? _expand.expandClassNames.expanded : '');
 }
 function getExpandBodyAriaLabel(title, intl) {
-  var safeTitle = title.trim() || (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyAriaLabelUntitled)) || _ui.expandMessages.expandBodyAriaLabelUntitled.defaultMessage;
-  return (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyAriaLabel, {
+  var safeTitle = title.trim() || (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_uiExpand.messages.expandBodyAriaLabelUntitled)) || _uiExpand.messages.expandBodyAriaLabelUntitled.defaultMessage;
+  return (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_uiExpand.messages.expandBodyAriaLabel, {
     title: safeTitle
-  })) || _ui.expandMessages.expandBodyAriaLabel.defaultMessage.replace('{title}', safeTitle);
+  })) || _uiExpand.messages.expandBodyAriaLabel.defaultMessage.replace('{title}', safeTitle);
 }
 var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditable) {
   var _node$attrs$title, _intl$formatMessage;
@@ -50,7 +53,7 @@ var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditabl
     'data-local-id': node.attrs.localId
   }), ['div', {
     // prettier-ignore
-    'class': _styles.expandClassNames.titleContainer,
+    'class': _expand.expandClassNames.titleContainer,
     contenteditable: 'false',
     // Element gains access to focus events.
     // This is needed to prevent PM gaining access
@@ -59,31 +62,31 @@ var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditabl
   },
   // prettier-ignore
   ['div', {
-    'class': _styles.expandClassNames.icon,
+    'class': _expand.expandClassNames.icon,
     style: "display: flex; width: ".concat("var(--ds-space-300, 24px)", "; height: ", "var(--ds-space-300, 24px)")
   }], ['div', {
     // prettier-ignore
-    'class': _styles.expandClassNames.inputContainer
+    'class': _expand.expandClassNames.inputContainer
   }, ['input', {
     // prettier-ignore
-    'class': _styles.expandClassNames.titleInput,
-    'aria-label': intl && intl.formatMessage(_ui.expandMessages.expandArialabel) || _ui.expandMessages.expandArialabel.defaultMessage,
+    'class': _expand.expandClassNames.titleInput,
+    'aria-label': intl && intl.formatMessage(_uiExpand.messages.expandArialabel) || _uiExpand.messages.expandArialabel.defaultMessage,
     value: node.attrs.title,
-    placeholder: intl && intl.formatMessage(_ui.expandMessages.expandPlaceholderText) || _ui.expandMessages.expandPlaceholderText.defaultMessage,
+    placeholder: intl && intl.formatMessage(_uiExpand.messages.expandPlaceholderText) || _uiExpand.messages.expandPlaceholderText.defaultMessage,
     type: 'text',
     readonly: titleReadOnly ? 'true' : undefined
   }]]], [(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2') ? 'section' : 'div', _objectSpread(_objectSpread({
     // prettier-ignore
-    class: "".concat(_styles.expandClassNames.content, " ").concat((__livePage ? !node.attrs.__expanded : node.attrs.__expanded) ? '' : _styles.expandClassNames.contentCollapsed),
+    class: "".concat(_expand.expandClassNames.content, " ").concat((__livePage ? !node.attrs.__expanded : node.attrs.__expanded) ? '' : _expand.expandClassNames.contentCollapsed),
     contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined
   }, !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2') && {
     role: 'textbox',
     'aria-multiline': 'true',
-    'aria-label': intl && intl.formatMessage(_ui.expandMessages.expandBodyAriaLabelOriginal) || _ui.expandMessages.expandBodyAriaLabelOriginal.defaultMessage
+    'aria-label': intl && intl.formatMessage(_uiExpand.messages.expandBodyAriaLabelOriginal) || _uiExpand.messages.expandBodyAriaLabelOriginal.defaultMessage
   }), (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2') && {
     'aria-label': getExpandBodyAriaLabel((_node$attrs$title = node.attrs.title) !== null && _node$attrs$title !== void 0 ? _node$attrs$title : '', intl),
-    'aria-description': (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyAriaDescription)) || _ui.expandMessages.expandBodyAriaDescription.defaultMessage,
-    'aria-roledescription': (_intl$formatMessage = intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyRoleDescription)) !== null && _intl$formatMessage !== void 0 ? _intl$formatMessage : _ui.expandMessages.expandBodyRoleDescription.defaultMessage
+    'aria-description': (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_uiExpand.messages.expandBodyAriaDescription)) || _uiExpand.messages.expandBodyAriaDescription.defaultMessage,
+    'aria-roledescription': (_intl$formatMessage = intl === null || intl === void 0 ? void 0 : intl.formatMessage(_uiExpand.messages.expandBodyRoleDescription)) !== null && _intl$formatMessage !== void 0 ? _intl$formatMessage : _uiExpand.messages.expandBodyRoleDescription.defaultMessage
   }), 0]];
 };
 var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
@@ -103,7 +106,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           dispatch = _this$view.dispatch;
         if (_this.selectNearNode) {
           var tr = _this.selectNearNode({
-            selectionRelativeToNode: _selection.RelativeSelectionPos.Start
+            selectionRelativeToNode: _types.RelativeSelectionPos.Start
           })(state);
           if (dispatch) {
             dispatch(tr);
@@ -140,7 +143,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       var _this$view2 = _this.view,
         state = _this$view2.state,
         dispatch = _this$view2.dispatch;
-      if ((0, _utils.closestElement)(target, ".".concat(_styles.expandClassNames.icon))) {
+      if ((0, _dom2.closestElement)(target, ".".concat(_expand.expandClassNames.icon))) {
         var _this$api;
         if (!_this.allowInteractiveExpand) {
           return;
@@ -388,7 +391,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           dispatch = _this$view6.dispatch;
         event.preventDefault();
         _this.view.focus();
-        dispatch(state.tr.setSelection(new _selection.GapCursorSelection(state.doc.resolve(_this.node.nodeSize + pos), _selection.Side.RIGHT)));
+        dispatch(state.tr.setSelection(new _selection2.GapCursorSelection(state.doc.resolve(_this.node.nodeSize + pos), _selection.Side.RIGHT)));
       }
     });
     (0, _defineProperty2.default)(this, "moveToPreviousLine", function (event) {
@@ -439,7 +442,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           state = _this$view8.state,
           dispatch = _this$view8.dispatch;
         _this.view.focus();
-        dispatch(state.tr.setSelection(new _selection.GapCursorSelection(state.doc.resolve(pos), _selection.Side.LEFT)));
+        dispatch(state.tr.setSelection(new _selection2.GapCursorSelection(state.doc.resolve(pos), _selection.Side.LEFT)));
       }
     });
     (0, _defineProperty2.default)(this, "handleArrowRightFromTitle", function (event) {
@@ -461,7 +464,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           dispatch = _this$view9.dispatch;
         _this.view.focus();
         var tr = _this.selectNearNode({
-          selectionRelativeToNode: _selection.RelativeSelectionPos.End,
+          selectionRelativeToNode: _types.RelativeSelectionPos.End,
           selection: _state.NodeSelection.create(state.doc, pos)
         })(state);
         if (dispatch) {
@@ -493,14 +496,14 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         if ((selectionSharedState === null || selectionSharedState === void 0 ? void 0 : selectionSharedState.selectionRelativeToNode) === undefined) {
           var tr = _this.selectNearNode({
             selectionRelativeToNode: undefined,
-            selection: new _selection.GapCursorSelection(state.doc.resolve(pos), _selection.Side.LEFT)
+            selection: new _selection2.GapCursorSelection(state.doc.resolve(pos), _selection.Side.LEFT)
           })(state);
           if (dispatch) {
             dispatch(tr);
           }
         } else {
           var _tr = _this.selectNearNode({
-            selectionRelativeToNode: _selection.RelativeSelectionPos.Start,
+            selectionRelativeToNode: _types.RelativeSelectionPos.Start,
             selection: _state.NodeSelection.create(state.doc, pos)
           })(state);
           if (dispatch) {
@@ -553,10 +556,10 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
     this.api = api;
-    this.icon = this.dom.querySelector(".".concat(_styles.expandClassNames.icon));
-    this.input = this.dom.querySelector(".".concat(_styles.expandClassNames.titleInput));
-    this.titleContainer = this.dom.querySelector(".".concat(_styles.expandClassNames.titleContainer));
-    this.content = this.dom.querySelector(".".concat(_styles.expandClassNames.content));
+    this.icon = this.dom.querySelector(".".concat(_expand.expandClassNames.icon));
+    this.input = this.dom.querySelector(".".concat(_expand.expandClassNames.titleInput));
+    this.titleContainer = this.dom.querySelector(".".concat(_expand.expandClassNames.titleContainer));
+    this.content = this.dom.querySelector(".".concat(_expand.expandClassNames.content));
     (0, _contentVisibility.applyContentVisibility)(this.dom, this.isLimitedModeEnabled(), function () {
       return {
         height: (0, _contentVisibility.estimateExpandIntrinsicHeight)(_this.node, !_this.isCollapsed())
@@ -636,9 +639,9 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       var isCollapsed = this.__livePage ? node.attrs.__expanded : !node.attrs.__expanded;
       if (this.content) {
         if (isCollapsed) {
-          this.content.classList.add(_styles.expandClassNames.contentCollapsed);
+          this.content.classList.add(_expand.expandClassNames.contentCollapsed);
         } else {
-          this.content.classList.remove(_styles.expandClassNames.contentCollapsed);
+          this.content.classList.remove(_expand.expandClassNames.contentCollapsed);
         }
       }
       // Collapsed vs expanded changes the reserved height, so re-apply the intrinsic-size estimate.
@@ -667,7 +670,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       // Ignored via go/ees005
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       var target = event.target;
-      return target === this.input || target === this.icon || !!(0, _utils.closestElement)(target, ".".concat(_styles.expandClassNames.icon));
+      return target === this.input || target === this.icon || !!(0, _dom2.closestElement)(target, ".".concat(_expand.expandClassNames.icon));
     }
   }, {
     key: "ignoreMutation",
@@ -699,7 +702,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           // Instead of re-rendering the view on an expand toggle
           // we toggle a class name to hide the content and animate the chevron.
           if (this.dom) {
-            this.dom.classList.toggle(_styles.expandClassNames.expanded);
+            this.dom.classList.toggle(_expand.expandClassNames.expanded);
             this.renderIcon(this.intl, node);
           }
           if (this.content) {

package/dist/cjs/legacyExpand/plugin.js

@@ -9,11 +9,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _expand = require("@atlaskit/adf-schema/expand");
 var _nestedExpand = require("@atlaskit/adf-schema/nested-expand");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _assets = require("@atlaskit/editor-common/assets");
-var _blockMenu = require("@atlaskit/editor-common/block-menu");
-var _messages = require("@atlaskit/editor-common/messages");
-var _utils = require("@atlaskit/editor-common/utils");
+var _key = require("@atlaskit/editor-common/block-menu/key");
+var _rank = require("@atlaskit/editor-common/block-menu/rank");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _createWrapSelectionTransaction = require("@atlaskit/editor-common/utils/create-wrap-selection-transaction");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _toggleExpandRange = require("../editor-commands/toggleExpandRange");
 var _ExpandBlockMenuItem = require("../ui/ExpandBlockMenuItem");
@@ -35,11 +36,11 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
   var isRegisteredSlashCommandEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_command');
   api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
     type: 'block-menu-item',
-    key: _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
+    key: _key.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
     parent: {
       type: 'block-menu-section',
-      key: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION.key,
-      rank: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION_RANK[_blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
+      key: _key.TRANSFORM_STRUCTURE_MENU_SECTION.key,
+      rank: _rank.TRANSFORM_STRUCTURE_MENU_SECTION_RANK[_key.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
     },
     component: (0, _ExpandBlockMenuItem.createExpandBlockMenuItem)(api),
     isHidden: function isHidden() {
@@ -110,8 +111,8 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
         }
         return [{
           id: 'expand',
-          title: formatMessage(_messages.toolbarInsertBlockMessages.expand),
-          description: formatMessage(_messages.toolbarInsertBlockMessages.expandDescription),
+          title: formatMessage(_insertBlock.toolbarInsertBlockMessages.expand),
+          description: formatMessage(_insertBlock.toolbarInsertBlockMessages.expandDescription),
           keywords: ['accordion', 'collapse'],
           priority: 600,
           icon: function icon() {
@@ -123,18 +124,18 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
             if (!node) {
               return false;
             }
-            var tr = state.selection.empty ? insert(node) : (0, _utils.createWrapSelectionTransaction)({
+            var tr = state.selection.empty ? insert(node) : (0, _createWrapSelectionTransaction.createWrapSelectionTransaction)({
               state: state,
               type: node.type
             });
             api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.attachAnalyticsEvent({
-              action: _analytics.ACTION.INSERTED,
-              actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: node.type === state.schema.nodes.nestedExpand ? _analytics.ACTION_SUBJECT_ID.NESTED_EXPAND : _analytics.ACTION_SUBJECT_ID.EXPAND,
+              action: _enums.ACTION.INSERTED,
+              actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+              actionSubjectId: node.type === state.schema.nodes.nestedExpand ? _enums.ACTION_SUBJECT_ID.NESTED_EXPAND : _enums.ACTION_SUBJECT_ID.EXPAND,
               attributes: {
-                inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
+                inputMethod: _enums.INPUT_METHOD.QUICK_INSERT
               },
-              eventType: _analytics.EVENT_TYPE.TRACK
+              eventType: _enums.EVENT_TYPE.TRACK
             })(tr);
             return tr;
           }

package/dist/cjs/legacyExpand/pm-plugins/keymap.js

@@ -7,6 +7,8 @@ exports.expandKeymap = expandKeymap;
 var _expand2 = require("@atlaskit/editor-common/expand");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _selection = require("@atlaskit/editor-common/selection");
+var _selection2 = require("@atlaskit/editor-common/selection/gap-cursor/selection");
+var _types = require("@atlaskit/editor-common/selection/types");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _utils = require("@atlaskit/editor-common/utils");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
@@ -33,7 +35,7 @@ function expandKeymap(api, options) {
     var selection = state.selection;
     var selectionSharedState = (api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : _api$selection.sharedState.currentState()) || {};
     var selectionRelativeToNode = selectionSharedState.selectionRelativeToNode;
-    if (isExpandSelected(selection) && selectionRelativeToNode === _selection.RelativeSelectionPos.Start) {
+    if (isExpandSelected(selection) && selectionRelativeToNode === _types.RelativeSelectionPos.Start) {
       return (0, _commands.focusTitle)(selection.from + 1)(state, dispatch, editorView);
     }
     return false;
@@ -49,7 +51,7 @@ function expandKeymap(api, options) {
     var selection = state.selection;
     var selectionSharedState = (api === null || api === void 0 || (_api$selection2 = api.selection) === null || _api$selection2 === void 0 ? void 0 : _api$selection2.sharedState.currentState()) || {};
     var selectionRelativeToNode = selectionSharedState.selectionRelativeToNode;
-    if (isExpandSelected(selection) && (selectionRelativeToNode === undefined || selectionRelativeToNode === _selection.RelativeSelectionPos.End)) {
+    if (isExpandSelected(selection) && (selectionRelativeToNode === undefined || selectionRelativeToNode === _types.RelativeSelectionPos.End)) {
       return (0, _commands.focusTitle)(selection.from + 1)(state, dispatch, editorView);
     }
     return false;
@@ -93,7 +95,7 @@ function expandKeymap(api, options) {
     var selection = state.selection,
       schema = state.schema;
     var nodeBefore = selection.$from.nodeBefore;
-    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
+    if (selection instanceof _selection2.GapCursorSelection && selection.side === _selection.Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
       var _$from = selection.$from;
       return (0, _commands.focusTitle)(Math.max(_$from.pos - 1, 0))(state, dispatch, editorView);
     }
@@ -141,7 +143,7 @@ function expandKeymap(api, options) {
       nestedExpand = _state$schema$nodes.nestedExpand;
     var selection = state.selection;
     var nodeAfter = selection.$from.nodeAfter;
-    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
+    if (selection instanceof _selection2.GapCursorSelection && selection.side === _selection.Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
       var $from = selection.$from;
       return (0, _commands.focusTitle)($from.pos + 1)(state, dispatch, editorView);
     }

package/dist/cjs/legacyExpand/pm-plugins/main.js

@@ -9,7 +9,7 @@ exports.createPlugin = void 0;
 exports.handleExpandDrag = handleExpandDrag;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection = require("@atlaskit/editor-common/selection");
-var _styles = require("@atlaskit/editor-common/styles");
+var _expand = require("@atlaskit/editor-common/styles/expand");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _commands = require("../commands");
@@ -54,16 +54,16 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, getInt
         })
       },
       handleKeyDown: function handleKeyDown(_view, event) {
-        return containsClass(event.target, _styles.expandClassNames.titleContainer);
+        return containsClass(event.target, _expand.expandClassNames.titleContainer);
       },
       handleKeyPress: function handleKeyPress(_view, event) {
-        return containsClass(event.target, _styles.expandClassNames.titleContainer);
+        return containsClass(event.target, _expand.expandClassNames.titleContainer);
       },
       handleScrollToSelection: function handleScrollToSelection() {
-        return containsClass(document.activeElement, _styles.expandClassNames.titleInput);
+        return containsClass(document.activeElement, _expand.expandClassNames.titleInput);
       },
       handleClickOn: (0, _selection.createSelectionClickHandler)(['expand', 'nestedExpand'], function (target) {
-        return target.classList.contains(_styles.expandClassNames.prefix);
+        return target.classList.contains(_expand.expandClassNames.prefix);
       }, {
         useLongPressSelection: useLongPressSelection
       }),
@@ -73,7 +73,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, getInt
     },
     // @see ED-8027 to follow up on this work-around
     filterTransaction: function filterTransaction(tr) {
-      if (containsClass(document.activeElement, _styles.expandClassNames.titleInput) && tr.selectionSet && (!tr.steps.length || tr.isGeneric)) {
+      if (containsClass(document.activeElement, _expand.expandClassNames.titleInput) && tr.selectionSet && (!tr.steps.length || tr.isGeneric)) {
         return false;
       }
       return true;

package/dist/cjs/legacyExpand/pm-plugins/plugin-factory.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = exports.getPluginState = exports.createPluginState = exports.createCommand = void 0;
-var _utils = require("@atlaskit/editor-common/utils");
+var _pluginStateFactory = require("@atlaskit/editor-common/utils/plugin-state-factory");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _reducer = _interopRequireDefault(require("../reducer"));
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 
 var pluginKey = exports.pluginKey = new _state.PluginKey('expandPlugin');
-var dest = (0, _utils.pluginFactory)(pluginKey, _reducer.default);
+var dest = (0, _pluginStateFactory.pluginFactory)(pluginKey, _reducer.default);
 var createPluginState = exports.createPluginState = dest.createPluginState;
 var createCommand = exports.createCommand = dest.createCommand;
 var getPluginState = exports.getPluginState = dest.getPluginState;

package/dist/cjs/legacyExpand/ui/ExpandIconButton.js

@@ -17,9 +17,9 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button/custom-theme-button"));
-var _styles = require("@atlaskit/editor-common/styles");
-var _ui = require("@atlaskit/editor-common/ui");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _expand = require("@atlaskit/editor-common/styles/expand");
+var _uiExpand = require("@atlaskit/editor-common/ui-expand");
+var _constants = require("@atlaskit/editor-shared-styles/constants");
 var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
 var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
 var _excluded = ["buttonStyles"];
@@ -47,7 +47,7 @@ var withTooltip = exports.withTooltip = function withTooltip(WrapperComponent) {
           (0, _react2.jsx)(_Tooltip.default, {
             content: label,
             position: "top",
-            tag: _ui.ExpandLayoutWrapperWithRef
+            tag: _uiExpand.ExpandLayoutWrapperWithRef
           }, (0, _react2.jsx)(WrapperComponent
           // Ignored via go/ees005
           // eslint-disable-next-line react/jsx-props-no-spreading
@@ -73,18 +73,18 @@ var CustomButton = exports.CustomButton = function CustomButton(props) {
         height: '100%',
         '& svg': {
           transform: props.expanded ? 'transform: rotate(90deg);' : 'transform: rotate(0deg);',
-          transition: "transform 0.2s ".concat(_editorSharedStyles.akEditorSwoopCubicBezier, ";")
+          transition: "transform 0.2s ".concat(_constants.akEditorSwoopCubicBezier, ";")
         }
       })
     }, rest);
   }, [props]);
-  var label = expanded ? _ui.expandMessages.collapseNode : _ui.expandMessages.expandNode;
+  var label = expanded ? _uiExpand.messages.collapseNode : _uiExpand.messages.expandNode;
   var labelIntl = intl ? intl.formatMessage(label) : label.defaultMessage;
   return (0, _react2.jsx)(_customThemeButton.default, {
     appearance: "subtle"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
-    className: _styles.expandClassNames.iconContainer,
+    className: _expand.expandClassNames.iconContainer,
     iconBefore: (0, _react2.jsx)(_chevronRight.default, {
       label: '',
       size: "small"
@@ -101,7 +101,7 @@ var ButtonWithoutTooltip = CustomButton;
 var ExpandIconButton = exports.ExpandIconButton = function ExpandIconButton(props) {
   var expanded = props.expanded,
     intl = props.intl;
-  var message = expanded ? _ui.expandMessages.collapseNode : _ui.expandMessages.expandNode;
+  var message = expanded ? _uiExpand.messages.collapseNode : _uiExpand.messages.expandNode;
   var label = intl && intl.formatMessage(message) || message.defaultMessage;
   // check to ensure device supports any-hover
   var supportsAnyHover = !!window.matchMedia ? window.matchMedia('(any-hover: hover)').matches !== window.matchMedia('(any-hover: none)').matches : false;
@@ -118,7 +118,7 @@ var ExpandIconButton = exports.ExpandIconButton = function ExpandIconButton(prop
   return (
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
     (0, _react2.jsx)("div", {
-      css: _ui.expandLayoutWrapperStyle
+      css: _uiExpand.expandLayoutWrapperStyle
     }, (0, _react2.jsx)(ButtonWithoutTooltip, (0, _extends2.default)({
       label: label
       // Ignored via go/ees005