@atlaskit/editor-plugin-layout 6.2.15 → 6.2.17

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-layout
 
+## 6.2.17
+
+### Patch Changes
+
+- [`9f03725ffb7b8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9f03725ffb7b8) -
+  Removing feature flag with changing internal use of custom icons.
+- Updated dependencies
+
+## 6.2.16
+
+### Patch Changes
+
+- [`90abe9b926a6f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/90abe9b926a6f) -
+  Icon entrypoint migration
+- Updated dependencies
+
 ## 6.2.15
 
 ### Patch Changes

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

@@ -211,7 +211,7 @@ function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
     // check if the column only contains a paragraph with a placeholder text
     // if so, remove the whole column, otherwise just remove the paragraph
     if ((0, _utils.isEmptyDocument)(column)) {
-      var fromPos = (0, _experiments.editorExperiment)('single_column_layouts', true) && (0, _platformFeatureFlags.fg)('platform_editor_convert_multiple_columns_to_single') ? columnPos : columnPos - 1;
+      var fromPos = (0, _experiments.editorExperiment)('single_column_layouts', true) ? columnPos : columnPos - 1;
       tr.replaceRange(tr.mapping.map(fromPos), tr.mapping.map(insideRightEdgePos), _model.Slice.empty);
     } else {
       tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(columnPos + 1), _model.Slice.empty);

package/dist/cjs/ui/icons/LayoutThreeWithLeftSidebars.js

