@atlaskit/editor-plugin-expand 20.0.1 → 20.0.3

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-expand
 
+## 20.0.3
+
+### Patch Changes
+
+- [`ad905e52e6f1b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ad905e52e6f1b) -
+  CONFCLOUD-84260: Include the expand title in body accessible names, localize the macro role
+  description, and keep them updated behind `platform_editor_expand_content_a11y_2`.
+- [`fc26bfc51dd5c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fc26bfc51dd5c) -
+  Add sparse block-control surface anchors, intersection-driven candidates, and explicit visibility
+  invalidation for registry-backed block controls. Expose registration change subscriptions from the
+  UI control registry model, and refresh cached visibility from suggestion and collapse transaction
+  metadata. Under `platform_editor_block_control_migration`, use native node-anchor identity across
+  Editor and Block Controls, and route expand keyboard focus through the shared Block Controls
+  command. Preserve Show Diff visibility checks in both migration cohorts so block controls stay
+  hidden while a diff is displayed. Keep the block menu closed when a migrated layout-column handle
+  opens the layout menu, and close the layout menu when the selection moves away from its selected
+  columns.
+- Updated dependencies
+
+## 20.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 20.0.1
 
 ### Patch Changes

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

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ExpandNodeView = void 0;
 exports.default = _default;
+exports.getExpandBodyAriaLabel = getExpandBodyAriaLabel;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _uuid = require("uuid");
 var _w3cKeyname = require("w3c-keyname");
+var _surfaceKeys = require("@atlaskit/editor-common/block-controls/surface-keys");
 var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
@@ -32,7 +34,14 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function buildExpandClassName(type, expanded) {
   return "".concat(_styles.expandClassNames.prefix, " ").concat(_styles.expandClassNames.type(type), " ").concat(expanded ? _styles.expandClassNames.expanded : '');
 }
