@atlaskit/editor-plugin-expand 1.2.5 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-expand
 
+## 1.3.0
+
+### Minor Changes
+
+- [#87870](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/87870) [`76711a3e7edd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/76711a3e7edd) - [ED-22839] Refactor expand plugin to use either legacy (current) expand or single player expand (coming soon). Single player expand will only be used if `platform.editor.single-player-expand` is true and livePage is enabled.
+
+## 1.2.6
+
+### Patch Changes
+
+- [#88038](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88038) [`19ac4de34153`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/19ac4de34153) - update 'w3c-keyname' dependency to 2.1.8
+- Updated dependencies
+
 ## 1.2.5
 
 ### Patch Changes

package/dist/cjs/legacyExpand/plugin.js

@@ -0,0 +1,105 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.expandPlugin = void 0;
+Object.defineProperty(exports, "pluginKey", {
+  enumerable: true,
+  get: function get() {
+    return _pluginFactory.pluginKey;
+  }
+});
+var _react = _interopRequireDefault(require("react"));
+var _adfSchema = require("@atlaskit/adf-schema");
+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 _commands = require("./commands");
+var _keymap = require("./pm-plugins/keymap");
+var _main = require("./pm-plugins/main");
+var _toolbar = require("./toolbar");
+var _pluginFactory = require("./pm-plugins/plugin-factory");
+var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
+  var _api$analytics;
+  var _ref$config = _ref.config,
+    options = _ref$config === void 0 ? {} : _ref$config,
+    api = _ref.api;
+  return {
+    name: 'expand',
+    nodes: function nodes() {
+      var nestedExpandNode = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-extended-nested-expand') ? _adfSchema.extendedNestedExpand : _adfSchema.nestedExpand;
+      return [{
+        name: 'expand',
+        node: _adfSchema.expand
+      }, {
+        name: 'nestedExpand',
+        node: nestedExpandNode
+      }];
+    },
+    actions: {
+      insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+    },
+    pmPlugins: function pmPlugins() {
+      return [{
+        name: 'expand',
+        plugin: function plugin(_ref2) {
+          var _options$allowInterac;
+          var dispatch = _ref2.dispatch,
+            getIntl = _ref2.getIntl;
+          return (0, _main.createPlugin)(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true, options.__livePage);
+        }
+      }, {
+        name: 'expandKeymap',
+        plugin: function plugin() {
+          return (0, _keymap.expandKeymap)(api, {
+            __livePage: options.__livePage
+          });
+        }
+      }];
+    },
+    pluginsOptions: {
+      floatingToolbar: (0, _toolbar.getToolbarConfig)(api),
+      quickInsert: function quickInsert(_ref3) {
+        var formatMessage = _ref3.formatMessage;
+        if (options && options.allowInsertion !== true) {
+          return [];
+        }
+        return [{
+          id: 'expand',
+          title: formatMessage(_messages.toolbarInsertBlockMessages.expand),
+          description: formatMessage(_messages.toolbarInsertBlockMessages.expandDescription),
+          keywords: ['accordion', 'collapse'],
+          priority: 600,
+          icon: function icon() {
+            return /*#__PURE__*/_react.default.createElement(_quickInsert.IconExpand, null);
+          },
+          action: function action(insert, state) {
+            var _api$analytics2;
+            var node = (0, _commands.createExpandNode)(state);
+            if (!node) {
+              return false;
+            }
+            var tr = state.selection.empty ? insert(node) : (0, _utils.createWrapSelectionTransaction)({
+              state: state,
+              type: node.type
+            });
+            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
+              action: _analytics.ACTION.INSERTED,
+              actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+              actionSubjectId: node.type === state.schema.nodes.nestedExpand ? _analytics.ACTION_SUBJECT_ID.NESTED_EXPAND : _analytics.ACTION_SUBJECT_ID.EXPAND,
+              attributes: {
+                inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
+              },
+              eventType: _analytics.EVENT_TYPE.TRACK
+            })(tr);
+            return tr;
+          }
+        }];
+      }
+    }
+  };
+};

