@atlaskit/editor-plugin-expand 3.2.11 → 3.2.13

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @atlaskit/editor-plugin-expand
 
+## 3.2.13
+
+### Patch Changes
+
+- [#159655](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159655)
+  [`24f8c627d50f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/24f8c627d50f2) - ##
+  WHAT? Remove experimental graceful edit mode from view mode plugin and associated props.
+
+  ## WHY?
+
+  This experiment is being cleaned up and we are no longer proceeding in this direction.
+
+  ## HOW to adjust?
+
+  This experiment was only enabled for Confluence and should not have been enabled in other places.
+  If for some reason any of the following props/state/methdos were used please remove them:
+
+  - isConsumption
+  - contentMode
+  - initialContentMode
+  - updateContentMode
+
+- Updated dependencies
+
+## 3.2.12
+
+### Patch Changes
+
+- [#159403](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159403)
+  [`8db235c23c369`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8db235c23c369) -
+  ENGHEALTH-28082:Added aria label to expand button
+- Updated dependencies
+
 ## 3.2.11
 
 ### Patch Changes

package/dist/cjs/legacyExpand/commands.js

@@ -78,7 +78,7 @@ var updateExpandTitle = exports.updateExpandTitle = function updateExpandTitle(_
     var node = state.doc.nodeAt(pos);
     if (node && node.type === nodeType && dispatch) {
       var tr = state.tr;
-      if (__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence')) {
+      if (__livePage) {
         tr.step(new _steps.SetAttrsStep(pos, _objectSpread(_objectSpread({}, node.attrs), {}, {
           title: title
         })));
@@ -102,7 +102,7 @@ var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandE
     if (node && node.type === nodeType && dispatch) {
       var tr = state.tr;
       var isExpandedNext = !node.attrs.__expanded;
-      if (__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence')) {
+      if (__livePage) {
         tr.step(new _steps.SetAttrsStep(pos, _objectSpread(_objectSpread({}, node.attrs), {}, {
           __expanded: isExpandedNext
         })));
@@ -115,7 +115,7 @@ var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandE
       // If we're going to collapse the expand and our cursor is currently inside
       // Move to a right gap cursor, if the toolbar is interacted (or an API),
       // it will insert below rather than inside (which will be invisible).
-      if (__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? isExpandedNext === true : isExpandedNext === false && (0, _transforms.findExpand)(state)) {
+      if (__livePage ? isExpandedNext === true : isExpandedNext === false && (0, _transforms.findExpand)(state)) {
         tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), _selection.Side.RIGHT));
       }
 
@@ -127,7 +127,7 @@ var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandE
         attributes: {
           platform: _analytics.PLATFORMS.WEB,
           mode: _analytics.MODE.EDITOR,
-          expanded: __livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !isExpandedNext : isExpandedNext
+          expanded: __livePage ? !isExpandedNext : isExpandedNext
         },
         eventType: _analytics.EVENT_TYPE.TRACK
       };

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

@@ -19,7 +19,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _history = require("@atlaskit/editor-prosemirror/history");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../commands");
 var _ExpandIconButton = require("../ui/ExpandIconButton");
 function buildExpandClassName(type, expanded) {
@@ -28,7 +27,7 @@ function buildExpandClassName(type, expanded) {
 var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditable) {
   return ['div', {
     // prettier-ignore
-    'class': buildExpandClassName(node.type.name, __livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded),
+    'class': buildExpandClassName(node.type.name, __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
     'data-node-type': node.type.name,
     'data-title': node.attrs.title
   }, ['div', {
@@ -272,7 +271,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       }
     });
     (0, _defineProperty2.default)(this, "isCollapsed", function () {
-      if (_this.__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence')) {
+      if (_this.__livePage) {
         return _this.node.attrs.__expanded;
       }
       return !_this.node.attrs.__expanded;
@@ -402,7 +401,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       return;
     });
     (0, _defineProperty2.default)(this, "getContentEditable", function (node) {
-      var contentEditable = _this.__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded;
+      var contentEditable = _this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded;
       if (_this.api && _this.api.editorDisabled) {
         var _this$api$editorDisab;
         return !((_this$api$editorDisab = _this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
@@ -495,7 +494,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         return /*#__PURE__*/_react.default.createElement(_ExpandIconButton.ExpandIconButton, {
           intl: intl,
           allowInteractiveExpand: _this3.allowInteractiveExpand,
-          expanded: _this3.__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
+          expanded: _this3.__livePage ? !__expanded : __expanded
         });
       }, this.icon, this.renderKey);
     }

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

@@ -11,7 +11,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../commands");
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -92,9 +91,7 @@ function expandKeymap(api, options) {
     var selection = state.selection,
       schema = state.schema;
     var nodeBefore = selection.$from.nodeBefore;
-    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
+    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
       var _$from = selection.$from;
       return (0, _commands.focusTitle)(Math.max(_$from.pos - 1, 0))(state, dispatch, editorView);
     }
@@ -118,9 +115,7 @@ function expandKeymap(api, options) {
       var expandBefore = (0, _transforms.findExpand)(state, sel);
       if (sel && expandBefore) {
         // moving cursor from outside of an expand to the title when it is collapsed
-        if (
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
+        if (options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
           return (0, _commands.focusTitle)(expandBefore.start)(state, dispatch, editorView);
         }
         // moving cursor from outside of an expand to the content when it is expanded
@@ -144,9 +139,7 @@ function expandKeymap(api, options) {
       nestedExpand = _state$schema$nodes.nestedExpand;
     var selection = state.selection;
     var nodeAfter = selection.$from.nodeAfter;
-    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
+    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
       var $from = selection.$from;
       return (0, _commands.focusTitle)($from.pos + 1)(state, dispatch, editorView);
     }
@@ -179,9 +172,7 @@ function expandKeymap(api, options) {
       // @see ED-7977
       var sel = _state.Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       var expandBefore = (0, _transforms.findExpand)(state, sel);
-      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (
-      // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-      (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
         return (0, _commands.focusTitle)(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

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

@@ -61,7 +61,8 @@ var withTooltip = exports.withTooltip = function withTooltip(WrapperComponent) {
 };
 var CustomButton = exports.CustomButton = function CustomButton(props) {
   var allowInteractiveExpand = props.allowInteractiveExpand,
-    expanded = props.expanded;
+    expanded = props.expanded,
+    intl = props.intl;
   var useTheme = (0, _react.useCallback)(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -79,6 +80,8 @@ var CustomButton = exports.CustomButton = function CustomButton(props) {
       })
     }, rest);
   }, [props]);
+  var label = expanded ? _ui.expandMessages.collapseNode : _ui.expandMessages.expandNode;
+  var labelIntl = intl ? intl.formatMessage(label) : label.defaultMessage;
   return (0, _react2.jsx)(_customThemeButton.default, {
     appearance: "subtle"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -90,6 +93,7 @@ var CustomButton = exports.CustomButton = function CustomButton(props) {
     }),
     shouldFitContainer: true,
     theme: useTheme,
+    "aria-label": labelIntl,
     "aria-expanded": expanded,
     isDisabled: !allowInteractiveExpand
   });

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

@@ -20,7 +20,6 @@ var _history = require("@atlaskit/editor-prosemirror/history");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../commands");
 var _ExpandButton = require("../ui/ExpandButton");
 var _NodeView = require("../ui/NodeView");
@@ -28,7 +27,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
   function ExpandNodeView(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI) {
     var _this = this,
       _api$editorDisabled,
-      _this$api8;
+      _this$api6;
     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;
@@ -123,17 +122,9 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "handleFocus", function (event) {
       event.stopImmediatePropagation();
     });
-    (0, _defineProperty2.default)(this, "handleInputClick", function () {
-      if (!(0, _experiments.editorExperiment)('live_pages_graceful_edit', 'control')) {
-        var _this$api2, _this$api3;
-        (_this$api2 = _this.api) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.core) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.actions) === null || _this$api2 === void 0 || _this$api2.execute((_this$api3 = _this.api) === null || _this$api3 === void 0 || (_this$api3 = _this$api3.editorViewMode) === null || _this$api3 === void 0 ? void 0 : _this$api3.commands.updateContentMode({
-          type: 'intent-to-edit'
-        }));
-      }
-    });
     (0, _defineProperty2.default)(this, "handleInputFocus", function () {
-      var _this$api4;
-      _this.decorationCleanup = (_this$api4 = _this.api) === null || _this$api4 === void 0 || (_this$api4 = _this$api4.selectionMarker) === null || _this$api4 === void 0 || (_this$api4 = _this$api4.actions) === null || _this$api4 === void 0 ? void 0 : _this$api4.hideDecoration();
+      var _this$api2;
+      _this.decorationCleanup = (_this$api2 = _this.api) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.selectionMarker) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.actions) === null || _this$api2 === void 0 ? void 0 : _this$api2.hideDecoration();
     });
     (0, _defineProperty2.default)(this, "handleBlur", function () {
       var _this$decorationClean;
@@ -185,8 +176,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$api3;
+        (0, _commands.deleteExpand)((_this$api3 = _this.api) === null || _this$api3 === void 0 || (_this$api3 = _this$api3.analytics) === null || _this$api3 === void 0 ? void 0 : _this$api3.actions)(state, _this.view.dispatch);
       }
     });
     (0, _defineProperty2.default)(this, "toggleExpand", function () {
@@ -195,12 +186,12 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         return;
       }
       if (_this.allowInteractiveExpand) {
-        var _this$api6;
+        var _this$api4;
         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$api4 = _this.api) === null || _this$api4 === void 0 || (_this$api4 = _this$api4.analytics) === null || _this$api4 === void 0 ? void 0 : _this$api4.actions,
           pos: pos,
           node: _this.node
         })(state, dispatch);
@@ -322,13 +313,13 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         selectionStart = _this$input5.selectionStart,
         selectionEnd = _this$input5.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === 0) {
-        var _this$api7;
+        var _this$api5;
         event.preventDefault();
         var _this$view8 = _this.view,
           state = _this$view8.state,
           dispatch = _this$view8.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$api5 = _this.api) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.selection) === null || _this$api5 === void 0 ? void 0 : _this$api5.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) {
@@ -429,11 +420,8 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     // If the user interacts in our title bar (either toggle or input)
     // Prevent ProseMirror from getting a focus event (causes weird selection issues).
     this.titleContainer.addEventListener('focus', this.handleFocus);
-    if (!(0, _experiments.editorExperiment)('live_pages_graceful_edit', 'control')) {
-      this.input.addEventListener('click', this.handleInputClick);
-    }
     this.icon.addEventListener('keydown', this.handleIconKeyDown);
-    if ((_this$api8 = this.api) !== null && _this$api8 !== void 0 && _this$api8.editorDisabled) {
+    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled) {
       this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(function (sharedState) {
         var editorDisabled = sharedState.nextSharedState.editorDisabled;
         if (_this.input) {
@@ -535,9 +523,6 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       this.input.removeEventListener('blur', this.handleBlur);
       this.input.removeEventListener('focus', this.handleInputFocus);
       this.titleContainer.removeEventListener('focus', this.handleFocus);
-      if (!(0, _experiments.editorExperiment)('live_pages_graceful_edit', 'control')) {
-        this.input.removeEventListener('click', this.handleInputClick);
-      }
       this.icon.removeEventListener('keydown', this.handleIconKeyDown);
       (_this$decorationClean2 = this.decorationCleanup) === null || _this$decorationClean2 === void 0 || _this$decorationClean2.call(this);
       if (this.cleanUpEditorDisabledOnChange) {

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

@@ -63,6 +63,10 @@ var ExpandButtonInner = exports.ExpandButtonInner = function ExpandButtonInner(p
       })
     }, rest);
   }, [props]);
+  var intl = props.intl,
+    expanded = props.expanded;
+  var label = expanded ? _ui.expandMessages.collapseNode : _ui.expandMessages.expandNode;
+  var labelIntl = intl ? intl.formatMessage(label) : label.defaultMessage;
   return (0, _react2.jsx)(_customThemeButton.default, {
     appearance: "subtle"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -74,6 +78,7 @@ var ExpandButtonInner = exports.ExpandButtonInner = function ExpandButtonInner(p
     }),
     shouldFitContainer: true,
     theme: useTheme,
+    "aria-label": labelIntl,
     "aria-expanded": props.expanded,
     isDisabled: !props.allowInteractiveExpand
   });

package/dist/es2019/legacyExpand/commands.js

@@ -62,7 +62,7 @@ export const updateExpandTitle = ({
     const {
       tr
     } = state;
-    if (__livePage && fg('platform.editor.live-pages-expand-divergence')) {
+    if (__livePage) {
       tr.step(new SetAttrsStep(pos, {
         ...node.attrs,
         title
@@ -89,7 +89,7 @@ export const toggleExpandExpanded = ({
       tr
     } = state;
     const isExpandedNext = !node.attrs.__expanded;
-    if (__livePage && fg('platform.editor.live-pages-expand-divergence')) {
+    if (__livePage) {
       tr.step(new SetAttrsStep(pos, {
         ...node.attrs,
         __expanded: isExpandedNext
@@ -104,7 +104,7 @@ export const toggleExpandExpanded = ({
     // If we're going to collapse the expand and our cursor is currently inside
     // Move to a right gap cursor, if the toolbar is interacted (or an API),
     // it will insert below rather than inside (which will be invisible).
-    if (__livePage && fg('platform.editor.live-pages-expand-divergence') ? isExpandedNext === true : isExpandedNext === false && findExpand(state)) {
+    if (__livePage ? isExpandedNext === true : isExpandedNext === false && findExpand(state)) {
       tr.setSelection(new GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), Side.RIGHT));
     }
 
@@ -116,7 +116,7 @@ export const toggleExpandExpanded = ({
       attributes: {
         platform: PLATFORMS.WEB,
         mode: MODE.EDITOR,
-        expanded: __livePage && fg('platform.editor.live-pages-expand-divergence') ? !isExpandedNext : isExpandedNext
+        expanded: __livePage ? !isExpandedNext : isExpandedNext
       },
       eventType: EVENT_TYPE.TRACK
     };

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

@@ -9,7 +9,6 @@ import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpandAtPos, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandIconButton } from '../ui/ExpandIconButton';
 function buildExpandClassName(type, expanded) {
@@ -17,7 +16,7 @@ function buildExpandClassName(type, expanded) {
 }
 const toDOM = (node, __livePage, intl, titleReadOnly, contentEditable) => ['div', {
   // prettier-ignore
-  'class': buildExpandClassName(node.type.name, __livePage && fg('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded),
+  'class': buildExpandClassName(node.type.name, __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
   'data-node-type': node.type.name,
   'data-title': node.attrs.title
 }, ['div', {
@@ -263,7 +262,7 @@ export class ExpandNodeView {
       }
     });
     _defineProperty(this, "isCollapsed", () => {
-      if (this.__livePage && fg('platform.editor.live-pages-expand-divergence')) {
+      if (this.__livePage) {
         return this.node.attrs.__expanded;
       }
       return !this.node.attrs.__expanded;
@@ -403,7 +402,7 @@ export class ExpandNodeView {
       return;
     });
     _defineProperty(this, "getContentEditable", node => {
-      const contentEditable = this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded;
+      const contentEditable = this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded;
       if (this.api && this.api.editorDisabled) {
         var _this$api$editorDisab;
         return !((_this$api$editorDisab = this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
@@ -491,7 +490,7 @@ export class ExpandNodeView {
     this.nodeViewPortalProviderAPI.render(() => /*#__PURE__*/React.createElement(ExpandIconButton, {
       intl: intl,
       allowInteractiveExpand: this.allowInteractiveExpand,
-      expanded: this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
+      expanded: this.__livePage ? !__expanded : __expanded
     }), this.icon, this.renderKey);
   }
   stopEvent(event) {

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

@@ -5,7 +5,6 @@ import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/uti
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isInTable } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 const isExpandNode = node => {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -98,9 +97,7 @@ export function expandKeymap(api, options) {
     const {
       nodeBefore
     } = selection.$from;
-    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
       const {
         $from
       } = selection;
@@ -128,9 +125,7 @@ export function expandKeymap(api, options) {
       const expandBefore = findExpand(state, sel);
       if (sel && expandBefore) {
         // moving cursor from outside of an expand to the title when it is collapsed
-        if (
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
+        if (options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
           return focusTitle(expandBefore.start)(state, dispatch, editorView);
         }
         // moving cursor from outside of an expand to the content when it is expanded
@@ -159,9 +154,7 @@ export function expandKeymap(api, options) {
     const {
       nodeAfter
     } = selection.$from;
-    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
       const {
         $from
       } = selection;
@@ -203,9 +196,7 @@ export function expandKeymap(api, options) {
       // @see ED-7977
       const sel = Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       const expandBefore = findExpand(state, sel);
-      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (
-      // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-      fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
         return focusTitle(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

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

@@ -40,7 +40,8 @@ export const withTooltip = WrapperComponent => {
 export const CustomButton = props => {
   const {
     allowInteractiveExpand,
-    expanded
+    expanded,
+    intl
   } = props;
   const useTheme = useCallback(
   // Ignored via go/ees005
@@ -62,6 +63,8 @@ export const CustomButton = props => {
       ...rest
     };
   }, [props]);
+  const label = expanded ? expandMessages.collapseNode : expandMessages.expandNode;
+  const labelIntl = intl ? intl.formatMessage(label) : label.defaultMessage;
   return jsx(Button, {
     appearance: "subtle"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -73,6 +76,7 @@ export const CustomButton = props => {
     }),
     shouldFitContainer: true,
     theme: useTheme,
+    "aria-label": labelIntl,
     "aria-expanded": expanded,
     isDisabled: !allowInteractiveExpand
   });

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

@@ -10,13 +10,12 @@ import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandButton } from '../ui/ExpandButton';
 import { buildExpandClassName, toDOM } from '../ui/NodeView';
 export class ExpandNodeView {
   constructor(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI, allowInteractiveExpand = true, __livePage = false, cleanUpEditorDisabledOnChange) {
-    var _api$editorDisabled, _api$editorDisabled$s, _this$api8;
+    var _api$editorDisabled, _api$editorDisabled$s, _this$api6;
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
     _defineProperty(this, "focusTitle", () => {
@@ -109,17 +108,9 @@ export class ExpandNodeView {
     _defineProperty(this, "handleFocus", event => {
       event.stopImmediatePropagation();
     });
-    _defineProperty(this, "handleInputClick", () => {
-      if (!editorExperiment('live_pages_graceful_edit', 'control')) {
-        var _this$api2, _this$api2$core, _this$api2$core$actio, _this$api3, _this$api3$editorView;
-        (_this$api2 = this.api) === null || _this$api2 === void 0 ? void 0 : (_this$api2$core = _this$api2.core) === null || _this$api2$core === void 0 ? void 0 : (_this$api2$core$actio = _this$api2$core.actions) === null || _this$api2$core$actio === void 0 ? void 0 : _this$api2$core$actio.execute((_this$api3 = this.api) === null || _this$api3 === void 0 ? void 0 : (_this$api3$editorView = _this$api3.editorViewMode) === null || _this$api3$editorView === void 0 ? void 0 : _this$api3$editorView.commands.updateContentMode({
-          type: 'intent-to-edit'
-        }));
-      }
-    });
     _defineProperty(this, "handleInputFocus", () => {
-      var _this$api4, _this$api4$selectionM, _this$api4$selectionM2;
-      this.decorationCleanup = (_this$api4 = this.api) === null || _this$api4 === void 0 ? void 0 : (_this$api4$selectionM = _this$api4.selectionMarker) === null || _this$api4$selectionM === void 0 ? void 0 : (_this$api4$selectionM2 = _this$api4$selectionM.actions) === null || _this$api4$selectionM2 === void 0 ? void 0 : _this$api4$selectionM2.hideDecoration();
+      var _this$api2, _this$api2$selectionM, _this$api2$selectionM2;
+      this.decorationCleanup = (_this$api2 = this.api) === null || _this$api2 === void 0 ? void 0 : (_this$api2$selectionM = _this$api2.selectionMarker) === null || _this$api2$selectionM === void 0 ? void 0 : (_this$api2$selectionM2 = _this$api2$selectionM.actions) === null || _this$api2$selectionM2 === void 0 ? void 0 : _this$api2$selectionM2.hideDecoration();
     });
     _defineProperty(this, "handleBlur", () => {
       var _this$decorationClean;
@@ -174,8 +165,8 @@ export class ExpandNodeView {
         return;
       }
       if (expandNode && isEmptyNode(state.schema)(expandNode)) {
-        var _this$api5, _this$api5$analytics;
-        deleteExpand((_this$api5 = this.api) === null || _this$api5 === void 0 ? void 0 : (_this$api5$analytics = _this$api5.analytics) === null || _this$api5$analytics === void 0 ? void 0 : _this$api5$analytics.actions)(state, this.view.dispatch);
+        var _this$api3, _this$api3$analytics;
+        deleteExpand((_this$api3 = this.api) === null || _this$api3 === void 0 ? void 0 : (_this$api3$analytics = _this$api3.analytics) === null || _this$api3$analytics === void 0 ? void 0 : _this$api3$analytics.actions)(state, this.view.dispatch);
       }
     });
     _defineProperty(this, "toggleExpand", () => {
@@ -184,13 +175,13 @@ export class ExpandNodeView {
         return;
       }
       if (this.allowInteractiveExpand) {
-        var _this$api6, _this$api6$analytics;
+        var _this$api4, _this$api4$analytics;
         const {
           state,
           dispatch
         } = this.view;
         toggleExpandExpanded({
-          editorAnalyticsAPI: (_this$api6 = this.api) === null || _this$api6 === void 0 ? void 0 : (_this$api6$analytics = _this$api6.analytics) === null || _this$api6$analytics === void 0 ? void 0 : _this$api6$analytics.actions,
+          editorAnalyticsAPI: (_this$api4 = this.api) === null || _this$api4 === void 0 ? void 0 : (_this$api4$analytics = _this$api4.analytics) === null || _this$api4$analytics === void 0 ? void 0 : _this$api4$analytics.actions,
           pos,
           node: this.node
         })(state, dispatch);
@@ -320,14 +311,14 @@ export class ExpandNodeView {
         selectionEnd
       } = this.input;
       if (selectionStart === selectionEnd && selectionStart === 0) {
-        var _this$api7, _this$api7$selection;
+        var _this$api5, _this$api5$selection;
         event.preventDefault();
         const {
           state,
           dispatch
         } = this.view;
         this.view.focus();
-        const selectionSharedState = ((_this$api7 = this.api) === null || _this$api7 === void 0 ? void 0 : (_this$api7$selection = _this$api7.selection) === null || _this$api7$selection === void 0 ? void 0 : _this$api7$selection.sharedState.currentState()) || {};
+        const selectionSharedState = ((_this$api5 = this.api) === null || _this$api5 === void 0 ? void 0 : (_this$api5$selection = _this$api5.selection) === null || _this$api5$selection === void 0 ? void 0 : _this$api5$selection.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) {
@@ -429,11 +420,8 @@ export class ExpandNodeView {
     // If the user interacts in our title bar (either toggle or input)
     // Prevent ProseMirror from getting a focus event (causes weird selection issues).
     this.titleContainer.addEventListener('focus', this.handleFocus);
-    if (!editorExperiment('live_pages_graceful_edit', 'control')) {
-      this.input.addEventListener('click', this.handleInputClick);
-    }
     this.icon.addEventListener('keydown', this.handleIconKeyDown);
-    if ((_this$api8 = this.api) !== null && _this$api8 !== void 0 && _this$api8.editorDisabled) {
+    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled) {
       this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(sharedState => {
         const editorDisabled = sharedState.nextSharedState.editorDisabled;
         if (this.input) {
@@ -522,9 +510,6 @@ export class ExpandNodeView {
     this.input.removeEventListener('blur', this.handleBlur);
     this.input.removeEventListener('focus', this.handleInputFocus);
     this.titleContainer.removeEventListener('focus', this.handleFocus);
-    if (!editorExperiment('live_pages_graceful_edit', 'control')) {
-      this.input.removeEventListener('click', this.handleInputClick);
-    }
     this.icon.removeEventListener('keydown', this.handleIconKeyDown);
     (_this$decorationClean2 = this.decorationCleanup) === null || _this$decorationClean2 === void 0 ? void 0 : _this$decorationClean2.call(this);
     if (this.cleanUpEditorDisabledOnChange) {

package/dist/es2019/singlePlayerExpand/ui/ExpandButton.js

@@ -52,6 +52,12 @@ export const ExpandButtonInner = props => {
       ...rest
     };
   }, [props]);
+  const {
+    intl,
+    expanded
+  } = props;
+  const label = expanded ? expandMessages.collapseNode : expandMessages.expandNode;
+  const labelIntl = intl ? intl.formatMessage(label) : label.defaultMessage;
   return jsx(Button, {
     appearance: "subtle"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -63,6 +69,7 @@ export const ExpandButtonInner = props => {
     }),
     shouldFitContainer: true,
     theme: useTheme,
+    "aria-label": labelIntl,
     "aria-expanded": props.expanded,
     isDisabled: !props.allowInteractiveExpand
   });

package/dist/esm/legacyExpand/commands.js

@@ -71,7 +71,7 @@ export var updateExpandTitle = function updateExpandTitle(_ref) {
     var node = state.doc.nodeAt(pos);
     if (node && node.type === nodeType && dispatch) {
       var tr = state.tr;
-      if (__livePage && fg('platform.editor.live-pages-expand-divergence')) {
+      if (__livePage) {
         tr.step(new SetAttrsStep(pos, _objectSpread(_objectSpread({}, node.attrs), {}, {
           title: title
         })));
@@ -95,7 +95,7 @@ export var toggleExpandExpanded = function toggleExpandExpanded(_ref2) {
     if (node && node.type === nodeType && dispatch) {
       var tr = state.tr;
       var isExpandedNext = !node.attrs.__expanded;
-      if (__livePage && fg('platform.editor.live-pages-expand-divergence')) {
+      if (__livePage) {
         tr.step(new SetAttrsStep(pos, _objectSpread(_objectSpread({}, node.attrs), {}, {
           __expanded: isExpandedNext
         })));
@@ -108,7 +108,7 @@ export var toggleExpandExpanded = function toggleExpandExpanded(_ref2) {
       // If we're going to collapse the expand and our cursor is currently inside
       // Move to a right gap cursor, if the toolbar is interacted (or an API),
       // it will insert below rather than inside (which will be invisible).
-      if (__livePage && fg('platform.editor.live-pages-expand-divergence') ? isExpandedNext === true : isExpandedNext === false && findExpand(state)) {
+      if (__livePage ? isExpandedNext === true : isExpandedNext === false && findExpand(state)) {
         tr.setSelection(new GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), Side.RIGHT));
       }
 
@@ -120,7 +120,7 @@ export var toggleExpandExpanded = function toggleExpandExpanded(_ref2) {
         attributes: {
           platform: PLATFORMS.WEB,
           mode: MODE.EDITOR,
-          expanded: __livePage && fg('platform.editor.live-pages-expand-divergence') ? !isExpandedNext : isExpandedNext
+          expanded: __livePage ? !isExpandedNext : isExpandedNext
         },
         eventType: EVENT_TYPE.TRACK
       };

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

@@ -11,7 +11,6 @@ import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpandAtPos, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandIconButton } from '../ui/ExpandIconButton';
 function buildExpandClassName(type, expanded) {
@@ -20,7 +19,7 @@ function buildExpandClassName(type, expanded) {
 var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditable) {
   return ['div', {
     // prettier-ignore
-    'class': buildExpandClassName(node.type.name, __livePage && fg('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded),
+    'class': buildExpandClassName(node.type.name, __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
     'data-node-type': node.type.name,
     'data-title': node.attrs.title
   }, ['div', {
@@ -264,7 +263,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       }
     });
     _defineProperty(this, "isCollapsed", function () {
-      if (_this.__livePage && fg('platform.editor.live-pages-expand-divergence')) {
+      if (_this.__livePage) {
         return _this.node.attrs.__expanded;
       }
       return !_this.node.attrs.__expanded;
@@ -394,7 +393,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       return;
     });
     _defineProperty(this, "getContentEditable", function (node) {
-      var contentEditable = _this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded;
+      var contentEditable = _this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded;
       if (_this.api && _this.api.editorDisabled) {
         var _this$api$editorDisab;
         return !((_this$api$editorDisab = _this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
@@ -487,7 +486,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         return /*#__PURE__*/React.createElement(ExpandIconButton, {
           intl: intl,
           allowInteractiveExpand: _this3.allowInteractiveExpand,
-          expanded: _this3.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
+          expanded: _this3.__livePage ? !__expanded : __expanded
         });
       }, this.icon, this.renderKey);
     }

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

@@ -5,7 +5,6 @@ import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/uti
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isInTable } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -86,9 +85,7 @@ export function expandKeymap(api, options) {
     var selection = state.selection,
       schema = state.schema;
     var nodeBefore = selection.$from.nodeBefore;
-    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
       var _$from = selection.$from;
       return focusTitle(Math.max(_$from.pos - 1, 0))(state, dispatch, editorView);
     }
@@ -112,9 +109,7 @@ export function expandKeymap(api, options) {
       var expandBefore = findExpand(state, sel);
       if (sel && expandBefore) {
         // moving cursor from outside of an expand to the title when it is collapsed
-        if (
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
+        if (options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
           return focusTitle(expandBefore.start)(state, dispatch, editorView);
         }
         // moving cursor from outside of an expand to the content when it is expanded
@@ -138,9 +133,7 @@ export function expandKeymap(api, options) {
       nestedExpand = _state$schema$nodes.nestedExpand;
     var selection = state.selection;
     var nodeAfter = selection.$from.nodeAfter;
-    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
       var $from = selection.$from;
       return focusTitle($from.pos + 1)(state, dispatch, editorView);
     }
@@ -173,9 +166,7 @@ export function expandKeymap(api, options) {
       // @see ED-7977
       var sel = Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       var expandBefore = findExpand(state, sel);
-      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (
-      // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-      fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
         return focusTitle(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

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

@@ -54,7 +54,8 @@ export var withTooltip = function withTooltip(WrapperComponent) {
 };
 export var CustomButton = function CustomButton(props) {
   var allowInteractiveExpand = props.allowInteractiveExpand,
-    expanded = props.expanded;
+    expanded = props.expanded,
+    intl = props.intl;
   var useTheme = useCallback(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -72,6 +73,8 @@ export var CustomButton = function CustomButton(props) {
       })
     }, rest);
   }, [props]);
+  var label = expanded ? expandMessages.collapseNode : expandMessages.expandNode;
+  var labelIntl = intl ? intl.formatMessage(label) : label.defaultMessage;
   return jsx(Button, {
     appearance: "subtle"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -83,6 +86,7 @@ export var CustomButton = function CustomButton(props) {
     }),
     shouldFitContainer: true,
     theme: useTheme,
+    "aria-label": labelIntl,
     "aria-expanded": expanded,
     isDisabled: !allowInteractiveExpand
   });

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

@@ -12,7 +12,6 @@ import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandButton } from '../ui/ExpandButton';
 import { buildExpandClassName, toDOM } from '../ui/NodeView';
@@ -20,7 +19,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
   function ExpandNodeView(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI) {
     var _this = this,
       _api$editorDisabled,
-      _this$api8;
+      _this$api6;
     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;
@@ -115,17 +114,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     _defineProperty(this, "handleFocus", function (event) {
       event.stopImmediatePropagation();
     });
-    _defineProperty(this, "handleInputClick", function () {
-      if (!editorExperiment('live_pages_graceful_edit', 'control')) {
-        var _this$api2, _this$api3;
-        (_this$api2 = _this.api) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.core) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.actions) === null || _this$api2 === void 0 || _this$api2.execute((_this$api3 = _this.api) === null || _this$api3 === void 0 || (_this$api3 = _this$api3.editorViewMode) === null || _this$api3 === void 0 ? void 0 : _this$api3.commands.updateContentMode({
-          type: 'intent-to-edit'
-        }));
-      }
-    });
     _defineProperty(this, "handleInputFocus", function () {
-      var _this$api4;
-      _this.decorationCleanup = (_this$api4 = _this.api) === null || _this$api4 === void 0 || (_this$api4 = _this$api4.selectionMarker) === null || _this$api4 === void 0 || (_this$api4 = _this$api4.actions) === null || _this$api4 === void 0 ? void 0 : _this$api4.hideDecoration();
+      var _this$api2;
+      _this.decorationCleanup = (_this$api2 = _this.api) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.selectionMarker) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.actions) === null || _this$api2 === void 0 ? void 0 : _this$api2.hideDecoration();
     });
     _defineProperty(this, "handleBlur", function () {
       var _this$decorationClean;
@@ -177,8 +168,8 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         return;
       }
       if (expandNode && isEmptyNode(state.schema)(expandNode)) {
-        var _this$api5;
-        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$api3;
+        deleteExpand((_this$api3 = _this.api) === null || _this$api3 === void 0 || (_this$api3 = _this$api3.analytics) === null || _this$api3 === void 0 ? void 0 : _this$api3.actions)(state, _this.view.dispatch);
       }
     });
     _defineProperty(this, "toggleExpand", function () {
@@ -187,12 +178,12 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         return;
       }
       if (_this.allowInteractiveExpand) {
-        var _this$api6;
+        var _this$api4;
         var _this$view3 = _this.view,
           state = _this$view3.state,
           dispatch = _this$view3.dispatch;
         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$api4 = _this.api) === null || _this$api4 === void 0 || (_this$api4 = _this$api4.analytics) === null || _this$api4 === void 0 ? void 0 : _this$api4.actions,
           pos: pos,
           node: _this.node
         })(state, dispatch);
@@ -314,13 +305,13 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         selectionStart = _this$input5.selectionStart,
         selectionEnd = _this$input5.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === 0) {
-        var _this$api7;
+        var _this$api5;
         event.preventDefault();
         var _this$view8 = _this.view,
           state = _this$view8.state,
           dispatch = _this$view8.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$api5 = _this.api) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.selection) === null || _this$api5 === void 0 ? void 0 : _this$api5.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) {
@@ -421,11 +412,8 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     // If the user interacts in our title bar (either toggle or input)
     // Prevent ProseMirror from getting a focus event (causes weird selection issues).
     this.titleContainer.addEventListener('focus', this.handleFocus);
-    if (!editorExperiment('live_pages_graceful_edit', 'control')) {
-      this.input.addEventListener('click', this.handleInputClick);
-    }
     this.icon.addEventListener('keydown', this.handleIconKeyDown);
-    if ((_this$api8 = this.api) !== null && _this$api8 !== void 0 && _this$api8.editorDisabled) {
+    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled) {
       this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(function (sharedState) {
         var editorDisabled = sharedState.nextSharedState.editorDisabled;
         if (_this.input) {
@@ -527,9 +515,6 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       this.input.removeEventListener('blur', this.handleBlur);
       this.input.removeEventListener('focus', this.handleInputFocus);
       this.titleContainer.removeEventListener('focus', this.handleFocus);
-      if (!editorExperiment('live_pages_graceful_edit', 'control')) {
-        this.input.removeEventListener('click', this.handleInputClick);
-      }
       this.icon.removeEventListener('keydown', this.handleIconKeyDown);
       (_this$decorationClean2 = this.decorationCleanup) === null || _this$decorationClean2 === void 0 || _this$decorationClean2.call(this);
       if (this.cleanUpEditorDisabledOnChange) {

package/dist/esm/singlePlayerExpand/ui/ExpandButton.js

@@ -54,6 +54,10 @@ export var ExpandButtonInner = function ExpandButtonInner(props) {
       })
     }, rest);
   }, [props]);
+  var intl = props.intl,
+    expanded = props.expanded;
+  var label = expanded ? expandMessages.collapseNode : expandMessages.expandNode;
+  var labelIntl = intl ? intl.formatMessage(label) : label.defaultMessage;
   return jsx(Button, {
     appearance: "subtle"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -65,6 +69,7 @@ export var ExpandButtonInner = function ExpandButtonInner(props) {
     }),
     shouldFitContainer: true,
     theme: useTheme,
+    "aria-label": labelIntl,
     "aria-expanded": props.expanded,
     isDisabled: !props.allowInteractiveExpand
   });

package/dist/types/singlePlayerExpand/node-views/index.d.ts

@@ -31,7 +31,6 @@ export declare class ExpandNodeView implements NodeView {
     private handleClick;
     private handleInput;
     private handleFocus;
-    private handleInputClick;
     private handleInputFocus;
     private handleBlur;
     private handleTitleKeydown;

package/dist/types-ts4.5/singlePlayerExpand/node-views/index.d.ts

@@ -31,7 +31,6 @@ export declare class ExpandNodeView implements NodeView {
     private handleClick;
     private handleInput;
     private handleFocus;
-    private handleInputClick;
     private handleInputFocus;
     private handleBlur;
     private handleTitleKeydown;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "3.2.11",
+	"version": "3.2.13",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,21 +34,21 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/button": "^23.0.0",
-		"@atlaskit/editor-common": "^105.0.0",
-		"@atlaskit/editor-plugin-analytics": "^2.2.0",
+		"@atlaskit/button": "^23.2.0",
+		"@atlaskit/editor-common": "^105.10.0",
+		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^4.0.0",
 		"@atlaskit/editor-plugin-selection": "^2.2.0",
-		"@atlaskit/editor-plugin-selection-marker": "^2.3.0",
+		"@atlaskit/editor-plugin-selection-marker": "^2.4.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^26.0.0",
+		"@atlaskit/icon": "^26.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.19.0",
-		"@atlaskit/tokens": "^4.8.0",
+		"@atlaskit/tmp-editor-statsig": "^5.0.0",
+		"@atlaskit/tokens": "^4.9.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -65,8 +65,8 @@
 		"@atlaskit/editor-plugin-content-insertion": "^2.1.0",
 		"@atlaskit/editor-plugin-guideline": "^2.0.0",
 		"@atlaskit/editor-plugin-quick-insert": "^2.5.0",
-		"@atlaskit/editor-plugin-table": "^10.9.0",
-		"@atlaskit/editor-plugin-type-ahead": "^2.6.0",
+		"@atlaskit/editor-plugin-table": "^10.11.0",
+		"@atlaskit/editor-plugin-type-ahead": "^2.7.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
 		"@testing-library/react": "^13.4.0",
 		"react-test-renderer": "^18.2.0",
@@ -106,9 +106,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform.editor.live-pages-expand-divergence": {
-			"type": "boolean"
-		},
 		"platform-editor-single-player-expand": {
 			"type": "boolean"
 		},