+function getExpandBodyAriaLabel(title, intl) {
+  var safeTitle = title.trim() || (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyAriaLabelUntitled)) || _ui.expandMessages.expandBodyAriaLabelUntitled.defaultMessage;
+  return (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyAriaLabel, {
+    title: safeTitle
+  })) || _ui.expandMessages.expandBodyAriaLabel.defaultMessage.replace('{title}', safeTitle);
+}
 var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditable) {
+  var _node$attrs$title, _intl$formatMessage;
   return ['div', _objectSpread({
     // prettier-ignore
     'class': buildExpandClassName(node.type.name, __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
@@ -64,14 +73,19 @@ var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditabl
     placeholder: intl && intl.formatMessage(_ui.expandMessages.expandPlaceholderText) || _ui.expandMessages.expandPlaceholderText.defaultMessage,
     type: 'text',
     readonly: titleReadOnly ? 'true' : undefined
-  }]]], ['div', {
+  }]]], [(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2') ? 'section' : 'div', _objectSpread(_objectSpread({
     // prettier-ignore
     class: "".concat(_styles.expandClassNames.content, " ").concat((__livePage ? !node.attrs.__expanded : node.attrs.__expanded) ? '' : _styles.expandClassNames.contentCollapsed),
-    contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined,
+    contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined
+  }, !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2') && {
     role: 'textbox',
     'aria-multiline': 'true',
-    'aria-label': intl && intl.formatMessage(_ui.expandMessages.expandBodyAriaLabel) || _ui.expandMessages.expandBodyAriaLabel.defaultMessage
-  }, 0]];
+    'aria-label': intl && intl.formatMessage(_ui.expandMessages.expandBodyAriaLabelOriginal) || _ui.expandMessages.expandBodyAriaLabelOriginal.defaultMessage
+  }), (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2') && {
+    'aria-label': getExpandBodyAriaLabel((_node$attrs$title = node.attrs.title) !== null && _node$attrs$title !== void 0 ? _node$attrs$title : '', intl),
+    'aria-description': (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyAriaDescription)) || _ui.expandMessages.expandBodyAriaDescription.defaultMessage,
+    'aria-roledescription': (_intl$formatMessage = intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyRoleDescription)) !== null && _intl$formatMessage !== void 0 ? _intl$formatMessage : _ui.expandMessages.expandBodyRoleDescription.defaultMessage
+  }), 0]];
 };
 var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
   function ExpandNodeView(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI) {
@@ -202,21 +216,30 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
             (_this$api3 = _this.api) === null || _this$api3 === void 0 || _this$api3.core.actions.execute(function (_ref) {
               var tr = _ref.tr;
               tr.setSelection(_state.NodeSelection.create(state.doc, pos));
-              // Show the drag handle on the selected expand node
+              if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_control_migration')) {
+                var _this$api4;
+                var command = (_this$api4 = _this.api) === null || _this$api4 === void 0 || (_this$api4 = _this$api4.blockControls) === null || _this$api4 === void 0 ? void 0 : _this$api4.commands.showControlAtPosition(pos, _surfaceKeys.BLOCK_CONTROLS_DRAG_HANDLE, {
+                  isFocused: true
+                });
+                if (command) {
+                  return command({
+                    tr: tr
+                  });
+                }
+                return null;
+              }
               var node = state.doc.nodeAt(pos);
               if (node) {
-                // Find the anchor name from the DOM
                 var dom = _this.view.nodeDOM(pos);
                 if (dom instanceof HTMLElement) {
                   var anchorName = dom.getAttribute('data-node-anchor');
-                  // Only proceed if we found a valid anchor name
                   if (anchorName) {
-                    var _this$api4;
-                    var command = (_this$api4 = _this.api) === null || _this$api4 === void 0 || (_this$api4 = _this$api4.blockControls) === null || _this$api4 === void 0 ? void 0 : _this$api4.commands.showDragHandleAt(pos, anchorName, node.type.name, {
+                    var _this$api5;
+                    var _command = (_this$api5 = _this.api) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.blockControls) === null || _this$api5 === void 0 ? void 0 : _this$api5.commands.showDragHandleAt(pos, anchorName, node.type.name, {
                       isFocused: true
                     });
-                    if (command) {
-                      return command({
+                    if (_command) {
+                      return _command({
                         tr: tr
                       });
                     }
@@ -294,8 +317,8 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       var state = _this.view.state;
       var expandNode = _this.node;
       if (expandNode && (0, _utils.isEmptyNode)(state.schema)(expandNode)) {
-        var _this$api5;
-        (0, _commands.deleteExpandAtPos)((_this$api5 = _this.api) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.analytics) === null || _this$api5 === void 0 ? void 0 : _this$api5.actions)(pos, expandNode)(state, _this.view.dispatch);
+        var _this$api6;
+        (0, _commands.deleteExpandAtPos)((_this$api6 = _this.api) === null || _this$api6 === void 0 || (_this$api6 = _this$api6.analytics) === null || _this$api6 === void 0 ? void 0 : _this$api6.actions)(pos, expandNode)(state, _this.view.dispatch);
       }
     });
     (0, _defineProperty2.default)(this, "toggleExpand", function () {
@@ -304,12 +327,12 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         return;
       }
       if (_this.allowInteractiveExpand) {
-        var _this$api6;
+        var _this$api7;
         var _this$view4 = _this.view,
           state = _this$view4.state,
           dispatch = _this$view4.dispatch;
         (0, _commands.toggleExpandExpanded)({
-          editorAnalyticsAPI: (_this$api6 = _this.api) === null || _this$api6 === void 0 || (_this$api6 = _this$api6.analytics) === null || _this$api6 === void 0 ? void 0 : _this$api6.actions,
+          editorAnalyticsAPI: (_this$api7 = _this.api) === null || _this$api7 === void 0 || (_this$api7 = _this$api7.analytics) === null || _this$api7 === void 0 ? void 0 : _this$api7.actions,
           pos: pos,
           nodeType: _this.node.type,
           __livePage: _this.__livePage
@@ -461,13 +484,13 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         selectionStart = _this$input6.selectionStart,
         selectionEnd = _this$input6.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === 0) {
-        var _this$api7;
+        var _this$api8;
         event.preventDefault();
         var _this$view0 = _this.view,
           state = _this$view0.state,
           dispatch = _this$view0.dispatch;
         _this.view.focus();
-        var selectionSharedState = ((_this$api7 = _this.api) === null || _this$api7 === void 0 || (_this$api7 = _this$api7.selection) === null || _this$api7 === void 0 ? void 0 : _this$api7.sharedState.currentState()) || {};
+        var selectionSharedState = ((_this$api8 = _this.api) === null || _this$api8 === void 0 || (_this$api8 = _this$api8.selection) === null || _this$api8 === void 0 ? void 0 : _this$api8.sharedState.currentState()) || {};
         // selectionRelativeToNode is undefined when user clicked to select node, then hit left to get focus in title
         // This is a special case where we want to bypass node selection and jump straight to gap cursor
         if ((selectionSharedState === null || selectionSharedState === void 0 ? void 0 : selectionSharedState.selectionRelativeToNode) === undefined) {
@@ -554,7 +577,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
   return (0, _createClass2.default)(ExpandNodeView, [{
     key: "initHandlers",
     value: function initHandlers() {
-      var _this$api8,
+      var _this$api9,
         _this2 = this;
       if (this.dom) {
         // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -580,7 +603,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
         this.icon.addEventListener('keydown', this.handleIconKeyDown);
       }
-      if ((_this$api8 = this.api) !== null && _this$api8 !== void 0 && _this$api8.editorDisabled) {
+      if ((_this$api9 = this.api) !== null && _this$api9 !== void 0 && _this$api9.editorDisabled) {
         this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(function (sharedState) {
           var editorDisabled = sharedState.nextSharedState.editorDisabled;
           if (_this2.input) {
@@ -650,13 +673,13 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
   }, {
     key: "isLimitedModeEnabled",
     value: function isLimitedModeEnabled() {
-      var _this$api9;
+      var _this$api0;
       // Read from `this.view.state` via the exposed plugin key rather than the shared state's
       // `enabled`, which reads a stale `false` during initial EditorView construction (the injection
       // API's editor state isn't wired up yet).
       //
       // Reads the plugin's derived `enabled`, so this covers every reason limited mode can be on.
-      return Boolean((_this$api9 = this.api) === null || _this$api9 === void 0 || (_this$api9 = _this$api9.limitedMode) === null || _this$api9 === void 0 || (_this$api9 = _this$api9.sharedState.currentState()) === null || _this$api9 === void 0 || (_this$api9 = _this$api9.limitedModePluginKey) === null || _this$api9 === void 0 || (_this$api9 = _this$api9.getState(this.view.state)) === null || _this$api9 === void 0 ? void 0 : _this$api9.enabled);
+      return Boolean((_this$api0 = this.api) === null || _this$api0 === void 0 || (_this$api0 = _this$api0.limitedMode) === null || _this$api0 === void 0 || (_this$api0 = _this$api0.sharedState.currentState()) === null || _this$api0 === void 0 || (_this$api0 = _this$api0.limitedModePluginKey) === null || _this$api0 === void 0 || (_this$api0 = _this$api0.getState(this.view.state)) === null || _this$api0 === void 0 ? void 0 : _this$api0.enabled);
     }
   }, {
     key: "stopEvent",
@@ -718,6 +741,12 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
             _this4.input.value = _this4.node.attrs.title;
           }
         });
+        if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2')) {
+          if (this.node.attrs.title !== node.attrs.title && this.content) {
+            var _node$attrs$title2;
+            this.content.setAttribute('aria-label', getExpandBodyAriaLabel((_node$attrs$title2 = node.attrs.title) !== null && _node$attrs$title2 !== void 0 ? _node$attrs$title2 : '', this.intl));
+          }
+        }
         this.node = node;
         return true;
       }

package/dist/cjs/legacyExpand/plugin.js

@@ -10,11 +10,11 @@ var _react = _interopRequireDefault(require("react"));
 var _expand = require("@atlaskit/adf-schema/expand");
 var _nestedExpand = require("@atlaskit/adf-schema/nested-expand");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _assets = require("@atlaskit/editor-common/assets");
 var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _messages = require("@atlaskit/editor-common/messages");
-var _assets = require("@atlaskit/editor-common/assets");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _utils = require("@atlaskit/editor-common/utils");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _toggleExpandRange = require("../editor-commands/toggleExpandRange");
 var _ExpandBlockMenuItem = require("../ui/ExpandBlockMenuItem");
 var _getExpandQuickInsertComponents = require("../ui/quick-insert/getExpandQuickInsertComponents");

package/dist/cjs/singlePlayerExpand/node-views/index.js

@@ -12,6 +12,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _uuid = require("uuid");
 var _w3cKeyname = require("w3c-keyname");
+var _surfaceKeys = require("@atlaskit/editor-common/block-controls/surface-keys");
 var _expand = require("@atlaskit/editor-common/expand");
 var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
@@ -34,7 +35,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     var _this = this,
       _expandedState$get,
       _api$editorDisabled,
-      _this$api8;
+      _this$api9;
     var allowInteractiveExpand = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : true;
     var __livePage = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
     var cleanUpEditorDisabledOnChange = arguments.length > 10 ? arguments[10] : undefined;
@@ -160,21 +161,30 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
             (_this$api3 = _this.api) === null || _this$api3 === void 0 || _this$api3.core.actions.execute(function (_ref) {
               var tr = _ref.tr;
               tr.setSelection(_state.NodeSelection.create(state.doc, pos));
-              // Show the drag handle on the selected expand node
+              if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_control_migration')) {
+                var _this$api4;
+                var command = (_this$api4 = _this.api) === null || _this$api4 === void 0 || (_this$api4 = _this$api4.blockControls) === null || _this$api4 === void 0 ? void 0 : _this$api4.commands.showControlAtPosition(pos, _surfaceKeys.BLOCK_CONTROLS_DRAG_HANDLE, {
+                  isFocused: true
+                });
+                if (command) {
+                  return command({
+                    tr: tr
+                  });
+                }
+                return null;
+              }
               var node = state.doc.nodeAt(pos);
               if (node) {
-                // Find the anchor name from the DOM
                 var dom = _this.view.nodeDOM(pos);
                 if (dom instanceof HTMLElement) {
                   var anchorName = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? dom.getAttribute('data-node-anchor') : dom.getAttribute('data-drag-handler-anchor-name');
-                  // Only proceed if we found a valid anchor name
                   if (anchorName) {
-                    var _this$api4;
-                    var command = (_this$api4 = _this.api) === null || _this$api4 === void 0 || (_this$api4 = _this$api4.blockControls) === null || _this$api4 === void 0 ? void 0 : _this$api4.commands.showDragHandleAt(pos, anchorName, node.type.name, {
+                    var _this$api5;
+                    var _command = (_this$api5 = _this.api) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.blockControls) === null || _this$api5 === void 0 ? void 0 : _this$api5.commands.showDragHandleAt(pos, anchorName, node.type.name, {
                       isFocused: true
                     });
-                    if (command) {
-                      return command({
+                    if (_command) {
+                      return _command({
                         tr: tr
                       });
                     }
@@ -247,8 +257,8 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         return;
       }
       if (expandNode && (0, _utils.isEmptyNode)(state.schema)(expandNode)) {
-        var _this$api5;
-        (0, _commands.deleteExpand)((_this$api5 = _this.api) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.analytics) === null || _this$api5 === void 0 ? void 0 : _this$api5.actions)(state, _this.view.dispatch);
+        var _this$api6;
+        (0, _commands.deleteExpand)((_this$api6 = _this.api) === null || _this$api6 === void 0 || (_this$api6 = _this$api6.analytics) === null || _this$api6 === void 0 ? void 0 : _this$api6.actions)(state, _this.view.dispatch);
       }
     });
     (0, _defineProperty2.default)(this, "toggleExpand", function () {
@@ -257,12 +267,12 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         return;
       }
       if (_this.allowInteractiveExpand) {
-        var _this$api6;
+        var _this$api7;
         var _this$view3 = _this.view,
           state = _this$view3.state,
           dispatch = _this$view3.dispatch;
         (0, _commands.toggleExpandExpanded)({
-          editorAnalyticsAPI: (_this$api6 = _this.api) === null || _this$api6 === void 0 || (_this$api6 = _this$api6.analytics) === null || _this$api6 === void 0 ? void 0 : _this$api6.actions,
+          editorAnalyticsAPI: (_this$api7 = _this.api) === null || _this$api7 === void 0 || (_this$api7 = _this$api7.analytics) === null || _this$api7 === void 0 ? void 0 : _this$api7.actions,
           pos: pos,
           node: _this.node
         })(state, dispatch);
@@ -416,13 +426,13 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         selectionStart = _this$input6.selectionStart,
         selectionEnd = _this$input6.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === 0) {
-        var _this$api7;
+        var _this$api8;
         event.preventDefault();
         var _this$view9 = _this.view,
           state = _this$view9.state,
           dispatch = _this$view9.dispatch;
         _this.view.focus();
-        var selectionSharedState = ((_this$api7 = _this.api) === null || _this$api7 === void 0 || (_this$api7 = _this$api7.selection) === null || _this$api7 === void 0 ? void 0 : _this$api7.sharedState.currentState()) || {};
+        var selectionSharedState = ((_this$api8 = _this.api) === null || _this$api8 === void 0 || (_this$api8 = _this$api8.selection) === null || _this$api8 === void 0 ? void 0 : _this$api8.sharedState.currentState()) || {};
         // selectionRelativeToNode is undefined when user clicked to select node, then hit left to get focus in title
         // This is a special case where we want to bypass node selection and jump straight to gap cursor
         if ((selectionSharedState === null || selectionSharedState === void 0 ? void 0 : selectionSharedState.selectionRelativeToNode) === undefined) {
@@ -538,7 +548,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     // Prevent ProseMirror from getting a focus event (causes weird selection issues).
     this.titleContainer.addEventListener('focus', this.handleFocus);
     this.icon.addEventListener('keydown', this.handleIconKeyDown);
-    if ((_this$api8 = this.api) !== null && _this$api8 !== void 0 && _this$api8.editorDisabled) {
+    if ((_this$api9 = this.api) !== null && _this$api9 !== void 0 && _this$api9.editorDisabled) {
       if ((0, _isExperimentEnabled.isExperimentEnabled)('cc_editor_limited_mode_perf_improvements')) {
         if (this.content) {
           this.content.setAttribute('contenteditable', this.getContentEditable(this.node) ? 'true' : 'false');
@@ -610,6 +620,12 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           }
         });
 
+        // Sync up the aria-label with the current expand title.
+        if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2') && this.node.attrs.title !== node.attrs.title && this.content) {
+          var _node$attrs$title;
+          this.content.setAttribute('aria-label', (0, _NodeView.getExpandBodyAriaLabel)((_node$attrs$title = node.attrs.title) !== null && _node$attrs$title !== void 0 ? _node$attrs$title : '', this.intl));
+        }
+
         // This checks if the node has been replaced with a different version
         // and updates the state of the new node to match the old one
         // Eg. typing in a node changes it to a new node so it must be updated
@@ -666,13 +682,13 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
   }, {
     key: "isLimitedModeEnabled",
     value: function isLimitedModeEnabled() {
-      var _this$api9;
+      var _this$api0;
       // Read from `this.view.state` via the exposed plugin key rather than the shared state's
       // `enabled`, which reads a stale `false` during initial EditorView construction (the injection
       // API's editor state isn't wired up yet).
       //
       // Reads the plugin's derived `enabled`, so this covers every reason limited mode can be on.
-      return Boolean((_this$api9 = this.api) === null || _this$api9 === void 0 || (_this$api9 = _this$api9.limitedMode) === null || _this$api9 === void 0 || (_this$api9 = _this$api9.sharedState.currentState()) === null || _this$api9 === void 0 || (_this$api9 = _this$api9.limitedModePluginKey) === null || _this$api9 === void 0 || (_this$api9 = _this$api9.getState(this.view.state)) === null || _this$api9 === void 0 ? void 0 : _this$api9.enabled);
+      return Boolean((_this$api0 = this.api) === null || _this$api0 === void 0 || (_this$api0 = _this$api0.limitedMode) === null || _this$api0 === void 0 || (_this$api0 = _this$api0.sharedState.currentState()) === null || _this$api0 === void 0 || (_this$api0 = _this$api0.limitedModePluginKey) === null || _this$api0 === void 0 || (_this$api0 = _this$api0.getState(this.view.state)) === null || _this$api0 === void 0 ? void 0 : _this$api0.enabled);
     }
   }, {
     key: "updateDisplayStyle",

package/dist/cjs/singlePlayerExpand/plugin.js

@@ -10,9 +10,9 @@ var _react = _interopRequireDefault(require("react"));
 var _expand = require("@atlaskit/adf-schema/expand");
 var _nestedExpand = require("@atlaskit/adf-schema/nested-expand");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _assets = require("@atlaskit/editor-common/assets");
 var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _messages = require("@atlaskit/editor-common/messages");
-var _assets = require("@atlaskit/editor-common/assets");
 var _utils = require("@atlaskit/editor-common/utils");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");

package/dist/cjs/singlePlayerExpand/ui/NodeView.js

@@ -4,19 +4,26 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toDOM = exports.buildExpandClassName = void 0;
+exports.toDOM = exports.getExpandBodyAriaLabel = exports.buildExpandClassName = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _expand = require("@atlaskit/editor-common/expand");
 var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 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 buildExpandClassName = exports.buildExpandClassName = function buildExpandClassName(type, expanded) {
   return "".concat(_styles.expandClassNames.prefix, " ").concat(_styles.expandClassNames.type(type), " ").concat(expanded ? _styles.expandClassNames.expanded : '');
 };
+var getExpandBodyAriaLabel = exports.getExpandBodyAriaLabel = function getExpandBodyAriaLabel(title, intl) {
+  var safeTitle = title.trim() || (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyAriaLabelUntitled)) || _ui.expandMessages.expandBodyAriaLabelUntitled.defaultMessage;
+  return (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyAriaLabel, {
+    title: safeTitle
+  })) || _ui.expandMessages.expandBodyAriaLabel.defaultMessage.replace('{title}', safeTitle);
+};
 var toDOM = exports.toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditable) {
-  var _expandedState$get;
+  var _expandedState$get, _node$attrs$title, _intl$formatMessage;
   return ['div', _objectSpread({
     // prettier-ignore
     'class': buildExpandClassName(node.type.name, (_expandedState$get = _expand.expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false),
@@ -48,12 +55,17 @@ var toDOM = exports.toDOM = function toDOM(node, __livePage, intl, titleReadOnly
     placeholder: intl && typeof intl.formatMessage === 'function' && intl.formatMessage(_ui.expandMessages.expandPlaceholderText) || _ui.expandMessages.expandPlaceholderText.defaultMessage,
     type: 'text',
     readonly: titleReadOnly ? 'true' : undefined
-  }]]], ['div', {
+  }]]], [(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2') ? 'section' : 'div', _objectSpread(_objectSpread({
     // prettier-ignore
     class: "".concat(_styles.expandClassNames.content, " ").concat(_expand.expandedState.get(node) ? '' : _styles.expandClassNames.contentCollapsed),
-    contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined,
+    contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined
+  }, !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2') && {
     role: 'textbox',
     'aria-multiline': 'true',
-    'aria-label': intl && intl.formatMessage(_ui.expandMessages.expandBodyAriaLabel) || _ui.expandMessages.expandBodyAriaLabel.defaultMessage
-  }, 0]];
+    'aria-label': intl && intl.formatMessage(_ui.expandMessages.expandBodyAriaLabelOriginal) || _ui.expandMessages.expandBodyAriaLabelOriginal.defaultMessage
+  }), (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_expand_content_a11y_2') && {
+    'aria-label': getExpandBodyAriaLabel((_node$attrs$title = node.attrs.title) !== null && _node$attrs$title !== void 0 ? _node$attrs$title : '', intl),
+    'aria-description': (intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyAriaDescription)) || _ui.expandMessages.expandBodyAriaDescription.defaultMessage,
+    'aria-roledescription': (_intl$formatMessage = intl === null || intl === void 0 ? void 0 : intl.formatMessage(_ui.expandMessages.expandBodyRoleDescription)) !== null && _intl$formatMessage !== void 0 ? _intl$formatMessage : _ui.expandMessages.expandBodyRoleDescription.defaultMessage
+  }), 0]];
 };

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

@@ -13,8 +13,8 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _menuItem = require("@atlaskit/editor-common/quick-insert/menu-item");
 var _utils = require("@atlaskit/editor-common/utils");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expandElement = _interopRequireDefault(require("@atlaskit/icon-lab/core/expand-element"));
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _commands = require("../../legacyExpand/commands");
 var _commands2 = require("../../singlePlayerExpand/commands");
 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); }

package/dist/es2019/entry-points/plugin.js

@@ -1,2 +1,3 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
+
 export { expandPlugin } from '../plugin';