@atlaskit/editor-plugin-expand 3.2.5 → 3.2.7

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-expand
 
+## 3.2.7
+
+### Patch Changes
+
+- [#139698](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/139698)
+  [`cf8ea53ed0264`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cf8ea53ed0264) -
+  Clean-up nested expand feature gate
+- Updated dependencies
+
+## 3.2.6
+
+### Patch Changes
+
+- [#141513](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/141513)
+  [`15ae5c8a85a20`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/15ae5c8a85a20) -
+  Do not re-render on every transaction in single player expand.
+- Updated dependencies
+
 ## 3.2.5
 
 ### Patch Changes

package/dist/cjs/legacyExpand/commands.js

@@ -16,7 +16,6 @@ var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _utils4 = require("../utils");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 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; }
@@ -49,12 +48,10 @@ var deleteExpandAtPos = exports.deleteExpandAtPos = function deleteExpandAtPos(e
         var tr = state.tr;
         tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-        if ((0, _experiments.editorExperiment)('nested-expand-in-expand', true)) {
-          if (expandNode.type === state.schema.nodes.nestedExpand) {
-            var resolvedPos = tr.doc.resolve(expandNodePos + 1);
-            if (resolvedPos) {
-              tr.setSelection(_state2.Selection.near(resolvedPos, -1));
-            }
+        if (expandNode.type === state.schema.nodes.nestedExpand) {
+          var resolvedPos = tr.doc.resolve(expandNodePos + 1);
+          if (resolvedPos) {
+            tr.setSelection(_state2.Selection.near(resolvedPos, -1));
           }
         }
         dispatch(tr);
@@ -146,19 +143,19 @@ var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandE
 };
 
 // Creates either an expand or a nestedExpand node based on the current selection
-var createExpandNode = exports.createExpandNode = function createExpandNode(state, isNestingExpandsSupported) {
+var createExpandNode = exports.createExpandNode = function createExpandNode(state) {
   var _state$schema$nodes = state.schema.nodes,
     expand = _state$schema$nodes.expand,
     nestedExpand = _state$schema$nodes.nestedExpand;
   var isSelectionInTable = !!(0, _utils3.findTable)(state.selection);
-  var isSelectionInExpand = isNestingExpandsSupported && (0, _utils4.isNestedInExpand)(state);
+  var isSelectionInExpand = (0, _utils4.isNestedInExpand)(state);
   var expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   return expandType.createAndFill({});
 };
-var insertExpandWithInputMethod = exports.insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI, isNestingExpandsSupported) {
+var insertExpandWithInputMethod = exports.insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI) {
   return function (inputMethod) {
     return function (state, dispatch) {
-      var expandNode = createExpandNode(state, isNestingExpandsSupported);
+      var expandNode = createExpandNode(state);
       if (!expandNode) {
         return false;
       }
@@ -183,9 +180,9 @@ var insertExpandWithInputMethod = exports.insertExpandWithInputMethod = function
     };
   };
 };
-var insertExpand = exports.insertExpand = function insertExpand(editorAnalyticsAPI, isNestingExpandsSupported) {
+var insertExpand = exports.insertExpand = function insertExpand(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    return insertExpandWithInputMethod(editorAnalyticsAPI, isNestingExpandsSupported)(_analytics.INPUT_METHOD.INSERT_MENU)(state, dispatch);
+    return insertExpandWithInputMethod(editorAnalyticsAPI)(_analytics.INPUT_METHOD.INSERT_MENU)(state, dispatch);
   };
 };
 var focusTitle = exports.focusTitle = function focusTitle(pos) {

package/dist/cjs/legacyExpand/plugin.js

@@ -11,8 +11,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _utils = require("@atlaskit/editor-common/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./commands");
 var _keymap = require("./pm-plugins/keymap");
 var _main = require("./pm-plugins/main");
@@ -20,14 +18,10 @@ var _toolbar = require("./toolbar");
 // Ignored via go/ees005
 // eslint-disable-next-line prefer-const
 var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
-  var _api$featureFlags, _api$analytics, _api$analytics2;
+  var _api$analytics, _api$analytics2;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  // Confluence is injecting the FF through editor props, from an experiment
-  // Jira is pulling it in through platform feature flags, from a feature gate
-  var isNestingExpandsSupported = (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.nestedExpandInExpandEx) || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
-  var nestedExpandNode = (0, _experiments.editorExperiment)('platform_editor_nested_non_bodied_macros', 'test') ? _adfSchema.nestedExpand : _adfSchema.nestedExpandWithoutNonBodiedMacros;
   return {
     name: 'expand',
     nodes: function nodes() {
@@ -36,12 +30,12 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
         node: _adfSchema.expandWithNestedExpand
       }, {
         name: 'nestedExpand',
-        node: nestedExpandNode
+        node: _adfSchema.nestedExpand
       }];
     },
     actions: {
-      insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isNestingExpandsSupported),
-      insertExpandWithInputMethod: (0, _commands.insertExpandWithInputMethod)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, isNestingExpandsSupported)
+      insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      insertExpandWithInputMethod: (0, _commands.insertExpandWithInputMethod)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
     pmPlugins: function pmPlugins() {
       return [{
@@ -80,7 +74,7 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
           },
           action: function action(insert, state) {
             var _api$analytics3;
-            var node = (0, _commands.createExpandNode)(state, isNestingExpandsSupported);
+            var node = (0, _commands.createExpandNode)(state);
             if (!node) {
               return false;
             }

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

@@ -12,7 +12,6 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../commands");
 var _nodeviews = _interopRequireDefault(require("../nodeviews"));
 var _pluginFactory = require("./plugin-factory");
@@ -136,12 +135,6 @@ function handleExpandDrag(view, event, slice) {
   var nodesWithNestedExpandSupport = [state.schema.nodes.expand, state.schema.nodes.tableHeader, state.schema.nodes.tableCell];
   var isNodeAtDropPosInsideNodesWithNestedExpandSupport = nodesWithNestedExpandSupport.includes(dropLocationNodeType) || nodesWithNestedExpandSupport.includes(dropLocationParentNodeType);
   var isNodeBeingDroppedInsideNestedExpand = dropLocationNodeType === state.schema.nodes.nestedExpand || dropLocationParentNodeType === state.schema.nodes.nestedExpand;
-  if ((0, _experiments.editorExperiment)('nested-expand-in-expand', false)) {
-    if ((sliceContainsExpand || sliceContainsNestedExpand) && (dropLocationNodeType === state.schema.nodes.expand || dropLocationParentNodeType === state.schema.nodes.expand)) {
-      event.preventDefault();
-      return true;
-    }
-  }
   var updatedSlice = slice;
   if (sliceContainsExpand && isNodeAtDropPosInsideNodesWithNestedExpandSupport) {
     updatedSlice = (0, _transforms.transformSliceExpandToNestedExpand)(slice);

package/dist/cjs/singlePlayerExpand/commands.js

@@ -17,19 +17,17 @@ var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _utils4 = require("../utils");
 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; }
 // Creates either an expand or a nestedExpand node based on the current selection
 var createExpandNode = exports.createExpandNode = function createExpandNode(state) {
   var setExpandedState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  var isNestingExpandsSupported = arguments.length > 2 ? arguments[2] : undefined;
   var _state$schema$nodes = state.schema.nodes,
     expand = _state$schema$nodes.expand,
     nestedExpand = _state$schema$nodes.nestedExpand;
   var isSelectionInTable = !!(0, _utils3.findTable)(state.selection);
-  var isSelectionInExpand = isNestingExpandsSupported && (0, _utils4.isNestedInExpand)(state);
+  var isSelectionInExpand = (0, _utils4.isNestedInExpand)(state);
   var expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   var expandNode = expandType.createAndFill({});
   if (setExpandedState) {
@@ -39,10 +37,10 @@ var createExpandNode = exports.createExpandNode = function createExpandNode(stat
   }
   return expandNode;
 };
-var insertExpandWithInputMethod = exports.insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI, isNestingExpandsSupported) {
+var insertExpandWithInputMethod = exports.insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI) {
   return function (inputMethod) {
     return function (state, dispatch) {
-      var expandNode = createExpandNode(state, false, isNestingExpandsSupported);
+      var expandNode = createExpandNode(state, false);
       if (!expandNode) {
         return false;
       }
@@ -79,9 +77,9 @@ var insertExpandWithInputMethod = exports.insertExpandWithInputMethod = function
     };
   };
 };
-var insertExpand = exports.insertExpand = function insertExpand(editorAnalyticsAPI, isNestingExpandsSupported) {
+var insertExpand = exports.insertExpand = function insertExpand(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    return insertExpandWithInputMethod(editorAnalyticsAPI, isNestingExpandsSupported)(_analytics.INPUT_METHOD.INSERT_MENU)(state, dispatch);
+    return insertExpandWithInputMethod(editorAnalyticsAPI)(_analytics.INPUT_METHOD.INSERT_MENU)(state, dispatch);
   };
 };
 var deleteExpand = exports.deleteExpand = function deleteExpand(editorAnalyticsAPI) {
@@ -111,12 +109,10 @@ var deleteExpandAtPos = exports.deleteExpandAtPos = function deleteExpandAtPos(e
         var tr = state.tr;
         tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-        if ((0, _experiments.editorExperiment)('nested-expand-in-expand', true)) {
-          if (expandNode.type === state.schema.nodes.nestedExpand) {
-            var resolvedPos = tr.doc.resolve(expandNodePos + 1);
-            if (resolvedPos) {
-              tr.setSelection(_state2.Selection.near(resolvedPos, -1));
-            }
+        if (expandNode.type === state.schema.nodes.nestedExpand) {
+          var resolvedPos = tr.doc.resolve(expandNodePos + 1);
+          if (resolvedPos) {
+            tr.setSelection(_state2.Selection.near(resolvedPos, -1));
           }
         }
         dispatch(tr);

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

@@ -19,6 +19,7 @@ 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 _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../commands");
 var _ExpandButton = require("../ui/ExpandButton");
@@ -494,7 +495,9 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           }
         }
         this.node = node;
-        this.updateExpandToggleIcon(this.node);
+        if (!(0, _platformFeatureFlags.fg)('platform_editor_disable_unnecessary_expand_renders')) {
+          this.updateExpandToggleIcon(this.node);
+        }
         return true;
       }
       return false;

package/dist/cjs/singlePlayerExpand/plugin.js

@@ -11,8 +11,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _utils = require("@atlaskit/editor-common/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./commands");
 var _keymap = require("./pm-plugins/keymap");
 var _main = require("./pm-plugins/main");
@@ -20,14 +18,10 @@ var _toolbar = require("./toolbar");
 // Ignored via go/ees005
 // eslint-disable-next-line prefer-const
 var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
-  var _api$featureFlags, _api$analytics, _api$analytics2;
+  var _api$analytics, _api$analytics2;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  // Confluence is injecting the FF through editor props, from an experiment
-  // Jira is pulling it in through platform feature flags, from a feature gate
-  var isNestingExpandsSupported = (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.nestedExpandInExpandEx) || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
-  var nestedExpandNode = (0, _experiments.editorExperiment)('platform_editor_nested_non_bodied_macros', 'test') ? _adfSchema.nestedExpand : _adfSchema.nestedExpandWithoutNonBodiedMacros;
   return {
     name: 'expand',
     nodes: function nodes() {
@@ -36,12 +30,12 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
         node: _adfSchema.expandWithNestedExpand
       }, {
         name: 'nestedExpand',
-        node: nestedExpandNode
+        node: _adfSchema.nestedExpand
       }];
     },
     actions: {
-      insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isNestingExpandsSupported),
-      insertExpandWithInputMethod: (0, _commands.insertExpandWithInputMethod)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, isNestingExpandsSupported)
+      insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      insertExpandWithInputMethod: (0, _commands.insertExpandWithInputMethod)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
     pmPlugins: function pmPlugins() {
       return [{
@@ -80,7 +74,7 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
           },
           action: function action(insert, state) {
             var _api$analytics3;
-            var node = (0, _commands.createExpandNode)(state, undefined, isNestingExpandsSupported);
+            var node = (0, _commands.createExpandNode)(state, undefined);
             if (!node) {
               return false;
             }

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

@@ -13,7 +13,6 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _nodeViews = _interopRequireDefault(require("../node-views"));
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
@@ -118,12 +117,6 @@ function handleExpandDrag(view, event, slice) {
   var nodesWithNestedExpandSupport = [state.schema.nodes.expand, state.schema.nodes.tableHeader, state.schema.nodes.tableCell];
   var isNodeAtDropPosInsideNodesWithNestedExpandSupport = nodesWithNestedExpandSupport.includes(dropLocationNodeType) || nodesWithNestedExpandSupport.includes(dropLocationParentNodeType);
   var isNodeBeingDroppedInsideNestedExpand = dropLocationNodeType === state.schema.nodes.nestedExpand || dropLocationParentNodeType === state.schema.nodes.nestedExpand;
-  if ((0, _experiments.editorExperiment)('nested-expand-in-expand', false)) {
-    if ((sliceContainsExpand || sliceContainsNestedExpand) && (dropLocationNodeType === state.schema.nodes.expand || dropLocationParentNodeType === state.schema.nodes.expand)) {
-      event.preventDefault();
-      return true;
-    }
-  }
   var updatedSlice = slice;
   if (sliceContainsExpand && isNodeAtDropPosInsideNodesWithNestedExpandSupport) {
     updatedSlice = (0, _transforms.transformSliceExpandToNestedExpand)(slice);

package/dist/es2019/legacyExpand/commands.js

@@ -8,7 +8,6 @@ import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isNestedInExpand } from '../utils';
 import { createCommand } from './pm-plugins/plugin-factory';
 export const setExpandRef = ref => createCommand({
@@ -35,12 +34,10 @@ export const deleteExpandAtPos = editorAnalyticsAPI => (expandNodePos, expandNod
     } = state;
     tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-    if (editorExperiment('nested-expand-in-expand', true)) {
-      if (expandNode.type === state.schema.nodes.nestedExpand) {
-        const resolvedPos = tr.doc.resolve(expandNodePos + 1);
-        if (resolvedPos) {
-          tr.setSelection(Selection.near(resolvedPos, -1));
-        }
+    if (expandNode.type === state.schema.nodes.nestedExpand) {
+      const resolvedPos = tr.doc.resolve(expandNodePos + 1);
+      if (resolvedPos) {
+        tr.setSelection(Selection.near(resolvedPos, -1));
       }
     }
     dispatch(tr);
@@ -134,18 +131,18 @@ export const toggleExpandExpanded = ({
 };
 
 // Creates either an expand or a nestedExpand node based on the current selection
-export const createExpandNode = (state, isNestingExpandsSupported) => {
+export const createExpandNode = state => {
   const {
     expand,
     nestedExpand
   } = state.schema.nodes;
   const isSelectionInTable = !!findTable(state.selection);
-  const isSelectionInExpand = isNestingExpandsSupported && isNestedInExpand(state);
+  const isSelectionInExpand = isNestedInExpand(state);
   const expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   return expandType.createAndFill({});
 };
-export const insertExpandWithInputMethod = (editorAnalyticsAPI, isNestingExpandsSupported) => inputMethod => (state, dispatch) => {
-  const expandNode = createExpandNode(state, isNestingExpandsSupported);
+export const insertExpandWithInputMethod = editorAnalyticsAPI => inputMethod => (state, dispatch) => {
+  const expandNode = createExpandNode(state);
   if (!expandNode) {
     return false;
   }
@@ -168,8 +165,8 @@ export const insertExpandWithInputMethod = (editorAnalyticsAPI, isNestingExpands
   }
   return true;
 };
-export const insertExpand = (editorAnalyticsAPI, isNestingExpandsSupported) => (state, dispatch) => {
-  return insertExpandWithInputMethod(editorAnalyticsAPI, isNestingExpandsSupported)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
+export const insertExpand = editorAnalyticsAPI => (state, dispatch) => {
+  return insertExpandWithInputMethod(editorAnalyticsAPI)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
 };
 export const focusTitle = pos => (state, dispatch, editorView) => {
   if (editorView) {

package/dist/es2019/legacyExpand/plugin.js

@@ -1,11 +1,9 @@
 import React from 'react';
-import { expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
+import { expandWithNestedExpand, nestedExpand } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconExpand } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
@@ -17,11 +15,7 @@ export let expandPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$featureFlags, _api$featureFlags$sha, _api$analytics, _api$analytics2;
-  // Confluence is injecting the FF through editor props, from an experiment
-  // Jira is pulling it in through platform feature flags, from a feature gate
-  const isNestingExpandsSupported = (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.nestedExpandInExpandEx) || fg('platform_editor_nest_nested_expand_in_expand_jira');
-  const nestedExpandNode = editorExperiment('platform_editor_nested_non_bodied_macros', 'test') ? nestedExpand : nestedExpandWithoutNonBodiedMacros;
+  var _api$analytics, _api$analytics2;
   return {
     name: 'expand',
     nodes() {
@@ -30,12 +24,12 @@ export let expandPlugin = ({
         node: expandWithNestedExpand
       }, {
         name: 'nestedExpand',
-        node: nestedExpandNode
+        node: nestedExpand
       }];
     },
     actions: {
-      insertExpand: insertExpand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isNestingExpandsSupported),
-      insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, isNestingExpandsSupported)
+      insertExpand: insertExpand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
     pmPlugins() {
       return [{
@@ -72,7 +66,7 @@ export let expandPlugin = ({
           icon: () => /*#__PURE__*/React.createElement(IconExpand, null),
           action(insert, state) {
             var _api$analytics3;
-            const node = createExpandNode(state, isNestingExpandsSupported);
+            const node = createExpandNode(state);
             if (!node) {
               return false;
             }

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

@@ -3,7 +3,6 @@ import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { findExpand, transformSliceExpandToNestedExpand, transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setExpandRef } from '../commands';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
@@ -126,12 +125,6 @@ export function handleExpandDrag(view, event, slice) {
   const nodesWithNestedExpandSupport = [state.schema.nodes.expand, state.schema.nodes.tableHeader, state.schema.nodes.tableCell];
   const isNodeAtDropPosInsideNodesWithNestedExpandSupport = nodesWithNestedExpandSupport.includes(dropLocationNodeType) || nodesWithNestedExpandSupport.includes(dropLocationParentNodeType);
   const isNodeBeingDroppedInsideNestedExpand = dropLocationNodeType === state.schema.nodes.nestedExpand || dropLocationParentNodeType === state.schema.nodes.nestedExpand;
-  if (editorExperiment('nested-expand-in-expand', false)) {
-    if ((sliceContainsExpand || sliceContainsNestedExpand) && (dropLocationNodeType === state.schema.nodes.expand || dropLocationParentNodeType === state.schema.nodes.expand)) {
-      event.preventDefault();
-      return true;
-    }
-  }
   let updatedSlice = slice;
   if (sliceContainsExpand && isNodeAtDropPosInsideNodesWithNestedExpandSupport) {
     updatedSlice = transformSliceExpandToNestedExpand(slice);

package/dist/es2019/singlePlayerExpand/commands.js

@@ -9,17 +9,16 @@ import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isNestedInExpand } from '../utils';
 
 // Creates either an expand or a nestedExpand node based on the current selection
-export const createExpandNode = (state, setExpandedState = true, isNestingExpandsSupported) => {
+export const createExpandNode = (state, setExpandedState = true) => {
   const {
     expand,
     nestedExpand
   } = state.schema.nodes;
   const isSelectionInTable = !!findTable(state.selection);
-  const isSelectionInExpand = isNestingExpandsSupported && isNestedInExpand(state);
+  const isSelectionInExpand = isNestedInExpand(state);
   const expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   const expandNode = expandType.createAndFill({});
   if (setExpandedState) {
@@ -29,8 +28,8 @@ export const createExpandNode = (state, setExpandedState = true, isNestingExpand
   }
   return expandNode;
 };
-export const insertExpandWithInputMethod = (editorAnalyticsAPI, isNestingExpandsSupported) => inputMethod => (state, dispatch) => {
-  const expandNode = createExpandNode(state, false, isNestingExpandsSupported);
+export const insertExpandWithInputMethod = editorAnalyticsAPI => inputMethod => (state, dispatch) => {
+  const expandNode = createExpandNode(state, false);
   if (!expandNode) {
     return false;
   }
@@ -65,8 +64,8 @@ export const insertExpandWithInputMethod = (editorAnalyticsAPI, isNestingExpands
   }
   return true;
 };
-export const insertExpand = (editorAnalyticsAPI, isNestingExpandsSupported) => (state, dispatch) => {
-  return insertExpandWithInputMethod(editorAnalyticsAPI, isNestingExpandsSupported)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
+export const insertExpand = editorAnalyticsAPI => (state, dispatch) => {
+  return insertExpandWithInputMethod(editorAnalyticsAPI)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
 };
 export const deleteExpand = editorAnalyticsAPI => (state, dispatch) => {
   const expandNode = findExpand(state);
@@ -93,12 +92,10 @@ export const deleteExpandAtPos = editorAnalyticsAPI => (expandNodePos, expandNod
     } = state;
     tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-    if (editorExperiment('nested-expand-in-expand', true)) {
-      if (expandNode.type === state.schema.nodes.nestedExpand) {
-        const resolvedPos = tr.doc.resolve(expandNodePos + 1);
-        if (resolvedPos) {
-          tr.setSelection(Selection.near(resolvedPos, -1));
-        }
+    if (expandNode.type === state.schema.nodes.nestedExpand) {
+      const resolvedPos = tr.doc.resolve(expandNodePos + 1);
+      if (resolvedPos) {
+        tr.setSelection(Selection.near(resolvedPos, -1));
       }
     }
     dispatch(tr);

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

@@ -9,6 +9,7 @@ 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandButton } from '../ui/ExpandButton';
@@ -487,7 +488,9 @@ export class ExpandNodeView {
         }
       }
       this.node = node;
-      this.updateExpandToggleIcon(this.node);
+      if (!fg('platform_editor_disable_unnecessary_expand_renders')) {
+        this.updateExpandToggleIcon(this.node);
+      }
       return true;
     }
     return false;

package/dist/es2019/singlePlayerExpand/plugin.js

@@ -1,11 +1,9 @@
 import React from 'react';
-import { expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
+import { expandWithNestedExpand, nestedExpand } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconExpand } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
@@ -17,11 +15,7 @@ export let expandPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$featureFlags, _api$featureFlags$sha, _api$analytics, _api$analytics2;
-  // Confluence is injecting the FF through editor props, from an experiment
-  // Jira is pulling it in through platform feature flags, from a feature gate
-  const isNestingExpandsSupported = (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.nestedExpandInExpandEx) || fg('platform_editor_nest_nested_expand_in_expand_jira');
-  const nestedExpandNode = editorExperiment('platform_editor_nested_non_bodied_macros', 'test') ? nestedExpand : nestedExpandWithoutNonBodiedMacros;
+  var _api$analytics, _api$analytics2;
   return {
     name: 'expand',
     nodes() {
@@ -30,12 +24,12 @@ export let expandPlugin = ({
         node: expandWithNestedExpand
       }, {
         name: 'nestedExpand',
-        node: nestedExpandNode
+        node: nestedExpand
       }];
     },
     actions: {
-      insertExpand: insertExpand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isNestingExpandsSupported),
-      insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, isNestingExpandsSupported)
+      insertExpand: insertExpand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
     pmPlugins() {
       return [{
@@ -72,7 +66,7 @@ export let expandPlugin = ({
           icon: () => /*#__PURE__*/React.createElement(IconExpand, null),
           action(insert, state) {
             var _api$analytics3;
-            const node = createExpandNode(state, undefined, isNestingExpandsSupported);
+            const node = createExpandNode(state, undefined);
             if (!node) {
               return false;
             }

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

@@ -3,7 +3,6 @@ import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { transformSliceExpandToNestedExpand, transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import ExpandNodeView from '../node-views';
@@ -105,12 +104,6 @@ export function handleExpandDrag(view, event, slice) {
   const nodesWithNestedExpandSupport = [state.schema.nodes.expand, state.schema.nodes.tableHeader, state.schema.nodes.tableCell];
   const isNodeAtDropPosInsideNodesWithNestedExpandSupport = nodesWithNestedExpandSupport.includes(dropLocationNodeType) || nodesWithNestedExpandSupport.includes(dropLocationParentNodeType);
   const isNodeBeingDroppedInsideNestedExpand = dropLocationNodeType === state.schema.nodes.nestedExpand || dropLocationParentNodeType === state.schema.nodes.nestedExpand;
-  if (editorExperiment('nested-expand-in-expand', false)) {
-    if ((sliceContainsExpand || sliceContainsNestedExpand) && (dropLocationNodeType === state.schema.nodes.expand || dropLocationParentNodeType === state.schema.nodes.expand)) {
-      event.preventDefault();
-      return true;
-    }
-  }
   let updatedSlice = slice;
   if (sliceContainsExpand && isNodeAtDropPosInsideNodesWithNestedExpandSupport) {
     updatedSlice = transformSliceExpandToNestedExpand(slice);

package/dist/esm/legacyExpand/commands.js

@@ -11,7 +11,6 @@ import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isNestedInExpand } from '../utils';
 import { createCommand } from './pm-plugins/plugin-factory';
 export var setExpandRef = function setExpandRef(ref) {
@@ -42,12 +41,10 @@ export var deleteExpandAtPos = function deleteExpandAtPos(editorAnalyticsAPI) {
         var tr = state.tr;
         tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-        if (editorExperiment('nested-expand-in-expand', true)) {
-          if (expandNode.type === state.schema.nodes.nestedExpand) {
-            var resolvedPos = tr.doc.resolve(expandNodePos + 1);
-            if (resolvedPos) {
-              tr.setSelection(Selection.near(resolvedPos, -1));
-            }
+        if (expandNode.type === state.schema.nodes.nestedExpand) {
+          var resolvedPos = tr.doc.resolve(expandNodePos + 1);
+          if (resolvedPos) {
+            tr.setSelection(Selection.near(resolvedPos, -1));
           }
         }
         dispatch(tr);
@@ -139,19 +136,19 @@ export var toggleExpandExpanded = function toggleExpandExpanded(_ref2) {
 };
 
 // Creates either an expand or a nestedExpand node based on the current selection
-export var createExpandNode = function createExpandNode(state, isNestingExpandsSupported) {
+export var createExpandNode = function createExpandNode(state) {
   var _state$schema$nodes = state.schema.nodes,
     expand = _state$schema$nodes.expand,
     nestedExpand = _state$schema$nodes.nestedExpand;
   var isSelectionInTable = !!findTable(state.selection);
-  var isSelectionInExpand = isNestingExpandsSupported && isNestedInExpand(state);
+  var isSelectionInExpand = isNestedInExpand(state);
   var expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   return expandType.createAndFill({});
 };
-export var insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI, isNestingExpandsSupported) {
+export var insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI) {
   return function (inputMethod) {
     return function (state, dispatch) {
-      var expandNode = createExpandNode(state, isNestingExpandsSupported);
+      var expandNode = createExpandNode(state);
       if (!expandNode) {
         return false;
       }
@@ -176,9 +173,9 @@ export var insertExpandWithInputMethod = function insertExpandWithInputMethod(ed
     };
   };
 };
-export var insertExpand = function insertExpand(editorAnalyticsAPI, isNestingExpandsSupported) {
+export var insertExpand = function insertExpand(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    return insertExpandWithInputMethod(editorAnalyticsAPI, isNestingExpandsSupported)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
+    return insertExpandWithInputMethod(editorAnalyticsAPI)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
   };
 };
 export var focusTitle = function focusTitle(pos) {

package/dist/esm/legacyExpand/plugin.js

@@ -1,11 +1,9 @@
 import React from 'react';
-import { expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
+import { expandWithNestedExpand, nestedExpand } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconExpand } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
@@ -14,14 +12,10 @@ import { getToolbarConfig } from './toolbar';
 // Ignored via go/ees005
 // eslint-disable-next-line prefer-const
 export var expandPlugin = function expandPlugin(_ref) {
-  var _api$featureFlags, _api$analytics, _api$analytics2;
+  var _api$analytics, _api$analytics2;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  // Confluence is injecting the FF through editor props, from an experiment
-  // Jira is pulling it in through platform feature flags, from a feature gate
-  var isNestingExpandsSupported = (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.nestedExpandInExpandEx) || fg('platform_editor_nest_nested_expand_in_expand_jira');
-  var nestedExpandNode = editorExperiment('platform_editor_nested_non_bodied_macros', 'test') ? nestedExpand : nestedExpandWithoutNonBodiedMacros;
   return {
     name: 'expand',
     nodes: function nodes() {
@@ -30,12 +24,12 @@ export var expandPlugin = function expandPlugin(_ref) {
         node: expandWithNestedExpand
       }, {
         name: 'nestedExpand',
-        node: nestedExpandNode
+        node: nestedExpand
       }];
     },
     actions: {
-      insertExpand: insertExpand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isNestingExpandsSupported),
-      insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, isNestingExpandsSupported)
+      insertExpand: insertExpand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
     pmPlugins: function pmPlugins() {
       return [{
@@ -74,7 +68,7 @@ export var expandPlugin = function expandPlugin(_ref) {
           },
           action: function action(insert, state) {
             var _api$analytics3;
-            var node = createExpandNode(state, isNestingExpandsSupported);
+            var node = createExpandNode(state);
             if (!node) {
               return false;
             }

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

@@ -3,7 +3,6 @@ import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { findExpand, transformSliceExpandToNestedExpand, transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setExpandRef } from '../commands';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
@@ -126,12 +125,6 @@ export function handleExpandDrag(view, event, slice) {
   var nodesWithNestedExpandSupport = [state.schema.nodes.expand, state.schema.nodes.tableHeader, state.schema.nodes.tableCell];
   var isNodeAtDropPosInsideNodesWithNestedExpandSupport = nodesWithNestedExpandSupport.includes(dropLocationNodeType) || nodesWithNestedExpandSupport.includes(dropLocationParentNodeType);
   var isNodeBeingDroppedInsideNestedExpand = dropLocationNodeType === state.schema.nodes.nestedExpand || dropLocationParentNodeType === state.schema.nodes.nestedExpand;
-  if (editorExperiment('nested-expand-in-expand', false)) {
-    if ((sliceContainsExpand || sliceContainsNestedExpand) && (dropLocationNodeType === state.schema.nodes.expand || dropLocationParentNodeType === state.schema.nodes.expand)) {
-      event.preventDefault();
-      return true;
-    }
-  }
   var updatedSlice = slice;
   if (sliceContainsExpand && isNodeAtDropPosInsideNodesWithNestedExpandSupport) {
     updatedSlice = transformSliceExpandToNestedExpand(slice);

package/dist/esm/singlePlayerExpand/commands.js

@@ -12,18 +12,16 @@ import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isNestedInExpand } from '../utils';
 
 // Creates either an expand or a nestedExpand node based on the current selection
 export var createExpandNode = function createExpandNode(state) {
   var setExpandedState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  var isNestingExpandsSupported = arguments.length > 2 ? arguments[2] : undefined;
   var _state$schema$nodes = state.schema.nodes,
     expand = _state$schema$nodes.expand,
     nestedExpand = _state$schema$nodes.nestedExpand;
   var isSelectionInTable = !!findTable(state.selection);
-  var isSelectionInExpand = isNestingExpandsSupported && isNestedInExpand(state);
+  var isSelectionInExpand = isNestedInExpand(state);
   var expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   var expandNode = expandType.createAndFill({});
   if (setExpandedState) {
@@ -33,10 +31,10 @@ export var createExpandNode = function createExpandNode(state) {
   }
   return expandNode;
 };
-export var insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI, isNestingExpandsSupported) {
+export var insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI) {
   return function (inputMethod) {
     return function (state, dispatch) {
-      var expandNode = createExpandNode(state, false, isNestingExpandsSupported);
+      var expandNode = createExpandNode(state, false);
       if (!expandNode) {
         return false;
       }
@@ -73,9 +71,9 @@ export var insertExpandWithInputMethod = function insertExpandWithInputMethod(ed
     };
   };
 };
-export var insertExpand = function insertExpand(editorAnalyticsAPI, isNestingExpandsSupported) {
+export var insertExpand = function insertExpand(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    return insertExpandWithInputMethod(editorAnalyticsAPI, isNestingExpandsSupported)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
+    return insertExpandWithInputMethod(editorAnalyticsAPI)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
   };
 };
 export var deleteExpand = function deleteExpand(editorAnalyticsAPI) {
@@ -105,12 +103,10 @@ export var deleteExpandAtPos = function deleteExpandAtPos(editorAnalyticsAPI) {
         var tr = state.tr;
         tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-        if (editorExperiment('nested-expand-in-expand', true)) {
-          if (expandNode.type === state.schema.nodes.nestedExpand) {
-            var resolvedPos = tr.doc.resolve(expandNodePos + 1);
-            if (resolvedPos) {
-              tr.setSelection(Selection.near(resolvedPos, -1));
-            }
+        if (expandNode.type === state.schema.nodes.nestedExpand) {
+          var resolvedPos = tr.doc.resolve(expandNodePos + 1);
+          if (resolvedPos) {
+            tr.setSelection(Selection.near(resolvedPos, -1));
           }
         }
         dispatch(tr);

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

@@ -11,6 +11,7 @@ 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandButton } from '../ui/ExpandButton';
@@ -486,7 +487,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           }
         }
         this.node = node;
-        this.updateExpandToggleIcon(this.node);
+        if (!fg('platform_editor_disable_unnecessary_expand_renders')) {
+          this.updateExpandToggleIcon(this.node);
+        }
         return true;
       }
       return false;

package/dist/esm/singlePlayerExpand/plugin.js

@@ -1,11 +1,9 @@
 import React from 'react';
-import { expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
+import { expandWithNestedExpand, nestedExpand } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconExpand } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
@@ -14,14 +12,10 @@ import { getToolbarConfig } from './toolbar';
 // Ignored via go/ees005
 // eslint-disable-next-line prefer-const
 export var expandPlugin = function expandPlugin(_ref) {
-  var _api$featureFlags, _api$analytics, _api$analytics2;
+  var _api$analytics, _api$analytics2;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  // Confluence is injecting the FF through editor props, from an experiment
-  // Jira is pulling it in through platform feature flags, from a feature gate
-  var isNestingExpandsSupported = (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.nestedExpandInExpandEx) || fg('platform_editor_nest_nested_expand_in_expand_jira');
-  var nestedExpandNode = editorExperiment('platform_editor_nested_non_bodied_macros', 'test') ? nestedExpand : nestedExpandWithoutNonBodiedMacros;
   return {
     name: 'expand',
     nodes: function nodes() {
@@ -30,12 +24,12 @@ export var expandPlugin = function expandPlugin(_ref) {
         node: expandWithNestedExpand
       }, {
         name: 'nestedExpand',
-        node: nestedExpandNode
+        node: nestedExpand
       }];
     },
     actions: {
-      insertExpand: insertExpand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isNestingExpandsSupported),
-      insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, isNestingExpandsSupported)
+      insertExpand: insertExpand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
     pmPlugins: function pmPlugins() {
       return [{
@@ -74,7 +68,7 @@ export var expandPlugin = function expandPlugin(_ref) {
           },
           action: function action(insert, state) {
             var _api$analytics3;
-            var node = createExpandNode(state, undefined, isNestingExpandsSupported);
+            var node = createExpandNode(state, undefined);
             if (!node) {
               return false;
             }

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

@@ -3,7 +3,6 @@ import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { transformSliceExpandToNestedExpand, transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import ExpandNodeView from '../node-views';
@@ -107,12 +106,6 @@ export function handleExpandDrag(view, event, slice) {
   var nodesWithNestedExpandSupport = [state.schema.nodes.expand, state.schema.nodes.tableHeader, state.schema.nodes.tableCell];
   var isNodeAtDropPosInsideNodesWithNestedExpandSupport = nodesWithNestedExpandSupport.includes(dropLocationNodeType) || nodesWithNestedExpandSupport.includes(dropLocationParentNodeType);
   var isNodeBeingDroppedInsideNestedExpand = dropLocationNodeType === state.schema.nodes.nestedExpand || dropLocationParentNodeType === state.schema.nodes.nestedExpand;
-  if (editorExperiment('nested-expand-in-expand', false)) {
-    if ((sliceContainsExpand || sliceContainsNestedExpand) && (dropLocationNodeType === state.schema.nodes.expand || dropLocationParentNodeType === state.schema.nodes.expand)) {
-      event.preventDefault();
-      return true;
-    }
-  }
   var updatedSlice = slice;
   if (sliceContainsExpand && isNodeAtDropPosInsideNodesWithNestedExpandSupport) {
     updatedSlice = transformSliceExpandToNestedExpand(slice);

package/dist/types/legacyExpand/commands.d.ts

@@ -18,9 +18,9 @@ export declare const toggleExpandExpanded: ({ editorAnalyticsAPI, pos, nodeType,
     nodeType: NodeType;
     __livePage: boolean;
 }) => Command;
-export declare const createExpandNode: (state: EditorState, isNestingExpandsSupported?: boolean) => PMNode | null;
-export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => (inputMethod: InsertMethod) => Command;
-export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => Command;
+export declare const createExpandNode: (state: EditorState) => PMNode | null;
+export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InsertMethod) => Command;
+export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const focusTitle: (pos: number) => Command;
 export declare const focusIcon: (expand: Node) => Command;
 export declare const setSelectionInsideExpand: (expandPos: number) => Command;

package/dist/types/singlePlayerExpand/commands.d.ts

@@ -3,9 +3,9 @@ import type { Command } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { InsertMethod } from '../types';
-export declare const createExpandNode: (state: EditorState, setExpandedState?: boolean, isNestingExpandsSupported?: boolean) => PMNode | null;
-export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => (inputMethod: InsertMethod) => Command;
-export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => Command;
+export declare const createExpandNode: (state: EditorState, setExpandedState?: boolean) => PMNode | null;
+export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InsertMethod) => Command;
+export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const deleteExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const deleteExpandAtPos: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (expandNodePos: number, expandNode: PMNode) => Command;
 export declare const setSelectionInsideExpand: (expandPos: number) => Command;

package/dist/types-ts4.5/legacyExpand/commands.d.ts

@@ -18,9 +18,9 @@ export declare const toggleExpandExpanded: ({ editorAnalyticsAPI, pos, nodeType,
     nodeType: NodeType;
     __livePage: boolean;
 }) => Command;
-export declare const createExpandNode: (state: EditorState, isNestingExpandsSupported?: boolean) => PMNode | null;
-export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => (inputMethod: InsertMethod) => Command;
-export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => Command;
+export declare const createExpandNode: (state: EditorState) => PMNode | null;
+export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InsertMethod) => Command;
+export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const focusTitle: (pos: number) => Command;
 export declare const focusIcon: (expand: Node) => Command;
 export declare const setSelectionInsideExpand: (expandPos: number) => Command;

package/dist/types-ts4.5/singlePlayerExpand/commands.d.ts

@@ -3,9 +3,9 @@ import type { Command } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { InsertMethod } from '../types';
-export declare const createExpandNode: (state: EditorState, setExpandedState?: boolean, isNestingExpandsSupported?: boolean) => PMNode | null;
-export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => (inputMethod: InsertMethod) => Command;
-export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => Command;
+export declare const createExpandNode: (state: EditorState, setExpandedState?: boolean) => PMNode | null;
+export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InsertMethod) => Command;
+export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const deleteExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const deleteExpandAtPos: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (expandNodePos: number, expandNode: PMNode) => Command;
 export declare const setSelectionInsideExpand: (expandPos: number) => Command;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "3.2.5",
+	"version": "3.2.7",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,20 +35,20 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/button": "^23.0.0",
-		"@atlaskit/editor-common": "^103.0.0",
+		"@atlaskit/editor-common": "^103.9.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^3.0.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
 		"@atlaskit/editor-plugin-selection": "^2.1.0",
-		"@atlaskit/editor-plugin-selection-marker": "^2.1.0",
+		"@atlaskit/editor-plugin-selection-marker": "^2.2.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^25.5.0",
+		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.6.0",
-		"@atlaskit/tokens": "^4.7.0",
+		"@atlaskit/tmp-editor-statsig": "^4.12.0",
+		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -64,9 +64,9 @@
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/editor-plugin-content-insertion": "^2.1.0",
 		"@atlaskit/editor-plugin-guideline": "^2.0.0",
-		"@atlaskit/editor-plugin-quick-insert": "^2.2.0",
-		"@atlaskit/editor-plugin-table": "^10.6.0",
-		"@atlaskit/editor-plugin-type-ahead": "^2.3.0",
+		"@atlaskit/editor-plugin-quick-insert": "^2.4.0",
+		"@atlaskit/editor-plugin-table": "^10.8.0",
+		"@atlaskit/editor-plugin-type-ahead": "^2.5.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
 		"@testing-library/react": "^13.4.0",
 		"react-test-renderer": "^18.2.0",
@@ -112,7 +112,7 @@
 		"platform-editor-single-player-expand": {
 			"type": "boolean"
 		},
-		"platform_editor_nest_nested_expand_in_expand_jira": {
+		"platform_editor_disable_unnecessary_expand_renders": {
 			"type": "boolean"
 		},
 		"platform_editor_long_node_expand": {