@atlaskit/editor-plugin-expand 2.2.0 → 2.3.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-expand
 
+## 2.3.0
+
+### Minor Changes
+
+- [#128347](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/128347)
+  [`e33566cebd5d1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e33566cebd5d1) -
+  [ED-24175] bump @atlaskit/adf-schema to 40.8.1 and @atlassian/adf-schema-json to 1.22.0 to
+  promotecodeblocks & media in quotes, and nested expands in expands to full schema, and allow
+  quotes in panels and decisions in lists in stage0 schema, and a validator spec change
+- [#128333](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/128333)
+  [`4ad86751ab1d7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4ad86751ab1d7) -
+  [ED-24505] Implement onClick handler for Turn into dropdown options and update relevant insertion
+  analytics with inputMethod: floatingToolbar when an element is inserted via the dropdown
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.2.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.2.0
 
 ### Minor Changes

package/dist/cjs/legacyExpand/commands.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateExpandTitle = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.setExpandRef = exports.insertExpand = exports.focusTitle = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
+exports.updateExpandTitle = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.setExpandRef = exports.insertExpandWithInputMethod = exports.insertExpand = exports.focusTitle = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -70,7 +70,7 @@ var updateExpandTitle = exports.updateExpandTitle = function updateExpandTitle(_
     var node = state.doc.nodeAt(pos);
     if (node && node.type === nodeType && dispatch) {
       var tr = state.tr;
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && __livePage) {
+      if (__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence')) {
         tr.step(new _steps.SetAttrsStep(pos, _objectSpread(_objectSpread({}, node.attrs), {}, {
           title: title
         })));
@@ -94,7 +94,7 @@ var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandE
     if (node && node.type === nodeType && dispatch) {
       var tr = state.tr;
       var isExpandedNext = !node.attrs.__expanded;
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && __livePage) {
+      if (__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence')) {
         tr.step(new _steps.SetAttrsStep(pos, _objectSpread(_objectSpread({}, node.attrs), {}, {
           __expanded: isExpandedNext
         })));
@@ -107,7 +107,7 @@ var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandE
       // If we're going to collapse the expand and our cursor is currently inside
       // Move to a right gap cursor, if the toolbar is interacted (or an API),
       // it will insert below rather than inside (which will be invisible).
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && __livePage ? isExpandedNext === true : isExpandedNext === false && (0, _utils4.findExpand)(state)) {
+      if (__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? isExpandedNext === true : isExpandedNext === false && (0, _utils4.findExpand)(state)) {
         tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), _selection.Side.RIGHT));
       }
 
@@ -119,7 +119,7 @@ var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandE
         attributes: {
           platform: _analytics.PLATFORMS.WEB,
           mode: _analytics.MODE.EDITOR,
-          expanded: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && __livePage ? !isExpandedNext : isExpandedNext
+          expanded: __livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !isExpandedNext : isExpandedNext
         },
         eventType: _analytics.EVENT_TYPE.TRACK
       };
@@ -142,30 +142,37 @@ var createExpandNode = exports.createExpandNode = function createExpandNode(stat
   var expandType = (0, _utils3.findTable)(state.selection) ? nestedExpand : expand;
   return expandType.createAndFill({});
 };
+var insertExpandWithInputMethod = exports.insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI) {
+  return function (inputMethod) {
+    return function (state, dispatch) {
+      var expandNode = createExpandNode(state);
+      if (!expandNode) {
+        return false;
+      }
+      var tr = state.selection.empty ? (0, _utils2.safeInsert)(expandNode)(state.tr).scrollIntoView() : (0, _utils.createWrapSelectionTransaction)({
+        state: state,
+        type: expandNode.type
+      });
+      var payload = {
+        action: _analytics.ACTION.INSERTED,
+        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? _analytics.ACTION_SUBJECT_ID.EXPAND : _analytics.ACTION_SUBJECT_ID.NESTED_EXPAND,
+        attributes: {
+          inputMethod: inputMethod
+        },
+        eventType: _analytics.EVENT_TYPE.TRACK
+      };
+      if (dispatch && expandNode) {
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+        dispatch(tr);
+      }
+      return true;
+    };
+  };
+};
 var insertExpand = exports.insertExpand = function insertExpand(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    var expandNode = createExpandNode(state);
-    if (!expandNode) {
-      return false;
-    }
-    var tr = state.selection.empty ? (0, _utils2.safeInsert)(expandNode)(state.tr).scrollIntoView() : (0, _utils.createWrapSelectionTransaction)({
-      state: state,
-      type: expandNode.type
-    });
-    var payload = {
-      action: _analytics.ACTION.INSERTED,
-      actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-      actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? _analytics.ACTION_SUBJECT_ID.EXPAND : _analytics.ACTION_SUBJECT_ID.NESTED_EXPAND,
-      attributes: {
-        inputMethod: _analytics.INPUT_METHOD.INSERT_MENU
-      },
-      eventType: _analytics.EVENT_TYPE.TRACK
-    };
-    if (dispatch && expandNode) {
-      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-      dispatch(tr);
-    }
-    return true;
+    return insertExpandWithInputMethod(editorAnalyticsAPI)(_analytics.INPUT_METHOD.INSERT_MENU)(state, dispatch);
   };
 };
 var focusTitle = exports.focusTitle = function focusTitle(pos) {

package/dist/cjs/legacyExpand/plugin.js

@@ -23,7 +23,7 @@ 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 _api$analytics, _api$analytics2;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
@@ -39,7 +39,8 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
       }];
     },
     actions: {
-      insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+      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 [{
@@ -76,7 +77,7 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconExpand, null);
           },
           action: function action(insert, state) {
-            var _api$analytics2;
+            var _api$analytics3;
             var node = (0, _commands.createExpandNode)(state);
             if (!node) {
               return false;
@@ -85,7 +86,7 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
               state: state,
               type: node.type
             });
-            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
+            api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.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,

package/dist/cjs/singlePlayerExpand/commands.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateExpandTitle = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.insertExpand = exports.focusTitle = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
+exports.updateExpandTitle = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.insertExpandWithInputMethod = exports.insertExpand = exports.focusTitle = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -27,30 +27,37 @@ var createExpandNode = exports.createExpandNode = function createExpandNode(stat
   _expand.expandedState.set(expandNode, true);
   return expandNode;
 };
+var insertExpandWithInputMethod = exports.insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI) {
+  return function (inputMethod) {
+    return function (state, dispatch) {
+      var expandNode = createExpandNode(state);
+      if (!expandNode) {
+        return false;
+      }
+      var tr = state.selection.empty ? (0, _utils2.safeInsert)(expandNode)(state.tr).scrollIntoView() : (0, _utils.createWrapSelectionTransaction)({
+        state: state,
+        type: expandNode.type
+      });
+      var payload = {
+        action: _analytics.ACTION.INSERTED,
+        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? _analytics.ACTION_SUBJECT_ID.EXPAND : _analytics.ACTION_SUBJECT_ID.NESTED_EXPAND,
+        attributes: {
+          inputMethod: inputMethod
+        },
+        eventType: _analytics.EVENT_TYPE.TRACK
+      };
+      if (dispatch && expandNode) {
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+        dispatch(tr);
+      }
+      return true;
+    };
+  };
+};
 var insertExpand = exports.insertExpand = function insertExpand(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    var expandNode = createExpandNode(state);
-    if (!expandNode) {
-      return false;
-    }
-    var tr = state.selection.empty ? (0, _utils2.safeInsert)(expandNode)(state.tr).scrollIntoView() : (0, _utils.createWrapSelectionTransaction)({
-      state: state,
-      type: expandNode.type
-    });
-    var payload = {
-      action: _analytics.ACTION.INSERTED,
-      actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-      actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? _analytics.ACTION_SUBJECT_ID.EXPAND : _analytics.ACTION_SUBJECT_ID.NESTED_EXPAND,
-      attributes: {
-        inputMethod: _analytics.INPUT_METHOD.INSERT_MENU
-      },
-      eventType: _analytics.EVENT_TYPE.TRACK
-    };
-    if (dispatch && expandNode) {
-      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-      dispatch(tr);
-    }
-    return true;
+    return insertExpandWithInputMethod(editorAnalyticsAPI)(_analytics.INPUT_METHOD.INSERT_MENU)(state, dispatch);
   };
 };
 var deleteExpand = exports.deleteExpand = function deleteExpand(editorAnalyticsAPI) {

package/dist/cjs/singlePlayerExpand/plugin.js

@@ -16,7 +16,7 @@ var _keymap = require("./pm-plugins/keymap");
 var _main = require("./pm-plugins/main");
 var _toolbar = require("./toolbar");
 var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
-  var _api$analytics;
+  var _api$analytics, _api$analytics2;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
@@ -32,7 +32,8 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
       }];
     },
     actions: {
-      insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+      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 [{
@@ -69,7 +70,7 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconExpand, null);
           },
           action: function action(insert, state) {
-            var _api$analytics2;
+            var _api$analytics3;
             var node = (0, _commands.createExpandNode)(state);
             if (!node) {
               return false;
@@ -78,7 +79,7 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
               state: state,
               type: node.type
             });
-            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
+            api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.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,

package/dist/es2019/legacyExpand/commands.js

@@ -5,7 +5,7 @@ import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createCommand } from './pm-plugins/plugin-factory';
 import { findExpand } from './utils';
 export const setExpandRef = ref => createCommand({
@@ -54,7 +54,7 @@ export const updateExpandTitle = ({
     const {
       tr
     } = state;
-    if (getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage) {
+    if (__livePage && fg('platform.editor.live-pages-expand-divergence')) {
       tr.step(new SetAttrsStep(pos, {
         ...node.attrs,
         title
@@ -81,7 +81,7 @@ export const toggleExpandExpanded = ({
       tr
     } = state;
     const isExpandedNext = !node.attrs.__expanded;
-    if (getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage) {
+    if (__livePage && fg('platform.editor.live-pages-expand-divergence')) {
       tr.step(new SetAttrsStep(pos, {
         ...node.attrs,
         __expanded: isExpandedNext
@@ -96,7 +96,7 @@ export const toggleExpandExpanded = ({
     // If we're going to collapse the expand and our cursor is currently inside
     // Move to a right gap cursor, if the toolbar is interacted (or an API),
     // it will insert below rather than inside (which will be invisible).
-    if (getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? isExpandedNext === true : isExpandedNext === false && findExpand(state)) {
+    if (__livePage && fg('platform.editor.live-pages-expand-divergence') ? isExpandedNext === true : isExpandedNext === false && findExpand(state)) {
       tr.setSelection(new GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), Side.RIGHT));
     }
 
@@ -108,7 +108,7 @@ export const toggleExpandExpanded = ({
       attributes: {
         platform: PLATFORMS.WEB,
         mode: MODE.EDITOR,
-        expanded: getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? !isExpandedNext : isExpandedNext
+        expanded: __livePage && fg('platform.editor.live-pages-expand-divergence') ? !isExpandedNext : isExpandedNext
       },
       eventType: EVENT_TYPE.TRACK
     };
@@ -131,7 +131,7 @@ export const createExpandNode = state => {
   const expandType = findTable(state.selection) ? nestedExpand : expand;
   return expandType.createAndFill({});
 };
-export const insertExpand = editorAnalyticsAPI => (state, dispatch) => {
+export const insertExpandWithInputMethod = editorAnalyticsAPI => inputMethod => (state, dispatch) => {
   const expandNode = createExpandNode(state);
   if (!expandNode) {
     return false;
@@ -145,7 +145,7 @@ export const insertExpand = editorAnalyticsAPI => (state, dispatch) => {
     actionSubject: ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? ACTION_SUBJECT_ID.EXPAND : ACTION_SUBJECT_ID.NESTED_EXPAND,
     attributes: {
-      inputMethod: INPUT_METHOD.INSERT_MENU
+      inputMethod
     },
     eventType: EVENT_TYPE.TRACK
   };
@@ -155,6 +155,9 @@ export const insertExpand = editorAnalyticsAPI => (state, dispatch) => {
   }
   return true;
 };
+export const insertExpand = editorAnalyticsAPI => (state, dispatch) => {
+  return insertExpandWithInputMethod(editorAnalyticsAPI)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
+};
 export const focusTitle = pos => (state, dispatch, editorView) => {
   if (editorView) {
     const dom = editorView.domAtPos(pos);

package/dist/es2019/legacyExpand/plugin.js

@@ -4,7 +4,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 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 { createExpandNode, insertExpand } from './commands';
+import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
@@ -13,7 +13,7 @@ export const expandPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$analytics;
+  var _api$analytics, _api$analytics2;
   return {
     name: 'expand',
     nodes() {
@@ -26,7 +26,8 @@ export const expandPlugin = ({
       }];
     },
     actions: {
-      insertExpand: insertExpand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+      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 [{
@@ -61,7 +62,7 @@ export const expandPlugin = ({
           priority: 600,
           icon: () => /*#__PURE__*/React.createElement(IconExpand, null),
           action(insert, state) {
-            var _api$analytics2;
+            var _api$analytics3;
             const node = createExpandNode(state);
             if (!node) {
               return false;
@@ -70,7 +71,7 @@ export const expandPlugin = ({
               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({
+            api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.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,

package/dist/es2019/singlePlayerExpand/commands.js

@@ -7,7 +7,6 @@ import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
-
 // Creates either an expand or a nestedExpand node based on the current selection
 export const createExpandNode = state => {
   const {
@@ -19,7 +18,7 @@ export const createExpandNode = state => {
   expandedState.set(expandNode, true);
   return expandNode;
 };
-export const insertExpand = editorAnalyticsAPI => (state, dispatch) => {
+export const insertExpandWithInputMethod = editorAnalyticsAPI => inputMethod => (state, dispatch) => {
   const expandNode = createExpandNode(state);
   if (!expandNode) {
     return false;
@@ -33,7 +32,7 @@ export const insertExpand = editorAnalyticsAPI => (state, dispatch) => {
     actionSubject: ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? ACTION_SUBJECT_ID.EXPAND : ACTION_SUBJECT_ID.NESTED_EXPAND,
     attributes: {
-      inputMethod: INPUT_METHOD.INSERT_MENU
+      inputMethod
     },
     eventType: EVENT_TYPE.TRACK
   };
@@ -43,6 +42,9 @@ export const insertExpand = editorAnalyticsAPI => (state, dispatch) => {
   }
   return true;
 };
+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);
   if (!expandNode) {

package/dist/es2019/singlePlayerExpand/plugin.js

@@ -4,7 +4,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 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 { createExpandNode, insertExpand } from './commands';
+import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
@@ -12,7 +12,7 @@ export const expandPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$analytics;
+  var _api$analytics, _api$analytics2;
   return {
     name: 'expand',
     nodes() {
@@ -25,7 +25,8 @@ export const expandPlugin = ({
       }];
     },
     actions: {
-      insertExpand: insertExpand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+      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 [{
@@ -60,7 +61,7 @@ export const expandPlugin = ({
           priority: 600,
           icon: () => /*#__PURE__*/React.createElement(IconExpand, null),
           action(insert, state) {
-            var _api$analytics2;
+            var _api$analytics3;
             const node = createExpandNode(state);
             if (!node) {
               return false;
@@ -69,7 +70,7 @@ export const expandPlugin = ({
               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({
+            api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.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,

package/dist/esm/legacyExpand/commands.js

@@ -8,7 +8,7 @@ import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createCommand } from './pm-plugins/plugin-factory';
 import { findExpand } from './utils';
 export var setExpandRef = function setExpandRef(ref) {
@@ -63,7 +63,7 @@ export var updateExpandTitle = function updateExpandTitle(_ref) {
     var node = state.doc.nodeAt(pos);
     if (node && node.type === nodeType && dispatch) {
       var tr = state.tr;
-      if (getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage) {
+      if (__livePage && fg('platform.editor.live-pages-expand-divergence')) {
         tr.step(new SetAttrsStep(pos, _objectSpread(_objectSpread({}, node.attrs), {}, {
           title: title
         })));
@@ -87,7 +87,7 @@ export var toggleExpandExpanded = function toggleExpandExpanded(_ref2) {
     if (node && node.type === nodeType && dispatch) {
       var tr = state.tr;
       var isExpandedNext = !node.attrs.__expanded;
-      if (getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage) {
+      if (__livePage && fg('platform.editor.live-pages-expand-divergence')) {
         tr.step(new SetAttrsStep(pos, _objectSpread(_objectSpread({}, node.attrs), {}, {
           __expanded: isExpandedNext
         })));
@@ -100,7 +100,7 @@ export var toggleExpandExpanded = function toggleExpandExpanded(_ref2) {
       // If we're going to collapse the expand and our cursor is currently inside
       // Move to a right gap cursor, if the toolbar is interacted (or an API),
       // it will insert below rather than inside (which will be invisible).
-      if (getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? isExpandedNext === true : isExpandedNext === false && findExpand(state)) {
+      if (__livePage && fg('platform.editor.live-pages-expand-divergence') ? isExpandedNext === true : isExpandedNext === false && findExpand(state)) {
         tr.setSelection(new GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), Side.RIGHT));
       }
 
@@ -112,7 +112,7 @@ export var toggleExpandExpanded = function toggleExpandExpanded(_ref2) {
         attributes: {
           platform: PLATFORMS.WEB,
           mode: MODE.EDITOR,
-          expanded: getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? !isExpandedNext : isExpandedNext
+          expanded: __livePage && fg('platform.editor.live-pages-expand-divergence') ? !isExpandedNext : isExpandedNext
         },
         eventType: EVENT_TYPE.TRACK
       };
@@ -135,30 +135,37 @@ export var createExpandNode = function createExpandNode(state) {
   var expandType = findTable(state.selection) ? nestedExpand : expand;
   return expandType.createAndFill({});
 };
+export var insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI) {
+  return function (inputMethod) {
+    return function (state, dispatch) {
+      var expandNode = createExpandNode(state);
+      if (!expandNode) {
+        return false;
+      }
+      var tr = state.selection.empty ? safeInsert(expandNode)(state.tr).scrollIntoView() : createWrapSelectionTransaction({
+        state: state,
+        type: expandNode.type
+      });
+      var payload = {
+        action: ACTION.INSERTED,
+        actionSubject: ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? ACTION_SUBJECT_ID.EXPAND : ACTION_SUBJECT_ID.NESTED_EXPAND,
+        attributes: {
+          inputMethod: inputMethod
+        },
+        eventType: EVENT_TYPE.TRACK
+      };
+      if (dispatch && expandNode) {
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+        dispatch(tr);
+      }
+      return true;
+    };
+  };
+};
 export var insertExpand = function insertExpand(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    var expandNode = createExpandNode(state);
-    if (!expandNode) {
-      return false;
-    }
-    var tr = state.selection.empty ? safeInsert(expandNode)(state.tr).scrollIntoView() : createWrapSelectionTransaction({
-      state: state,
-      type: expandNode.type
-    });
-    var payload = {
-      action: ACTION.INSERTED,
-      actionSubject: ACTION_SUBJECT.DOCUMENT,
-      actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? ACTION_SUBJECT_ID.EXPAND : ACTION_SUBJECT_ID.NESTED_EXPAND,
-      attributes: {
-        inputMethod: INPUT_METHOD.INSERT_MENU
-      },
-      eventType: EVENT_TYPE.TRACK
-    };
-    if (dispatch && expandNode) {
-      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-      dispatch(tr);
-    }
-    return true;
+    return insertExpandWithInputMethod(editorAnalyticsAPI)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
   };
 };
 export var focusTitle = function focusTitle(pos) {

package/dist/esm/legacyExpand/plugin.js

@@ -4,13 +4,13 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 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 { createExpandNode, insertExpand } from './commands';
+import { createExpandNode, insertExpand, insertExpandWithInputMethod } 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 _api$analytics, _api$analytics2;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
@@ -26,7 +26,8 @@ export var expandPlugin = function expandPlugin(_ref) {
       }];
     },
     actions: {
-      insertExpand: insertExpand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+      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 [{
@@ -63,7 +64,7 @@ export var expandPlugin = function expandPlugin(_ref) {
             return /*#__PURE__*/React.createElement(IconExpand, null);
           },
           action: function action(insert, state) {
-            var _api$analytics2;
+            var _api$analytics3;
             var node = createExpandNode(state);
             if (!node) {
               return false;
@@ -72,7 +73,7 @@ export var expandPlugin = function expandPlugin(_ref) {
               state: state,
               type: node.type
             });
-            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
+            api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.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,

package/dist/esm/singlePlayerExpand/commands.js

@@ -10,7 +10,6 @@ import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
-
 // Creates either an expand or a nestedExpand node based on the current selection
 export var createExpandNode = function createExpandNode(state) {
   var _state$schema$nodes = state.schema.nodes,
@@ -21,30 +20,37 @@ export var createExpandNode = function createExpandNode(state) {
   expandedState.set(expandNode, true);
   return expandNode;
 };
+export var insertExpandWithInputMethod = function insertExpandWithInputMethod(editorAnalyticsAPI) {
+  return function (inputMethod) {
+    return function (state, dispatch) {
+      var expandNode = createExpandNode(state);
+      if (!expandNode) {
+        return false;
+      }
+      var tr = state.selection.empty ? safeInsert(expandNode)(state.tr).scrollIntoView() : createWrapSelectionTransaction({
+        state: state,
+        type: expandNode.type
+      });
+      var payload = {
+        action: ACTION.INSERTED,
+        actionSubject: ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? ACTION_SUBJECT_ID.EXPAND : ACTION_SUBJECT_ID.NESTED_EXPAND,
+        attributes: {
+          inputMethod: inputMethod
+        },
+        eventType: EVENT_TYPE.TRACK
+      };
+      if (dispatch && expandNode) {
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+        dispatch(tr);
+      }
+      return true;
+    };
+  };
+};
 export var insertExpand = function insertExpand(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    var expandNode = createExpandNode(state);
-    if (!expandNode) {
-      return false;
-    }
-    var tr = state.selection.empty ? safeInsert(expandNode)(state.tr).scrollIntoView() : createWrapSelectionTransaction({
-      state: state,
-      type: expandNode.type
-    });
-    var payload = {
-      action: ACTION.INSERTED,
-      actionSubject: ACTION_SUBJECT.DOCUMENT,
-      actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? ACTION_SUBJECT_ID.EXPAND : ACTION_SUBJECT_ID.NESTED_EXPAND,
-      attributes: {
-        inputMethod: INPUT_METHOD.INSERT_MENU
-      },
-      eventType: EVENT_TYPE.TRACK
-    };
-    if (dispatch && expandNode) {
-      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-      dispatch(tr);
-    }
-    return true;
+    return insertExpandWithInputMethod(editorAnalyticsAPI)(INPUT_METHOD.INSERT_MENU)(state, dispatch);
   };
 };
 export var deleteExpand = function deleteExpand(editorAnalyticsAPI) {

package/dist/esm/singlePlayerExpand/plugin.js

@@ -4,12 +4,12 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 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 { createExpandNode, insertExpand } from './commands';
+import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
 export var expandPlugin = function expandPlugin(_ref) {
-  var _api$analytics;
+  var _api$analytics, _api$analytics2;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
@@ -25,7 +25,8 @@ export var expandPlugin = function expandPlugin(_ref) {
       }];
     },
     actions: {
-      insertExpand: insertExpand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+      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 [{
@@ -62,7 +63,7 @@ export var expandPlugin = function expandPlugin(_ref) {
             return /*#__PURE__*/React.createElement(IconExpand, null);
           },
           action: function action(insert, state) {
-            var _api$analytics2;
+            var _api$analytics3;
             var node = createExpandNode(state);
             if (!node) {
               return false;
@@ -71,7 +72,7 @@ export var expandPlugin = function expandPlugin(_ref) {
               state: state,
               type: node.type
             });
-            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
+            api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.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,

package/dist/types/index.d.ts

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

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

@@ -2,6 +2,7 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 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 setExpandRef: (ref?: HTMLDivElement | null) => Command;
 export declare const deleteExpandAtPos: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (expandNodePos: number, expandNode: PMNode) => Command;
 export declare const deleteExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
@@ -18,6 +19,7 @@ export declare const toggleExpandExpanded: ({ editorAnalyticsAPI, pos, nodeType,
     __livePage: 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 setSelectionInsideExpand: (expandPos: number) => Command;

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

@@ -2,7 +2,9 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 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) => 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;

package/dist/types/types.d.ts

@@ -1,10 +1,11 @@
+import { type INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAppearance, LongPressSelectionPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { SelectionMarkerPlugin } from '@atlaskit/editor-plugin-selection-marker';
-import type { insertExpand } from './legacyExpand/commands';
+import type { insertExpand, insertExpandWithInputMethod } from './legacyExpand/commands';
 export interface ExpandPluginState {
     expandRef?: HTMLDivElement | null;
 }
@@ -14,6 +15,7 @@ export type ExpandPluginAction = {
         ref?: HTMLDivElement | null;
     };
 };
+export type InsertMethod = INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.INSERT_MENU | INPUT_METHOD.FLOATING_TB;
 export interface ExpandPluginOptions extends LongPressSelectionPluginOptions {
     allowInsertion?: boolean;
     /**
@@ -44,6 +46,13 @@ export type ExpandPlugin = NextEditorPlugin<'expand', {
         OptionalPlugin<EditorDisabledPlugin>
     ];
     actions: {
+        /**
+         * Insert an expand node and dispatch event with `insertMenu` inputMethod
+         */
         insertExpand: ReturnType<typeof insertExpand>;
+        /**
+         * Insert an expand node and dispatch event with inputMethod specified
+         */
+        insertExpandWithInputMethod: ReturnType<typeof insertExpandWithInputMethod>;
     };
 }>;

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

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

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

@@ -2,6 +2,7 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 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 setExpandRef: (ref?: HTMLDivElement | null) => Command;
 export declare const deleteExpandAtPos: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (expandNodePos: number, expandNode: PMNode) => Command;
 export declare const deleteExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
@@ -18,6 +19,7 @@ export declare const toggleExpandExpanded: ({ editorAnalyticsAPI, pos, nodeType,
     __livePage: 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 setSelectionInsideExpand: (expandPos: number) => Command;

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

@@ -2,7 +2,9 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 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) => 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;

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

@@ -1,10 +1,11 @@
+import { type INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAppearance, LongPressSelectionPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { SelectionMarkerPlugin } from '@atlaskit/editor-plugin-selection-marker';
-import type { insertExpand } from './legacyExpand/commands';
+import type { insertExpand, insertExpandWithInputMethod } from './legacyExpand/commands';
 export interface ExpandPluginState {
     expandRef?: HTMLDivElement | null;
 }
@@ -14,6 +15,7 @@ export type ExpandPluginAction = {
         ref?: HTMLDivElement | null;
     };
 };
+export type InsertMethod = INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.INSERT_MENU | INPUT_METHOD.FLOATING_TB;
 export interface ExpandPluginOptions extends LongPressSelectionPluginOptions {
     allowInsertion?: boolean;
     /**
@@ -44,6 +46,13 @@ export type ExpandPlugin = NextEditorPlugin<'expand', {
         OptionalPlugin<EditorDisabledPlugin>
     ];
     actions: {
+        /**
+         * Insert an expand node and dispatch event with `insertMenu` inputMethod
+         */
         insertExpand: ReturnType<typeof insertExpand>;
+        /**
+         * Insert an expand node and dispatch event with inputMethod specified
+         */
+        insertExpandWithInputMethod: ReturnType<typeof insertExpandWithInputMethod>;
     };
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "2.2.0",
+	"version": "2.3.0",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,10 +33,10 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^40.3.0",
+		"@atlaskit/adf-schema": "^40.8.1",
 		"@atlaskit/button": "^19.1.0",
-		"@atlaskit/editor-common": "^86.8.0",
-		"@atlaskit/editor-plugin-analytics": "^1.6.0",
+		"@atlaskit/editor-common": "^87.6.0",
+		"@atlaskit/editor-plugin-analytics": "^1.7.0",
 		"@atlaskit/editor-plugin-decorations": "^1.2.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.2.0",
 		"@atlaskit/editor-plugin-selection": "^1.3.0",
@@ -44,9 +44,9 @@
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^22.7.0",
+		"@atlaskit/icon": "^22.11.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tooltip": "^18.5.0",
+		"@atlaskit/tooltip": "^18.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"w3c-keyname": "^2.1.8"
@@ -57,12 +57,12 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"devDependencies": {
-		"@atlaskit/analytics-next": "^9.3.0",
-		"@atlaskit/editor-plugin-content-insertion": "^1.6.0",
+		"@atlaskit/analytics-next": "^10.0.0",
+		"@atlaskit/editor-plugin-content-insertion": "^1.7.0",
 		"@atlaskit/editor-plugin-guideline": "^1.2.0",
 		"@atlaskit/editor-plugin-quick-insert": "^1.2.0",
-		"@atlaskit/editor-plugin-table": "^7.23.0",
-		"@atlaskit/editor-plugin-type-ahead": "^1.6.0",
+		"@atlaskit/editor-plugin-table": "^7.25.0",
+		"@atlaskit/editor-plugin-type-ahead": "^1.7.0",
 		"@atlaskit/editor-plugin-width": "^1.2.0",
 		"@testing-library/react": "^12.1.5",
 		"react-test-renderer": "^16.8.0",