@atlaskit/editor-plugin-expand 2.11.1 → 2.12.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-expand
 
+## 2.12.1
+
+### Patch Changes
+
+- [#112186](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/112186)
+  [`9462d8ca2405a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9462d8ca2405a) -
+  Bump adf-schema to 47.2.1
+
+## 2.12.0
+
+### Minor Changes
+
+- [#105322](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105322)
+  [`8876083532adc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8876083532adc) -
+  Bumped editor-prosemirror version to 7.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.11.1
 
 ### Patch Changes

package/dist/cjs/legacyExpand/nodeviews/index.js

@@ -10,7 +10,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _reactDom = _interopRequireDefault(require("react-dom"));
 var _v = _interopRequireDefault(require("uuid/v4"));
 var _w3cKeyname = require("w3c-keyname");
 var _selection = require("@atlaskit/editor-common/selection");
@@ -491,21 +490,13 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       }
       var _ref = node && node.attrs || this.node.attrs,
         __expanded = _ref.__expanded;
-      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_plugin_portalprovider')) {
-        this.nodeViewPortalProviderAPI.render(function () {
-          return /*#__PURE__*/_react.default.createElement(_ExpandIconButton.ExpandIconButton, {
-            intl: intl,
-            allowInteractiveExpand: _this3.allowInteractiveExpand,
-            expanded: _this3.__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
-          });
-        }, this.icon, this.renderKey);
-      } else {
-        _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_ExpandIconButton.ExpandIconButton, {
+      this.nodeViewPortalProviderAPI.render(function () {
+        return /*#__PURE__*/_react.default.createElement(_ExpandIconButton.ExpandIconButton, {
           intl: intl,
-          allowInteractiveExpand: this.allowInteractiveExpand,
-          expanded: this.__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
-        }), this.icon);
-      }
+          allowInteractiveExpand: _this3.allowInteractiveExpand,
+          expanded: _this3.__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
+        });
+      }, this.icon, this.renderKey);
     }
   }, {
     key: "stopEvent",
@@ -584,11 +575,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       if (this.icon) {
         // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
         this.icon.removeEventListener('keydown', this.handleIconKeyDown);
-        if ((0, _platformFeatureFlags.fg)('platform_editor_react18_plugin_portalprovider')) {
-          this.nodeViewPortalProviderAPI.remove(this.renderKey);
-        } else {
-          _reactDom.default.unmountComponentAtNode(this.icon);
-        }
+        this.nodeViewPortalProviderAPI.remove(this.renderKey);
       }
       (_this$decorationClean2 = this.decorationCleanup) === null || _this$decorationClean2 === void 0 || _this$decorationClean2.call(this);
       if (this.cleanUpEditorDisabledOnChange) {

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

@@ -10,7 +10,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _reactDom = _interopRequireDefault(require("react-dom"));
 var _v = _interopRequireDefault(require("uuid/v4"));
 var _w3cKeyname = require("w3c-keyname");
 var _expand = require("@atlaskit/editor-common/expand");
@@ -20,7 +19,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _history = require("@atlaskit/editor-prosemirror/history");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../commands");
 var _ExpandButton = require("../ui/ExpandButton");
@@ -379,21 +377,13 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       if (!icon) {
         return;
       }
-      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_plugin_portalprovider')) {
-        _this.nodeViewPortalProviderAPI.render(function () {
-          return /*#__PURE__*/_react.default.createElement(_ExpandButton.ExpandButton, {
-            intl: _this.intl,
-            allowInteractiveExpand: _this.allowInteractiveExpand,
-            expanded: expanded
-          });
-        }, icon, _this.renderKey);
-      } else {
-        _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_ExpandButton.ExpandButton, {
+      _this.nodeViewPortalProviderAPI.render(function () {
+        return /*#__PURE__*/_react.default.createElement(_ExpandButton.ExpandButton, {
           intl: _this.intl,
           allowInteractiveExpand: _this.allowInteractiveExpand,
           expanded: expanded
-        }), icon);
-      }
+        });
+      }, icon, _this.renderKey);
     });
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
@@ -550,11 +540,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       if (this.cleanUpEditorDisabledOnChange) {
         this.cleanUpEditorDisabledOnChange();
       }
