@atlaskit/editor-plugin-expand 20.0.0 → 20.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-plugin-expand
2
2
 
3
+ ## 20.0.2
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 20.0.1
10
+
11
+ ### Patch Changes
12
+
13
+ - [`8d37dc7e55d62`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8d37dc7e55d62) -
14
+ Clean up shipped experiment `platform_editor_block_menu`
15
+ - Updated dependencies
16
+
3
17
  ## 20.0.0
4
18
 
5
19
  ### Patch Changes
@@ -10,12 +10,11 @@ var _react = _interopRequireDefault(require("react"));
10
10
  var _expand = require("@atlaskit/adf-schema/expand");
11
11
  var _nestedExpand = require("@atlaskit/adf-schema/nested-expand");
12
12
  var _analytics = require("@atlaskit/editor-common/analytics");
13
+ var _assets = require("@atlaskit/editor-common/assets");
13
14
  var _blockMenu = require("@atlaskit/editor-common/block-menu");
14
15
  var _messages = require("@atlaskit/editor-common/messages");
15
- var _assets = require("@atlaskit/editor-common/assets");
16
- var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
17
16
  var _utils = require("@atlaskit/editor-common/utils");
18
- var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
17
+ var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
19
18
  var _toggleExpandRange = require("../editor-commands/toggleExpandRange");
20
19
  var _ExpandBlockMenuItem = require("../ui/ExpandBlockMenuItem");
21
20
  var _getExpandQuickInsertComponents = require("../ui/quick-insert/getExpandQuickInsertComponents");
@@ -29,28 +28,25 @@ var EXPAND_NODE_NAME = 'expand';
29
28
  // Ignored via go/ees005
30
29
  // eslint-disable-next-line prefer-const
31
30
  var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
32
- var _api$analytics, _api$analytics2;
31
+ var _api$blockMenu, _api$analytics, _api$analytics2;
33
32
  var _ref$config = _ref.config,
34
33
  options = _ref$config === void 0 ? {} : _ref$config,
35
34
  api = _ref.api;
36
35
  var isRegisteredSlashCommandEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_command');