package/dist/cjs/plugin.js

@@ -1,105 +1,25 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.expandPlugin = void 0;
-Object.defineProperty(exports, "pluginKey", {
-  enumerable: true,
-  get: function get() {
-    return _pluginFactory.pluginKey;
-  }
-});
-var _react = _interopRequireDefault(require("react"));
-var _adfSchema = require("@atlaskit/adf-schema");
-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 _commands = require("./commands");
-var _keymap = require("./pm-plugins/keymap");
-var _main = require("./pm-plugins/main");
-var _toolbar = require("./toolbar");
-var _pluginFactory = require("./pm-plugins/plugin-factory");
+var _plugin = require("./legacyExpand/plugin");
+var _plugin2 = require("./singlePlayerExpand/plugin");
 var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
-  var _api$analytics;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  return {
-    name: 'expand',
-    nodes: function nodes() {
-      var nestedExpandNode = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-extended-nested-expand') ? _adfSchema.extendedNestedExpand : _adfSchema.nestedExpand;
-      return [{
-        name: 'expand',
-        node: _adfSchema.expand
-      }, {
-        name: 'nestedExpand',
-        node: nestedExpandNode
-      }];
-    },
-    actions: {
-      insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
-    },
-    pmPlugins: function pmPlugins() {
-      return [{
-        name: 'expand',
-        plugin: function plugin(_ref2) {
-          var _options$allowInterac;
-          var dispatch = _ref2.dispatch,
-            getIntl = _ref2.getIntl;
-          return (0, _main.createPlugin)(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true, options.__livePage);
-        }
-      }, {
-        name: 'expandKeymap',
-        plugin: function plugin() {
-          return (0, _keymap.expandKeymap)(api, {
-            __livePage: options.__livePage
-          });
-        }
-      }];
-    },
-    pluginsOptions: {
-      floatingToolbar: (0, _toolbar.getToolbarConfig)(api),
-      quickInsert: function quickInsert(_ref3) {
-        var formatMessage = _ref3.formatMessage;
-        if (options && options.allowInsertion !== true) {
-          return [];
-        }
-        return [{
-          id: 'expand',
-          title: formatMessage(_messages.toolbarInsertBlockMessages.expand),
-          description: formatMessage(_messages.toolbarInsertBlockMessages.expandDescription),
-          keywords: ['accordion', 'collapse'],
-          priority: 600,
-          icon: function icon() {
-            return /*#__PURE__*/_react.default.createElement(_quickInsert.IconExpand, null);
-          },
-          action: function action(insert, state) {
-            var _api$analytics2;
-            var node = (0, _commands.createExpandNode)(state);
-            if (!node) {
-              return false;
-            }
-            var tr = state.selection.empty ? insert(node) : (0, _utils.createWrapSelectionTransaction)({
-              state: state,
-              type: node.type
-            });
-            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
-              action: _analytics.ACTION.INSERTED,
-              actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: node.type === state.schema.nodes.nestedExpand ? _analytics.ACTION_SUBJECT_ID.NESTED_EXPAND : _analytics.ACTION_SUBJECT_ID.EXPAND,
-              attributes: {
-                inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
-              },
-              eventType: _analytics.EVENT_TYPE.TRACK
-            })(tr);
-            return tr;
-          }
-        }];
-      }
-    }
-  };
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.single-player-expand') && options !== null && options !== void 0 && options.__livePage) {
+    return (0, _plugin2.expandPlugin)({
+      config: options,
+      api: api
+    });
+  } else {
+    return (0, _plugin.expandPlugin)({
+      config: options,
+      api: api
+    });
+  }
 };