-      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_plugin_portalprovider')) {
-        this.nodeViewPortalProviderAPI.remove(this.renderKey);
-      } else {
-        _reactDom.default.unmountComponentAtNode(this.icon);
-      }
+      this.nodeViewPortalProviderAPI.remove(this.renderKey);
     }
   }]);
 }();

package/dist/es2019/legacyExpand/nodeviews/index.js

@@ -1,6 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import ReactDOM from 'react-dom';
 import uuid from 'uuid/v4';
 import { keyName } from 'w3c-keyname';
 import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor-common/selection';
@@ -488,19 +487,11 @@ export class ExpandNodeView {
     const {
       __expanded
     } = node && node.attrs || this.node.attrs;
-    if (fg('platform_editor_react18_plugin_portalprovider')) {
-      this.nodeViewPortalProviderAPI.render(() => /*#__PURE__*/React.createElement(ExpandIconButton, {
-        intl: intl,
-        allowInteractiveExpand: this.allowInteractiveExpand,
-        expanded: this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
-      }), this.icon, this.renderKey);
-    } else {
-      ReactDOM.render( /*#__PURE__*/React.createElement(ExpandIconButton, {
-        intl: intl,
-        allowInteractiveExpand: this.allowInteractiveExpand,
-        expanded: this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
-      }), this.icon);
-    }
+    this.nodeViewPortalProviderAPI.render(() => /*#__PURE__*/React.createElement(ExpandIconButton, {
+      intl: intl,
+      allowInteractiveExpand: this.allowInteractiveExpand,
+      expanded: this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
+    }), this.icon, this.renderKey);
   }
   stopEvent(event) {
     // Ignored via go/ees005
@@ -570,11 +561,7 @@ export class ExpandNodeView {
     if (this.icon) {
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
       this.icon.removeEventListener('keydown', this.handleIconKeyDown);
-      if (fg('platform_editor_react18_plugin_portalprovider')) {
-        this.nodeViewPortalProviderAPI.remove(this.renderKey);
-      } else {
-        ReactDOM.unmountComponentAtNode(this.icon);
-      }
+      this.nodeViewPortalProviderAPI.remove(this.renderKey);
     }
     (_this$decorationClean2 = this.decorationCleanup) === null || _this$decorationClean2 === void 0 ? void 0 : _this$decorationClean2.call(this);
     if (this.cleanUpEditorDisabledOnChange) {

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

@@ -1,6 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import ReactDOM from 'react-dom';
 import uuid from 'uuid/v4';
 import { keyName } from 'w3c-keyname';
 import { expandedState, isExpandCollapsed } from '@atlaskit/editor-common/expand';
@@ -10,7 +9,6 @@ import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandButton } from '../ui/ExpandButton';
@@ -380,19 +378,11 @@ export class ExpandNodeView {
       if (!icon) {
         return;
       }
-      if (fg('platform_editor_react18_plugin_portalprovider')) {
-        this.nodeViewPortalProviderAPI.render(() => /*#__PURE__*/React.createElement(ExpandButton, {
-          intl: this.intl,
-          allowInteractiveExpand: this.allowInteractiveExpand,
-          expanded: expanded
-        }), icon, this.renderKey);
-      } else {
-        ReactDOM.render( /*#__PURE__*/React.createElement(ExpandButton, {
-          intl: this.intl,
-          allowInteractiveExpand: this.allowInteractiveExpand,
-          expanded: expanded
-        }), icon);
-      }
+      this.nodeViewPortalProviderAPI.render(() => /*#__PURE__*/React.createElement(ExpandButton, {
+        intl: this.intl,
+        allowInteractiveExpand: this.allowInteractiveExpand,
+        expanded: expanded
+      }), icon, this.renderKey);
     });
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
@@ -537,11 +527,7 @@ export class ExpandNodeView {
     if (this.cleanUpEditorDisabledOnChange) {
       this.cleanUpEditorDisabledOnChange();
     }
-    if (fg('platform_editor_react18_plugin_portalprovider')) {
-      this.nodeViewPortalProviderAPI.remove(this.renderKey);
-    } else {
-      ReactDOM.unmountComponentAtNode(this.icon);
-    }
+    this.nodeViewPortalProviderAPI.remove(this.renderKey);
   }
 }
 export default function ({

package/dist/esm/legacyExpand/nodeviews/index.js

@@ -2,7 +2,6 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import ReactDOM from 'react-dom';
 import uuid from 'uuid/v4';
 import { keyName } from 'w3c-keyname';
 import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor-common/selection';
@@ -483,21 +482,13 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       }
       var _ref = node && node.attrs || this.node.attrs,
         __expanded = _ref.__expanded;
-      if (fg('platform_editor_react18_plugin_portalprovider')) {
-        this.nodeViewPortalProviderAPI.render(function () {
-          return /*#__PURE__*/React.createElement(ExpandIconButton, {
-            intl: intl,
-            allowInteractiveExpand: _this3.allowInteractiveExpand,
-            expanded: _this3.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
-          });
-        }, this.icon, this.renderKey);
-      } else {
-        ReactDOM.render( /*#__PURE__*/React.createElement(ExpandIconButton, {
+      this.nodeViewPortalProviderAPI.render(function () {
+        return /*#__PURE__*/React.createElement(ExpandIconButton, {
           intl: intl,
-          allowInteractiveExpand: this.allowInteractiveExpand,
-          expanded: this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
-        }), this.icon);
-      }
+          allowInteractiveExpand: _this3.allowInteractiveExpand,
+          expanded: _this3.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
+        });
+      }, this.icon, this.renderKey);
     }
   }, {
     key: "stopEvent",
@@ -576,11 +567,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       if (this.icon) {
         // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
         this.icon.removeEventListener('keydown', this.handleIconKeyDown);
-        if (fg('platform_editor_react18_plugin_portalprovider')) {
-          this.nodeViewPortalProviderAPI.remove(this.renderKey);
-        } else {
-          ReactDOM.unmountComponentAtNode(this.icon);
-        }
+        this.nodeViewPortalProviderAPI.remove(this.renderKey);
       }
       (_this$decorationClean2 = this.decorationCleanup) === null || _this$decorationClean2 === void 0 || _this$decorationClean2.call(this);
       if (this.cleanUpEditorDisabledOnChange) {

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

@@ -2,7 +2,6 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import ReactDOM from 'react-dom';
 import uuid from 'uuid/v4';
 import { keyName } from 'w3c-keyname';
 import { expandedState, isExpandCollapsed } from '@atlaskit/editor-common/expand';
@@ -12,7 +11,6 @@ import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandButton } from '../ui/ExpandButton';
@@ -371,21 +369,13 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       if (!icon) {
         return;
       }
-      if (fg('platform_editor_react18_plugin_portalprovider')) {
-        _this.nodeViewPortalProviderAPI.render(function () {
-          return /*#__PURE__*/React.createElement(ExpandButton, {
-            intl: _this.intl,
-            allowInteractiveExpand: _this.allowInteractiveExpand,
-            expanded: expanded
-          });
-        }, icon, _this.renderKey);
-      } else {
-        ReactDOM.render( /*#__PURE__*/React.createElement(ExpandButton, {
+      _this.nodeViewPortalProviderAPI.render(function () {
+        return /*#__PURE__*/React.createElement(ExpandButton, {
           intl: _this.intl,
           allowInteractiveExpand: _this.allowInteractiveExpand,
           expanded: expanded
-        }), icon);
-      }
+        });
+      }, icon, _this.renderKey);
     });
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
@@ -542,11 +532,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       if (this.cleanUpEditorDisabledOnChange) {
         this.cleanUpEditorDisabledOnChange();
       }