37
- if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
38
- var _api$blockMenu;
39
- api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
40
- type: 'block-menu-item',
41
- key: _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
42
- parent: {
43
- type: 'block-menu-section',
44
- key: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION.key,
45
- rank: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION_RANK[_blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
46
- },
47
- component: (0, _ExpandBlockMenuItem.createExpandBlockMenuItem)(api),
48
- isHidden: function isHidden() {
49
- var _api$blockMenu2;
50
- return Boolean(api === null || api === void 0 || (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
51
- }
52
- }]);
53
- }
36
+ api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
37
+ type: 'block-menu-item',
38
+ key: _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
39
+ parent: {
40
+ type: 'block-menu-section',
41
+ key: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION.key,
42
+ rank: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION_RANK[_blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
43
+ },
44
+ component: (0, _ExpandBlockMenuItem.createExpandBlockMenuItem)(api),
45
+ isHidden: function isHidden() {
46
+ var _api$blockMenu2;
47
+ return Boolean(api === null || api === void 0 || (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
48
+ }
49
+ }]);
54
50
  if (isRegisteredSlashCommandEnabled && options.allowInsertion === true) {
55
51
  var _api$uiControlRegistr;
56
52
  api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register((0, _getExpandQuickInsertComponents.getExpandQuickInsertComponents)({
@@ -23,7 +23,6 @@ var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-ex
23
23
  var _redo = require("@atlaskit/prosemirror-history/redo");
24
24
  var _undo = require("@atlaskit/prosemirror-history/undo");
25
25
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
26
- var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
27
26
  var _renderExpandButton = require("../../ui/renderExpandButton");
28
27
  var _commands = require("../commands");
29
28
  var _ExpandButton = require("../ui/ExpandButton");
@@ -33,6 +32,7 @@ var _utils2 = require("../utils");
33
32
  var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
34
33
  function ExpandNodeView(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI) {
35
34
  var _this = this,
35
+ _expandedState$get,
36
36
  _api$editorDisabled,
37
37
  _this$api8;
38
38
  var allowInteractiveExpand = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : true;
@@ -490,13 +490,8 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
490
490
  this.getPos = getPos;
491
491
  this.view = view;
492
492
  this.node = _node;
493
- if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true, {
494
- exposure: true
495
- })) {
496
- var _expandedState$get;
497
- this.isExpanded.expanded = (_expandedState$get = _expand.expandedState.get(_node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
498
- this.isExpanded.localId = _node.attrs.localId;
499
- }
493
+ this.isExpanded.expanded = (_expandedState$get = _expand.expandedState.get(_node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
494
+ this.isExpanded.localId = _node.attrs.localId;
500
495
  var editorDisabled = api === null || api === void 0 || (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 || (_api$editorDisabled = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled === void 0 ? void 0 : _api$editorDisabled.editorDisabled;
501
496
  var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, (0, _NodeView.toDOM)(_node, this.__livePage, this.intl, editorDisabled, !editorDisabled && !(0, _expand.isExpandCollapsed)(_node))),
502
497
  _dom = _DOMSerializer$render.dom,
@@ -634,9 +629,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
634
629
  };
635
630
  });
636
631
  var currentExpanded = (_expandedState$get2 = _expand.expandedState.get(node)) !== null && _expandedState$get2 !== void 0 ? _expandedState$get2 : false;
637
- var hasChanged = (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true, {
638
- exposure: true
639
- }) ? this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId : this.isExpanded.expanded !== currentExpanded;
632
+ var hasChanged = this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId;
640
633
  if (hasChanged) {
641
634
  this.updateExpandToggleIcon(node);
642
635
  this.updateDisplayStyle(node);
@@ -665,13 +658,9 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
665
658
  }
666
659
  }
667
660
  this.updateExpandBodyContentEditable();
668
- this.isExpanded = (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true, {
669
- exposure: true
670
- }) ? {
661
+ this.isExpanded = {
671
662
  expanded: expanded !== null && expanded !== void 0 ? expanded : false,
672
663
  localId: node.attrs.localId
673
- } : {
674
- expanded: expanded !== null && expanded !== void 0 ? expanded : false
675
664
  };
676
665
  }
677
666
  }, {
@@ -10,13 +10,12 @@ var _react = _interopRequireDefault(require("react"));
10
10
  var _expand = require("@atlaskit/adf-schema/expand");
11
11
  var _nestedExpand = require("@atlaskit/adf-schema/nested-expand");
12
12
  var _analytics = require("@atlaskit/editor-common/analytics");
13
+ var _assets = require("@atlaskit/editor-common/assets");
13
14
  var _blockMenu = require("@atlaskit/editor-common/block-menu");
14
15
  var _messages = require("@atlaskit/editor-common/messages");
15
- var _assets = require("@atlaskit/editor-common/assets");
16
16
  var _utils = require("@atlaskit/editor-common/utils");
17
17
  var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
18
18
  var _fg = require("@atlaskit/platform-feature-flags/fg");
19
- var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
20
19
  var _toggleExpandRange = require("../editor-commands/toggleExpandRange");
21
20
  var _ExpandBlockMenuItem = require("../ui/ExpandBlockMenuItem");
22
21
  var _getExpandQuickInsertComponents = require("../ui/quick-insert/getExpandQuickInsertComponents");
@@ -30,27 +29,25 @@ var EXPAND_NODE_NAME = 'expand';
30
29
  // Ignored via go/ees005
31
30
  // eslint-disable-next-line prefer-const
32
31
  var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
32
+ var _api$blockMenu;
33
33
  var _ref$config = _ref.config,
34
34
  options = _ref$config === void 0 ? {} : _ref$config,
35
35
  api = _ref.api;
36
36
  var isRegisteredSlashCommandEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_command');
37
- if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
38
- var _api$blockMenu;
39
- api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
40
- type: 'block-menu-item',
41
- key: _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
42
- parent: {
43
- type: 'block-menu-section',
44
- key: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION.key,
45
- rank: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION_RANK[_blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
46
- },
47
- component: (0, _ExpandBlockMenuItem.createExpandBlockMenuItem)(api),
48
- isHidden: function isHidden() {
49
- var _api$blockMenu2;
50
- return Boolean(api === null || api === void 0 || (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
51
- }
52
- }]);
53
- }
37
+ api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
38
+ type: 'block-menu-item',
39
+ key: _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
40
+ parent: {
41
+ type: 'block-menu-section',
42
+ key: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION.key,
43
+ rank: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION_RANK[_blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
44
+ },
45
+ component: (0, _ExpandBlockMenuItem.createExpandBlockMenuItem)(api),
46
+ isHidden: function isHidden() {
47
+ var _api$blockMenu2;
48
+ return Boolean(api === null || api === void 0 || (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
49
+ }
50
+ }]);
54
51
  if (isRegisteredSlashCommandEnabled && options.allowInsertion === true) {
55
52
  var _api$uiControlRegistr;
56
53
  api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register((0, _getExpandQuickInsertComponents.getExpandQuickInsertComponents)({
@@ -13,8 +13,8 @@ var _hooks = require("@atlaskit/editor-common/hooks");
13
13
  var _messages = require("@atlaskit/editor-common/messages");
14
14
  var _menuItem = require("@atlaskit/editor-common/quick-insert/menu-item");
15
15
  var _utils = require("@atlaskit/editor-common/utils");
16
- var _fg = require("@atlaskit/platform-feature-flags/fg");
17
16
  var _expandElement = _interopRequireDefault(require("@atlaskit/icon-lab/core/expand-element"));
17
+ var _fg = require("@atlaskit/platform-feature-flags/fg");
18
18
  var _commands = require("../../legacyExpand/commands");
19
19
  var _commands2 = require("../../singlePlayerExpand/commands");
20
20
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -1,2 +1,3 @@
1
1
  /* eslint-disable @atlaskit/editor/no-re-export */
2
+
2
3
  export { expandPlugin } from '../plugin';
@@ -2,12 +2,11 @@ import React from 'react';
2
2
  import { expandWithNestedExpand } from '@atlaskit/adf-schema/expand';
3
3
  import { nestedExpand } from '@atlaskit/adf-schema/nested-expand';
4
4
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
5
+ import { IconExpand } from '@atlaskit/editor-common/assets';
5
6
  import { TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu';
6
7
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
7
- import { IconExpand } from '@atlaskit/editor-common/assets';
8
- import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
9
8
  import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
10
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
9
+ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
11
10
  import { toggleExpandRange } from '../editor-commands/toggleExpandRange';
12
11
  import { createExpandBlockMenuItem } from '../ui/ExpandBlockMenuItem';
13
12
  import { getExpandQuickInsertComponents } from '../ui/quick-insert/getExpandQuickInsertComponents';
@@ -23,25 +22,22 @@ export let expandPlugin = ({
23
22
  config: options = {},
24
23
  api
25
24
  }) => {
26
- var _api$analytics, _api$analytics2;
25
+ var _api$blockMenu, _api$analytics, _api$analytics2;
27
26
  const isRegisteredSlashCommandEnabled = isExperimentEnabled('platform_editor_slash_command');
28
- if (editorExperiment('platform_editor_block_menu', true)) {
29
- var _api$blockMenu;
30
- api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.registerBlockMenuComponents([{
31
- type: 'block-menu-item',
32
- key: TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
33
- parent: {
34
- type: 'block-menu-section',
35
- key: TRANSFORM_STRUCTURE_MENU_SECTION.key,
36
- rank: TRANSFORM_STRUCTURE_MENU_SECTION_RANK[TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
37
- },
38
- component: createExpandBlockMenuItem(api),
39
- isHidden: () => {
40
- var _api$blockMenu2;
41
- return Boolean(api === null || api === void 0 ? void 0 : (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
42
- }
43
- }]);
44
- }
27
+ api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.registerBlockMenuComponents([{
28
+ type: 'block-menu-item',
29
+ key: TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
30
+ parent: {
31
+ type: 'block-menu-section',
32
+ key: TRANSFORM_STRUCTURE_MENU_SECTION.key,
33
+ rank: TRANSFORM_STRUCTURE_MENU_SECTION_RANK[TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
34
+ },
35
+ component: createExpandBlockMenuItem(api),
36
+ isHidden: () => {
37
+ var _api$blockMenu2;
38
+ return Boolean(api === null || api === void 0 ? void 0 : (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
39
+ }
40
+ }]);
45
41
  if (isRegisteredSlashCommandEnabled && options.allowInsertion === true) {
46
42
  var _api$uiControlRegistr;
47
43
  api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getExpandQuickInsertComponents({
@@ -14,7 +14,6 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
14
14
  import { redo } from '@atlaskit/prosemirror-history/redo';
15
15
  import { undo } from '@atlaskit/prosemirror-history/undo';
16
16
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
17
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
18
17
  import { renderExpandButton } from '../../ui/renderExpandButton';
19
18
  import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
20
19
  import { ExpandButton } from '../ui/ExpandButton';
@@ -24,7 +23,7 @@ export class ExpandNodeView {
24
23
  constructor(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI, allowInteractiveExpand = true, __livePage = false, cleanUpEditorDisabledOnChange, isExpanded = {
25
24
  expanded: false
26
25
  }) {
27
- var _api$editorDisabled, _api$editorDisabled$s, _this$api8;
26
+ var _expandedState$get, _api$editorDisabled, _api$editorDisabled$s, _this$api8;
28
27
  _defineProperty(this, "allowInteractiveExpand", true);
29
28
  _defineProperty(this, "isMobile", false);
30
29
  _defineProperty(this, "focusTitle", () => {
@@ -493,13 +492,8 @@ export class ExpandNodeView {
493
492
  this.getPos = getPos;
494
493
  this.view = view;
495
494
  this.node = _node;
496
- if (editorExperiment('platform_editor_block_menu', true, {
497
- exposure: true
498
- })) {
499
- var _expandedState$get;
500
- this.isExpanded.expanded = (_expandedState$get = expandedState.get(_node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
501
- this.isExpanded.localId = _node.attrs.localId;
502
- }
495
+ this.isExpanded.expanded = (_expandedState$get = expandedState.get(_node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
496
+ this.isExpanded.localId = _node.attrs.localId;
503
497
  const editorDisabled = api === null || api === void 0 ? void 0 : (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 ? void 0 : (_api$editorDisabled$s = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled$s === void 0 ? void 0 : _api$editorDisabled$s.editorDisabled;
504
498
  const {
505
499
  dom: _dom,
@@ -627,9 +621,7 @@ export class ExpandNodeView {
627
621
  height: estimateExpandIntrinsicHeight(this.node, !isExpandCollapsed(this.node))
628
622
  }));
629
623
  const currentExpanded = (_expandedState$get2 = expandedState.get(node)) !== null && _expandedState$get2 !== void 0 ? _expandedState$get2 : false;
630
- const hasChanged = editorExperiment('platform_editor_block_menu', true, {
631
- exposure: true
632
- }) ? this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId : this.isExpanded.expanded !== currentExpanded;
624
+ const hasChanged = this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId;
633
625
  if (hasChanged) {
634
626
  this.updateExpandToggleIcon(node);
635
627
  this.updateDisplayStyle(node);
@@ -654,13 +646,9 @@ export class ExpandNodeView {
654
646
  }
655
647
  }
656
648
  this.updateExpandBodyContentEditable();
657
- this.isExpanded = editorExperiment('platform_editor_block_menu', true, {
658
- exposure: true
659
- }) ? {
649
+ this.isExpanded = {
660
650
  expanded: expanded !== null && expanded !== void 0 ? expanded : false,
661
651
  localId: node.attrs.localId
662
- } : {
663
- expanded: expanded !== null && expanded !== void 0 ? expanded : false
664
652
  };
665
653
  }
666
654
  isLimitedModeEnabled() {
@@ -2,13 +2,12 @@ import React from 'react';
2
2
  import { expandWithNestedExpand, expandWithNestedExpandLocalId } from '@atlaskit/adf-schema/expand';
3
3
  import { nestedExpand, nestedExpandWithLocalId } from '@atlaskit/adf-schema/nested-expand';
4
4
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
5
+ import { IconExpand } from '@atlaskit/editor-common/assets';
5
6
  import { TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu';
6
7
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
7
- import { IconExpand } from '@atlaskit/editor-common/assets';
8
8
  import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
9
9
  import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
10
10
  import { fg } from '@atlaskit/platform-feature-flags/fg';
11
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
12
11
  import { toggleExpandRange } from '../editor-commands/toggleExpandRange';
13
12
  import { createExpandBlockMenuItem } from '../ui/ExpandBlockMenuItem';
14
13
  import { getExpandQuickInsertComponents } from '../ui/quick-insert/getExpandQuickInsertComponents';
@@ -24,24 +23,22 @@ export let expandPlugin = ({
24
23
  config: options = {},
25
24
  api
26
25
  }) => {
26
+ var _api$blockMenu;
27
27
  const isRegisteredSlashCommandEnabled = isExperimentEnabled('platform_editor_slash_command');
28
- if (editorExperiment('platform_editor_block_menu', true)) {
29
- var _api$blockMenu;
30
- api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.registerBlockMenuComponents([{
31
- type: 'block-menu-item',
32
- key: TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
33
- parent: {
34
- type: 'block-menu-section',
35
- key: TRANSFORM_STRUCTURE_MENU_SECTION.key,
36
- rank: TRANSFORM_STRUCTURE_MENU_SECTION_RANK[TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
37
- },
38
- component: createExpandBlockMenuItem(api),
39
- isHidden: () => {
40
- var _api$blockMenu2;
41
- return Boolean(api === null || api === void 0 ? void 0 : (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
42
- }
43
- }]);
44
- }
28
+ api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.registerBlockMenuComponents([{
29
+ type: 'block-menu-item',
30
+ key: TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
31
+ parent: {
32
+ type: 'block-menu-section',
33
+ key: TRANSFORM_STRUCTURE_MENU_SECTION.key,
34
+ rank: TRANSFORM_STRUCTURE_MENU_SECTION_RANK[TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
35
+ },
36
+ component: createExpandBlockMenuItem(api),
37
+ isHidden: () => {
38
+ var _api$blockMenu2;
39
+ return Boolean(api === null || api === void 0 ? void 0 : (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
40
+ }
41
+ }]);
45
42
  if (isRegisteredSlashCommandEnabled && options.allowInsertion === true) {
46
43
  var _api$uiControlRegistr;
47
44
  api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getExpandQuickInsertComponents({
@@ -5,8 +5,8 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
5
5
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
6
6
  import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
7
7
  import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
8
- import { fg } from '@atlaskit/platform-feature-flags/fg';
9
8
  import ExpandElementIcon from '@atlaskit/icon-lab/core/expand-element';
9
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
10
10
  import { createExpandNode as createLegacyExpandNode } from '../../legacyExpand/commands';
11
11
  import { createExpandNode as createSinglePlayerExpandNode, wrapSelectionAndSetExpandedState } from '../../singlePlayerExpand/commands';
12
12
  export const ExpandQuickInsertMenuItem = ({
@@ -1,2 +1,3 @@
1
1
  /* eslint-disable @atlaskit/editor/no-re-export */
2
+
2
3
  export { expandPlugin } from '../plugin';
@@ -5,12 +5,11 @@ import React from 'react';
5
5
  import { expandWithNestedExpand } from '@atlaskit/adf-schema/expand';
6
6
  import { nestedExpand } from '@atlaskit/adf-schema/nested-expand';
7
7
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
8
+ import { IconExpand } from '@atlaskit/editor-common/assets';
8
9
  import { TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu';
9
10
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
10
- import { IconExpand } from '@atlaskit/editor-common/assets';
11
- import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
12
11
  import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
13
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
12
+ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
14
13
  import { toggleExpandRange } from '../editor-commands/toggleExpandRange';
15
14
  import { createExpandBlockMenuItem } from '../ui/ExpandBlockMenuItem';
16
15
  import { getExpandQuickInsertComponents } from '../ui/quick-insert/getExpandQuickInsertComponents';
@@ -23,28 +22,25 @@ import { getToolbarConfig } from './toolbar';
23
22
  // Ignored via go/ees005
24
23
  // eslint-disable-next-line prefer-const
25
24
  export var expandPlugin = function expandPlugin(_ref) {
26
- var _api$analytics, _api$analytics2;
25
+ var _api$blockMenu, _api$analytics, _api$analytics2;
27
26
  var _ref$config = _ref.config,
28
27
  options = _ref$config === void 0 ? {} : _ref$config,
29
28
  api = _ref.api;
30
29
  var isRegisteredSlashCommandEnabled = isExperimentEnabled('platform_editor_slash_command');
31
- if (editorExperiment('platform_editor_block_menu', true)) {
32
- var _api$blockMenu;
33
- api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
34
- type: 'block-menu-item',
35
- key: TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
36
- parent: {
37
- type: 'block-menu-section',
38
- key: TRANSFORM_STRUCTURE_MENU_SECTION.key,
39
- rank: TRANSFORM_STRUCTURE_MENU_SECTION_RANK[TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
40
- },
41
- component: createExpandBlockMenuItem(api),
42
- isHidden: function isHidden() {
43
- var _api$blockMenu2;
44
- return Boolean(api === null || api === void 0 || (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
45
- }
46
- }]);
47
- }
30
+ api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
31
+ type: 'block-menu-item',
32
+ key: TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
33
+ parent: {
34
+ type: 'block-menu-section',
35
+ key: TRANSFORM_STRUCTURE_MENU_SECTION.key,
36
+ rank: TRANSFORM_STRUCTURE_MENU_SECTION_RANK[TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
37
+ },
38
+ component: createExpandBlockMenuItem(api),
39
+ isHidden: function isHidden() {
40
+ var _api$blockMenu2;
41
+ return Boolean(api === null || api === void 0 || (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
42
+ }
43
+ }]);
48
44
  if (isRegisteredSlashCommandEnabled && options.allowInsertion === true) {
49
45
  var _api$uiControlRegistr;
50
46
  api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register(getExpandQuickInsertComponents({
@@ -16,7 +16,6 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
16
16
  import { redo } from '@atlaskit/prosemirror-history/redo';
17
17
  import { undo } from '@atlaskit/prosemirror-history/undo';
18
18
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
19
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
20
19
  import { renderExpandButton } from '../../ui/renderExpandButton';
21
20
  import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
22
21
  import { ExpandButton } from '../ui/ExpandButton';
@@ -25,6 +24,7 @@ import { findReplaceExpandDecorations } from '../utils';
25
24
  export var ExpandNodeView = /*#__PURE__*/function () {
26
25
  function ExpandNodeView(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI) {
27
26
  var _this = this,
27
+ _expandedState$get,
28
28
  _api$editorDisabled,
29
29
  _this$api8;
30
30
  var allowInteractiveExpand = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : true;
@@ -482,13 +482,8 @@ export var ExpandNodeView = /*#__PURE__*/function () {
482
482
  this.getPos = getPos;
483
483
  this.view = view;
484
484
  this.node = _node;
485
- if (editorExperiment('platform_editor_block_menu', true, {
486
- exposure: true
487
- })) {
488
- var _expandedState$get;
489
- this.isExpanded.expanded = (_expandedState$get = expandedState.get(_node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
490
- this.isExpanded.localId = _node.attrs.localId;
491
- }
485
+ this.isExpanded.expanded = (_expandedState$get = expandedState.get(_node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false;
486
+ this.isExpanded.localId = _node.attrs.localId;
492
487
  var editorDisabled = api === null || api === void 0 || (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 || (_api$editorDisabled = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled === void 0 ? void 0 : _api$editorDisabled.editorDisabled;
493
488
  var _DOMSerializer$render = DOMSerializer.renderSpec(document, toDOM(_node, this.__livePage, this.intl, editorDisabled, !editorDisabled && !isExpandCollapsed(_node))),
494
489
  _dom = _DOMSerializer$render.dom,
@@ -626,9 +621,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
626
621
  };
627
622
  });
628
623
  var currentExpanded = (_expandedState$get2 = expandedState.get(node)) !== null && _expandedState$get2 !== void 0 ? _expandedState$get2 : false;
629
- var hasChanged = editorExperiment('platform_editor_block_menu', true, {
630
- exposure: true
631
- }) ? this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId : this.isExpanded.expanded !== currentExpanded;
624
+ var hasChanged = this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId;
632
625
  if (hasChanged) {
633
626
  this.updateExpandToggleIcon(node);
634
627
  this.updateDisplayStyle(node);
@@ -657,13 +650,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
657
650
  }
658
651
  }
659
652
  this.updateExpandBodyContentEditable();
660
- this.isExpanded = editorExperiment('platform_editor_block_menu', true, {
661
- exposure: true
662
- }) ? {
653
+ this.isExpanded = {
663
654
  expanded: expanded !== null && expanded !== void 0 ? expanded : false,
664
655
  localId: node.attrs.localId
665
- } : {
666
- expanded: expanded !== null && expanded !== void 0 ? expanded : false
667
656
  };
668
657
  }
669
658
  }, {
@@ -5,13 +5,12 @@ import React from 'react';
5
5
  import { expandWithNestedExpand, expandWithNestedExpandLocalId } from '@atlaskit/adf-schema/expand';
6
6
  import { nestedExpand, nestedExpandWithLocalId } from '@atlaskit/adf-schema/nested-expand';
7
7
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
8
+ import { IconExpand } from '@atlaskit/editor-common/assets';
8
9
  import { TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu';
9
10
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
10
- import { IconExpand } from '@atlaskit/editor-common/assets';
11
11
  import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
12
12
  import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
13
13
  import { fg } from '@atlaskit/platform-feature-flags/fg';
14
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
15
14
  import { toggleExpandRange } from '../editor-commands/toggleExpandRange';
16
15
  import { createExpandBlockMenuItem } from '../ui/ExpandBlockMenuItem';
17
16
  import { getExpandQuickInsertComponents } from '../ui/quick-insert/getExpandQuickInsertComponents';
@@ -24,27 +23,25 @@ import { getToolbarConfig } from './toolbar';
24
23
  // Ignored via go/ees005
25
24
  // eslint-disable-next-line prefer-const
26
25
  export var expandPlugin = function expandPlugin(_ref) {
26
+ var _api$blockMenu;
27
27
  var _ref$config = _ref.config,
28
28
  options = _ref$config === void 0 ? {} : _ref$config,
29
29
  api = _ref.api;
30
30
  var isRegisteredSlashCommandEnabled = isExperimentEnabled('platform_editor_slash_command');
31
- if (editorExperiment('platform_editor_block_menu', true)) {
32
- var _api$blockMenu;
33
- api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
34
- type: 'block-menu-item',
35
- key: TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
36
- parent: {
37
- type: 'block-menu-section',
38
- key: TRANSFORM_STRUCTURE_MENU_SECTION.key,
39
- rank: TRANSFORM_STRUCTURE_MENU_SECTION_RANK[TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
40
- },
41
- component: createExpandBlockMenuItem(api),
42
- isHidden: function isHidden() {
43
- var _api$blockMenu2;
44
- return Boolean(api === null || api === void 0 || (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
45
- }
46
- }]);
47
- }
31
+ api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
32
+ type: 'block-menu-item',
33
+ key: TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key,
34
+ parent: {
35
+ type: 'block-menu-section',
36
+ key: TRANSFORM_STRUCTURE_MENU_SECTION.key,
37
+ rank: TRANSFORM_STRUCTURE_MENU_SECTION_RANK[TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]
38
+ },
39
+ component: createExpandBlockMenuItem(api),
40
+ isHidden: function isHidden() {
41
+ var _api$blockMenu2;
42
+ return Boolean(api === null || api === void 0 || (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(EXPAND_NODE_NAME));
43
+ }
44
+ }]);
48
45
  if (isRegisteredSlashCommandEnabled && options.allowInsertion === true) {
49
46
  var _api$uiControlRegistr;
50
47
  api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register(getExpandQuickInsertComponents({
@@ -5,8 +5,8 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
5
5
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
6
6
  import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
7
7
  import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
8
- import { fg } from '@atlaskit/platform-feature-flags/fg';
9
8
  import ExpandElementIcon from '@atlaskit/icon-lab/core/expand-element';
9
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
10
10
  import { createExpandNode as createLegacyExpandNode } from '../../legacyExpand/commands';
11
11
  import { createExpandNode as createSinglePlayerExpandNode, wrapSelectionAndSetExpandedState } from '../../singlePlayerExpand/commands';
12
12
  export var ExpandQuickInsertMenuItem = function ExpandQuickInsertMenuItem(_ref) {
@@ -9,9 +9,9 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
9
9
  import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
10
10
  import type { LimitedModePlugin } from '@atlaskit/editor-plugin-limited-mode/limited-mode-plugin-type';
11
11
  import type { LocalIdPlugin } from '@atlaskit/editor-plugin-local-id';
12
- import type { UiControlRegistryPlugin } from '@atlaskit/editor-plugin-ui-control-registry';
13
12
  import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
14
13
  import type { SelectionMarkerPlugin } from '@atlaskit/editor-plugin-selection-marker';
14
+ import type { UiControlRegistryPlugin } from '@atlaskit/editor-plugin-ui-control-registry';
15
15
  import type { Selection } from '@atlaskit/editor-prosemirror/state';
16
16
  import type { insertExpand, insertExpandWithInputMethod } from './legacyExpand/commands';
17
17
  export interface ExpandPluginState {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-expand",
3
- "version": "20.0.0",
3
+ "version": "20.0.2",
4
4
  "description": "Expand plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -36,14 +36,14 @@
36
36
  "@atlaskit/editor-prosemirror": "^9.0.0",
37
37
  "@atlaskit/editor-shared-styles": "^4.3.0",
38
38
  "@atlaskit/editor-tables": "^3.2.0",
39
- "@atlaskit/editor-toolbar": "^2.6.0",
39
+ "@atlaskit/editor-toolbar": "^2.7.0",
40
40
  "@atlaskit/editor-ui-control-model": "^2.9.0",
41
41
  "@atlaskit/icon": "^37.7.0",
42
42
  "@atlaskit/icon-lab": "^7.9.0",
43
43
  "@atlaskit/platform-feature-experiments": "^0.3.0",
44
44
  "@atlaskit/platform-feature-flags": "^2.2.0",
45
45
  "@atlaskit/prosemirror-history": "^1.2.0",
46
- "@atlaskit/tmp-editor-statsig": "^199.0.0",
46
+ "@atlaskit/tmp-editor-statsig": "^201.0.0",
47
47
  "@atlaskit/tokens": "^18.2.0",
48
48
  "@atlaskit/tooltip": "^24.3.0",
49
49
  "@babel/runtime": "^7.0.0",
@@ -52,7 +52,7 @@
52
52
  "w3c-keyname": "^2.1.8"
53
53
  },
54
54
  "peerDependencies": {
55
- "@atlaskit/editor-common": "^123.0.0",
55
+ "@atlaskit/editor-common": "^123.2.0",
56
56
  "react": "^18.2.0 || ^19.2.0",
57
57
  "react-dom": "^18.2.0 || ^19.2.0",
58
58
  "react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"