package/dist/cjs/singlePlayerExpand/plugin.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.expandPlugin = void 0;
+var _adfSchema = require("@atlaskit/adf-schema");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+// TODO: https://product-fabric.atlassian.net/browse/ED-22840
+// In ED-22840 make sure we update the ExpandPlugin type to use singlePlayerExpands own types
+
+var expandPlugin = exports.expandPlugin = function expandPlugin() {
+  return {
+    name: 'expand',
+    nodes: function nodes() {
+      var nestedExpandNode = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-extended-nested-expand') ? _adfSchema.extendedNestedExpand : _adfSchema.nestedExpand;
+      return [{
+        name: 'expand',
+        node: _adfSchema.expand
+      }, {
+        name: 'nestedExpand',
+        node: nestedExpandNode
+      }];
+    },
+    actions: {
+      insertExpand: function insertExpand() {
+        return false;
+      }
+    },
+    pmPlugins: function pmPlugins() {
+      return [];
+    },
+    pluginsOptions: {}
+  };
+};

package/dist/es2019/index.js

@@ -1 +1,3 @@
+// TODO: Handle type exports for singlePlayerExpandPlugin when they're created
+// https://product-fabric.atlassian.net/browse/ED-22840
 export { expandPlugin } from './plugin';

package/dist/es2019/legacyExpand/plugin.js

@@ -0,0 +1,90 @@
+import React from 'react';
+import { expand, extendedNestedExpand, 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { createExpandNode, insertExpand } from './commands';
+import { expandKeymap } from './pm-plugins/keymap';
+import { createPlugin } from './pm-plugins/main';
+import { getToolbarConfig } from './toolbar';
+export { pluginKey } from './pm-plugins/plugin-factory';
+export const expandPlugin = ({
+  config: options = {},
+  api
+}) => {
+  var _api$analytics;
+  return {
+    name: 'expand',
+    nodes() {
+      const nestedExpandNode = getBooleanFF('platform.editor.allow-extended-nested-expand') ? extendedNestedExpand : nestedExpand;
+      return [{
+        name: 'expand',
+        node: expand
+      }, {
+        name: 'nestedExpand',
+        node: nestedExpandNode
+      }];
+    },
+    actions: {
+      insertExpand: insertExpand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+    },
+    pmPlugins() {
+      return [{
+        name: 'expand',
+        plugin: ({
+          dispatch,
+          getIntl
+        }) => {
+          var _options$allowInterac;
+          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true, options.__livePage);
+        }
+      }, {
+        name: 'expandKeymap',
+        plugin: () => expandKeymap(api, {
+          __livePage: options.__livePage
+        })
+      }];
+    },
+    pluginsOptions: {
+      floatingToolbar: getToolbarConfig(api),
+      quickInsert: ({
+        formatMessage
+      }) => {
+        if (options && options.allowInsertion !== true) {
+          return [];
+        }
+        return [{
+          id: 'expand',
+          title: formatMessage(messages.expand),
+          description: formatMessage(messages.expandDescription),
+          keywords: ['accordion', 'collapse'],
+          priority: 600,
+          icon: () => /*#__PURE__*/React.createElement(IconExpand, null),
+          action(insert, state) {
+            var _api$analytics2;
+            const node = createExpandNode(state);
+            if (!node) {
+              return false;
+            }
+            const tr = state.selection.empty ? insert(node) : createWrapSelectionTransaction({
+              state,
+              type: node.type
+            });
+            api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
+              action: ACTION.INSERTED,
+              actionSubject: ACTION_SUBJECT.DOCUMENT,
+              actionSubjectId: node.type === state.schema.nodes.nestedExpand ? ACTION_SUBJECT_ID.NESTED_EXPAND : ACTION_SUBJECT_ID.EXPAND,
+              attributes: {
+                inputMethod: INPUT_METHOD.QUICK_INSERT
+              },
+              eventType: EVENT_TYPE.TRACK
+            })(tr);
+            return tr;
+          }
+        }];
+      }
+    }
+  };
+};

package/dist/es2019/plugin.js

