@atlaskit/editor-common 92.1.1 → 92.1.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-common
 
+## 92.1.2
+
+### Patch Changes
+
+- [#148109](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/148109)
+  [`ac5a4bdf86ac6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ac5a4bdf86ac6) -
+  Fix selection sync in React 18 for certain nodes.
+- Updated dependencies
+
 ## 92.1.1
 
 ### Patch Changes

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "92.1.1";
+var packageVersion = "92.1.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/react-node-view/index.js

@@ -22,7 +22,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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
 var _eventDispatcher = require("../event-dispatcher");
 var _ErrorBoundary = require("../ui/ErrorBoundary");
@@ -151,48 +150,44 @@ var ReactNodeView = exports.default = /*#__PURE__*/function () {
 
       // move the contentDOM node inside the inner reference after rendering
       if (node && contentDOM && !node.contains(contentDOM)) {
-        if ((0, _platformFeatureFlags.fg)('platform_editor_react_18_prosemirror_sel_resync')) {
-          var _this$view$state$sele;
-          // @ts-ignore - ignoreMutation may not be declared
-          oldIgnoreMutation = this.ignoreMutation; // store ref to previous ignoreMutation
+        var _this$view$state$sele;
+        // @ts-ignore - ignoreMutation may not be declared
+        oldIgnoreMutation = this.ignoreMutation; // store ref to previous ignoreMutation
 
-          // ignore all mutations caused by ProseMirror's MutationObserver triggering
-          // after DOM change, except selection changes
-          // @ts-ignore ProseMirror adds selection type to MutationRecord
-          this.ignoreMutation = function (m) {
-            var isSelectionMutation = m.type === 'selection';
-            if (!isSelectionMutation) {
-              mutationsIgnored = true;
-            }
-            return !isSelectionMutation;
-          };
-
-          // capture document selection state before React DOM changes triggers ProseMirror selection change transaction
-          if (this.view.state.selection.visible) {
-            selectionBookmark = this.view.state.selection.getBookmark();
+        // ignore all mutations caused by ProseMirror's MutationObserver triggering
+        // after DOM change, except selection changes
+        // @ts-ignore ProseMirror adds selection type to MutationRecord
+        this.ignoreMutation = function (m) {
+          var isSelectionMutation = m.type === 'selection';
+          if (!isSelectionMutation) {
+            mutationsIgnored = true;
           }
+          return !isSelectionMutation;
+        };
 
-          // ... and capture parent offset before DOM change
-          if (((_this$view$state$sele = this.view.state.selection) === null || _this$view$state$sele === void 0 ? void 0 : _this$view$state$sele.ranges.length) > 0) {
-            var _this$view$state$sele2, _this$view$state$sele3;
-            parentOffset = (_this$view$state$sele2 = (_this$view$state$sele3 = this.view.state.selection) === null || _this$view$state$sele3 === void 0 || (_this$view$state$sele3 = _this$view$state$sele3.ranges[0].$from) === null || _this$view$state$sele3 === void 0 ? void 0 : _this$view$state$sele3.parentOffset) !== null && _this$view$state$sele2 !== void 0 ? _this$view$state$sele2 : 0;
-          }
+        // capture document selection state before React DOM changes triggers ProseMirror selection change transaction
+        if (this.view.state.selection.visible) {
+          selectionBookmark = this.view.state.selection.getBookmark();
         }
-        node.appendChild(contentDOM);
-        if ((0, _platformFeatureFlags.fg)('platform_editor_react_18_prosemirror_sel_resync')) {
-          requestAnimationFrame(function () {
-            // Reset ignoreMutation after frame ....
-            // @ts-ignore - this may not have been declared by implementing class
-            _this4.ignoreMutation = oldIgnoreMutation;
 
-            // only trigger selection re-sync if the selection is not at the start of the
-            // node, and DOM mutations were ignored
-            if (selectionBookmark && mutationsIgnored && parentOffset > 0) {
-              // ... and dispatch expected selection state
-              _this4.view.dispatch(_this4.view.state.tr.setSelection(selectionBookmark.resolve(_this4.view.state.tr.doc)));
-            }
-          });
+        // ... and capture parent offset before DOM change
+        if (((_this$view$state$sele = this.view.state.selection) === null || _this$view$state$sele === void 0 ? void 0 : _this$view$state$sele.ranges.length) > 0) {
+          var _this$view$state$sele2, _this$view$state$sele3;
+          parentOffset = (_this$view$state$sele2 = (_this$view$state$sele3 = this.view.state.selection) === null || _this$view$state$sele3 === void 0 || (_this$view$state$sele3 = _this$view$state$sele3.ranges[0].$from) === null || _this$view$state$sele3 === void 0 ? void 0 : _this$view$state$sele3.parentOffset) !== null && _this$view$state$sele2 !== void 0 ? _this$view$state$sele2 : 0;
         }
+        node.appendChild(contentDOM);
+        requestAnimationFrame(function () {
+          // Reset ignoreMutation after frame ....
+          // @ts-ignore - this may not have been declared by implementing class
+          _this4.ignoreMutation = oldIgnoreMutation;
+
+          // only trigger selection re-sync if the selection is not at the start of the
+          // node, and DOM mutations were ignored
+          if (selectionBookmark && mutationsIgnored && parentOffset > 0) {
+            // ... and dispatch expected selection state
+            _this4.view.dispatch(_this4.view.state.tr.setSelection(selectionBookmark.resolve(_this4.view.state.tr.doc)));
+          }
+        });
       }
     }
   }, {

package/dist/cjs/ui/DropList/index.js

@@ -25,7 +25,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "92.1.1";
+var packageVersion = "92.1.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "92.1.1";
+const packageVersion = "92.1.2";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/react-node-view/index.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../analytics';
 import { createDispatch } from '../event-dispatcher';
 import { ErrorBoundary } from '../ui/ErrorBoundary';
@@ -113,48 +112,44 @@ export default class ReactNodeView {
 
     // move the contentDOM node inside the inner reference after rendering
     if (node && contentDOM && !node.contains(contentDOM)) {
-      if (fg('platform_editor_react_18_prosemirror_sel_resync')) {
-        var _this$view$state$sele;
-        // @ts-ignore - ignoreMutation may not be declared
-        oldIgnoreMutation = this.ignoreMutation; // store ref to previous ignoreMutation
+      var _this$view$state$sele;
+      // @ts-ignore - ignoreMutation may not be declared
+      oldIgnoreMutation = this.ignoreMutation; // store ref to previous ignoreMutation
 
-        // ignore all mutations caused by ProseMirror's MutationObserver triggering
-        // after DOM change, except selection changes
-        // @ts-ignore ProseMirror adds selection type to MutationRecord
-        this.ignoreMutation = m => {
-          const isSelectionMutation = m.type === 'selection';
-          if (!isSelectionMutation) {
-            mutationsIgnored = true;
-          }
-          return !isSelectionMutation;
-        };
-
-        // capture document selection state before React DOM changes triggers ProseMirror selection change transaction
-        if (this.view.state.selection.visible) {
-          selectionBookmark = this.view.state.selection.getBookmark();
+      // ignore all mutations caused by ProseMirror's MutationObserver triggering
+      // after DOM change, except selection changes
+      // @ts-ignore ProseMirror adds selection type to MutationRecord
+      this.ignoreMutation = m => {
+        const isSelectionMutation = m.type === 'selection';
+        if (!isSelectionMutation) {
+          mutationsIgnored = true;
         }
+        return !isSelectionMutation;
+      };
 
-        // ... and capture parent offset before DOM change
-        if (((_this$view$state$sele = this.view.state.selection) === null || _this$view$state$sele === void 0 ? void 0 : _this$view$state$sele.ranges.length) > 0) {
-          var _this$view$state$sele2, _this$view$state$sele3, _this$view$state$sele4;
-          parentOffset = (_this$view$state$sele2 = (_this$view$state$sele3 = this.view.state.selection) === null || _this$view$state$sele3 === void 0 ? void 0 : (_this$view$state$sele4 = _this$view$state$sele3.ranges[0].$from) === null || _this$view$state$sele4 === void 0 ? void 0 : _this$view$state$sele4.parentOffset) !== null && _this$view$state$sele2 !== void 0 ? _this$view$state$sele2 : 0;
-        }
+      // capture document selection state before React DOM changes triggers ProseMirror selection change transaction
+      if (this.view.state.selection.visible) {
+        selectionBookmark = this.view.state.selection.getBookmark();
       }
-      node.appendChild(contentDOM);
-      if (fg('platform_editor_react_18_prosemirror_sel_resync')) {
-        requestAnimationFrame(() => {
-          // Reset ignoreMutation after frame ....
-          // @ts-ignore - this may not have been declared by implementing class
-          this.ignoreMutation = oldIgnoreMutation;
 
-          // only trigger selection re-sync if the selection is not at the start of the
-          // node, and DOM mutations were ignored
-          if (selectionBookmark && mutationsIgnored && parentOffset > 0) {
-            // ... and dispatch expected selection state
-            this.view.dispatch(this.view.state.tr.setSelection(selectionBookmark.resolve(this.view.state.tr.doc)));
-          }
-        });
+      // ... and capture parent offset before DOM change
+      if (((_this$view$state$sele = this.view.state.selection) === null || _this$view$state$sele === void 0 ? void 0 : _this$view$state$sele.ranges.length) > 0) {
+        var _this$view$state$sele2, _this$view$state$sele3, _this$view$state$sele4;
+        parentOffset = (_this$view$state$sele2 = (_this$view$state$sele3 = this.view.state.selection) === null || _this$view$state$sele3 === void 0 ? void 0 : (_this$view$state$sele4 = _this$view$state$sele3.ranges[0].$from) === null || _this$view$state$sele4 === void 0 ? void 0 : _this$view$state$sele4.parentOffset) !== null && _this$view$state$sele2 !== void 0 ? _this$view$state$sele2 : 0;
       }
+      node.appendChild(contentDOM);
+      requestAnimationFrame(() => {
+        // Reset ignoreMutation after frame ....
+        // @ts-ignore - this may not have been declared by implementing class
+        this.ignoreMutation = oldIgnoreMutation;
+
+        // only trigger selection re-sync if the selection is not at the start of the
+        // node, and DOM mutations were ignored
+        if (selectionBookmark && mutationsIgnored && parentOffset > 0) {
+          // ... and dispatch expected selection state
+          this.view.dispatch(this.view.state.tr.setSelection(selectionBookmark.resolve(this.view.state.tr.doc)));
+        }
+      });
     }
   }
   render(props, forwardRef) {

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "92.1.1";
+const packageVersion = "92.1.2";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "92.1.1";
+var packageVersion = "92.1.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/react-node-view/index.js

@@ -3,7 +3,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 { fg } from '@atlaskit/platform-feature-flags';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../analytics';
 import { createDispatch } from '../event-dispatcher';
 import { ErrorBoundary } from '../ui/ErrorBoundary';
@@ -132,48 +131,44 @@ var ReactNodeView = /*#__PURE__*/function () {
 
       // move the contentDOM node inside the inner reference after rendering
       if (node && contentDOM && !node.contains(contentDOM)) {
-        if (fg('platform_editor_react_18_prosemirror_sel_resync')) {
-          var _this$view$state$sele;
-          // @ts-ignore - ignoreMutation may not be declared
-          oldIgnoreMutation = this.ignoreMutation; // store ref to previous ignoreMutation
+        var _this$view$state$sele;
+        // @ts-ignore - ignoreMutation may not be declared
+        oldIgnoreMutation = this.ignoreMutation; // store ref to previous ignoreMutation
 
-          // ignore all mutations caused by ProseMirror's MutationObserver triggering
-          // after DOM change, except selection changes
-          // @ts-ignore ProseMirror adds selection type to MutationRecord
-          this.ignoreMutation = function (m) {
-            var isSelectionMutation = m.type === 'selection';
-            if (!isSelectionMutation) {
-              mutationsIgnored = true;
-            }
-            return !isSelectionMutation;
-          };
-
-          // capture document selection state before React DOM changes triggers ProseMirror selection change transaction
-          if (this.view.state.selection.visible) {
-            selectionBookmark = this.view.state.selection.getBookmark();
+        // ignore all mutations caused by ProseMirror's MutationObserver triggering
+        // after DOM change, except selection changes
+        // @ts-ignore ProseMirror adds selection type to MutationRecord
+        this.ignoreMutation = function (m) {
+          var isSelectionMutation = m.type === 'selection';
+          if (!isSelectionMutation) {
+            mutationsIgnored = true;
           }
+          return !isSelectionMutation;
+        };
 
-          // ... and capture parent offset before DOM change
-          if (((_this$view$state$sele = this.view.state.selection) === null || _this$view$state$sele === void 0 ? void 0 : _this$view$state$sele.ranges.length) > 0) {
-            var _this$view$state$sele2, _this$view$state$sele3;
-            parentOffset = (_this$view$state$sele2 = (_this$view$state$sele3 = this.view.state.selection) === null || _this$view$state$sele3 === void 0 || (_this$view$state$sele3 = _this$view$state$sele3.ranges[0].$from) === null || _this$view$state$sele3 === void 0 ? void 0 : _this$view$state$sele3.parentOffset) !== null && _this$view$state$sele2 !== void 0 ? _this$view$state$sele2 : 0;
-          }
+        // capture document selection state before React DOM changes triggers ProseMirror selection change transaction
+        if (this.view.state.selection.visible) {
+          selectionBookmark = this.view.state.selection.getBookmark();
         }
-        node.appendChild(contentDOM);
-        if (fg('platform_editor_react_18_prosemirror_sel_resync')) {
-          requestAnimationFrame(function () {
-            // Reset ignoreMutation after frame ....
-            // @ts-ignore - this may not have been declared by implementing class
-            _this4.ignoreMutation = oldIgnoreMutation;
 
-            // only trigger selection re-sync if the selection is not at the start of the
-            // node, and DOM mutations were ignored
-            if (selectionBookmark && mutationsIgnored && parentOffset > 0) {
-              // ... and dispatch expected selection state
-              _this4.view.dispatch(_this4.view.state.tr.setSelection(selectionBookmark.resolve(_this4.view.state.tr.doc)));
-            }
-          });
+        // ... and capture parent offset before DOM change
+        if (((_this$view$state$sele = this.view.state.selection) === null || _this$view$state$sele === void 0 ? void 0 : _this$view$state$sele.ranges.length) > 0) {
+          var _this$view$state$sele2, _this$view$state$sele3;
+          parentOffset = (_this$view$state$sele2 = (_this$view$state$sele3 = this.view.state.selection) === null || _this$view$state$sele3 === void 0 || (_this$view$state$sele3 = _this$view$state$sele3.ranges[0].$from) === null || _this$view$state$sele3 === void 0 ? void 0 : _this$view$state$sele3.parentOffset) !== null && _this$view$state$sele2 !== void 0 ? _this$view$state$sele2 : 0;
         }
+        node.appendChild(contentDOM);
+        requestAnimationFrame(function () {
+          // Reset ignoreMutation after frame ....
+          // @ts-ignore - this may not have been declared by implementing class
+          _this4.ignoreMutation = oldIgnoreMutation;
+
+          // only trigger selection re-sync if the selection is not at the start of the
+          // node, and DOM mutations were ignored
+          if (selectionBookmark && mutationsIgnored && parentOffset > 0) {
+            // ... and dispatch expected selection state
+            _this4.view.dispatch(_this4.view.state.tr.setSelection(selectionBookmark.resolve(_this4.view.state.tr.doc)));
+          }
+        });
       }
     }
   }, {

package/dist/esm/ui/DropList/index.js

@@ -22,7 +22,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "92.1.1";
+var packageVersion = "92.1.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "92.1.1",
+	"version": "92.1.2",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -128,7 +128,7 @@
 		"@atlaskit/icon": "^22.20.0",
 		"@atlaskit/icon-object": "^6.5.0",
 		"@atlaskit/link-datasource": "^3.2.0",
-		"@atlaskit/link-picker": "^1.46.0",
+		"@atlaskit/link-picker": "^1.47.0",
 		"@atlaskit/media-card": "^78.5.0",
 		"@atlaskit/media-client": "^28.0.0",
 		"@atlaskit/media-client-react": "^2.2.0",
@@ -267,9 +267,6 @@
 		"cc_page_experiences_live_search_wysiwyg": {
 			"type": "boolean"
 		},
-		"platform_editor_react_18_prosemirror_sel_resync": {
-			"type": "boolean"
-		},
 		"platform-fix-table-ssr-resizing": {
 			"type": "boolean"
 		},