@@ -5,63 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LayoutThreeWithLeftSidebarsIcon = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = require("@emotion/react");
-var _icon = _interopRequireDefault(require("@atlaskit/icon"));
+var _react = _interopRequireDefault(require("react"));
 var _layoutThreeColumnsSidebarsLeft = _interopRequireDefault(require("@atlaskit/icon-lab/core/layout-three-columns-sidebars-left"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
-
-var LayoutThreeWithLeftSidebarsGlyph = function LayoutThreeWithLeftSidebarsGlyph(props) {
-  if ((0, _platformFeatureFlags.fg)('platform-visual-refresh-icons')) {
-    return (0, _react.jsx)("svg", (0, _extends2.default)({
-      width: "16",
-      height: "14",
-      viewBox: "0 0 16 14",
-      fill: "none",
-      xmlns: "http://www.w3.org/2000/svg"
-      // Ignored via go/ees005
-      // eslint-disable-next-line react/jsx-props-no-spreading
-    }, props), (0, _react.jsx)("path", {
-      fillRule: "evenodd",
-      clipRule: "evenodd",
-      d: "M8.5 1.375C8.5 0.615609 7.88439 0 7.125 0H6.375C5.61561 0 5 0.615608 5 1.375V12.625C5 13.3844 5.61561 14 6.375 14H7.125C7.88439 14 8.5 13.3844 8.5 12.625V1.375ZM7 1.5V12.5H6.5V1.5H7ZM16 1.37505C16 0.615655 15.3844 4.66853e-05 14.625 4.66853e-05H11.375C10.6156 4.66853e-05 10 0.615655 10 1.37505V12.625C10 13.3844 10.6156 14 11.375 14H14.625C15.3844 14 16 13.3844 16 12.625V1.37505ZM14.5 1.50005V12.5H11.5V1.50005H14.5ZM3.5 1.37505C3.5 0.615655 2.88439 4.66853e-05 2.125 4.66853e-05H1.375C0.615608 4.66853e-05 0 0.615655 0 1.37505V12.625C0 13.3844 0.615608 14 1.375 14H2.125C2.88439 14 3.5 13.3844 3.5 12.625V1.37505ZM2 1.50005V12.5H1.5V1.50005H2Z",
-      fill: "currentcolor"
-    }));
-  }
-  return (0, _react.jsx)("svg", (0, _extends2.default)({
-    width: "16",
-    height: "14",
-    viewBox: "0 0 16 14",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props), (0, _react.jsx)("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M1 0C1.26522 0 1.51957 0.105357 1.70711 0.292893C1.89464 0.48043 2 0.734784 2 1V13C2 13.2652 1.89464 13.5196 1.70711 13.7071C1.51957 13.8946 1.26522 14 1 14C0.734784 14 0.48043 13.8946 0.292893 13.7071C0.105357 13.5196 0 13.2652 0 13V1C0 0.734784 0.105357 0.48043 0.292893 0.292893C0.48043 0.105357 0.734784 0 1 0ZM9 0H15C15.2652 0 15.5196 0.105357 15.7071 0.292893C15.8946 0.48043 16 0.734784 16 1V13C16 13.2652 15.8946 13.5196 15.7071 13.7071C15.5196 13.8946 15.2652 14 15 14H9C8.73478 14 8.48043 13.8946 8.29289 13.7071C8.10536 13.5196 8 13.2652 8 13V1C8 0.734784 8.10536 0.48043 8.29289 0.292893C8.48043 0.105357 8.73478 0 9 0ZM5 0C5.26522 0 5.51957 0.105356 5.70711 0.292892C5.89464 0.480429 6 0.734784 6 1V13C6 13.2652 5.89464 13.5196 5.70711 13.7071C5.51957 13.8946 5.26522 14 5 14C4.73478 14 4.48043 13.8946 4.29289 13.7071C4.10536 13.5196 4 13.2652 4 13V1C4 0.734784 4.10536 0.480429 4.29289 0.292892C4.48043 0.105356 4.73478 0 5 0Z",
-    fill: "currentcolor"
-  }));
-};
-var floatingToolbarPadding = (0, _react.css)({
-  paddingRight: "var(--ds-space-050, 4px)",
-  paddingLeft: "var(--ds-space-050, 4px)"
-});
 var LayoutThreeWithLeftSidebarsIcon = exports.LayoutThreeWithLeftSidebarsIcon = function LayoutThreeWithLeftSidebarsIcon(props) {
-  if ((0, _platformFeatureFlags.fg)('platform-custom-icon-migration')) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    return (0, _react.jsx)(_layoutThreeColumnsSidebarsLeft.default, props);
-  }
-  return (0, _react.jsx)("span", {
-    css: floatingToolbarPadding
-  }, (0, _react.jsx)(_icon.default, (0, _extends2.default)({
-    glyph: LayoutThreeWithLeftSidebarsGlyph
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props)));
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  return /*#__PURE__*/_react.default.createElement(_layoutThreeColumnsSidebarsLeft.default, props);
 };

package/dist/cjs/ui/icons/LayoutThreeWithRightSidebars.js

@@ -5,63 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LayoutThreeWithRightSidebarsIcon = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = require("@emotion/react");
-var _icon = _interopRequireDefault(require("@atlaskit/icon"));
+var _react = _interopRequireDefault(require("react"));
 var _layoutThreeColumnsSidebarsRight = _interopRequireDefault(require("@atlaskit/icon-lab/core/layout-three-columns-sidebars-right"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
-
-var LayoutThreeWithRightSidebarsGlyph = function LayoutThreeWithRightSidebarsGlyph(props) {
-  if ((0, _platformFeatureFlags.fg)('platform-visual-refresh-icons')) {
-    return (0, _react.jsx)("svg", (0, _extends2.default)({
-      width: "16",
-      height: "14",
-      viewBox: "0 0 16 14",
-      fill: "none",
-      xmlns: "http://www.w3.org/2000/svg"
-      // Ignored via go/ees005
-      // eslint-disable-next-line react/jsx-props-no-spreading
-    }, props), (0, _react.jsx)("path", {
-      fillRule: "evenodd",
-      clipRule: "evenodd",
-      d: "M7.5 1.375C7.5 0.615609 8.11561 0 8.875 0H9.625C10.3844 0 11 0.615608 11 1.375V12.625C11 13.3844 10.3844 14 9.625 14H8.875C8.11561 14 7.5 13.3844 7.5 12.625V1.375ZM9 1.5V12.5H9.5V1.5H9ZM0 1.37505C0 0.615655 0.615608 4.66853e-05 1.375 4.66853e-05H4.625C5.38439 4.66853e-05 6 0.615655 6 1.37505V12.625C6 13.3844 5.38439 14 4.625 14H1.375C0.615608 14 0 13.3844 0 12.625V1.37505ZM1.5 1.50005V12.5H4.5V1.50005H1.5ZM12.5 1.37505C12.5 0.615655 13.1156 4.66853e-05 13.875 4.66853e-05H14.625C15.3844 4.66853e-05 16 0.615655 16 1.37505V12.625C16 13.3844 15.3844 14 14.625 14H13.875C13.1156 14 12.5 13.3844 12.5 12.625V1.37505ZM14 1.50005V12.5H14.5V1.50005H14Z",
-      fill: "currentcolor"
-    }));
-  }
-  return (0, _react.jsx)("svg", (0, _extends2.default)({
-    width: "16",
-    height: "14",
-    viewBox: "0 0 16 14",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props), (0, _react.jsx)("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M11 0C11.2652 0 11.5196 0.105357 11.7071 0.292893C11.8946 0.48043 12 0.734784 12 1V13C12 13.2652 11.8946 13.5196 11.7071 13.7071C11.5196 13.8946 11.2652 14 11 14C10.7348 14 10.4804 13.8946 10.2929 13.7071C10.1054 13.5196 10 13.2652 10 13V1C10 0.734784 10.1054 0.48043 10.2929 0.292893C10.4804 0.105357 10.7348 0 11 0ZM1 0H7C7.26522 0 7.51957 0.105357 7.70711 0.292893C7.89464 0.48043 8 0.734784 8 1V13C8 13.2652 7.89464 13.5196 7.70711 13.7071C7.51957 13.8946 7.26522 14 7 14H1C0.734784 14 0.48043 13.8946 0.292893 13.7071C0.105357 13.5196 0 13.2652 0 13V1C0 0.734784 0.105357 0.48043 0.292893 0.292893C0.48043 0.105357 0.734784 0 1 0ZM15 0C15.2652 0 15.5196 0.105357 15.7071 0.292893C15.8946 0.48043 16 0.734784 16 1V13C16 13.2652 15.8946 13.5196 15.7071 13.7071C15.5196 13.8946 15.2652 14 15 14C14.7348 14 14.4804 13.8946 14.2929 13.7071C14.1054 13.5196 14 13.2652 14 13V1C14 0.734784 14.1054 0.48043 14.2929 0.292893C14.4804 0.105357 14.7348 0 15 0Z",
-    fill: "currentcolor"
-  }));
-};
-var floatingToolbarPadding = (0, _react.css)({
-  paddingRight: "var(--ds-space-050, 4px)",
-  paddingLeft: "var(--ds-space-050, 4px)"
-});
 var LayoutThreeWithRightSidebarsIcon = exports.LayoutThreeWithRightSidebarsIcon = function LayoutThreeWithRightSidebarsIcon(props) {
-  if ((0, _platformFeatureFlags.fg)('platform-custom-icon-migration')) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    return (0, _react.jsx)(_layoutThreeColumnsSidebarsRight.default, props);
-  }
-  return (0, _react.jsx)("span", {
-    css: floatingToolbarPadding
-  }, (0, _react.jsx)(_icon.default, (0, _extends2.default)({
-    glyph: LayoutThreeWithRightSidebarsGlyph
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props)));
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  return /*#__PURE__*/_react.default.createElement(_layoutThreeColumnsSidebarsRight.default, props);
 };

package/dist/cjs/ui/toolbar.js

@@ -15,13 +15,13 @@ var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
-var _deleteEditorRemove = _interopRequireDefault(require("@atlaskit/icon/core/migration/delete--editor-remove"));
-var _layoutOneColumnEditorLayoutSingle = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-one-column--editor-layout-single"));
-var _layoutThreeColumnsEditorLayoutThreeEqual = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-three-columns--editor-layout-three-equal"));
-var _layoutThreeColumnsSidebarsEditorLayoutThreeWithSidebars = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-three-columns-sidebars--editor-layout-three-with-sidebars"));
-var _layoutTwoColumnsEditorLayoutTwoEqual = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-two-columns--editor-layout-two-equal"));
-var _layoutTwoColumnsSidebarLeftEditorLayoutTwoLeftSidebar = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-two-columns-sidebar-left--editor-layout-two-left-sidebar"));
-var _layoutTwoColumnsSidebarRightEditorLayoutTwoRightSidebar = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-two-columns-sidebar-right--editor-layout-two-right-sidebar"));
+var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
+var _layoutOneColumn = _interopRequireDefault(require("@atlaskit/icon/core/layout-one-column"));
+var _layoutThreeColumns = _interopRequireDefault(require("@atlaskit/icon/core/layout-three-columns"));
+var _layoutThreeColumnsSidebars = _interopRequireDefault(require("@atlaskit/icon/core/layout-three-columns-sidebars"));
+var _layoutTwoColumns = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns"));
+var _layoutTwoColumnsSidebarLeft = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns-sidebar-left"));
+var _layoutTwoColumnsSidebarRight = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns-sidebar-right"));
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = require("../pm-plugins/actions");
 var _LayoutColumnsIcon = require("./icons/LayoutColumnsIcon");
@@ -34,34 +34,34 @@ var LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
   type: 'two_equal',
   title: _messages.layoutMessages.twoColumns,
-  icon: _layoutTwoColumnsEditorLayoutTwoEqual.default
+  icon: _layoutTwoColumns.default
 }, {
   id: 'editor.layout.threeEquals',
   type: 'three_equal',
   title: _messages.layoutMessages.threeColumns,
-  icon: _layoutThreeColumnsEditorLayoutThreeEqual.default
+  icon: _layoutThreeColumns.default
 }];
 var LAYOUT_TYPES_WITH_SINGLE_COL = [{
   id: 'editor.layout.singeLayout',
   type: 'single',
   title: _messages.layoutMessages.singleColumn,
-  icon: _layoutOneColumnEditorLayoutSingle.default
+  icon: _layoutOneColumn.default
 }].concat(LAYOUT_TYPES);
 var SIDEBAR_LAYOUT_TYPES = [{
   id: 'editor.layout.twoRightSidebar',
   type: 'two_right_sidebar',
   title: _messages.layoutMessages.rightSidebar,
-  icon: _layoutTwoColumnsSidebarRightEditorLayoutTwoRightSidebar.default
+  icon: _layoutTwoColumnsSidebarRight.default
 }, {
   id: 'editor.layout.twoLeftSidebar',
   type: 'two_left_sidebar',
   title: _messages.layoutMessages.leftSidebar,
-  icon: _layoutTwoColumnsSidebarLeftEditorLayoutTwoLeftSidebar.default
+  icon: _layoutTwoColumnsSidebarLeft.default
 }, {
   id: 'editor.layout.threeWithSidebars',
   type: 'three_with_sidebars',
   title: _messages.layoutMessages.threeColumnsWithSidebars,
-  icon: _layoutThreeColumnsSidebarsEditorLayoutThreeWithSidebars.default
+  icon: _layoutThreeColumnsSidebars.default
 }];
 
 // These are used for advanced layout options
@@ -69,28 +69,28 @@ var LAYOUT_WITH_TWO_COL_DISTRIBUTION = [{
   id: 'editor.layout.twoEquals',
   type: 'two_equal',
   title: _messages.layoutMessages.twoColumns,
-  icon: _layoutTwoColumnsEditorLayoutTwoEqual.default
+  icon: _layoutTwoColumns.default
 }, {
   id: 'editor.layout.twoRightSidebar',
   type: 'two_right_sidebar',
   title: _messages.layoutMessages.rightSidebar,
-  icon: _layoutTwoColumnsSidebarRightEditorLayoutTwoRightSidebar.default
+  icon: _layoutTwoColumnsSidebarRight.default
 }, {
   id: 'editor.layout.twoLeftSidebar',
   type: 'two_left_sidebar',
   title: _messages.layoutMessages.leftSidebar,
-  icon: _layoutTwoColumnsSidebarLeftEditorLayoutTwoLeftSidebar.default
+  icon: _layoutTwoColumnsSidebarLeft.default
 }];
 var LAYOUT_WITH_THREE_COL_DISTRIBUTION = [{
   id: 'editor.layout.threeEquals',
   type: 'three_equal',
   title: _messages.layoutMessages.threeColumns,
-  icon: _layoutThreeColumnsEditorLayoutThreeEqual.default
+  icon: _layoutThreeColumns.default
 }, {
   id: 'editor.layout.threeWithSidebars',
   type: 'three_with_sidebars',
   title: _messages.layoutMessages.threeColumnsWithSidebars,
-  icon: _layoutThreeColumnsSidebarsEditorLayoutThreeWithSidebars.default
+  icon: _layoutThreeColumnsSidebars.default
 }, {
   id: 'editor.layout.threeRightSidebars',
   type: 'three_right_sidebars',
@@ -118,7 +118,7 @@ var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, ed
   };
 };
 var layoutToolbarTitle = exports.layoutToolbarTitle = 'Layout floating controls';
-var iconPlaceholder = _layoutTwoColumnsEditorLayoutTwoEqual.default; // TODO: ED-25466 - Replace with proper icon
+var iconPlaceholder = _layoutTwoColumns.default; // TODO: ED-25466 - Replace with proper icon
 
 var getLayoutColumnsIcons = function getLayoutColumnsIcons(colCount) {
   if (!(0, _experiments.editorExperiment)('single_column_layouts', true) && !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
@@ -126,15 +126,15 @@ var getLayoutColumnsIcons = function getLayoutColumnsIcons(colCount) {
   }
   switch (colCount) {
     case 1:
-      return /*#__PURE__*/_react.default.createElement(_layoutOneColumnEditorLayoutSingle.default, {
+      return /*#__PURE__*/_react.default.createElement(_layoutOneColumn.default, {
         label: ""
       });
     case 2:
-      return /*#__PURE__*/_react.default.createElement(_layoutTwoColumnsEditorLayoutTwoEqual.default, {
+      return /*#__PURE__*/_react.default.createElement(_layoutTwoColumns.default, {
         label: ""
       });
     case 3:
-      return /*#__PURE__*/_react.default.createElement(_layoutThreeColumnsEditorLayoutThreeEqual.default, {
+      return /*#__PURE__*/_react.default.createElement(_layoutThreeColumns.default, {
         label: ""
       });
     case 4:
@@ -235,7 +235,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
       type: 'button',
       appearance: 'danger',
       focusEditoronEnter: true,
-      icon: _deleteEditorRemove.default,
+      icon: _delete.default,
       testId: _messages.default.remove.id,
       title: intl.formatMessage(_messages.default.remove),
       onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI, _analytics.INPUT_METHOD.FLOATING_TB),
@@ -282,7 +282,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
       }, hoverDecorationProps(nodeType, _editorSharedStyles.akEditorSelectedNodeClassName)), _objectSpread({
         title: intl.formatMessage(_messages.default.delete),
         onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI, _analytics.INPUT_METHOD.FLOATING_TB),
-        icon: /*#__PURE__*/_react.default.createElement(_deleteEditorRemove.default, {
+        icon: /*#__PURE__*/_react.default.createElement(_delete.default, {
           label: ""
         })
       }, hoverDecorationProps(nodeType))]

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

@@ -190,7 +190,7 @@ function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
     // check if the column only contains a paragraph with a placeholder text
     // if so, remove the whole column, otherwise just remove the paragraph
     if (isEmptyDocument(column)) {
-      const fromPos = editorExperiment('single_column_layouts', true) && fg('platform_editor_convert_multiple_columns_to_single') ? columnPos : columnPos - 1;
+      const fromPos = editorExperiment('single_column_layouts', true) ? columnPos : columnPos - 1;
       tr.replaceRange(tr.mapping.map(fromPos), tr.mapping.map(insideRightEdgePos), Slice.empty);
     } else {
       tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(columnPos + 1), Slice.empty);

package/dist/es2019/ui/icons/LayoutThreeWithLeftSidebars.js

@@ -1,59 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
-import { css, jsx } from '@emotion/react';
-import Icon from '@atlaskit/icon';
+import React from 'react';
 import LayoutThreeColumnsSidebarsLeftIcon from '@atlaskit/icon-lab/core/layout-three-columns-sidebars-left';
-import { fg } from '@atlaskit/platform-feature-flags';
-const LayoutThreeWithLeftSidebarsGlyph = props => {
-  if (fg('platform-visual-refresh-icons')) {
-    return jsx("svg", _extends({
-      width: "16",
-      height: "14",
-      viewBox: "0 0 16 14",
-      fill: "none",
-      xmlns: "http://www.w3.org/2000/svg"
-      // Ignored via go/ees005
-      // eslint-disable-next-line react/jsx-props-no-spreading
-    }, props), jsx("path", {
-      fillRule: "evenodd",
-      clipRule: "evenodd",
-      d: "M8.5 1.375C8.5 0.615609 7.88439 0 7.125 0H6.375C5.61561 0 5 0.615608 5 1.375V12.625C5 13.3844 5.61561 14 6.375 14H7.125C7.88439 14 8.5 13.3844 8.5 12.625V1.375ZM7 1.5V12.5H6.5V1.5H7ZM16 1.37505C16 0.615655 15.3844 4.66853e-05 14.625 4.66853e-05H11.375C10.6156 4.66853e-05 10 0.615655 10 1.37505V12.625C10 13.3844 10.6156 14 11.375 14H14.625C15.3844 14 16 13.3844 16 12.625V1.37505ZM14.5 1.50005V12.5H11.5V1.50005H14.5ZM3.5 1.37505C3.5 0.615655 2.88439 4.66853e-05 2.125 4.66853e-05H1.375C0.615608 4.66853e-05 0 0.615655 0 1.37505V12.625C0 13.3844 0.615608 14 1.375 14H2.125C2.88439 14 3.5 13.3844 3.5 12.625V1.37505ZM2 1.50005V12.5H1.5V1.50005H2Z",
-      fill: "currentcolor"
-    }));
-  }
-  return jsx("svg", _extends({
-    width: "16",
-    height: "14",
-    viewBox: "0 0 16 14",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props), jsx("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M1 0C1.26522 0 1.51957 0.105357 1.70711 0.292893C1.89464 0.48043 2 0.734784 2 1V13C2 13.2652 1.89464 13.5196 1.70711 13.7071C1.51957 13.8946 1.26522 14 1 14C0.734784 14 0.48043 13.8946 0.292893 13.7071C0.105357 13.5196 0 13.2652 0 13V1C0 0.734784 0.105357 0.48043 0.292893 0.292893C0.48043 0.105357 0.734784 0 1 0ZM9 0H15C15.2652 0 15.5196 0.105357 15.7071 0.292893C15.8946 0.48043 16 0.734784 16 1V13C16 13.2652 15.8946 13.5196 15.7071 13.7071C15.5196 13.8946 15.2652 14 15 14H9C8.73478 14 8.48043 13.8946 8.29289 13.7071C8.10536 13.5196 8 13.2652 8 13V1C8 0.734784 8.10536 0.48043 8.29289 0.292893C8.48043 0.105357 8.73478 0 9 0ZM5 0C5.26522 0 5.51957 0.105356 5.70711 0.292892C5.89464 0.480429 6 0.734784 6 1V13C6 13.2652 5.89464 13.5196 5.70711 13.7071C5.51957 13.8946 5.26522 14 5 14C4.73478 14 4.48043 13.8946 4.29289 13.7071C4.10536 13.5196 4 13.2652 4 13V1C4 0.734784 4.10536 0.480429 4.29289 0.292892C4.48043 0.105356 4.73478 0 5 0Z",
-    fill: "currentcolor"
-  }));
-};
-const floatingToolbarPadding = css({
-  paddingRight: "var(--ds-space-050, 4px)",
-  paddingLeft: "var(--ds-space-050, 4px)"
-});
 export const LayoutThreeWithLeftSidebarsIcon = props => {
-  if (fg('platform-custom-icon-migration')) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    return jsx(LayoutThreeColumnsSidebarsLeftIcon, props);
-  }
-  return jsx("span", {
-    css: floatingToolbarPadding
-  }, jsx(Icon, _extends({
-    glyph: LayoutThreeWithLeftSidebarsGlyph
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props)));
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  return /*#__PURE__*/React.createElement(LayoutThreeColumnsSidebarsLeftIcon, props);
 };

package/dist/es2019/ui/icons/LayoutThreeWithRightSidebars.js

@@ -1,59 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
-import { css, jsx } from '@emotion/react';
-import Icon from '@atlaskit/icon';
+import React from 'react';
 import LayoutThreeColumnsSidebarsRightIcon from '@atlaskit/icon-lab/core/layout-three-columns-sidebars-right';
-import { fg } from '@atlaskit/platform-feature-flags';
-const LayoutThreeWithRightSidebarsGlyph = props => {
-  if (fg('platform-visual-refresh-icons')) {
-    return jsx("svg", _extends({
-      width: "16",
-      height: "14",
-      viewBox: "0 0 16 14",
-      fill: "none",
-      xmlns: "http://www.w3.org/2000/svg"
-      // Ignored via go/ees005
-      // eslint-disable-next-line react/jsx-props-no-spreading
-    }, props), jsx("path", {
-      fillRule: "evenodd",
-      clipRule: "evenodd",
-      d: "M7.5 1.375C7.5 0.615609 8.11561 0 8.875 0H9.625C10.3844 0 11 0.615608 11 1.375V12.625C11 13.3844 10.3844 14 9.625 14H8.875C8.11561 14 7.5 13.3844 7.5 12.625V1.375ZM9 1.5V12.5H9.5V1.5H9ZM0 1.37505C0 0.615655 0.615608 4.66853e-05 1.375 4.66853e-05H4.625C5.38439 4.66853e-05 6 0.615655 6 1.37505V12.625C6 13.3844 5.38439 14 4.625 14H1.375C0.615608 14 0 13.3844 0 12.625V1.37505ZM1.5 1.50005V12.5H4.5V1.50005H1.5ZM12.5 1.37505C12.5 0.615655 13.1156 4.66853e-05 13.875 4.66853e-05H14.625C15.3844 4.66853e-05 16 0.615655 16 1.37505V12.625C16 13.3844 15.3844 14 14.625 14H13.875C13.1156 14 12.5 13.3844 12.5 12.625V1.37505ZM14 1.50005V12.5H14.5V1.50005H14Z",
-      fill: "currentcolor"
-    }));
-  }
-  return jsx("svg", _extends({
-    width: "16",
-    height: "14",
-    viewBox: "0 0 16 14",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props), jsx("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M11 0C11.2652 0 11.5196 0.105357 11.7071 0.292893C11.8946 0.48043 12 0.734784 12 1V13C12 13.2652 11.8946 13.5196 11.7071 13.7071C11.5196 13.8946 11.2652 14 11 14C10.7348 14 10.4804 13.8946 10.2929 13.7071C10.1054 13.5196 10 13.2652 10 13V1C10 0.734784 10.1054 0.48043 10.2929 0.292893C10.4804 0.105357 10.7348 0 11 0ZM1 0H7C7.26522 0 7.51957 0.105357 7.70711 0.292893C7.89464 0.48043 8 0.734784 8 1V13C8 13.2652 7.89464 13.5196 7.70711 13.7071C7.51957 13.8946 7.26522 14 7 14H1C0.734784 14 0.48043 13.8946 0.292893 13.7071C0.105357 13.5196 0 13.2652 0 13V1C0 0.734784 0.105357 0.48043 0.292893 0.292893C0.48043 0.105357 0.734784 0 1 0ZM15 0C15.2652 0 15.5196 0.105357 15.7071 0.292893C15.8946 0.48043 16 0.734784 16 1V13C16 13.2652 15.8946 13.5196 15.7071 13.7071C15.5196 13.8946 15.2652 14 15 14C14.7348 14 14.4804 13.8946 14.2929 13.7071C14.1054 13.5196 14 13.2652 14 13V1C14 0.734784 14.1054 0.48043 14.2929 0.292893C14.4804 0.105357 14.7348 0 15 0Z",
-    fill: "currentcolor"
-  }));
-};
-const floatingToolbarPadding = css({
-  paddingRight: "var(--ds-space-050, 4px)",
-  paddingLeft: "var(--ds-space-050, 4px)"
-});
 export const LayoutThreeWithRightSidebarsIcon = props => {
-  if (fg('platform-custom-icon-migration')) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    return jsx(LayoutThreeColumnsSidebarsRightIcon, props);
-  }
-  return jsx("span", {
-    css: floatingToolbarPadding
-  }, jsx(Icon, _extends({
-    glyph: LayoutThreeWithRightSidebarsGlyph
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props)));
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  return /*#__PURE__*/React.createElement(LayoutThreeColumnsSidebarsRightIcon, props);
 };

package/dist/es2019/ui/toolbar.js

@@ -5,13 +5,13 @@ import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-che
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import CopyIcon from '@atlaskit/icon/core/copy';
-import DeleteIcon from '@atlaskit/icon/core/migration/delete--editor-remove';
-import LayoutOneColumnIcon from '@atlaskit/icon/core/migration/layout-one-column--editor-layout-single';
-import LayoutThreeColumnsIcon from '@atlaskit/icon/core/migration/layout-three-columns--editor-layout-three-equal';
-import LayoutThreeColumnsSidebarsIcon from '@atlaskit/icon/core/migration/layout-three-columns-sidebars--editor-layout-three-with-sidebars';
-import LayoutTwoColumnsIcon from '@atlaskit/icon/core/migration/layout-two-columns--editor-layout-two-equal';
-import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/migration/layout-two-columns-sidebar-left--editor-layout-two-left-sidebar';
-import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/migration/layout-two-columns-sidebar-right--editor-layout-two-right-sidebar';
+import DeleteIcon from '@atlaskit/icon/core/delete';
+import LayoutOneColumnIcon from '@atlaskit/icon/core/layout-one-column';
+import LayoutThreeColumnsIcon from '@atlaskit/icon/core/layout-three-columns';
+import LayoutThreeColumnsSidebarsIcon from '@atlaskit/icon/core/layout-three-columns-sidebars';
+import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
+import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-left';
+import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-right';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { deleteActiveLayoutNode, getPresetLayout, setPresetLayout } from '../pm-plugins/actions';
 import { EditorLayoutFiveColumnsIcon, EditorLayoutFourColumnsIcon } from './icons/LayoutColumnsIcon';

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

@@ -202,7 +202,7 @@ function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
     // check if the column only contains a paragraph with a placeholder text
     // if so, remove the whole column, otherwise just remove the paragraph
     if (isEmptyDocument(column)) {
-      var fromPos = editorExperiment('single_column_layouts', true) && fg('platform_editor_convert_multiple_columns_to_single') ? columnPos : columnPos - 1;
+      var fromPos = editorExperiment('single_column_layouts', true) ? columnPos : columnPos - 1;
       tr.replaceRange(tr.mapping.map(fromPos), tr.mapping.map(insideRightEdgePos), Slice.empty);
     } else {
       tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(columnPos + 1), Slice.empty);

package/dist/esm/ui/icons/LayoutThreeWithLeftSidebars.js

@@ -1,59 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
-import { css, jsx } from '@emotion/react';
-import Icon from '@atlaskit/icon';
+import React from 'react';
 import LayoutThreeColumnsSidebarsLeftIcon from '@atlaskit/icon-lab/core/layout-three-columns-sidebars-left';
-import { fg } from '@atlaskit/platform-feature-flags';
-var LayoutThreeWithLeftSidebarsGlyph = function LayoutThreeWithLeftSidebarsGlyph(props) {
-  if (fg('platform-visual-refresh-icons')) {
-    return jsx("svg", _extends({
-      width: "16",
-      height: "14",
-      viewBox: "0 0 16 14",
-      fill: "none",
-      xmlns: "http://www.w3.org/2000/svg"
-      // Ignored via go/ees005
-      // eslint-disable-next-line react/jsx-props-no-spreading
-    }, props), jsx("path", {
-      fillRule: "evenodd",
-      clipRule: "evenodd",
-      d: "M8.5 1.375C8.5 0.615609 7.88439 0 7.125 0H6.375C5.61561 0 5 0.615608 5 1.375V12.625C5 13.3844 5.61561 14 6.375 14H7.125C7.88439 14 8.5 13.3844 8.5 12.625V1.375ZM7 1.5V12.5H6.5V1.5H7ZM16 1.37505C16 0.615655 15.3844 4.66853e-05 14.625 4.66853e-05H11.375C10.6156 4.66853e-05 10 0.615655 10 1.37505V12.625C10 13.3844 10.6156 14 11.375 14H14.625C15.3844 14 16 13.3844 16 12.625V1.37505ZM14.5 1.50005V12.5H11.5V1.50005H14.5ZM3.5 1.37505C3.5 0.615655 2.88439 4.66853e-05 2.125 4.66853e-05H1.375C0.615608 4.66853e-05 0 0.615655 0 1.37505V12.625C0 13.3844 0.615608 14 1.375 14H2.125C2.88439 14 3.5 13.3844 3.5 12.625V1.37505ZM2 1.50005V12.5H1.5V1.50005H2Z",
-      fill: "currentcolor"
-    }));
-  }
-  return jsx("svg", _extends({
-    width: "16",
-    height: "14",
-    viewBox: "0 0 16 14",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props), jsx("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M1 0C1.26522 0 1.51957 0.105357 1.70711 0.292893C1.89464 0.48043 2 0.734784 2 1V13C2 13.2652 1.89464 13.5196 1.70711 13.7071C1.51957 13.8946 1.26522 14 1 14C0.734784 14 0.48043 13.8946 0.292893 13.7071C0.105357 13.5196 0 13.2652 0 13V1C0 0.734784 0.105357 0.48043 0.292893 0.292893C0.48043 0.105357 0.734784 0 1 0ZM9 0H15C15.2652 0 15.5196 0.105357 15.7071 0.292893C15.8946 0.48043 16 0.734784 16 1V13C16 13.2652 15.8946 13.5196 15.7071 13.7071C15.5196 13.8946 15.2652 14 15 14H9C8.73478 14 8.48043 13.8946 8.29289 13.7071C8.10536 13.5196 8 13.2652 8 13V1C8 0.734784 8.10536 0.48043 8.29289 0.292893C8.48043 0.105357 8.73478 0 9 0ZM5 0C5.26522 0 5.51957 0.105356 5.70711 0.292892C5.89464 0.480429 6 0.734784 6 1V13C6 13.2652 5.89464 13.5196 5.70711 13.7071C5.51957 13.8946 5.26522 14 5 14C4.73478 14 4.48043 13.8946 4.29289 13.7071C4.10536 13.5196 4 13.2652 4 13V1C4 0.734784 4.10536 0.480429 4.29289 0.292892C4.48043 0.105356 4.73478 0 5 0Z",
-    fill: "currentcolor"
-  }));
-};
-var floatingToolbarPadding = css({
-  paddingRight: "var(--ds-space-050, 4px)",
-  paddingLeft: "var(--ds-space-050, 4px)"
-});
 export var LayoutThreeWithLeftSidebarsIcon = function LayoutThreeWithLeftSidebarsIcon(props) {
-  if (fg('platform-custom-icon-migration')) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    return jsx(LayoutThreeColumnsSidebarsLeftIcon, props);
-  }
-  return jsx("span", {
-    css: floatingToolbarPadding
-  }, jsx(Icon, _extends({
-    glyph: LayoutThreeWithLeftSidebarsGlyph
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props)));
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  return /*#__PURE__*/React.createElement(LayoutThreeColumnsSidebarsLeftIcon, props);
 };

package/dist/esm/ui/icons/LayoutThreeWithRightSidebars.js

@@ -1,59 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
-import { css, jsx } from '@emotion/react';
-import Icon from '@atlaskit/icon';
+import React from 'react';
 import LayoutThreeColumnsSidebarsRightIcon from '@atlaskit/icon-lab/core/layout-three-columns-sidebars-right';
-import { fg } from '@atlaskit/platform-feature-flags';
-var LayoutThreeWithRightSidebarsGlyph = function LayoutThreeWithRightSidebarsGlyph(props) {
-  if (fg('platform-visual-refresh-icons')) {
-    return jsx("svg", _extends({
-      width: "16",
-      height: "14",
-      viewBox: "0 0 16 14",
-      fill: "none",
-      xmlns: "http://www.w3.org/2000/svg"
-      // Ignored via go/ees005
-      // eslint-disable-next-line react/jsx-props-no-spreading
-    }, props), jsx("path", {
-      fillRule: "evenodd",
-      clipRule: "evenodd",
-      d: "M7.5 1.375C7.5 0.615609 8.11561 0 8.875 0H9.625C10.3844 0 11 0.615608 11 1.375V12.625C11 13.3844 10.3844 14 9.625 14H8.875C8.11561 14 7.5 13.3844 7.5 12.625V1.375ZM9 1.5V12.5H9.5V1.5H9ZM0 1.37505C0 0.615655 0.615608 4.66853e-05 1.375 4.66853e-05H4.625C5.38439 4.66853e-05 6 0.615655 6 1.37505V12.625C6 13.3844 5.38439 14 4.625 14H1.375C0.615608 14 0 13.3844 0 12.625V1.37505ZM1.5 1.50005V12.5H4.5V1.50005H1.5ZM12.5 1.37505C12.5 0.615655 13.1156 4.66853e-05 13.875 4.66853e-05H14.625C15.3844 4.66853e-05 16 0.615655 16 1.37505V12.625C16 13.3844 15.3844 14 14.625 14H13.875C13.1156 14 12.5 13.3844 12.5 12.625V1.37505ZM14 1.50005V12.5H14.5V1.50005H14Z",
-      fill: "currentcolor"
-    }));
-  }
-  return jsx("svg", _extends({
-    width: "16",
-    height: "14",
-    viewBox: "0 0 16 14",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props), jsx("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M11 0C11.2652 0 11.5196 0.105357 11.7071 0.292893C11.8946 0.48043 12 0.734784 12 1V13C12 13.2652 11.8946 13.5196 11.7071 13.7071C11.5196 13.8946 11.2652 14 11 14C10.7348 14 10.4804 13.8946 10.2929 13.7071C10.1054 13.5196 10 13.2652 10 13V1C10 0.734784 10.1054 0.48043 10.2929 0.292893C10.4804 0.105357 10.7348 0 11 0ZM1 0H7C7.26522 0 7.51957 0.105357 7.70711 0.292893C7.89464 0.48043 8 0.734784 8 1V13C8 13.2652 7.89464 13.5196 7.70711 13.7071C7.51957 13.8946 7.26522 14 7 14H1C0.734784 14 0.48043 13.8946 0.292893 13.7071C0.105357 13.5196 0 13.2652 0 13V1C0 0.734784 0.105357 0.48043 0.292893 0.292893C0.48043 0.105357 0.734784 0 1 0ZM15 0C15.2652 0 15.5196 0.105357 15.7071 0.292893C15.8946 0.48043 16 0.734784 16 1V13C16 13.2652 15.8946 13.5196 15.7071 13.7071C15.5196 13.8946 15.2652 14 15 14C14.7348 14 14.4804 13.8946 14.2929 13.7071C14.1054 13.5196 14 13.2652 14 13V1C14 0.734784 14.1054 0.48043 14.2929 0.292893C14.4804 0.105357 14.7348 0 15 0Z",
-    fill: "currentcolor"
-  }));
-};
-var floatingToolbarPadding = css({
-  paddingRight: "var(--ds-space-050, 4px)",
-  paddingLeft: "var(--ds-space-050, 4px)"
-});
 export var LayoutThreeWithRightSidebarsIcon = function LayoutThreeWithRightSidebarsIcon(props) {
-  if (fg('platform-custom-icon-migration')) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    return jsx(LayoutThreeColumnsSidebarsRightIcon, props);
-  }
-  return jsx("span", {
-    css: floatingToolbarPadding
-  }, jsx(Icon, _extends({
-    glyph: LayoutThreeWithRightSidebarsGlyph
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props)));
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  return /*#__PURE__*/React.createElement(LayoutThreeColumnsSidebarsRightIcon, props);
 };

package/dist/esm/ui/toolbar.js

@@ -9,13 +9,13 @@ import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-che
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import CopyIcon from '@atlaskit/icon/core/copy';
-import DeleteIcon from '@atlaskit/icon/core/migration/delete--editor-remove';
-import LayoutOneColumnIcon from '@atlaskit/icon/core/migration/layout-one-column--editor-layout-single';
-import LayoutThreeColumnsIcon from '@atlaskit/icon/core/migration/layout-three-columns--editor-layout-three-equal';
-import LayoutThreeColumnsSidebarsIcon from '@atlaskit/icon/core/migration/layout-three-columns-sidebars--editor-layout-three-with-sidebars';
-import LayoutTwoColumnsIcon from '@atlaskit/icon/core/migration/layout-two-columns--editor-layout-two-equal';
-import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/migration/layout-two-columns-sidebar-left--editor-layout-two-left-sidebar';
-import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/migration/layout-two-columns-sidebar-right--editor-layout-two-right-sidebar';
+import DeleteIcon from '@atlaskit/icon/core/delete';
+import LayoutOneColumnIcon from '@atlaskit/icon/core/layout-one-column';
+import LayoutThreeColumnsIcon from '@atlaskit/icon/core/layout-three-columns';
+import LayoutThreeColumnsSidebarsIcon from '@atlaskit/icon/core/layout-three-columns-sidebars';
+import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
+import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-left';
+import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-right';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { deleteActiveLayoutNode, getPresetLayout, setPresetLayout } from '../pm-plugins/actions';
 import { EditorLayoutFiveColumnsIcon, EditorLayoutFourColumnsIcon } from './icons/LayoutColumnsIcon';

package/dist/types/ui/icons/LayoutThreeWithLeftSidebars.d.ts

@@ -1,7 +1,3 @@
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-import { jsx } from '@emotion/react';
-import { type IconProps } from '@atlaskit/icon';
-export declare const LayoutThreeWithLeftSidebarsIcon: (props: Omit<IconProps, "glyph" | "size">) => jsx.JSX.Element;
+import React from 'react';
+import type { IconProps } from '@atlaskit/icon';
+export declare const LayoutThreeWithLeftSidebarsIcon: (props: Omit<IconProps, "glyph" | "size">) => React.JSX.Element;

package/dist/types/ui/icons/LayoutThreeWithRightSidebars.d.ts

@@ -1,7 +1,3 @@
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-import { jsx } from '@emotion/react';
-import { type IconProps } from '@atlaskit/icon';
-export declare const LayoutThreeWithRightSidebarsIcon: (props: Omit<IconProps, "glyph" | "size">) => jsx.JSX.Element;
+import React from 'react';
+import type { IconProps } from '@atlaskit/icon';
+export declare const LayoutThreeWithRightSidebarsIcon: (props: Omit<IconProps, "glyph" | "size">) => React.JSX.Element;

package/dist/types-ts4.5/ui/icons/LayoutThreeWithLeftSidebars.d.ts

@@ -1,7 +1,3 @@
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-import { jsx } from '@emotion/react';
-import { type IconProps } from '@atlaskit/icon';
-export declare const LayoutThreeWithLeftSidebarsIcon: (props: Omit<IconProps, "glyph" | "size">) => jsx.JSX.Element;
+import React from 'react';
+import type { IconProps } from '@atlaskit/icon';
+export declare const LayoutThreeWithLeftSidebarsIcon: (props: Omit<IconProps, "glyph" | "size">) => React.JSX.Element;

package/dist/types-ts4.5/ui/icons/LayoutThreeWithRightSidebars.d.ts

@@ -1,7 +1,3 @@
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-import { jsx } from '@emotion/react';
-import { type IconProps } from '@atlaskit/icon';
-export declare const LayoutThreeWithRightSidebarsIcon: (props: Omit<IconProps, "glyph" | "size">) => jsx.JSX.Element;
+import React from 'react';
+import type { IconProps } from '@atlaskit/icon';
+export declare const LayoutThreeWithRightSidebarsIcon: (props: Omit<IconProps, "glyph" | "size">) => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "6.2.15",
+	"version": "6.2.17",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,9 +29,9 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.5.1",
+		"@atlaskit/adf-schema": "^51.5.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-menu": "^5.1.0",
+		"@atlaskit/editor-plugin-block-menu": "^5.2.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^6.1.0",
 		"@atlaskit/editor-plugin-guideline": "^6.0.0",
@@ -39,19 +39,19 @@
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-toolbar": "^3.4.0",
 		"@atlaskit/editor-plugin-width": "^7.0.0",
-		"@atlaskit/editor-prosemirror": "7.0.0",
+		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
-		"@atlaskit/icon": "^29.0.0",
-		"@atlaskit/icon-lab": "^5.12.0",
+		"@atlaskit/icon": "^29.3.0",
+		"@atlaskit/icon-lab": "^5.13.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^15.0.0",
-		"@atlaskit/tokens": "^8.4.0",
+		"@atlaskit/tmp-editor-statsig": "^15.14.0",
+		"@atlaskit/tokens": "^8.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.40.0",
+		"@atlaskit/editor-common": "^110.46.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -100,17 +100,11 @@
 		"platform-visual-refresh-icons": {
 			"type": "boolean"
 		},
-		"platform_editor_convert_multiple_columns_to_single": {
-			"type": "boolean"
-		},
 		"platform_editor_column_count_analytics": {
 			"type": "boolean"
 		},
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
-		},
-		"platform-custom-icon-migration": {
-			"type": "boolean"
 		}
 	}
 }