@@ -1,90 +1,19 @@
-import React from 'react';
-import { expand, extendedNestedExpand, 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { createExpandNode, insertExpand } from './commands';
-import { expandKeymap } from './pm-plugins/keymap';
-import { createPlugin } from './pm-plugins/main';
-import { getToolbarConfig } from './toolbar';
+import { expandPlugin as legacyExpandPlugin } from './legacyExpand/plugin';
+import { expandPlugin as singlePlayerExpandPlugin } from './singlePlayerExpand/plugin';
 export const expandPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$analytics;
-  return {
-    name: 'expand',
-    nodes() {
-      const nestedExpandNode = getBooleanFF('platform.editor.allow-extended-nested-expand') ? extendedNestedExpand : nestedExpand;
-      return [{
-        name: 'expand',
-        node: expand
-      }, {
-        name: 'nestedExpand',
-        node: nestedExpandNode
-      }];
-    },
-    actions: {
-      insertExpand: insertExpand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
-    },
-    pmPlugins() {
-      return [{
-        name: 'expand',
-        plugin: ({
-          dispatch,
-          getIntl
-        }) => {
-          var _options$allowInterac;
-          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true, options.__livePage);
-        }
-      }, {
-        name: 'expandKeymap',
-        plugin: () => expandKeymap(api, {
-          __livePage: options.__livePage
-        })
-      }];
-    },
-    pluginsOptions: {
-      floatingToolbar: getToolbarConfig(api),
-      quickInsert: ({
-        formatMessage
-      }) => {
-        if (options && options.allowInsertion !== true) {
-          return [];
-        }
-        return [{
-          id: 'expand',
-          title: formatMessage(messages.expand),
-          description: formatMessage(messages.expandDescription),
-          keywords: ['accordion', 'collapse'],
-          priority: 600,
-          icon: () => /*#__PURE__*/React.createElement(IconExpand, null),
-          action(insert, state) {
-            var _api$analytics2;
-            const node = createExpandNode(state);
-            if (!node) {
-              return false;
-            }
-            const tr = state.selection.empty ? insert(node) : createWrapSelectionTransaction({
-              state,
-              type: node.type
-            });
-            api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: node.type === state.schema.nodes.nestedExpand ? ACTION_SUBJECT_ID.NESTED_EXPAND : ACTION_SUBJECT_ID.EXPAND,
-              attributes: {
-                inputMethod: INPUT_METHOD.QUICK_INSERT
-              },
-              eventType: EVENT_TYPE.TRACK
-            })(tr);
-            return tr;
-          }
-        }];
-      }
-    }
-  };
-};
-export { pluginKey } from './pm-plugins/plugin-factory';
+  if (getBooleanFF('platform.editor.single-player-expand') && options !== null && options !== void 0 && options.__livePage) {
+    return singlePlayerExpandPlugin({
+      config: options,
+      api
+    });
+  } else {
+    return legacyExpandPlugin({
+      config: options,
+      api
+    });
+  }
+};

package/dist/es2019/singlePlayerExpand/plugin.js

@@ -0,0 +1,30 @@
+import { expand, extendedNestedExpand, nestedExpand } from '@atlaskit/adf-schema';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+
+// TODO: https://product-fabric.atlassian.net/browse/ED-22840
+// In ED-22840 make sure we update the ExpandPlugin type to use singlePlayerExpands own types
+
+export const expandPlugin = () => {
+  return {
+    name: 'expand',
+    nodes() {
+      const nestedExpandNode = getBooleanFF('platform.editor.allow-extended-nested-expand') ? extendedNestedExpand : nestedExpand;
+      return [{
+        name: 'expand',
+        node: expand
+      }, {
+        name: 'nestedExpand',
+        node: nestedExpandNode
+      }];
+    },
+    actions: {
+      insertExpand: () => {
+        return false;
+      }
+    },
+    pmPlugins() {
+      return [];
+    },
+    pluginsOptions: {}
+  };
+};

package/dist/esm/index.js

@@ -1 +1,3 @@
+// TODO: Handle type exports for singlePlayerExpandPlugin when they're created
+// https://product-fabric.atlassian.net/browse/ED-22840
 export { expandPlugin } from './plugin';

package/dist/esm/legacyExpand/plugin.js