-      if (fg('platform_editor_react18_plugin_portalprovider')) {
-        this.nodeViewPortalProviderAPI.remove(this.renderKey);
-      } else {
-        ReactDOM.unmountComponentAtNode(this.icon);
-      }
+      this.nodeViewPortalProviderAPI.remove(this.renderKey);
     }
   }]);
 }();

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

@@ -50,7 +50,7 @@ export declare class ExpandNodeView implements NodeView {
     stopEvent(event: Event): boolean;
     ignoreMutation(mutationRecord: MutationRecord | {
         type: 'selection';
-        target: Element;
+        target: Node;
     }): boolean;
     update(node: PmNode, _decorations: readonly Decoration[]): boolean;
     destroy(): void;

package/dist/types/singlePlayerExpand/node-views/index.d.ts

@@ -49,7 +49,7 @@ export declare class ExpandNodeView implements NodeView {
     stopEvent(event: Event): boolean;
     ignoreMutation(mutationRecord: MutationRecord | {
         type: 'selection';
-        target: Element;
+        target: Node;
     }): boolean;
     update(node: PmNode, _decorations: readonly Decoration[]): boolean;
     updateExpandToggleIcon(node: PmNode): void;

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

@@ -50,7 +50,7 @@ export declare class ExpandNodeView implements NodeView {
     stopEvent(event: Event): boolean;
     ignoreMutation(mutationRecord: MutationRecord | {
         type: 'selection';
-        target: Element;
+        target: Node;
     }): boolean;
     update(node: PmNode, _decorations: readonly Decoration[]): boolean;
     destroy(): void;

package/dist/types-ts4.5/singlePlayerExpand/node-views/index.d.ts

@@ -49,7 +49,7 @@ export declare class ExpandNodeView implements NodeView {
     stopEvent(event: Event): boolean;
     ignoreMutation(mutationRecord: MutationRecord | {
         type: 'selection';
-        target: Element;
+        target: Node;
     }): boolean;
     update(node: PmNode, _decorations: readonly Decoration[]): boolean;
     updateExpandToggleIcon(node: PmNode): void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "2.11.1",
+	"version": "2.12.1",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,21 +31,21 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/button": "^20.4.0",
-		"@atlaskit/editor-common": "^99.7.0",
-		"@atlaskit/editor-plugin-analytics": "^1.11.0",
-		"@atlaskit/editor-plugin-decorations": "^1.4.0",
-		"@atlaskit/editor-plugin-editor-disabled": "^1.4.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.16",
-		"@atlaskit/editor-plugin-selection": "^1.6.0",
-		"@atlaskit/editor-plugin-selection-marker": "^1.7.0",
-		"@atlaskit/editor-prosemirror": "6.2.1",
+		"@atlaskit/adf-schema": "^47.2.1",
+		"@atlaskit/button": "^20.5.0",
+		"@atlaskit/editor-common": "^99.14.0",
+		"@atlaskit/editor-plugin-analytics": "^1.12.0",
+		"@atlaskit/editor-plugin-decorations": "^1.5.0",
+		"@atlaskit/editor-plugin-editor-disabled": "^1.5.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^2.2.0",
+		"@atlaskit/editor-plugin-selection": "^1.8.0",
+		"@atlaskit/editor-plugin-selection-marker": "^1.8.0",
+		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
-		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^23.6.0",
+		"@atlaskit/editor-tables": "^2.9.0",
+		"@atlaskit/icon": "^23.9.0",
 		"@atlaskit/platform-feature-flags": "^1.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.41.0",
+		"@atlaskit/tmp-editor-statsig": "^2.46.0",
 		"@atlaskit/tokens": "^3.3.0",
 		"@atlaskit/tooltip": "^19.1.0",
 		"@babel/runtime": "^7.0.0",
@@ -60,12 +60,12 @@
 	},
 	"devDependencies": {
 		"@atlaskit/analytics-next": "^10.3.0",
-		"@atlaskit/editor-plugin-content-insertion": "^1.12.0",
-		"@atlaskit/editor-plugin-guideline": "^1.3.0",
-		"@atlaskit/editor-plugin-quick-insert": "^1.9.0",
-		"@atlaskit/editor-plugin-table": "^9.3.0",
-		"@atlaskit/editor-plugin-type-ahead": "^1.12.0",
-		"@atlaskit/editor-plugin-width": "^2.0.0",
+		"@atlaskit/editor-plugin-content-insertion": "^1.13.0",
+		"@atlaskit/editor-plugin-guideline": "^1.4.0",
+		"@atlaskit/editor-plugin-quick-insert": "^1.10.0",
+		"@atlaskit/editor-plugin-table": "^9.4.0",
+		"@atlaskit/editor-plugin-type-ahead": "^1.13.0",
+		"@atlaskit/editor-plugin-width": "^2.1.0",
 		"@testing-library/react": "^13.4.0",
 		"react-test-renderer": "^18.2.0",
 		"typescript": "~5.4.2"
@@ -119,9 +119,6 @@
 		"platform_editor_remove_copy_button_from_view_mode": {
 			"type": "boolean"
 		},
-		"platform_editor_react18_plugin_portalprovider": {
-			"type": "boolean"
-		},
 		"platform_editor_long_node_expand": {
 			"type": "boolean",
 			"referenceOnly": true