@atlaskit/editor-plugin-expand 0.2.1 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-expand
 
+## 0.4.0
+
+### Minor Changes
+
+- [#64335](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64335) [`efc8826c907f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/efc8826c907f) - [ux] [ED-16509] Restart numbered list inserting nodes via QUICK INSERT, nodes including : panels, expands, decisions, tables, layout, quotes, actions, dividers, headings. Changes are being guarded behind feature flag platform.editor.ordered-list-inserting-nodes_bh0vo
+
+### Patch Changes
+
+- Updated dependencies
+
+## 0.3.0
+
+### Minor Changes
+
+- [#62737](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/62737) [`2a6280e4e570`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2a6280e4e570) - Add new configuration option to expand plugin (`allowInteractiveExpand`) to configure the plugin. Previously the consumer would have to set the `interactiveExpand` feature flag in the expand plugin to configure this behaviour. It is also now set by default.
+
 ## 0.2.1
 
 ### Patch Changes

package/dist/cjs/nodeviews/index.js

@@ -57,8 +57,9 @@ var toDOM = function toDOM(node, intl) {
   }, 0]];
 };
 var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
-  function ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags, selectNearNode, api) {
+  function ExpandNodeView(node, view, getPos, getIntl, isMobile, selectNearNode, api) {
     var _this = this;
+    var allowInteractiveExpand = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
     (0, _classCallCheck2.default)(this, ExpandNodeView);
     (0, _defineProperty2.default)(this, "allowInteractiveExpand", true);
     (0, _defineProperty2.default)(this, "isMobile", false);
@@ -94,9 +95,6 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           break;
       }
     });
-    (0, _defineProperty2.default)(this, "isAllowInteractiveExpandEnabled", function () {
-      return _this.featureFlags && !!_this.featureFlags.interactiveExpand;
-    });
     (0, _defineProperty2.default)(this, "handleClick", function (event) {
       var pos = _this.getPos();
       if (typeof pos !== 'number') {
@@ -108,7 +106,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         dispatch = _this$view2.dispatch;
       if ((0, _utils.closestElement)(target, ".".concat(_styles.expandClassNames.icon))) {
         var _this$api;
-        if (!_this.isAllowInteractiveExpandEnabled()) {
+        if (!_this.allowInteractiveExpand) {
           return;
         }
         event.stopPropagation();
@@ -193,7 +191,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       if (typeof pos !== 'number') {
         return;
       }
-      if (_this.isAllowInteractiveExpandEnabled()) {
+      if (_this.allowInteractiveExpand) {
         var _this$api3;
         var _this$view4 = _this.view,
           state = _this$view4.state,
@@ -345,13 +343,13 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, toDOM(node, this.intl)),
       dom = _DOMSerializer$render.dom,
       contentDOM = _DOMSerializer$render.contentDOM;
+    this.allowInteractiveExpand = allowInteractiveExpand;
     this.getPos = getPos;
     this.view = view;
     this.node = node;
     this.dom = dom;
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
-    this.featureFlags = featureFlags;
     this.api = api;
     this.icon = this.dom.querySelector(".".concat(_styles.expandClassNames.icon));
     this.input = this.dom.querySelector(".".concat(_styles.expandClassNames.titleInput));
@@ -394,7 +392,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         __expanded = _ref.__expanded;
       _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_ExpandIconButton.ExpandIconButton, {
         intl: intl,
-        allowInteractiveExpand: this.isAllowInteractiveExpandEnabled(),
+        allowInteractiveExpand: this.allowInteractiveExpand,
         expanded: __expanded
       }), this.icon);
     }
@@ -485,10 +483,11 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
 function _default(_ref2) {
   var getIntl = _ref2.getIntl,
     isMobile = _ref2.isMobile,
-    featureFlags = _ref2.featureFlags,
-    api = _ref2.api;
+    api = _ref2.api,
+    _ref2$allowInteractiv = _ref2.allowInteractiveExpand,
+    allowInteractiveExpand = _ref2$allowInteractiv === void 0 ? true : _ref2$allowInteractiv;
   return function (node, view, getPos) {
     var _api$selection;
-    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags, api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.actions) === null || _api$selection === void 0 ? void 0 : _api$selection.selectNearNode, api);
+    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.actions) === null || _api$selection === void 0 ? void 0 : _api$selection.selectNearNode, api, allowInteractiveExpand);
   };
 }