@@ -0,0 +1,92 @@
+import React from 'react';
+import { expand, extendedNestedExpand, 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { createExpandNode, insertExpand } from './commands';
+import { expandKeymap } from './pm-plugins/keymap';
+import { createPlugin } from './pm-plugins/main';
+import { getToolbarConfig } from './toolbar';
+export { pluginKey } from './pm-plugins/plugin-factory';
+export var expandPlugin = function expandPlugin(_ref) {
+  var _api$analytics;
+  var _ref$config = _ref.config,
+    options = _ref$config === void 0 ? {} : _ref$config,
+    api = _ref.api;
+  return {
+    name: 'expand',
+    nodes: function nodes() {
+      var nestedExpandNode = getBooleanFF('platform.editor.allow-extended-nested-expand') ? extendedNestedExpand : nestedExpand;
+      return [{
+        name: 'expand',
+        node: expand
+      }, {
+        name: 'nestedExpand',
+        node: nestedExpandNode
+      }];
+    },
+    actions: {
+      insertExpand: insertExpand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+    },
+    pmPlugins: function pmPlugins() {
+      return [{
+        name: 'expand',
+        plugin: function plugin(_ref2) {
+          var _options$allowInterac;
+          var dispatch = _ref2.dispatch,
+            getIntl = _ref2.getIntl;
+          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true, options.__livePage);
+        }
+      }, {
+        name: 'expandKeymap',
+        plugin: function plugin() {
+          return expandKeymap(api, {
+            __livePage: options.__livePage
+          });
+        }
+      }];
+    },
+    pluginsOptions: {
+      floatingToolbar: getToolbarConfig(api),
+      quickInsert: function quickInsert(_ref3) {
+        var formatMessage = _ref3.formatMessage;
+        if (options && options.allowInsertion !== true) {
+          return [];
+        }
+        return [{
+          id: 'expand',
+          title: formatMessage(messages.expand),
+          description: formatMessage(messages.expandDescription),
+          keywords: ['accordion', 'collapse'],
+          priority: 600,
+          icon: function icon() {
+            return /*#__PURE__*/React.createElement(IconExpand, null);
+          },
+          action: function action(insert, state) {
+            var _api$analytics2;
+            var node = createExpandNode(state);
+            if (!node) {
+              return false;
+            }
+            var tr = state.selection.empty ? insert(node) : createWrapSelectionTransaction({
+              state: state,
+              type: node.type
+            });
+            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
+              action: ACTION.INSERTED,
+              actionSubject: ACTION_SUBJECT.DOCUMENT,
+              actionSubjectId: node.type === state.schema.nodes.nestedExpand ? ACTION_SUBJECT_ID.NESTED_EXPAND : ACTION_SUBJECT_ID.EXPAND,
+              attributes: {
+                inputMethod: INPUT_METHOD.QUICK_INSERT
+              },
+              eventType: EVENT_TYPE.TRACK
+            })(tr);
+            return tr;
+          }
+        }];
+      }
+    }
+  };
+};

package/dist/esm/plugin.js

