@atlaskit/editor-plugin-layout 17.0.3 → 17.1.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-layout
 
+## 17.1.0
+
+### Minor Changes
+
+- [`6f957d4e7bcb8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6f957d4e7bcb8) -
+  Make layout column resizing generally available
+
+### Patch Changes
+
+- Updated dependencies
+
+## 17.0.4
+
+### Patch Changes
+
+- [`d82ea790b5c1c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d82ea790b5c1c) -
+  Update registered slash-command menu icons, including the Jira datasource WorkItems icon, when the
+  `platform_editor_slash_command` experiment is enabled.
+- Updated dependencies
+
 ## 17.0.3
 
 ### Patch Changes

package/dist/cjs/layoutPlugin.js

@@ -127,7 +127,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
           }
         });
       }
-      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max' && (0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true)) && api && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
+      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max') && api && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
         plugins.push({
           name: 'layoutResizing',
           plugin: function plugin(_ref2) {

package/dist/cjs/pm-plugins/actions.js

@@ -391,14 +391,8 @@ var setPresetLayout = exports.setPresetLayout = function setPresetLayout(editorA
 };
 function layoutNeedChanges(node) {
   if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
-    if ((0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true)) {
-      // Custom widths that sum to 100% are valid and should not be forced back to presets
-      if (isValidLayoutWidthDistributions(node)) {
-        return false;
-      }
-      return true;
-    }
-    return !getPresetLayout(node) || !isValidLayoutWidthDistributions(node);
+    // Custom widths that sum to 100% are valid and should not be forced back to presets.
+    return !isValidLayoutWidthDistributions(node);
   }
   return !getPresetLayout(node);
 }
@@ -478,9 +472,8 @@ var fixColumnStructure = exports.fixColumnStructure = function fixColumnStructur
     var node = state.doc.nodeAt(pos);
     if (node) {
       if (node.childCount !== getWidthsForPreset(selectedLayout).length) {
-        // If the resize handle experiment is on and widths are valid, don't force preset
-        // (column count mismatch might be from a different preset being selected)
-        if ((0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true) && isValidLayoutWidthDistributions(node)) {
+        // Valid custom widths may use a different column count from the selected preset.
+        if ((0, _experiments.editorExperiment)('advanced_layouts', true) && isValidLayoutWidthDistributions(node)) {
           return;
         }
         return forceSectionToPresetLayout(state, node, pos, selectedLayout);

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

@@ -276,7 +276,7 @@ var _default = exports.default = function _default(options, editorAnalyticsAPI)
       decorations: function decorations(state) {
         var layoutState = _pluginKey.pluginKey.getState(state);
         var isLayoutResizingPluginAvailable = _resizing.pluginKey.get(state) !== undefined;
-        if ((0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true) && isLayoutResizingPluginAvailable) {
+        if ((0, _experiments.editorExperiment)('advanced_layouts', true) && isLayoutResizingPluginAvailable) {
           var dividerDecorations = (0, _columnResizeDivider.getColumnDividerDecorations)(state, editorViewRef, editorAnalyticsAPI);
           var selectedDecorations = layoutState.pos !== null ? getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)) : [];
           var _dangerPreviewDecorations = getDangerPreviewDecorations(state, layoutState.dangerPreviewLayoutColumnPositions);
@@ -365,7 +365,7 @@ var _default = exports.default = function _default(options, editorAnalyticsAPI)
         }
 
         // Skip fixing column sizes for column resize drag transactions
-        if ((0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true) && prevTr.getMeta('layoutColumnResize')) {
+        if (prevTr.getMeta('layoutColumnResize')) {
           return;
         }
 

package/dist/cjs/pm-plugins/resizing.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
@@ -15,11 +14,8 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _nodeviews = require("../nodeviews");
 var _layoutSectionView = require("../nodeviews/layoutSectionView");
-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; }
 var pluginKey = exports.pluginKey = new _state.PluginKey('layoutResizingPlugin');
 
 /**
@@ -101,7 +97,7 @@ var _default = exports.default = function _default(options, pluginInjectionApi,
   return new _safePlugin.SafePlugin({
     key: pluginKey,
     props: {
-      nodeViews: _objectSpread({
+      nodeViews: {
         layoutSection: function layoutSection(node, view, getPos) {
           // Both experiments are required: the vanilla view renders no React, so it
           // cannot mount the <LayoutBreakoutResizer> that LayoutSectionView.render()
@@ -123,12 +119,11 @@ var _default = exports.default = function _default(options, pluginInjectionApi,
             options: options,
             intl: intl
           }).init();
-        }
-      }, (0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true) || (0, _coreUtils.isSSR)() ? {
+        },
         layoutColumn: function layoutColumn(node, view, getPos) {
           return new LayoutColumnView(node, view, getPos);
         }
-      } : {})
+      }
     }
   });
 };

package/dist/cjs/ui/quick-insert/LayoutQuickInsertMenuItem.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -8,16 +9,19 @@ exports.LayoutQuickInsertMenuItem = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _assets = require("@atlaskit/editor-common/assets");
 var _menuItem = require("@atlaskit/editor-common/quick-insert/menu-item");
+var _layoutThreeColumns = _interopRequireDefault(require("@atlaskit/icon/core/layout-three-columns"));
+var _layoutTwoColumns = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns"));
+var _layoutFiveColumns = _interopRequireDefault(require("@atlaskit/icon-lab/core/layout-five-columns"));
+var _layoutFourColumns = _interopRequireDefault(require("@atlaskit/icon-lab/core/layout-four-columns"));
 var _layoutPlugin = require("../../layoutPlugin");
 var _actions = require("../../pm-plugins/actions");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var icons = {
-  2: _assets.IconTwoColumnLayout,
-  3: _assets.IconThreeColumnLayout,
-  4: _assets.IconFourColumnLayout,
-  5: _assets.IconFiveColumnLayout
+  2: _layoutTwoColumns.default,
+  3: _layoutThreeColumns.default,
+  4: _layoutFourColumns.default,
+  5: _layoutFiveColumns.default
 };
 var LayoutQuickInsertMenuItem = exports.LayoutQuickInsertMenuItem = function LayoutQuickInsertMenuItem(_ref) {
   var api = _ref.api,
@@ -46,7 +50,9 @@ var LayoutQuickInsertMenuItem = exports.LayoutQuickInsertMenuItem = function Lay
     return tr;
   }, [api, columnCount]);
   return /*#__PURE__*/_react.default.createElement(_menuItem.QuickInsertMenuItem, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(Icon, null),
+    iconBefore: /*#__PURE__*/_react.default.createElement(Icon, {
+      label: ""
+    }),
     onSelect: onSelect,
     title: formatMessage(title)
   });

package/dist/es2019/layoutPlugin.js

@@ -117,7 +117,7 @@ export const layoutPlugin = ({
           })
         });
       }
-      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max' && editorExperiment('platform_editor_layout_column_resize_handle', true)) && api && editorExperiment('advanced_layouts', true)) {
+      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max') && api && editorExperiment('advanced_layouts', true)) {
         plugins.push({
           name: 'layoutResizing',
           plugin: ({

package/dist/es2019/pm-plugins/actions.js

@@ -365,14 +365,8 @@ export const setPresetLayout = editorAnalyticsAPI => layout => (state, dispatch)
 };
 function layoutNeedChanges(node) {
   if (editorExperiment('advanced_layouts', true)) {
-    if (editorExperiment('platform_editor_layout_column_resize_handle', true)) {
-      // Custom widths that sum to 100% are valid and should not be forced back to presets
-      if (isValidLayoutWidthDistributions(node)) {
-        return false;
-      }
-      return true;
-    }
-    return !getPresetLayout(node) || !isValidLayoutWidthDistributions(node);
+    // Custom widths that sum to 100% are valid and should not be forced back to presets.
+    return !isValidLayoutWidthDistributions(node);
   }
   return !getPresetLayout(node);
 }
@@ -455,9 +449,8 @@ export const fixColumnStructure = state => {
     const node = state.doc.nodeAt(pos);
     if (node) {
       if (node.childCount !== getWidthsForPreset(selectedLayout).length) {
-        // If the resize handle experiment is on and widths are valid, don't force preset
-        // (column count mismatch might be from a different preset being selected)
-        if (editorExperiment('advanced_layouts', true) && editorExperiment('platform_editor_layout_column_resize_handle', true) && isValidLayoutWidthDistributions(node)) {
+        // Valid custom widths may use a different column count from the selected preset.
+        if (editorExperiment('advanced_layouts', true) && isValidLayoutWidthDistributions(node)) {
           return;
         }
         return forceSectionToPresetLayout(state, node, pos, selectedLayout);

package/dist/es2019/pm-plugins/main.js

@@ -276,7 +276,7 @@ export default ((options, editorAnalyticsAPI) => {
       decorations(state) {
         const layoutState = pluginKey.getState(state);
         const isLayoutResizingPluginAvailable = layoutResizingPluginKey.get(state) !== undefined;
-        if (editorExperiment('advanced_layouts', true) && editorExperiment('platform_editor_layout_column_resize_handle', true) && isLayoutResizingPluginAvailable) {
+        if (editorExperiment('advanced_layouts', true) && isLayoutResizingPluginAvailable) {
           const dividerDecorations = getColumnDividerDecorations(state, editorViewRef, editorAnalyticsAPI);
           const selectedDecorations = layoutState.pos !== null ? getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)) : [];
           const dangerPreviewDecorations = getDangerPreviewDecorations(state, layoutState.dangerPreviewLayoutColumnPositions);
@@ -361,7 +361,7 @@ export default ((options, editorAnalyticsAPI) => {
         }
 
         // Skip fixing column sizes for column resize drag transactions
-        if (editorExperiment('platform_editor_layout_column_resize_handle', true) && prevTr.getMeta('layoutColumnResize')) {
+        if (prevTr.getMeta('layoutColumnResize')) {
           return;
         }
 

package/dist/es2019/pm-plugins/resizing.js

@@ -4,7 +4,6 @@ import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { LayoutSectionView } from '../nodeviews';
 import { LayoutSectionView as LayoutSectionViewVanilla } from '../nodeviews/layoutSectionView';
 export const pluginKey = new PluginKey('layoutResizingPlugin');
@@ -107,18 +106,7 @@ export default ((options, pluginInjectionApi, portalProviderAPI, eventDispatcher
           intl
         }).init();
       },
-      // Register the column node view when EITHER:
-      // 1. The resize handle experiment is on (its original purpose:
-      //    suppress style-attribute MutationObserver callbacks during
-      //    drag, allowing direct flex-basis writes without PM
-      //    interference).
-      // 2. Rendering on the server — the column node view stamps
-      //    `container-type: inline-size` inline on each column dom so
-      //    that the SSR-rendered table inside the column constrains
-      //    its width to the column (see comment in the constructor).
-      ...(editorExperiment('platform_editor_layout_column_resize_handle', true) || isSSR() ? {
-        layoutColumn: (node, view, getPos) => new LayoutColumnView(node, view, getPos)
-      } : {})
+      layoutColumn: (node, view, getPos) => new LayoutColumnView(node, view, getPos)
     }
   }
 }));

package/dist/es2019/ui/quick-insert/LayoutQuickInsertMenuItem.js

@@ -1,15 +1,18 @@
 import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { IconFiveColumnLayout, IconFourColumnLayout, IconThreeColumnLayout, IconTwoColumnLayout } from '@atlaskit/editor-common/assets';
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
+import LayoutThreeColumnsIcon from '@atlaskit/icon/core/layout-three-columns';
+import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
+import LayoutFiveColumnsIcon from '@atlaskit/icon-lab/core/layout-five-columns';
+import LayoutFourColumnsIcon from '@atlaskit/icon-lab/core/layout-four-columns';
 import { selectIntoLayoutSection } from '../../layoutPlugin';
 import { createMultiColumnLayoutSection } from '../../pm-plugins/actions';
 const icons = {
-  2: IconTwoColumnLayout,
-  3: IconThreeColumnLayout,
-  4: IconFourColumnLayout,
-  5: IconFiveColumnLayout
+  2: LayoutTwoColumnsIcon,
+  3: LayoutThreeColumnsIcon,
+  4: LayoutFourColumnsIcon,
+  5: LayoutFiveColumnsIcon
 };
 export const LayoutQuickInsertMenuItem = ({
   api,
@@ -41,7 +44,9 @@ export const LayoutQuickInsertMenuItem = ({
     return tr;
   }, [api, columnCount]);
   return /*#__PURE__*/React.createElement(QuickInsertMenuItem, {
-    iconBefore: /*#__PURE__*/React.createElement(Icon, null),
+    iconBefore: /*#__PURE__*/React.createElement(Icon, {
+      label: ""
+    }),
     onSelect: onSelect,
     title: formatMessage(title)
   });

package/dist/esm/layoutPlugin.js

@@ -120,7 +120,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
           }
         });
       }
-      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max' && editorExperiment('platform_editor_layout_column_resize_handle', true)) && api && editorExperiment('advanced_layouts', true)) {
+      if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max') && api && editorExperiment('advanced_layouts', true)) {
         plugins.push({
           name: 'layoutResizing',
           plugin: function plugin(_ref2) {

package/dist/esm/pm-plugins/actions.js

@@ -381,14 +381,8 @@ export var setPresetLayout = function setPresetLayout(editorAnalyticsAPI) {
 };
 function layoutNeedChanges(node) {
   if (editorExperiment('advanced_layouts', true)) {
-    if (editorExperiment('platform_editor_layout_column_resize_handle', true)) {
-      // Custom widths that sum to 100% are valid and should not be forced back to presets
-      if (isValidLayoutWidthDistributions(node)) {
-        return false;
-      }
-      return true;
-    }
-    return !getPresetLayout(node) || !isValidLayoutWidthDistributions(node);
+    // Custom widths that sum to 100% are valid and should not be forced back to presets.
+    return !isValidLayoutWidthDistributions(node);
   }
   return !getPresetLayout(node);
 }
@@ -468,9 +462,8 @@ export var fixColumnStructure = function fixColumnStructure(state) {
     var node = state.doc.nodeAt(pos);
     if (node) {
       if (node.childCount !== getWidthsForPreset(selectedLayout).length) {
-        // If the resize handle experiment is on and widths are valid, don't force preset
-        // (column count mismatch might be from a different preset being selected)
-        if (editorExperiment('advanced_layouts', true) && editorExperiment('platform_editor_layout_column_resize_handle', true) && isValidLayoutWidthDistributions(node)) {
+        // Valid custom widths may use a different column count from the selected preset.
+        if (editorExperiment('advanced_layouts', true) && isValidLayoutWidthDistributions(node)) {
           return;
         }
         return forceSectionToPresetLayout(state, node, pos, selectedLayout);

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

@@ -269,7 +269,7 @@ export default (function (options, editorAnalyticsAPI) {
       decorations: function decorations(state) {
         var layoutState = pluginKey.getState(state);
         var isLayoutResizingPluginAvailable = layoutResizingPluginKey.get(state) !== undefined;
-        if (editorExperiment('advanced_layouts', true) && editorExperiment('platform_editor_layout_column_resize_handle', true) && isLayoutResizingPluginAvailable) {
+        if (editorExperiment('advanced_layouts', true) && isLayoutResizingPluginAvailable) {
           var dividerDecorations = getColumnDividerDecorations(state, editorViewRef, editorAnalyticsAPI);
           var selectedDecorations = layoutState.pos !== null ? getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)) : [];
           var _dangerPreviewDecorations = getDangerPreviewDecorations(state, layoutState.dangerPreviewLayoutColumnPositions);
@@ -358,7 +358,7 @@ export default (function (options, editorAnalyticsAPI) {
         }
 
         // Skip fixing column sizes for column resize drag transactions
-        if (editorExperiment('platform_editor_layout_column_resize_handle', true) && prevTr.getMeta('layoutColumnResize')) {
+        if (prevTr.getMeta('layoutColumnResize')) {
           return;
         }
 

package/dist/esm/pm-plugins/resizing.js

@@ -1,16 +1,12 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _typeof from "@babel/runtime/helpers/typeof";
-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) { _defineProperty(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; }
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { LayoutSectionView } from '../nodeviews';
 import { LayoutSectionView as LayoutSectionViewVanilla } from '../nodeviews/layoutSectionView';
 export var pluginKey = new PluginKey('layoutResizingPlugin');
@@ -94,7 +90,7 @@ export default (function (options, pluginInjectionApi, portalProviderAPI, eventD
   return new SafePlugin({
     key: pluginKey,
     props: {
-      nodeViews: _objectSpread({
+      nodeViews: {
         layoutSection: function layoutSection(node, view, getPos) {
           // Both experiments are required: the vanilla view renders no React, so it
           // cannot mount the <LayoutBreakoutResizer> that LayoutSectionView.render()
@@ -116,12 +112,11 @@ export default (function (options, pluginInjectionApi, portalProviderAPI, eventD
             options: options,
             intl: intl
           }).init();
-        }
-      }, editorExperiment('platform_editor_layout_column_resize_handle', true) || isSSR() ? {
+        },
         layoutColumn: function layoutColumn(node, view, getPos) {
           return new LayoutColumnView(node, view, getPos);
         }
-      } : {})
+      }
     }
   });
 });

package/dist/esm/ui/quick-insert/LayoutQuickInsertMenuItem.js

@@ -1,15 +1,18 @@
 import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { IconFiveColumnLayout, IconFourColumnLayout, IconThreeColumnLayout, IconTwoColumnLayout } from '@atlaskit/editor-common/assets';
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
+import LayoutThreeColumnsIcon from '@atlaskit/icon/core/layout-three-columns';
+import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
+import LayoutFiveColumnsIcon from '@atlaskit/icon-lab/core/layout-five-columns';
+import LayoutFourColumnsIcon from '@atlaskit/icon-lab/core/layout-four-columns';
 import { selectIntoLayoutSection } from '../../layoutPlugin';
 import { createMultiColumnLayoutSection } from '../../pm-plugins/actions';
 var icons = {
-  2: IconTwoColumnLayout,
-  3: IconThreeColumnLayout,
-  4: IconFourColumnLayout,
-  5: IconFiveColumnLayout
+  2: LayoutTwoColumnsIcon,
+  3: LayoutThreeColumnsIcon,
+  4: LayoutFourColumnsIcon,
+  5: LayoutFiveColumnsIcon
 };
 export var LayoutQuickInsertMenuItem = function LayoutQuickInsertMenuItem(_ref) {
   var api = _ref.api,
@@ -38,7 +41,9 @@ export var LayoutQuickInsertMenuItem = function LayoutQuickInsertMenuItem(_ref)
     return tr;
   }, [api, columnCount]);
   return /*#__PURE__*/React.createElement(QuickInsertMenuItem, {
-    iconBefore: /*#__PURE__*/React.createElement(Icon, null),
+    iconBefore: /*#__PURE__*/React.createElement(Icon, {
+      label: ""
+    }),
     onSelect: onSelect,
     title: formatMessage(title)
   });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "17.0.3",
+	"version": "17.1.0",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -21,8 +21,8 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^57.1.0",
-		"@atlaskit/css": "^1.0.0",
+		"@atlaskit/adf-schema": "^57.2.0",
+		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/editor-plugin-analytics": "^16.0.0",
 		"@atlaskit/editor-plugin-block-controls": "^17.1.0",
 		"@atlaskit/editor-plugin-block-menu": "^15.0.0",
@@ -43,7 +43,7 @@
 		"@atlaskit/icon-lab": "^7.7.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^162.0.0",
+		"@atlaskit/tmp-editor-statsig": "^163.0.0",
 		"@atlaskit/tokens": "^16.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",