package/dist/cjs/plugin.js

@@ -23,11 +23,10 @@ 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$featureFlags, _api$analytics;
+  var _api$analytics;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'expand',
     nodes: function nodes() {
@@ -46,9 +45,10 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
       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, featureFlags, api);
+          return (0, _main.createPlugin)(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true);
         }
       }, {
         name: 'expandKeymap',

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

@@ -21,8 +21,8 @@ function containsClass(element, className) {
 var createPlugin = exports.createPlugin = function createPlugin(dispatch, getIntl) {
   var appearance = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'full-page';
   var useLongPressSelection = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var featureFlags = arguments.length > 4 ? arguments[4] : undefined;
-  var api = arguments.length > 5 ? arguments[5] : undefined;
+  var api = arguments.length > 4 ? arguments[4] : undefined;
+  var allowInteractiveExpand = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
   var state = (0, _pluginFactory.createPluginState)(dispatch, {});
   var isMobile = appearance === 'mobile';
   return new _safePlugin.SafePlugin({
@@ -33,14 +33,14 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, getInt
         expand: (0, _nodeviews.default)({
           getIntl: getIntl,
           isMobile: isMobile,
-          featureFlags: featureFlags,
-          api: api
+          api: api,
+          allowInteractiveExpand: allowInteractiveExpand
         }),
         nestedExpand: (0, _nodeviews.default)({
           getIntl: getIntl,
           isMobile: isMobile,
-          featureFlags: featureFlags,
-          api: api
+          api: api,
+          allowInteractiveExpand: allowInteractiveExpand
         })
       },
       handleKeyDown: function handleKeyDown(_view, event) {

package/dist/es2019/nodeviews/index.js

@@ -45,7 +45,7 @@ const toDOM = (node, intl) => ['div', {
   'class': expandClassNames.content
 }, 0]];
 export class ExpandNodeView {
-  constructor(node, view, getPos, getIntl, isMobile, featureFlags, selectNearNode, api) {
+  constructor(node, view, getPos, getIntl, isMobile, selectNearNode, api, allowInteractiveExpand = true) {
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
     _defineProperty(this, "focusTitle", () => {
@@ -81,9 +81,6 @@ export class ExpandNodeView {
           break;
       }
     });
-    _defineProperty(this, "isAllowInteractiveExpandEnabled", () => {
-      return this.featureFlags && !!this.featureFlags.interactiveExpand;
-    });
     _defineProperty(this, "handleClick", event => {
       const pos = this.getPos();
       if (typeof pos !== 'number') {
@@ -96,7 +93,7 @@ export class ExpandNodeView {
       } = this.view;
       if (closestElement(target, `.${expandClassNames.icon}`)) {
         var _this$api, _this$api$analytics;
-        if (!this.isAllowInteractiveExpandEnabled()) {
+        if (!this.allowInteractiveExpand) {
           return;
         }
         event.stopPropagation();
@@ -185,7 +182,7 @@ export class ExpandNodeView {
       if (typeof pos !== 'number') {
         return;
       }
-      if (this.isAllowInteractiveExpandEnabled()) {
+      if (this.allowInteractiveExpand) {
         var _this$api3, _this$api3$analytics;
         const {
           state,
@@ -348,13 +345,13 @@ export class ExpandNodeView {
       dom,
       contentDOM
     } = DOMSerializer.renderSpec(document, toDOM(node, this.intl));
+    this.allowInteractiveExpand = allowInteractiveExpand;
     this.getPos = getPos;
     this.view = view;
     this.node = node;
     this.dom = dom;
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
-    this.featureFlags = featureFlags;
     this.api = api;
     this.icon = this.dom.querySelector(`.${expandClassNames.icon}`);
     this.input = this.dom.querySelector(`.${expandClassNames.titleInput}`);
@@ -394,7 +391,7 @@ export class ExpandNodeView {
     } = node && node.attrs || this.node.attrs;
     ReactDOM.render( /*#__PURE__*/React.createElement(ExpandIconButton, {
       intl: intl,
-      allowInteractiveExpand: this.isAllowInteractiveExpandEnabled(),
+      allowInteractiveExpand: this.allowInteractiveExpand,
       expanded: __expanded
     }), this.icon);
   }
@@ -474,11 +471,11 @@ export class ExpandNodeView {
 export default function ({
   getIntl,
   isMobile,
-  featureFlags,
-  api
+  api,
+  allowInteractiveExpand = true
 }) {
   return (node, view, getPos) => {
     var _api$selection, _api$selection$action;
-    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags, api === null || api === void 0 ? void 0 : (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : (_api$selection$action = _api$selection.actions) === null || _api$selection$action === void 0 ? void 0 : _api$selection$action.selectNearNode, api);
+    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, api === null || api === void 0 ? void 0 : (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : (_api$selection$action = _api$selection.actions) === null || _api$selection$action === void 0 ? void 0 : _api$selection$action.selectNearNode, api, allowInteractiveExpand);
   };
 }

package/dist/es2019/plugin.js

@@ -12,8 +12,7 @@ export const expandPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$featureFlags, _api$analytics;
-  const featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
+  var _api$analytics;
   return {
     name: 'expand',
     nodes() {
@@ -35,7 +34,8 @@ export const expandPlugin = ({
           dispatch,
           getIntl
         }) => {
-          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, featureFlags, api);
+          var _options$allowInterac;
+          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true);
         }
       }, {
         name: 'expandKeymap',

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

@@ -10,7 +10,7 @@ export function containsClass(element, className) {
   var _element$classList;
   return Boolean(element === null || element === void 0 ? void 0 : (_element$classList = element.classList) === null || _element$classList === void 0 ? void 0 : _element$classList.contains(className));
 }
-export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLongPressSelection = false, featureFlags, api) => {
+export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLongPressSelection = false, api, allowInteractiveExpand = true) => {
   const state = createPluginState(dispatch, {});
   const isMobile = appearance === 'mobile';
   return new SafePlugin({
@@ -21,14 +21,14 @@ export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLon
         expand: ExpandNodeView({
           getIntl,
           isMobile,
-          featureFlags,
-          api
+          api,
+          allowInteractiveExpand
         }),
         nestedExpand: ExpandNodeView({
           getIntl,
           isMobile,
-          featureFlags,
-          api
+          api,
+          allowInteractiveExpand
         })
       },
       handleKeyDown(_view, event) {

package/dist/esm/nodeviews/index.js

@@ -49,8 +49,9 @@ var toDOM = function toDOM(node, intl) {
   }, 0]];
 };
 export var ExpandNodeView = /*#__PURE__*/function () {
-  function ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags, selectNearNode, api) {
+  function ExpandNodeView(node, view, getPos, getIntl, isMobile, selectNearNode, api) {
     var _this = this;
+    var allowInteractiveExpand = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
     _classCallCheck(this, ExpandNodeView);
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
@@ -86,9 +87,6 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           break;
       }
     });
-    _defineProperty(this, "isAllowInteractiveExpandEnabled", function () {
-      return _this.featureFlags && !!_this.featureFlags.interactiveExpand;
-    });
     _defineProperty(this, "handleClick", function (event) {
       var pos = _this.getPos();
       if (typeof pos !== 'number') {
@@ -100,7 +98,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         dispatch = _this$view2.dispatch;
       if (closestElement(target, ".".concat(expandClassNames.icon))) {
         var _this$api;
-        if (!_this.isAllowInteractiveExpandEnabled()) {
+        if (!_this.allowInteractiveExpand) {
           return;
         }
         event.stopPropagation();
@@ -185,7 +183,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       if (typeof pos !== 'number') {
         return;
       }
-      if (_this.isAllowInteractiveExpandEnabled()) {
+      if (_this.allowInteractiveExpand) {
         var _this$api3;
         var _this$view4 = _this.view,
           state = _this$view4.state,
@@ -337,13 +335,13 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     var _DOMSerializer$render = DOMSerializer.renderSpec(document, toDOM(node, this.intl)),
       dom = _DOMSerializer$render.dom,
       contentDOM = _DOMSerializer$render.contentDOM;
+    this.allowInteractiveExpand = allowInteractiveExpand;
     this.getPos = getPos;
     this.view = view;
     this.node = node;
     this.dom = dom;
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
-    this.featureFlags = featureFlags;
     this.api = api;
     this.icon = this.dom.querySelector(".".concat(expandClassNames.icon));
     this.input = this.dom.querySelector(".".concat(expandClassNames.titleInput));
@@ -386,7 +384,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         __expanded = _ref.__expanded;
       ReactDOM.render( /*#__PURE__*/React.createElement(ExpandIconButton, {
         intl: intl,
-        allowInteractiveExpand: this.isAllowInteractiveExpandEnabled(),
+        allowInteractiveExpand: this.allowInteractiveExpand,
         expanded: __expanded
       }), this.icon);
     }
@@ -477,10 +475,11 @@ export var ExpandNodeView = /*#__PURE__*/function () {
 export default function (_ref2) {
   var getIntl = _ref2.getIntl,
     isMobile = _ref2.isMobile,
-    featureFlags = _ref2.featureFlags,
-    api = _ref2.api;
+    api = _ref2.api,
+    _ref2$allowInteractiv = _ref2.allowInteractiveExpand,
+    allowInteractiveExpand = _ref2$allowInteractiv === void 0 ? true : _ref2$allowInteractiv;
   return function (node, view, getPos) {
     var _api$selection;
-    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags, api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.actions) === null || _api$selection === void 0 ? void 0 : _api$selection.selectNearNode, api);
+    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.actions) === null || _api$selection === void 0 ? void 0 : _api$selection.selectNearNode, api, allowInteractiveExpand);
   };
 }

package/dist/esm/plugin.js

@@ -9,11 +9,10 @@ import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
 export var expandPlugin = function expandPlugin(_ref) {
-  var _api$featureFlags, _api$analytics;
+  var _api$analytics;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'expand',
     nodes: function nodes() {
@@ -32,9 +31,10 @@ export var expandPlugin = function expandPlugin(_ref) {
       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, featureFlags, api);
+          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, api, (_options$allowInterac = options.allowInteractiveExpand) !== null && _options$allowInterac !== void 0 ? _options$allowInterac : true);
         }
       }, {
         name: 'expandKeymap',

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

@@ -13,8 +13,8 @@ export function containsClass(element, className) {
 export var createPlugin = function createPlugin(dispatch, getIntl) {
   var appearance = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'full-page';
   var useLongPressSelection = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var featureFlags = arguments.length > 4 ? arguments[4] : undefined;
-  var api = arguments.length > 5 ? arguments[5] : undefined;
+  var api = arguments.length > 4 ? arguments[4] : undefined;
+  var allowInteractiveExpand = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
   var state = createPluginState(dispatch, {});
   var isMobile = appearance === 'mobile';
   return new SafePlugin({
@@ -25,14 +25,14 @@ export var createPlugin = function createPlugin(dispatch, getIntl) {
         expand: ExpandNodeView({
           getIntl: getIntl,
           isMobile: isMobile,
-          featureFlags: featureFlags,
-          api: api
+          api: api,
+          allowInteractiveExpand: allowInteractiveExpand
         }),
         nestedExpand: ExpandNodeView({
           getIntl: getIntl,
           isMobile: isMobile,
-          featureFlags: featureFlags,
-          api: api
+          api: api,
+          allowInteractiveExpand: allowInteractiveExpand
         })
       },
       handleKeyDown: function handleKeyDown(_view, event) {

package/dist/types/index.d.ts

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

package/dist/types/nodeviews/index.d.ts

@@ -1,6 +1,6 @@
 import type { IntlShape } from 'react-intl-next';
 import type { SetSelectionRelativeToNode } from '@atlaskit/editor-common/selection';
-import type { ExtractInjectionAPI, FeatureFlags } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { 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';
@@ -19,14 +19,12 @@ export declare class ExpandNodeView implements NodeView {
     intl: IntlShape;
     allowInteractiveExpand: boolean;
     isMobile: boolean;
-    featureFlags: FeatureFlags;
     api: ExtractInjectionAPI<ExpandPlugin> | undefined;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, featureFlags: FeatureFlags, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined);
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean);
     private initHandlers;
     private focusTitle;
     private handleIconKeyDown;
     private renderIcon;
-    private isAllowInteractiveExpandEnabled;
     private handleClick;
     private handleInput;
     private handleFocus;
@@ -47,9 +45,9 @@ export declare class ExpandNodeView implements NodeView {
     update(node: PmNode, _decorations: readonly Decoration[]): boolean;
     destroy(): void;
 }
-export default function ({ getIntl, isMobile, featureFlags, api, }: {
+export default function ({ getIntl, isMobile, api, allowInteractiveExpand, }: {
     getIntl: () => IntlShape;
     isMobile: boolean;
-    featureFlags: FeatureFlags;
     api: ExtractInjectionAPI<ExpandPlugin> | undefined;
+    allowInteractiveExpand: boolean;
 }): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;

package/dist/types/plugin.d.ts

@@ -1,24 +1,3 @@
-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 { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
-import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
-import { insertExpand } from './commands';
-interface ExpandPluginOptions extends LongPressSelectionPluginOptions {
-    allowInsertion?: boolean;
-    appearance?: EditorAppearance;
-}
-export type ExpandPlugin = NextEditorPlugin<'expand', {
-    pluginConfiguration: ExpandPluginOptions | undefined;
-    dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
-        DecorationsPlugin,
-        SelectionPlugin,
-        OptionalPlugin<AnalyticsPlugin>
-    ];
-    actions: {
-        insertExpand: ReturnType<typeof insertExpand>;
-    };
-}>;
+import type { ExpandPlugin } from './types';
 export declare const expandPlugin: ExpandPlugin;
 export { pluginKey } from './pm-plugins/plugin-factory';

package/dist/types/pm-plugins/main.d.ts

@@ -1,7 +1,7 @@
 import type { IntlShape } from 'react-intl-next';
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { EditorAppearance, ExtractInjectionAPI, FeatureFlags } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { ExpandPlugin } from '../types';
 export declare function containsClass(element: Element | null, className: string): boolean;
-export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorAppearance | undefined, useLongPressSelection: boolean | undefined, featureFlags: FeatureFlags, api: ExtractInjectionAPI<ExpandPlugin> | undefined) => SafePlugin<import("../types").ExpandPluginState>;
+export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorAppearance | undefined, useLongPressSelection: boolean | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean) => SafePlugin<import("../types").ExpandPluginState>;

package/dist/types/types.d.ts

@@ -1,7 +1,6 @@
 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 { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { insertExpand } from './commands';
 export interface ExpandPluginState {
@@ -15,12 +14,17 @@ export type ExpandPluginAction = {
 };
 export interface ExpandPluginOptions extends LongPressSelectionPluginOptions {
     allowInsertion?: boolean;
+    /**
+     * Allows the expand button to toggle. Previously this was set via the editor prop featureFlag (`interactiveExpand`)
+     *
+     * Defaults to true
+     */
+    allowInteractiveExpand?: boolean;
     appearance?: EditorAppearance;
 }
 export type ExpandPlugin = NextEditorPlugin<'expand', {
     pluginConfiguration: ExpandPluginOptions | undefined;
     dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
         DecorationsPlugin,
         SelectionPlugin,
         OptionalPlugin<AnalyticsPlugin>

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

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

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

@@ -1,6 +1,6 @@
 import type { IntlShape } from 'react-intl-next';
 import type { SetSelectionRelativeToNode } from '@atlaskit/editor-common/selection';
-import type { ExtractInjectionAPI, FeatureFlags } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { 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';
@@ -19,14 +19,12 @@ export declare class ExpandNodeView implements NodeView {
     intl: IntlShape;
     allowInteractiveExpand: boolean;
     isMobile: boolean;
-    featureFlags: FeatureFlags;
     api: ExtractInjectionAPI<ExpandPlugin> | undefined;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, featureFlags: FeatureFlags, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined);
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean);
     private initHandlers;
     private focusTitle;
     private handleIconKeyDown;
     private renderIcon;
-    private isAllowInteractiveExpandEnabled;
     private handleClick;
     private handleInput;
     private handleFocus;
@@ -47,9 +45,9 @@ export declare class ExpandNodeView implements NodeView {
     update(node: PmNode, _decorations: readonly Decoration[]): boolean;
     destroy(): void;
 }
-export default function ({ getIntl, isMobile, featureFlags, api, }: {
+export default function ({ getIntl, isMobile, api, allowInteractiveExpand, }: {
     getIntl: () => IntlShape;
     isMobile: boolean;
-    featureFlags: FeatureFlags;
     api: ExtractInjectionAPI<ExpandPlugin> | undefined;
+    allowInteractiveExpand: boolean;
 }): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;

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

@@ -1,24 +1,3 @@
-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 { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
-import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
-import { insertExpand } from './commands';
-interface ExpandPluginOptions extends LongPressSelectionPluginOptions {
-    allowInsertion?: boolean;
-    appearance?: EditorAppearance;
-}
-export type ExpandPlugin = NextEditorPlugin<'expand', {
-    pluginConfiguration: ExpandPluginOptions | undefined;
-    dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
-        DecorationsPlugin,
-        SelectionPlugin,
-        OptionalPlugin<AnalyticsPlugin>
-    ];
-    actions: {
-        insertExpand: ReturnType<typeof insertExpand>;
-    };
-}>;
+import type { ExpandPlugin } from './types';
 export declare const expandPlugin: ExpandPlugin;
 export { pluginKey } from './pm-plugins/plugin-factory';

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

@@ -1,7 +1,7 @@
 import type { IntlShape } from 'react-intl-next';
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { EditorAppearance, ExtractInjectionAPI, FeatureFlags } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { ExpandPlugin } from '../types';
 export declare function containsClass(element: Element | null, className: string): boolean;
-export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorAppearance | undefined, useLongPressSelection: boolean | undefined, featureFlags: FeatureFlags, api: ExtractInjectionAPI<ExpandPlugin> | undefined) => SafePlugin<import("../types").ExpandPluginState>;
+export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorAppearance | undefined, useLongPressSelection: boolean | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, allowInteractiveExpand?: boolean) => SafePlugin<import("../types").ExpandPluginState>;

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

@@ -1,7 +1,6 @@
 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 { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { insertExpand } from './commands';
 export interface ExpandPluginState {
@@ -15,12 +14,17 @@ export type ExpandPluginAction = {
 };
 export interface ExpandPluginOptions extends LongPressSelectionPluginOptions {
     allowInsertion?: boolean;
+    /**
+     * Allows the expand button to toggle. Previously this was set via the editor prop featureFlag (`interactiveExpand`)
+     *
+     * Defaults to true
+     */
+    allowInteractiveExpand?: boolean;
     appearance?: EditorAppearance;
 }
 export type ExpandPlugin = NextEditorPlugin<'expand', {
     pluginConfiguration: ExpandPluginOptions | undefined;
     dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
         DecorationsPlugin,
         SelectionPlugin,
         OptionalPlugin<AnalyticsPlugin>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-expand",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "Expand plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -10,7 +10,8 @@
   "atlassian": {
     "team": "Editor: Jenga",
     "inPublicMirror": false,
-    "releaseModel": "continuous"
+    "releaseModel": "continuous",
+    "runReact18": false
   },
   "repository": "https://bitbucket.org/atlassian/atlassian-frontend",
   "main": "dist/cjs/index.js",
@@ -32,17 +33,16 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^35.2.0",
-    "@atlaskit/button": "^17.1.0",
-    "@atlaskit/editor-common": "^76.27.0",
+    "@atlaskit/button": "^17.2.0",
+    "@atlaskit/editor-common": "^76.34.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-plugin-decorations": "^0.2.0",
-    "@atlaskit/editor-plugin-feature-flags": "^1.0.1",
     "@atlaskit/editor-plugin-selection": "^0.1.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
-    "@atlaskit/editor-shared-styles": "^2.8.0",
+    "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/editor-tables": "^2.3.0",
     "@atlaskit/icon": "^22.0.0",
-    "@atlaskit/tooltip": "^18.0.0",
+    "@atlaskit/tooltip": "^18.1.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "w3c-keyname": "^2.1.0"
@@ -57,8 +57,8 @@
     "@atlaskit/editor-plugin-content-insertion": "^0.1.0",
     "@atlaskit/editor-plugin-guideline": "^0.5.0",
     "@atlaskit/editor-plugin-quick-insert": "^0.2.0",
-    "@atlaskit/editor-plugin-table": "^5.6.0",
-    "@atlaskit/editor-plugin-type-ahead": "^0.8.0",
+    "@atlaskit/editor-plugin-table": "^5.7.0",
+    "@atlaskit/editor-plugin-type-ahead": "^0.9.0",
     "@atlaskit/editor-plugin-width": "^0.2.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
     "@testing-library/react": "^12.1.5",