@@ -1,92 +1,19 @@
-import React from 'react';
-import { expand, extendedNestedExpand, 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { createExpandNode, insertExpand } from './commands';
-import { expandKeymap } from './pm-plugins/keymap';
-import { createPlugin } from './pm-plugins/main';
-import { getToolbarConfig } from './toolbar';
+import { expandPlugin as legacyExpandPlugin } from './legacyExpand/plugin';
+import { expandPlugin as singlePlayerExpandPlugin } from './singlePlayerExpand/plugin';
 export var expandPlugin = function expandPlugin(_ref) {
-  var _api$analytics;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  return {
-    name: 'expand',
-    nodes: function nodes() {
-      var nestedExpandNode = getBooleanFF('platform.editor.allow-extended-nested-expand') ? extendedNestedExpand : nestedExpand;
-      return [{
-        name: 'expand',
-        node: expand
-      }, {
-        name: 'nestedExpand',
-        node: nestedExpandNode
-      }];
-    },
-    actions: {
-      insertExpand: insertExpand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
-    },
-    pmPlugins: function pmPlugins() {
-      return [{
-        name: 'expand',
-        plugin: function plugin(_ref2) {
-          var _options$allowInterac;
-          var dispatch = _ref2.dispatch,
-            getIntl = _ref2.getIntl;
-          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true, options.__livePage);
-        }
-      }, {
-        name: 'expandKeymap',
-        plugin: function plugin() {
-          return expandKeymap(api, {
-            __livePage: options.__livePage
-          });
-        }
-      }];
-    },
-    pluginsOptions: {
-      floatingToolbar: getToolbarConfig(api),
-      quickInsert: function quickInsert(_ref3) {
-        var formatMessage = _ref3.formatMessage;
-        if (options && options.allowInsertion !== true) {
-          return [];
-        }
-        return [{
-          id: 'expand',
-          title: formatMessage(messages.expand),
-          description: formatMessage(messages.expandDescription),
-          keywords: ['accordion', 'collapse'],
-          priority: 600,
-          icon: function icon() {
-            return /*#__PURE__*/React.createElement(IconExpand, null);
-          },
-          action: function action(insert, state) {
-            var _api$analytics2;
-            var node = createExpandNode(state);
-            if (!node) {
-              return false;
-            }
-            var tr = state.selection.empty ? insert(node) : createWrapSelectionTransaction({
-              state: state,
-              type: node.type
-            });
-            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: node.type === state.schema.nodes.nestedExpand ? ACTION_SUBJECT_ID.NESTED_EXPAND : ACTION_SUBJECT_ID.EXPAND,
-              attributes: {
-                inputMethod: INPUT_METHOD.QUICK_INSERT
-              },
-              eventType: EVENT_TYPE.TRACK
-            })(tr);
-            return tr;
-          }
-        }];
-      }
-    }
-  };
-};
-export { pluginKey } from './pm-plugins/plugin-factory';
+  if (getBooleanFF('platform.editor.single-player-expand') && options !== null && options !== void 0 && options.__livePage) {
+    return singlePlayerExpandPlugin({
+      config: options,
+      api: api
+    });
+  } else {
+    return legacyExpandPlugin({
+      config: options,
+      api: api
+    });
+  }
+};

package/dist/esm/singlePlayerExpand/plugin.js

@@ -0,0 +1,30 @@
+import { expand, extendedNestedExpand, nestedExpand } from '@atlaskit/adf-schema';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+
+// TODO: https://product-fabric.atlassian.net/browse/ED-22840
+// In ED-22840 make sure we update the ExpandPlugin type to use singlePlayerExpands own types
+
+export var expandPlugin = function expandPlugin() {
+  return {
+    name: 'expand',
+    nodes: function nodes() {
+      var nestedExpandNode = getBooleanFF('platform.editor.allow-extended-nested-expand') ? extendedNestedExpand : nestedExpand;
+      return [{
+        name: 'expand',
+        node: expand
+      }, {
+        name: 'nestedExpand',
+        node: nestedExpandNode
+      }];
+    },
+    actions: {
+      insertExpand: function insertExpand() {
+        return false;
+      }
+    },
+    pmPlugins: function pmPlugins() {
+      return [];
+    },
+    pluginsOptions: {}
+  };
+};

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export type { ExpandPlugin, ExpandPluginState, ExpandPluginOptions, } from './types';
+export type { ExpandPlugin, ExpandPluginState, ExpandPluginOptions, } from './legacyExpand/types';
 export { expandPlugin } from './plugin';

package/dist/{types-ts4.5 → types/legacyExpand}/nodeviews/index.d.ts

