@atlaskit/editor-plugin-insert-block 1.9.1 → 1.10.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-insert-block
 
+## 1.10.0
+
+### Minor Changes
+
+- [#133191](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133191)
+  [`78a1927084934`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/78a1927084934) -
+  [ux] Remove icon migration feature gate and migrate new icons on primary toolbar
+
+### Patch Changes
+
+- [`193f8c85e1a39`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/193f8c85e1a39) -
+  [ux] [ED-24635]
+
+  - Disable Turn into dropdown options when wrapping is not supported
+  - Update expand icon so that it can show disabled status
+  - Update Turn into icon to show active status when dropdown is open
+
+- Updated dependencies
+
+## 1.9.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.9.1
 
 ### Patch Changes

package/dist/cjs/assets/expand.js

@@ -18,7 +18,8 @@ var iconContainer = (0, _react.css)({
   width: '24px',
   height: '24px'
 });
-function ExpandIcon() {
+function ExpandIcon(_ref) {
+  var disabled = _ref.disabled;
   return (0, _react.jsx)("span", {
     css: iconContainer
   }, (0, _react.jsx)("svg", {
@@ -29,11 +30,11 @@ function ExpandIcon() {
     fill: "none"
   }, (0, _react.jsx)("path", {
     d: "M2 2V14H16V2H2ZM2 0H16C16.5304 0 17.0391 0.210714 17.4142 0.585786C17.7893 0.960859 18 1.46957 18 2V14C18 14.5304 17.7893 15.0391 17.4142 15.4142C17.0391 15.7893 16.5304 16 16 16H2C1.46957 16 0.960859 15.7893 0.585786 15.4142C0.210714 15.0391 0 14.5304 0 14V2C0 1.46957 0.210714 0.960859 0.585786 0.585786C0.960859 0.210714 1.46957 0 2 0Z",
-    fill: "var(--ds-icon, #44546F)"
+    fill: disabled ? "var(--ds-icon-disabled, #B3B9C4)" : "var(--ds-icon, #44546F)"
   }), (0, _react.jsx)("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M5.29158 6.29294C5.10477 6.48183 5 6.73678 5 7.00244C5 7.2681 5.10477 7.52305 5.29158 7.71194L8.23058 10.6769C8.44858 10.8919 8.73058 10.9989 9.00958 10.9989C9.28858 10.9989 9.56558 10.8919 9.77858 10.6769L12.7086 7.72194C12.8951 7.53292 12.9998 7.27803 12.9998 7.01244C12.9998 6.74686 12.8951 6.49196 12.7086 6.30294C12.6167 6.20976 12.5073 6.13576 12.3866 6.08525C12.2659 6.03474 12.1364 6.00873 12.0056 6.00873C11.8748 6.00873 11.7452 6.03474 11.6245 6.08525C11.5039 6.13576 11.3944 6.20976 11.3026 6.30294L9.00458 8.61994L6.69758 6.29294C6.60554 6.20012 6.49604 6.12644 6.37538 6.07617C6.25472 6.02589 6.1253 6 5.99458 6C5.86386 6 5.73444 6.02589 5.61378 6.07617C5.49312 6.12644 5.38362 6.20012 5.29158 6.29294Z",
-    fill: "var(--ds-icon, #44546F)"
+    fill: disabled ? "var(--ds-icon-disabled, #B3B9C4)" : "var(--ds-icon, #44546F)"
   })));
 }

package/dist/cjs/assets/switch.js

@@ -5,26 +5,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = SwitchIcon;
-var _react = _interopRequireDefault(require("react"));
-var _svg = _interopRequireDefault(require("@atlaskit/icon/svg"));
+var _react = require("@emotion/react");
+var _refresh = _interopRequireDefault(require("@atlaskit/icon/glyph/refresh"));
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
+
+var iconStyle = (0, _react.css)({
+  transform: 'rotate(-90deg)'
+});
 function SwitchIcon() {
-  return /*#__PURE__*/_react.default.createElement(_svg.default, {
+  return (0, _react.jsx)("span", {
+    css: iconStyle
+  }, (0, _react.jsx)(_refresh.default, {
     label: ""
-  }, /*#__PURE__*/_react.default.createElement("path", {
-    d: "M6.003 16H8.998C9.26322 16 9.51757 15.8947 9.70511 15.7071C9.89264 15.5196 9.998 15.2652 9.998 15C9.998 14.7348 9.89264 14.4805 9.70511 14.2929C9.51757 14.1054 9.26322 14 8.998 14H5.102C4.494 14 4 14.493 4 15.1V19C4 19.2656 4.10551 19.5204 4.29333 19.7082C4.48115 19.896 4.73589 20.0015 5.0015 20.0015C5.26711 20.0015 5.52185 19.896 5.70967 19.7082C5.89748 19.5204 6.003 19.2656 6.003 19V16Z",
-    fill: "var(--ds-icon, #44546F)"
-  }), /*#__PURE__*/_react.default.createElement("path", {
-    d: "M18.018 14.572C16.989 16.649 14.807 18 12.37 18C10.104 18 8.051 16.833 6.945 14.98C6.659 14.5 6.023 14.334 5.524 14.609C5.40677 14.6709 5.30331 14.7559 5.21991 14.8589C5.13651 14.9619 5.0749 15.0808 5.0388 15.2083C5.00271 15.3359 4.99289 15.4694 5.00994 15.6009C5.027 15.7323 5.07056 15.8589 5.138 15.973C6.611 18.443 9.35 20 12.37 20C15.618 20 18.528 18.198 19.899 15.43C20.146 14.932 19.925 14.335 19.406 14.098C18.886 13.861 18.265 14.073 18.018 14.572Z",
-    fill: "var(--ds-icon, #44546F)"
-  }), /*#__PURE__*/_react.default.createElement("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M15.002 10L18.898 10C19.506 10 20 9.50703 20 8.90003V5.00003C20 4.73441 19.8945 4.47968 19.7067 4.29186C19.5188 4.10404 19.2641 3.99853 18.9985 3.99853C18.7329 3.99853 18.4782 4.10404 18.2903 4.29186C18.1025 4.47968 17.997 4.73441 17.997 5.00003V8.00003H15.002C14.7368 8.00003 14.4824 8.10538 14.2949 8.29292C14.1074 8.48046 14.002 8.73481 14.002 9.00003C14.002 9.26524 14.1074 9.5196 14.2949 9.70713C14.4824 9.89467 14.7368 10 15.002 10Z",
-    fill: "var(--ds-icon, #44546F)"
-  }), /*#__PURE__*/_react.default.createElement("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M4.596 9.90303C5.116 10.14 5.736 9.92803 5.983 9.42903C7.012 7.35203 9.193 6.00103 11.63 6.00103C13.896 6.00103 15.95 7.16803 17.055 9.02203C17.1988 9.25438 17.4265 9.42245 17.6909 9.49135C17.9553 9.56024 18.2361 9.52468 18.475 9.39203C18.975 9.11803 19.148 8.50703 18.862 8.02803C17.389 5.55803 14.65 4.00103 11.63 4.00103C8.382 4.00103 5.472 5.80303 4.102 8.57103C4.03537 8.70353 4.00045 8.84971 4 8.99803C4.00188 9.1902 4.05909 9.37775 4.16479 9.53825C4.27049 9.69875 4.4202 9.8254 4.596 9.90303Z",
-    fill: "var(--ds-icon, #44546F)"
   }));
 }

package/dist/cjs/plugin.js

@@ -9,9 +9,11 @@ exports.insertBlockPlugin = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _insert = require("@atlaskit/editor-common/insert");
 var _messages = require("@atlaskit/editor-common/messages");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _types = require("@atlaskit/editor-common/types");
+var _utils = require("@atlaskit/editor-common/utils");
 var _consts = require("@atlaskit/editor-plugin-block-type/consts");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _switch = _interopRequireDefault(require("./assets/switch"));
@@ -126,10 +128,8 @@ var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_
       // Experiment one-pager: https://hello.atlassian.net/wiki/spaces/ETM/pages/3931754727/Experiment+Elements+Basic+Text+Transformations
       selectionToolbar: function selectionToolbar(state, intl) {
         var _api$featureFlags;
-        var $from = state.selection.$from;
-        var isEligible =
-        // basicTextTransformations is used to present AI enablement status to avoid adding editor props
-        (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 || (_api$featureFlags = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.basicTextTransformations) && $from.depth === 1;
+        var isEligible = // basicTextTransformations is used to present AI enablement status to avoid adding editor props
+        api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 || (_api$featureFlags = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.basicTextTransformations;
         if (!isEligible) {
           return;
         }
@@ -137,13 +137,29 @@ var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_
           exposure: true
         })) {
           var formatMessage = intl.formatMessage;
-          var _options = (0, _transformOptions.transformationOptions)(api).map(function (option) {
+          var _options = (0, _transformOptions.transformationOptions)(api, state.schema).map(function (option) {
+            var canWrap;
+            if (option.type.name === 'codeBlock') {
+              var _$from$node;
+              var $from = state.selection.$from;
+              var grandParentNodeType = (_$from$node = $from.node(-1)) === null || _$from$node === void 0 ? void 0 : _$from$node.type;
+              var parentNodeType = $from.parent.type;
+              canWrap = (0, _insert.shouldSplitSelectedNodeOnNodeInsertion)({
+                parentNodeType: parentNodeType,
+                grandParentNodeType: grandParentNodeType,
+                content: option.type.createAndFill()
+              }) && (0, _insert.contentAllowedInCodeBlock)(state);
+            } else {
+              canWrap = !!(0, _utils.getWrappingOptions)(state, option.type).wrapping;
+            }
             var IconBefore = option.icon;
             return {
               title: formatMessage(option.title),
               icon: /*#__PURE__*/_react.default.createElement(IconBefore, {
-                label: ""
+                label: "",
+                disabled: !canWrap
               }),
+              disabled: !canWrap,
               onClick: function onClick(state, dispatch) {
                 var _option$command;
                 (_option$command = option.command) === null || _option$command === void 0 || _option$command.call(option, _analytics.INPUT_METHOD.FLOATING_TB)(state, dispatch);

package/dist/cjs/ui/ToolbarInsertBlock/dropdown-button.js

@@ -8,14 +8,10 @@ exports.DropDownButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _styles = require("@atlaskit/editor-common/styles");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _addEditorAdd = _interopRequireDefault(require("@atlaskit/icon/core/migration/add--editor-add"));
-var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
-var _add = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/add"));
-var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _styles2 = require("./styles");
+var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
+var _styles = require("./styles");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -27,25 +23,15 @@ var DropDownButtonIcon = /*#__PURE__*/_react.default.memo(function (props) {
   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)("span", {
-      css: _styles2.triggerWrapper
-    }, (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? (0, _react2.jsx)(_addEditorAdd.default, {
+      css: _styles.triggerWrapper
+    }, (0, _react2.jsx)(_addEditorAdd.default, {
       label: props.label,
-      color: "currentColor"
-    }) : (0, _react2.jsx)(_add.default, {
-      label: props.label
-    }), (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ?
-    //eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    (0, _react2.jsx)("span", {
-      css: _styles2.expandWrapperStyle
-    }, (0, _react2.jsx)(_chevronDown2.default, {
+      color: "currentColor",
+      spacing: "spacious"
+    }), (0, _react2.jsx)("span", null, (0, _react2.jsx)(_chevronDown.default, {
       label: "",
-      color: "currentColor"
-    })) :
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    (0, _react2.jsx)("span", {
-      css: _styles.expandIconWrapperStyle
-    }, (0, _react2.jsx)(_chevronDown.default, {
-      label: ""
+      color: "currentColor",
+      LEGACY_margin: "0 0 0 -8px"
     })))
   );
 });

package/dist/cjs/ui/ToolbarInsertBlock/item.js

@@ -15,32 +15,19 @@ var _calendarEditorDate = _interopRequireDefault(require("@atlaskit/icon/core/mi
 var _checkboxCheckedEditorTask = _interopRequireDefault(require("@atlaskit/icon/core/migration/checkbox-checked--editor-task"));
 var _decisionEditorDecision = _interopRequireDefault(require("@atlaskit/icon/core/migration/decision--editor-decision"));
 var _emojiEditorEmoji = _interopRequireDefault(require("@atlaskit/icon/core/migration/emoji--editor-emoji"));
+var _gridEditorTable = _interopRequireDefault(require("@atlaskit/icon/core/migration/grid--editor-table"));
 var _imageEditorImage = _interopRequireDefault(require("@atlaskit/icon/core/migration/image--editor-image"));
 var _informationEditorInfo = _interopRequireDefault(require("@atlaskit/icon/core/migration/information--editor-info"));
 var _linkEditorLink = _interopRequireDefault(require("@atlaskit/icon/core/migration/link--editor-link"));
 var _mentionEditorMention = _interopRequireDefault(require("@atlaskit/icon/core/migration/mention--editor-mention"));
 var _quotationMarkQuote = _interopRequireDefault(require("@atlaskit/icon/core/migration/quotation-mark--quote"));
 var _showMoreHorizontalEditorMore = _interopRequireDefault(require("@atlaskit/icon/core/migration/show-more-horizontal--editor-more"));
-var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
-var _chevronRightCircle = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-right-circle"));
-var _code = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/code"));
-var _date = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/date"));
-var _decision = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/decision"));
-var _emoji = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/emoji"));
 var _horizontalRule = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/horizontal-rule"));
-var _image = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/image"));
-var _info = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/info"));
 var _layoutTwoEqual = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/layout-two-equal"));
-var _link = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/link"));
-var _mention = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/mention"));
-var _more = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/more"));
-var _table = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/table"));
-var _task = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/task"));
 var _text = _interopRequireDefault(require("@atlaskit/icon/glyph/media-services/text"));
-var _quote = _interopRequireDefault(require("@atlaskit/icon/glyph/quote"));
 var _status = _interopRequireDefault(require("@atlaskit/icon/glyph/status"));
-var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
+var _chevronRightChevronRightCircle = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-right--chevron-right-circle"));
 var _shallowEquals = require("./shallow-equals");
 /**
  * @jsxRuntime classic
@@ -57,7 +44,9 @@ var from = function from(init) {
       name: init.name
     },
     elemBefore: (0, _react2.jsx)(init.Icon, {
-      label: ""
+      label: "",
+      color: "currentColor",
+      spacing: "spacious"
     }),
     elemAfter: init.shortcut ?
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
@@ -81,7 +70,7 @@ var action = exports.action = mem(function (init) {
     disabled: init.disabled,
     name: 'action',
     shortcut: '[]',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _checkboxCheckedEditorTask.default : _task.default,
+    Icon: _checkboxCheckedEditorTask.default,
     'aria-keyshortcuts': '[ ] Space'
   });
 });
@@ -92,7 +81,7 @@ var link = exports.link = mem(function (init) {
     disabled: init.disabled,
     name: 'link',
     shortcut: (0, _keymaps.tooltip)(_keymaps.addLink),
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _linkEditorLink.default : _link.default,
+    Icon: _linkEditorLink.default,
     'aria-haspopup': init['aria-haspopup'],
     'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(_keymaps.addLink)
   });
@@ -103,7 +92,7 @@ var media = exports.media = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'media',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _imageEditorImage.default : _image.default
+    Icon: _imageEditorImage.default
   });
 });
 var imageUpload = exports.imageUpload = mem(function (init) {
@@ -112,7 +101,7 @@ var imageUpload = exports.imageUpload = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'image upload',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _imageEditorImage.default : _image.default
+    Icon: _imageEditorImage.default
   });
 });
 var mention = exports.mention = mem(function (init) {
@@ -121,7 +110,7 @@ var mention = exports.mention = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'mention',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _mentionEditorMention.default : _mention.default,
+    Icon: _mentionEditorMention.default,
     shortcut: '@',
     'aria-haspopup': init['aria-haspopup'],
     'aria-keyshortcuts': 'Shift+2 Space'
@@ -133,7 +122,7 @@ var emoji = exports.emoji = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'emoji',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _emojiEditorEmoji.default : _emoji.default,
+    Icon: _emojiEditorEmoji.default,
     shortcut: ':',
     'aria-haspopup': init['aria-haspopup'],
     'aria-keyshortcuts': 'Shift+;'
@@ -145,7 +134,7 @@ var table = exports.table = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'table',
-    Icon: _table.default,
+    Icon: _gridEditorTable.default,
     shortcut: (0, _keymaps.tooltip)(_keymaps.toggleTable),
     'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(_keymaps.toggleTable)
   });
@@ -156,12 +145,12 @@ var tableSelector = exports.tableSelector = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'table selector',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? function () {
-      return (0, _react2.jsx)(_chevronDown2.default, {
+    Icon: function Icon() {
+      return (0, _react2.jsx)(_chevronDown.default, {
         label: "",
         color: "currentColor"
       });
-    } : _chevronDown.default
+    }
   });
 });
 var layout = exports.layout = mem(function (init) {
@@ -179,7 +168,7 @@ var codeblock = exports.codeblock = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'codeblock',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _angleBracketsEditorCode.default : _code.default,
+    Icon: _angleBracketsEditorCode.default,
     shortcut: init.shortcut,
     'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(init.shortcut)
   });
@@ -190,7 +179,7 @@ var panel = exports.panel = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'panel',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _informationEditorInfo.default : _info.default,
+    Icon: _informationEditorInfo.default,
     shortcut: init.shortcut,
     'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(init.shortcut)
   });
@@ -201,7 +190,7 @@ var blockquote = exports.blockquote = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'blockquote',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _quotationMarkQuote.default : _quote.default,
+    Icon: _quotationMarkQuote.default,
     shortcut: init.shortcut,
     'aria-keyshortcuts': 'Shift+. Space'
   });
@@ -212,7 +201,7 @@ var decision = exports.decision = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'decision',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _decisionEditorDecision.default : _decision.default,
+    Icon: _decisionEditorDecision.default,
     shortcut: '<>',
     'aria-keyshortcuts': 'Shift+, Shift+. Space'
   });
@@ -234,7 +223,7 @@ var expand = exports.expand = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'expand',
-    Icon: _chevronRightCircle.default
+    Icon: _chevronRightChevronRightCircle.default
   });
 });
 var date = exports.date = mem(function (init) {
@@ -243,7 +232,7 @@ var date = exports.date = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'date',
-    Icon: (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? _calendarEditorDate.default : _date.default,
+    Icon: _calendarEditorDate.default,
     shortcut: '//',
     'aria-keyshortcuts': '/ / Enter'
   });
@@ -277,11 +266,9 @@ var more = exports.more = mem(function (init) {
     disabled: init.disabled,
     name: 'macro',
     Icon: function Icon() {
-      return (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? (0, _react2.jsx)(_showMoreHorizontalEditorMore.default, {
+      return (0, _react2.jsx)(_showMoreHorizontalEditorMore.default, {
         label: "",
         color: "currentColor"
-      }) : (0, _react2.jsx)(_more.default, {
-        label: ""
       });
     }
   });

package/dist/cjs/ui/transformOptions.js

@@ -10,21 +10,25 @@ var _code = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/code"));
 var _info = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/info"));
 var _quote = _interopRequireDefault(require("@atlaskit/icon/glyph/quote"));
 var _expand = _interopRequireDefault(require("../assets/expand"));
-var transformationOptions = exports.transformationOptions = function transformationOptions(api) {
+var transformationOptions = exports.transformationOptions = function transformationOptions(api, schema) {
   var _api$panel, _api$expand, _api$codeBlock, _api$blockType;
   return [{
+    type: schema.nodes.panel,
     title: _messages.blockTypeMessages.panel,
     icon: _info.default,
     command: api === null || api === void 0 || (_api$panel = api.panel) === null || _api$panel === void 0 ? void 0 : _api$panel.actions.insertPanel
   }, {
+    type: schema.nodes.expand,
     title: _messages.toolbarInsertBlockMessages.expand,
     icon: _expand.default,
     command: api === null || api === void 0 || (_api$expand = api.expand) === null || _api$expand === void 0 ? void 0 : _api$expand.actions.insertExpandWithInputMethod
   }, {
+    type: schema.nodes.codeBlock,
     title: _messages.blockTypeMessages.codeblock,
     icon: _code.default,
     command: api === null || api === void 0 || (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 ? void 0 : _api$codeBlock.actions.insertCodeBlock
   }, {
+    type: schema.nodes.blockquote,
     title: _messages.blockTypeMessages.blockquote,
     icon: _quote.default,
     command: api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 ? void 0 : _api$blockType.actions.insertBlockQuote

package/dist/es2019/assets/expand.js

@@ -11,7 +11,9 @@ const iconContainer = css({
   width: '24px',
   height: '24px'
 });
-export default function ExpandIcon() {
+export default function ExpandIcon({
+  disabled
+}) {
   return jsx("span", {
     css: iconContainer
   }, jsx("svg", {
@@ -22,11 +24,11 @@ export default function ExpandIcon() {
     fill: "none"
   }, jsx("path", {
     d: "M2 2V14H16V2H2ZM2 0H16C16.5304 0 17.0391 0.210714 17.4142 0.585786C17.7893 0.960859 18 1.46957 18 2V14C18 14.5304 17.7893 15.0391 17.4142 15.4142C17.0391 15.7893 16.5304 16 16 16H2C1.46957 16 0.960859 15.7893 0.585786 15.4142C0.210714 15.0391 0 14.5304 0 14V2C0 1.46957 0.210714 0.960859 0.585786 0.585786C0.960859 0.210714 1.46957 0 2 0Z",
-    fill: "var(--ds-icon, #44546F)"
+    fill: disabled ? "var(--ds-icon-disabled, #B3B9C4)" : "var(--ds-icon, #44546F)"
   }), jsx("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M5.29158 6.29294C5.10477 6.48183 5 6.73678 5 7.00244C5 7.2681 5.10477 7.52305 5.29158 7.71194L8.23058 10.6769C8.44858 10.8919 8.73058 10.9989 9.00958 10.9989C9.28858 10.9989 9.56558 10.8919 9.77858 10.6769L12.7086 7.72194C12.8951 7.53292 12.9998 7.27803 12.9998 7.01244C12.9998 6.74686 12.8951 6.49196 12.7086 6.30294C12.6167 6.20976 12.5073 6.13576 12.3866 6.08525C12.2659 6.03474 12.1364 6.00873 12.0056 6.00873C11.8748 6.00873 11.7452 6.03474 11.6245 6.08525C11.5039 6.13576 11.3944 6.20976 11.3026 6.30294L9.00458 8.61994L6.69758 6.29294C6.60554 6.20012 6.49604 6.12644 6.37538 6.07617C6.25472 6.02589 6.1253 6 5.99458 6C5.86386 6 5.73444 6.02589 5.61378 6.07617C5.49312 6.12644 5.38362 6.20012 5.29158 6.29294Z",
-    fill: "var(--ds-icon, #44546F)"
+    fill: disabled ? "var(--ds-icon-disabled, #B3B9C4)" : "var(--ds-icon, #44546F)"
   })));
 }

package/dist/es2019/assets/switch.js

@@ -1,23 +1,18 @@
-import React from 'react';
-import SVG from '@atlaskit/icon/svg';
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
+import { css, jsx } from '@emotion/react';
+import RefreshIcon from '@atlaskit/icon/glyph/refresh';
+const iconStyle = css({
+  transform: 'rotate(-90deg)'
+});
 export default function SwitchIcon() {
-  return /*#__PURE__*/React.createElement(SVG, {
+  return jsx("span", {
+    css: iconStyle
+  }, jsx(RefreshIcon, {
     label: ""
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M6.003 16H8.998C9.26322 16 9.51757 15.8947 9.70511 15.7071C9.89264 15.5196 9.998 15.2652 9.998 15C9.998 14.7348 9.89264 14.4805 9.70511 14.2929C9.51757 14.1054 9.26322 14 8.998 14H5.102C4.494 14 4 14.493 4 15.1V19C4 19.2656 4.10551 19.5204 4.29333 19.7082C4.48115 19.896 4.73589 20.0015 5.0015 20.0015C5.26711 20.0015 5.52185 19.896 5.70967 19.7082C5.89748 19.5204 6.003 19.2656 6.003 19V16Z",
-    fill: "var(--ds-icon, #44546F)"
-  }), /*#__PURE__*/React.createElement("path", {
-    d: "M18.018 14.572C16.989 16.649 14.807 18 12.37 18C10.104 18 8.051 16.833 6.945 14.98C6.659 14.5 6.023 14.334 5.524 14.609C5.40677 14.6709 5.30331 14.7559 5.21991 14.8589C5.13651 14.9619 5.0749 15.0808 5.0388 15.2083C5.00271 15.3359 4.99289 15.4694 5.00994 15.6009C5.027 15.7323 5.07056 15.8589 5.138 15.973C6.611 18.443 9.35 20 12.37 20C15.618 20 18.528 18.198 19.899 15.43C20.146 14.932 19.925 14.335 19.406 14.098C18.886 13.861 18.265 14.073 18.018 14.572Z",
-    fill: "var(--ds-icon, #44546F)"
-  }), /*#__PURE__*/React.createElement("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M15.002 10L18.898 10C19.506 10 20 9.50703 20 8.90003V5.00003C20 4.73441 19.8945 4.47968 19.7067 4.29186C19.5188 4.10404 19.2641 3.99853 18.9985 3.99853C18.7329 3.99853 18.4782 4.10404 18.2903 4.29186C18.1025 4.47968 17.997 4.73441 17.997 5.00003V8.00003H15.002C14.7368 8.00003 14.4824 8.10538 14.2949 8.29292C14.1074 8.48046 14.002 8.73481 14.002 9.00003C14.002 9.26524 14.1074 9.5196 14.2949 9.70713C14.4824 9.89467 14.7368 10 15.002 10Z",
-    fill: "var(--ds-icon, #44546F)"
-  }), /*#__PURE__*/React.createElement("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M4.596 9.90303C5.116 10.14 5.736 9.92803 5.983 9.42903C7.012 7.35203 9.193 6.00103 11.63 6.00103C13.896 6.00103 15.95 7.16803 17.055 9.02203C17.1988 9.25438 17.4265 9.42245 17.6909 9.49135C17.9553 9.56024 18.2361 9.52468 18.475 9.39203C18.975 9.11803 19.148 8.50703 18.862 8.02803C17.389 5.55803 14.65 4.00103 11.63 4.00103C8.382 4.00103 5.472 5.80303 4.102 8.57103C4.03537 8.70353 4.00045 8.84971 4 8.99803C4.00188 9.1902 4.05909 9.37775 4.16479 9.53825C4.27049 9.69875 4.4202 9.8254 4.596 9.90303Z",
-    fill: "var(--ds-icon, #44546F)"
   }));
 }

package/dist/es2019/plugin.js

@@ -1,9 +1,11 @@
 import React, { useLayoutEffect } from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { contentAllowedInCodeBlock, shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
+import { getWrappingOptions } from '@atlaskit/editor-common/utils';
 import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-type/consts';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import SwitchIcon from './assets/switch';
@@ -115,14 +117,8 @@ export const insertBlockPlugin = ({
       // Experiment one-pager: https://hello.atlassian.net/wiki/spaces/ETM/pages/3931754727/Experiment+Elements+Basic+Text+Transformations
       selectionToolbar: (state, intl) => {
         var _api$featureFlags, _api$featureFlags$sha;
-        const {
-          selection: {
-            $from
-          }
-        } = state;
-        const isEligible =
-        // basicTextTransformations is used to present AI enablement status to avoid adding editor props
-        (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : (_api$featureFlags$sha = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags$sha === void 0 ? void 0 : _api$featureFlags$sha.basicTextTransformations) && $from.depth === 1;
+        const isEligible = // basicTextTransformations is used to present AI enablement status to avoid adding editor props
+        api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : (_api$featureFlags$sha = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags$sha === void 0 ? void 0 : _api$featureFlags$sha.basicTextTransformations;
         if (!isEligible) {
           return;
         }
@@ -132,13 +128,31 @@ export const insertBlockPlugin = ({
           const {
             formatMessage
           } = intl;
-          const options = transformationOptions(api).map(option => {
+          const options = transformationOptions(api, state.schema).map(option => {
+            let canWrap;
+            if (option.type.name === 'codeBlock') {
+              var _$from$node;
+              const {
+                $from
+              } = state.selection;
+              const grandParentNodeType = (_$from$node = $from.node(-1)) === null || _$from$node === void 0 ? void 0 : _$from$node.type;
+              const parentNodeType = $from.parent.type;
+              canWrap = shouldSplitSelectedNodeOnNodeInsertion({
+                parentNodeType,
+                grandParentNodeType,
+                content: option.type.createAndFill()
+              }) && contentAllowedInCodeBlock(state);
+            } else {
+              canWrap = !!getWrappingOptions(state, option.type).wrapping;
+            }
             const IconBefore = option.icon;
             return {
               title: formatMessage(option.title),
               icon: /*#__PURE__*/React.createElement(IconBefore, {
-                label: ""
+                label: "",
+                disabled: !canWrap
               }),
+              disabled: !canWrap,
               onClick: (state, dispatch) => {
                 var _option$command;
                 (_option$command = option.command) === null || _option$command === void 0 ? void 0 : _option$command.call(option, INPUT_METHOD.FLOATING_TB)(state, dispatch);

package/dist/es2019/ui/ToolbarInsertBlock/dropdown-button.js

@@ -7,36 +7,22 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import AddIcon from '@atlaskit/icon/core/migration/add--editor-add';
-import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
-import { default as AddIconLegacy } from '@atlaskit/icon/glyph/editor/add';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { expandWrapperStyle, triggerWrapper } from './styles';
+import { triggerWrapper } from './styles';
 const DropDownButtonIcon = /*#__PURE__*/React.memo(props =>
 // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 jsx("span", {
   css: triggerWrapper
-}, fg('platform_editor_migration_icon_and_typography') ? jsx(AddIcon, {
+}, jsx(AddIcon, {
   label: props.label,
-  color: "currentColor"
-}) : jsx(AddIconLegacy, {
-  label: props.label
-}), fg('platform_editor_migration_icon_and_typography') ?
-//eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-jsx("span", {
-  css: expandWrapperStyle
-}, jsx(ChevronDownIcon, {
+  color: "currentColor",
+  spacing: "spacious"
+}), jsx("span", null, jsx(ChevronDownIcon, {
   label: "",
-  color: "currentColor"
-})) :
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-jsx("span", {
-  css: expandIconWrapperStyle
-}, jsx(ExpandIcon, {
-  label: ""
+  color: "currentColor",
+  LEGACY_margin: "0 0 0 -8px"
 }))));
 export const DropDownButton = /*#__PURE__*/React.memo(props => jsx(ToolbarButton, {
   ref: props.handleRef,