@@ -1,7 +1,6 @@
 import type { IntlShape } from 'react-intl-next';
 import type { SetSelectionRelativeToNode } from '@atlaskit/editor-common/selection';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { getPosHandler, getPosHandlerNode } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI, getPosHandler, getPosHandlerNode } from '@atlaskit/editor-common/types';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { Decoration, EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 import type { ExpandPlugin } from '../types';

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

@@ -0,0 +1,3 @@
+import type { ExpandPlugin } from './types';
+export { pluginKey } from './pm-plugins/plugin-factory';
+export declare const expandPlugin: ExpandPlugin;

package/dist/types/legacyExpand/pm-plugins/plugin-factory.d.ts

@@ -0,0 +1,3 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export declare const pluginKey: PluginKey<any>;
+export declare const createPluginState: (dispatch: import("@atlaskit/editor-common/event-dispatcher").Dispatch, initialState: import("../types").ExpandPluginState | ((state: import("prosemirror-state").EditorState) => import("../types").ExpandPluginState)) => import("prosemirror-state").SafeStateField<import("../types").ExpandPluginState>, createCommand: <A = import("../types").ExpandPluginAction>(action: A | ((state: Readonly<import("prosemirror-state").EditorState>) => false | A), transform?: ((tr: import("prosemirror-state").Transaction, state: import("prosemirror-state").EditorState) => import("prosemirror-state").Transaction) | undefined) => import("@atlaskit/editor-common/types").Command, getPluginState: (state: import("prosemirror-state").EditorState) => import("../types").ExpandPluginState;

package/dist/types/{toolbar.d.ts → legacyExpand/toolbar.d.ts}

@@ -1,3 +1,3 @@
 import type { ExtractInjectionAPI, FloatingToolbarHandler } from '@atlaskit/editor-common/types';
-import type { ExpandPlugin } from './index';
+import type { ExpandPlugin } from './types';
 export declare const getToolbarConfig: (api: ExtractInjectionAPI<ExpandPlugin> | undefined) => FloatingToolbarHandler;

package/dist/types/plugin.d.ts

@@ -1,3 +1,2 @@
-import type { ExpandPlugin } from './types';
+import type { ExpandPlugin } from './legacyExpand/types';
 export declare const expandPlugin: ExpandPlugin;
-export { pluginKey } from './pm-plugins/plugin-factory';

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

@@ -0,0 +1,2 @@
+import type { ExpandPlugin } from '../legacyExpand/types';
+export declare const expandPlugin: ExpandPlugin;

package/dist/types-ts4.5/index.d.ts

@@ -1,2 +1,2 @@
-export type { ExpandPlugin, ExpandPluginState, ExpandPluginOptions, } from './types';
+export type { ExpandPlugin, ExpandPluginState, ExpandPluginOptions, } from './legacyExpand/types';
 export { expandPlugin } from './plugin';

package/dist/{types → types-ts4.5/legacyExpand}/nodeviews/index.d.ts

@@ -1,7 +1,6 @@
 import type { IntlShape } from 'react-intl-next';
 import type { SetSelectionRelativeToNode } from '@atlaskit/editor-common/selection';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { getPosHandler, getPosHandlerNode } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI, getPosHandler, getPosHandlerNode } from '@atlaskit/editor-common/types';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { Decoration, EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 import type { ExpandPlugin } from '../types';

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

@@ -0,0 +1,3 @@
+import type { ExpandPlugin } from './types';
+export { pluginKey } from './pm-plugins/plugin-factory';
+export declare const expandPlugin: ExpandPlugin;

package/dist/types-ts4.5/legacyExpand/pm-plugins/plugin-factory.d.ts

@@ -0,0 +1,3 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export declare const pluginKey: PluginKey<any>;
+export declare const createPluginState: (dispatch: import("@atlaskit/editor-common/event-dispatcher").Dispatch, initialState: import("../types").ExpandPluginState | ((state: import("prosemirror-state").EditorState) => import("../types").ExpandPluginState)) => import("prosemirror-state").SafeStateField<import("../types").ExpandPluginState>, createCommand: <A = import("../types").ExpandPluginAction>(action: A | ((state: Readonly<import("prosemirror-state").EditorState>) => false | A), transform?: ((tr: import("prosemirror-state").Transaction, state: import("prosemirror-state").EditorState) => import("prosemirror-state").Transaction) | undefined) => import("@atlaskit/editor-common/types").Command, getPluginState: (state: import("prosemirror-state").EditorState) => import("../types").ExpandPluginState;

package/dist/types-ts4.5/{toolbar.d.ts → legacyExpand/toolbar.d.ts}

@@ -1,3 +1,3 @@
 import type { ExtractInjectionAPI, FloatingToolbarHandler } from '@atlaskit/editor-common/types';
-import type { ExpandPlugin } from './index';
+import type { ExpandPlugin } from './types';
 export declare const getToolbarConfig: (api: ExtractInjectionAPI<ExpandPlugin> | undefined) => FloatingToolbarHandler;

package/dist/types-ts4.5/plugin.d.ts

@@ -1,3 +1,2 @@
-import type { ExpandPlugin } from './types';
+import type { ExpandPlugin } from './legacyExpand/types';
 export declare const expandPlugin: ExpandPlugin;
-export { pluginKey } from './pm-plugins/plugin-factory';

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

@@ -0,0 +1,2 @@
+import type { ExpandPlugin } from '../legacyExpand/types';
+export declare const expandPlugin: ExpandPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-expand",
-  "version": "1.2.5",
+  "version": "1.3.0",
   "description": "Expand plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -34,8 +34,8 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^35.8.0",
-    "@atlaskit/button": "^17.8.0",
-    "@atlaskit/editor-common": "^78.22.0",
+    "@atlaskit/button": "^17.11.0",
+    "@atlaskit/editor-common": "^78.23.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-decorations": "^1.0.0",
     "@atlaskit/editor-plugin-selection": "^1.1.0",
@@ -47,7 +47,7 @@
     "@atlaskit/tooltip": "^18.1.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
-    "w3c-keyname": "^2.1.0"
+    "w3c-keyname": "^2.1.8"
   },
   "peerDependencies": {
     "react": "^16.8.0",
@@ -107,6 +107,9 @@
     },
     "platform.editor.live-pages-expand-divergence": {
       "type": "boolean"
+    },
+    "platform.editor.single-player-expand": {
+      "type": "boolean"
     }
   }
 }

package/dist/types/pm-plugins/plugin-factory.d.ts

@@ -1,3 +0,0 @@
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-export declare const pluginKey: PluginKey<any>;
-export declare const createPluginState: (dispatch: import("@atlaskit/editor-common/event-dispatcher").Dispatch, initialState: import("..").ExpandPluginState | ((state: import("prosemirror-state").EditorState) => import("..").ExpandPluginState)) => import("prosemirror-state").SafeStateField<import("..").ExpandPluginState>, createCommand: <A = import("../types").ExpandPluginAction>(action: A | ((state: Readonly<import("prosemirror-state").EditorState>) => false | A), transform?: ((tr: import("prosemirror-state").Transaction, state: import("prosemirror-state").EditorState) => import("prosemirror-state").Transaction) | undefined) => import("@atlaskit/editor-common/types").Command, getPluginState: (state: import("prosemirror-state").EditorState) => import("..").ExpandPluginState;

package/dist/types-ts4.5/pm-plugins/plugin-factory.d.ts

@@ -1,3 +0,0 @@
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-export declare const pluginKey: PluginKey<any>;
-export declare const createPluginState: (dispatch: import("@atlaskit/editor-common/event-dispatcher").Dispatch, initialState: import("..").ExpandPluginState | ((state: import("prosemirror-state").EditorState) => import("..").ExpandPluginState)) => import("prosemirror-state").SafeStateField<import("..").ExpandPluginState>, createCommand: <A = import("../types").ExpandPluginAction>(action: A | ((state: Readonly<import("prosemirror-state").EditorState>) => false | A), transform?: ((tr: import("prosemirror-state").Transaction, state: import("prosemirror-state").EditorState) => import("prosemirror-state").Transaction) | undefined) => import("@atlaskit/editor-common/types").Command, getPluginState: (state: import("prosemirror-state").EditorState) => import("..").ExpandPluginState;