@atlaskit/editor-common 88.8.1 → 88.8.3

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-common
 
+## 88.8.3
+
+### Patch Changes
+
+- [#136760](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136760)
+  [`39e4b9c90b284`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/39e4b9c90b284) -
+  LazyNodeView update method to compare decorations
+
+## 88.8.2
+
+### Patch Changes
+
+- [#137244](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137244)
+  [`e6f32d1f22896`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e6f32d1f22896) -
+  Control show or hide editor toolbar in SSR environment
+- [#136871](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136871)
+  [`87a30d5cb3ffb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/87a30d5cb3ffb) -
+  ED-24814 - Addressing a bug where changing the language on a wrapped code block caused the wrapped
+  decorator to disappear. Required changing the sequence in which we update the keys on the wrapped
+  states WeakMap. Due to the amount of changes, it has all be placed behind a bug fix feature gate
+  (editor_code_block_wrapping_language_change_bug) and the original feature gate
+  (editor_support_code_block_wrapping).
+- Updated dependencies
+
 ## 88.8.1
 
 ### Patch Changes

package/dist/cjs/code-block/index.js

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transferCodeBlockWrappedValue = exports.isCodeBlockWordWrapEnabled = exports.defaultWordWrapState = exports.codeBlockWrappedStates = void 0;
+exports.updateCodeBlockWrappedStateNodeKeys = exports.transferCodeBlockWrappedValue = exports.isCodeBlockWordWrapEnabled = exports.defaultWordWrapState = exports.codeBlockWrappedStates = void 0;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
 var defaultWordWrapState = exports.defaultWordWrapState = false;
 var codeBlockWrappedStates = exports.codeBlockWrappedStates = new WeakMap();
 var isCodeBlockWordWrapEnabled = exports.isCodeBlockWordWrapEnabled = function isCodeBlockWordWrapEnabled(codeBlockNode) {
@@ -16,14 +18,13 @@ var isCodeBlockWordWrapEnabled = exports.isCodeBlockWordWrapEnabled = function i
 };
 
 /**
- * As the code block node is used as the key, there is instances where the node will be destroyed & recreated and is no longer a valid key.
- * In these instances, we must get the value from that old node and set it to the value of the new node.
+ * Swap the old node key with the new node key in the wrapped states WeakMap.
+ * Replaced with updateCodeBlockWrappedStateNodeKeys() under 'editor_code_block_wrapping_language_change_bug' feature gate.
  */
 var transferCodeBlockWrappedValue = exports.transferCodeBlockWrappedValue = function transferCodeBlockWrappedValue(oldCodeBlockNode, newCodeBlockNode) {
   if (!(0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping')) {
     return;
   }
-
   // Don't overwrite the value for the new node if it already exists.
   // This can happen when a drag&drop is swapping nodes.
   if (codeBlockWrappedStates.has(newCodeBlockNode)) {
@@ -32,4 +33,33 @@ var transferCodeBlockWrappedValue = exports.transferCodeBlockWrappedValue = func
   var previousValue = isCodeBlockWordWrapEnabled(oldCodeBlockNode);
   codeBlockWrappedStates.set(newCodeBlockNode, previousValue);
   codeBlockWrappedStates.delete(oldCodeBlockNode);
+};
+
+/**
+ * As the code block node is used as the wrapped state key, there is instances where the node will be destroyed & recreated and is no longer a valid key.
+ * In these instances, we must get the value from that old node and set it to the value of the new node.
+ * This function takes all the given nodes, finds their old nodes from the old state and updates these old node keys.
+ */
+var updateCodeBlockWrappedStateNodeKeys = exports.updateCodeBlockWrappedStateNodeKeys = function updateCodeBlockWrappedStateNodeKeys(newCodeBlockNodes, oldState) {
+  if (!(0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping') || !(0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug')) {
+    return;
+  }
+  newCodeBlockNodes.forEach(function (newCodeBlockNode) {
+    // Don't overwrite the value for the new node if it already exists.
+    // This can happen when a drag&drop is swapping nodes.
+    if (codeBlockWrappedStates.has(newCodeBlockNode.node)) {
+      return;
+    }
+
+    // Do not go out of range on the oldState doc. Happens on initial load.
+    if (oldState.doc.nodeSize <= newCodeBlockNode.pos) {
+      return;
+    }
+    var oldCodeBlockNode = oldState.doc.nodeAt(newCodeBlockNode.pos);
+    if (!oldCodeBlockNode || oldCodeBlockNode.type !== oldState.schema.nodes.codeBlock) {
+      return;
+    }
+    var previousValue = isCodeBlockWordWrapEnabled(oldCodeBlockNode);
+    codeBlockWrappedStates.set(newCodeBlockNode.node, previousValue);
+  });
 };

package/dist/cjs/core-utils/index.js

@@ -15,5 +15,12 @@ Object.defineProperty(exports, "insideTable", {
     return _inside.insideTable;
   }
 });
+Object.defineProperty(exports, "isSSR", {
+  enumerable: true,
+  get: function get() {
+    return _isSsr.isSSR;
+  }
+});
 var _inside = require("./inside");
-var _documentLogger = require("./document-logger");
+var _documentLogger = require("./document-logger");
+var _isSsr = require("./is-ssr");

package/dist/cjs/core-utils/is-ssr.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isSSR = isSSR;
+function isSSR() {
+  try {
+    var _process;
+    return Boolean(
+    // In most places there is no document when running on server-side
+    typeof document === 'undefined' ||
+    // When SSRing editor with full cycle mode we define the document
+    // Check Confluence specific environment variable
+    typeof process !== 'undefined' && ((_process = process) === null || _process === void 0 || (_process = _process.env) === null || _process === void 0 ? void 0 : _process.REACT_SSR));
+  } catch (e) {
+    // Catch possible error that might occur and just return false
+    return false;
+  }
+}

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

@@ -70,7 +70,7 @@ var testOnlyIgnoreLazyNodeViewSet = new WeakSet();
  *
  * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
  *
- * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ * @deprecated DO NOT USE THIS OUTSIDE TESTS.
  */
 function testOnlyIgnoreLazyNodeView(view) {
   testOnlyIgnoreLazyNodeViewSet.add(view);
@@ -137,7 +137,7 @@ var withLazyLoading = exports.withLazyLoading = function withLazyLoading(_ref) {
       if (resolvedNodeView && !testOnlyIgnoreLazyNodeViewSet.has(view)) {
         return resolvedNodeView(node, view, getPos, decorations);
       }
-      return new _nodeView.LazyNodeView(node, view, getPos, requestedNodes.get(nodeName));
+      return new _nodeView.LazyNodeView(node, view, getPos, decorations);
     }
     var loaderPromise = loader().then(function (nodeViewFuncModule) {
       var _resolvedNodesPerEdit;
@@ -187,7 +187,7 @@ var withLazyLoading = exports.withLazyLoading = function withLazyLoading(_ref) {
       //   },
       // });
     }
-    return new _nodeView.LazyNodeView(node, view, getPos, loaderPromise);
+    return new _nodeView.LazyNodeView(node, view, getPos, decorations);
   };
   return createLazyNodeView;
 };

package/dist/cjs/lazy-node-view/node-view.js

@@ -15,23 +15,40 @@ var getEditorLineWidth = (0, _memoize.default)(function (view) {
   return (_view$dom = view.dom) === null || _view$dom === void 0 ? void 0 : _view$dom.clientWidth;
 });
 
+// Copied from ProseMirror NodeView
+// https://github.com/ProseMirror/prosemirror-view/blob/cfa73eb969777f63bcb39972594fd4a9110f5a93/src/viewdesc.ts#L1095-L1099
+function sameOuterDeco(a, b) {
+  if (a.length !== b.length) {
+    return false;
+  }
+  for (var i = 0; i < a.length; i++) {
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type) {
+      return false;
+    }
+
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type.eq(b[i].type)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * 🧱 Internal: Editor FE Platform
  *
  * A NodeView that serves as a placeholder until the actual NodeView is loaded.
  */
 var LazyNodeView = exports.LazyNodeView = /*#__PURE__*/function () {
-  function LazyNodeView(_node, view, _getPos, nodeViewLoader) {
+  function LazyNodeView(_node, view, _getPos, _outerDeco) {
     var _this = this,
       _node$type;
     (0, _classCallCheck2.default)(this, LazyNodeView);
-    (0, _defineProperty2.default)(this, "update", function (node) {
+    (0, _defineProperty2.default)(this, "update", function (node, outerDeco) {
       var prevNode = _this.node;
       _this.node = node;
-
-      // Forcing NodeView to be re-created
-      // so that ProseMirror can replace LazyNodeView with the real one.
-      if (_this.isNodeViewLoaded) {
+      if (!sameOuterDeco(outerDeco, _this.outerDeco)) {
         return false;
       }
 
@@ -40,7 +57,7 @@ var LazyNodeView = exports.LazyNodeView = /*#__PURE__*/function () {
       return !_this.node.sameMarkup(prevNode);
     });
     this.node = _node;
-    this.isNodeViewLoaded = false;
+    this.outerDeco = _outerDeco;
     if (typeof ((_node$type = _node.type) === null || _node$type === void 0 || (_node$type = _node$type.spec) === null || _node$type === void 0 ? void 0 : _node$type.toDOM) !== 'function') {
       this.dom = document.createElement('div');
       return;
@@ -63,9 +80,6 @@ var LazyNodeView = exports.LazyNodeView = /*#__PURE__*/function () {
       // before the test started
       this.dom.setAttribute('data-lazy-node-view-fallback', 'true');
     }
-    nodeViewLoader.then(function () {
-      _this.isNodeViewLoaded = true;
-    });
   }
   (0, _createClass2.default)(LazyNodeView, [{
     key: "ignoreMutation",

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 && Object.prototype.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 = "88.8.1";
+var packageVersion = "88.8.3";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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 = "88.8.1";
+var packageVersion = "88.8.3";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -16,7 +16,7 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _widthDetector = require("@atlaskit/width-detector");
-var _isSSR = require("./isSSR");
+var _isSsr = require("../../core-utils/is-ssr");
 var _isSsrButNoBreakoutScriptObserved = require("./isSsrButNoBreakoutScriptObserved");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 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 && Object.prototype.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; }
@@ -67,7 +67,7 @@ var Provider = WidthContext.Provider,
  */
 var getBodyWidth = exports.getBodyWidth = (0, _memoizeOne.default)(function () {
   var _document$body$offset, _document$body;
-  return (0, _isSSR.isSSR)() ? 0 : (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0;
+  return (0, _isSsr.isSSR)() ? 0 : (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0;
 });
 var WidthProvider = exports.WidthProvider = function WidthProvider(_ref) {
   var className = _ref.className,

package/dist/cjs/ui/WidthProvider/isSsrButNoBreakoutScriptObserved.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isSsrButNoBreakoutScriptObserved = isSsrButNoBreakoutScriptObserved;
-var _isSSR = require("./isSSR");
+var _isSsr = require("../../core-utils/is-ssr");
 // export for testing
 function isSsrButNoBreakoutScriptObserved() {
-  return (0, _isSSR.isSSR)() && !window.__SSR_BREAKOUT_OBSERVED;
+  return (0, _isSsr.isSSR)() && !window.__SSR_BREAKOUT_OBSERVED;
 }

package/dist/es2019/code-block/index.js

@@ -1,3 +1,5 @@
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
 import { fg } from '@atlaskit/platform-feature-flags';
 export const defaultWordWrapState = false;
 export const codeBlockWrappedStates = new WeakMap();
@@ -10,14 +12,13 @@ export const isCodeBlockWordWrapEnabled = codeBlockNode => {
 };
 
 /**
- * As the code block node is used as the key, there is instances where the node will be destroyed & recreated and is no longer a valid key.
- * In these instances, we must get the value from that old node and set it to the value of the new node.
+ * Swap the old node key with the new node key in the wrapped states WeakMap.
+ * Replaced with updateCodeBlockWrappedStateNodeKeys() under 'editor_code_block_wrapping_language_change_bug' feature gate.
  */
 export const transferCodeBlockWrappedValue = (oldCodeBlockNode, newCodeBlockNode) => {
   if (!fg('editor_support_code_block_wrapping')) {
     return;
   }
-
   // Don't overwrite the value for the new node if it already exists.
   // This can happen when a drag&drop is swapping nodes.
   if (codeBlockWrappedStates.has(newCodeBlockNode)) {
@@ -26,4 +27,33 @@ export const transferCodeBlockWrappedValue = (oldCodeBlockNode, newCodeBlockNode
   const previousValue = isCodeBlockWordWrapEnabled(oldCodeBlockNode);
   codeBlockWrappedStates.set(newCodeBlockNode, previousValue);
   codeBlockWrappedStates.delete(oldCodeBlockNode);
+};
+
+/**
+ * As the code block node is used as the wrapped state key, there is instances where the node will be destroyed & recreated and is no longer a valid key.
+ * In these instances, we must get the value from that old node and set it to the value of the new node.
+ * This function takes all the given nodes, finds their old nodes from the old state and updates these old node keys.
+ */
+export const updateCodeBlockWrappedStateNodeKeys = (newCodeBlockNodes, oldState) => {
+  if (!fg('editor_support_code_block_wrapping') || !fg('editor_code_block_wrapping_language_change_bug')) {
+    return;
+  }
+  newCodeBlockNodes.forEach(newCodeBlockNode => {
+    // Don't overwrite the value for the new node if it already exists.
+    // This can happen when a drag&drop is swapping nodes.
+    if (codeBlockWrappedStates.has(newCodeBlockNode.node)) {
+      return;
+    }
+
+    // Do not go out of range on the oldState doc. Happens on initial load.
+    if (oldState.doc.nodeSize <= newCodeBlockNode.pos) {
+      return;
+    }
+    const oldCodeBlockNode = oldState.doc.nodeAt(newCodeBlockNode.pos);
+    if (!oldCodeBlockNode || oldCodeBlockNode.type !== oldState.schema.nodes.codeBlock) {
+      return;
+    }
+    const previousValue = isCodeBlockWordWrapEnabled(oldCodeBlockNode);
+    codeBlockWrappedStates.set(newCodeBlockNode.node, previousValue);
+  });
 };

package/dist/es2019/core-utils/index.js

@@ -1,2 +1,3 @@
 export { insideTable } from './inside';
-export { getDocStructure } from './document-logger';
+export { getDocStructure } from './document-logger';
+export { isSSR } from './is-ssr';

package/dist/es2019/core-utils/is-ssr.js

@@ -0,0 +1,14 @@
+export function isSSR() {
+  try {
+    var _process, _process$env;
+    return Boolean(
+    // In most places there is no document when running on server-side
+    typeof document === 'undefined' ||
+    // When SSRing editor with full cycle mode we define the document
+    // Check Confluence specific environment variable
+    typeof process !== 'undefined' && ((_process = process) === null || _process === void 0 ? void 0 : (_process$env = _process.env) === null || _process$env === void 0 ? void 0 : _process$env.REACT_SSR));
+  } catch (e) {
+    // Catch possible error that might occur and just return false
+    return false;
+  }
+}

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

@@ -54,7 +54,7 @@ const testOnlyIgnoreLazyNodeViewSet = new WeakSet();
  *
  * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
  *
- * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ * @deprecated DO NOT USE THIS OUTSIDE TESTS.
  */
 export function testOnlyIgnoreLazyNodeView(view) {
   testOnlyIgnoreLazyNodeViewSet.add(view);
@@ -122,7 +122,7 @@ export const withLazyLoading = ({
       if (resolvedNodeView && !testOnlyIgnoreLazyNodeViewSet.has(view)) {
         return resolvedNodeView(node, view, getPos, decorations);
       }
-      return new LazyNodeView(node, view, getPos, requestedNodes.get(nodeName));
+      return new LazyNodeView(node, view, getPos, decorations);
     }
     const loaderPromise = loader().then(nodeViewFuncModule => {
       var _resolvedNodesPerEdit;
@@ -169,7 +169,7 @@ export const withLazyLoading = ({
       //   },
       // });
     }
-    return new LazyNodeView(node, view, getPos, loaderPromise);
+    return new LazyNodeView(node, view, getPos, decorations);
   };
   return createLazyNodeView;
 };

package/dist/es2019/lazy-node-view/node-view.js

@@ -6,21 +6,38 @@ const getEditorLineWidth = memoize(view => {
   return (_view$dom = view.dom) === null || _view$dom === void 0 ? void 0 : _view$dom.clientWidth;
 });
 
+// Copied from ProseMirror NodeView
+// https://github.com/ProseMirror/prosemirror-view/blob/cfa73eb969777f63bcb39972594fd4a9110f5a93/src/viewdesc.ts#L1095-L1099
+function sameOuterDeco(a, b) {
+  if (a.length !== b.length) {
+    return false;
+  }
+  for (let i = 0; i < a.length; i++) {
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type) {
+      return false;
+    }
+
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type.eq(b[i].type)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * 🧱 Internal: Editor FE Platform
  *
  * A NodeView that serves as a placeholder until the actual NodeView is loaded.
  */
 export class LazyNodeView {
-  constructor(_node, view, _getPos, nodeViewLoader) {
+  constructor(_node, view, _getPos, _outerDeco) {
     var _node$type, _node$type$spec;
-    _defineProperty(this, "update", node => {
+    _defineProperty(this, "update", (node, outerDeco) => {
       const prevNode = this.node;
       this.node = node;
-
-      // Forcing NodeView to be re-created
-      // so that ProseMirror can replace LazyNodeView with the real one.
-      if (this.isNodeViewLoaded) {
+      if (!sameOuterDeco(outerDeco, this.outerDeco)) {
         return false;
       }
 
@@ -29,7 +46,7 @@ export class LazyNodeView {
       return !this.node.sameMarkup(prevNode);
     });
     this.node = _node;
-    this.isNodeViewLoaded = false;
+    this.outerDeco = _outerDeco;
     if (typeof ((_node$type = _node.type) === null || _node$type === void 0 ? void 0 : (_node$type$spec = _node$type.spec) === null || _node$type$spec === void 0 ? void 0 : _node$type$spec.toDOM) !== 'function') {
       this.dom = document.createElement('div');
       return;
@@ -52,9 +69,6 @@ export class LazyNodeView {
       // before the test started
       this.dom.setAttribute('data-lazy-node-view-fallback', 'true');
     }
-    nodeViewLoader.then(() => {
-      this.isNodeViewLoaded = true;
-    });
   }
   ignoreMutation() {
     if (this.node.type.isTextblock) {

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 = "88.8.1";
+const packageVersion = "88.8.3";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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 = "88.8.1";
+const packageVersion = "88.8.3";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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

@@ -10,7 +10,7 @@ import memoizeOne from 'memoize-one';
 import rafSchedule from 'raf-schd';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { WidthObserver } from '@atlaskit/width-detector';
-import { isSSR } from './isSSR';
+import { isSSR } from '../../core-utils/is-ssr';
 import { isSsrButNoBreakoutScriptObserved } from './isSsrButNoBreakoutScriptObserved';
 const styles = css({
   position: 'relative',

package/dist/es2019/ui/WidthProvider/isSsrButNoBreakoutScriptObserved.js

@@ -1,4 +1,4 @@
-import { isSSR } from './isSSR';
+import { isSSR } from '../../core-utils/is-ssr';
 
 // export for testing
 export function isSsrButNoBreakoutScriptObserved() {

package/dist/esm/code-block/index.js

@@ -1,3 +1,5 @@
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
 import { fg } from '@atlaskit/platform-feature-flags';
 export var defaultWordWrapState = false;
 export var codeBlockWrappedStates = new WeakMap();
@@ -10,14 +12,13 @@ export var isCodeBlockWordWrapEnabled = function isCodeBlockWordWrapEnabled(code
 };
 
 /**
- * As the code block node is used as the key, there is instances where the node will be destroyed & recreated and is no longer a valid key.
- * In these instances, we must get the value from that old node and set it to the value of the new node.
+ * Swap the old node key with the new node key in the wrapped states WeakMap.
+ * Replaced with updateCodeBlockWrappedStateNodeKeys() under 'editor_code_block_wrapping_language_change_bug' feature gate.
  */
 export var transferCodeBlockWrappedValue = function transferCodeBlockWrappedValue(oldCodeBlockNode, newCodeBlockNode) {
   if (!fg('editor_support_code_block_wrapping')) {
     return;
   }
-
   // Don't overwrite the value for the new node if it already exists.
   // This can happen when a drag&drop is swapping nodes.
   if (codeBlockWrappedStates.has(newCodeBlockNode)) {
@@ -26,4 +27,33 @@ export var transferCodeBlockWrappedValue = function transferCodeBlockWrappedValu
   var previousValue = isCodeBlockWordWrapEnabled(oldCodeBlockNode);
   codeBlockWrappedStates.set(newCodeBlockNode, previousValue);
   codeBlockWrappedStates.delete(oldCodeBlockNode);
+};
+
+/**
+ * As the code block node is used as the wrapped state key, there is instances where the node will be destroyed & recreated and is no longer a valid key.
+ * In these instances, we must get the value from that old node and set it to the value of the new node.
+ * This function takes all the given nodes, finds their old nodes from the old state and updates these old node keys.
+ */
+export var updateCodeBlockWrappedStateNodeKeys = function updateCodeBlockWrappedStateNodeKeys(newCodeBlockNodes, oldState) {
+  if (!fg('editor_support_code_block_wrapping') || !fg('editor_code_block_wrapping_language_change_bug')) {
+    return;
+  }
+  newCodeBlockNodes.forEach(function (newCodeBlockNode) {
+    // Don't overwrite the value for the new node if it already exists.
+    // This can happen when a drag&drop is swapping nodes.
+    if (codeBlockWrappedStates.has(newCodeBlockNode.node)) {
+      return;
+    }
+
+    // Do not go out of range on the oldState doc. Happens on initial load.
+    if (oldState.doc.nodeSize <= newCodeBlockNode.pos) {
+      return;
+    }
+    var oldCodeBlockNode = oldState.doc.nodeAt(newCodeBlockNode.pos);
+    if (!oldCodeBlockNode || oldCodeBlockNode.type !== oldState.schema.nodes.codeBlock) {
+      return;
+    }
+    var previousValue = isCodeBlockWordWrapEnabled(oldCodeBlockNode);
+    codeBlockWrappedStates.set(newCodeBlockNode.node, previousValue);
+  });
 };

package/dist/esm/core-utils/index.js

@@ -1,2 +1,3 @@
 export { insideTable } from './inside';
-export { getDocStructure } from './document-logger';
+export { getDocStructure } from './document-logger';
+export { isSSR } from './is-ssr';

package/dist/esm/core-utils/is-ssr.js

@@ -0,0 +1,14 @@
+export function isSSR() {
+  try {
+    var _process;
+    return Boolean(
+    // In most places there is no document when running on server-side
+    typeof document === 'undefined' ||
+    // When SSRing editor with full cycle mode we define the document
+    // Check Confluence specific environment variable
+    typeof process !== 'undefined' && ((_process = process) === null || _process === void 0 || (_process = _process.env) === null || _process === void 0 ? void 0 : _process.REACT_SSR));
+  } catch (e) {
+    // Catch possible error that might occur and just return false
+    return false;
+  }
+}

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

@@ -55,7 +55,7 @@ var testOnlyIgnoreLazyNodeViewSet = new WeakSet();
  *
  * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
  *
- * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ * @deprecated DO NOT USE THIS OUTSIDE TESTS.
  */
 export function testOnlyIgnoreLazyNodeView(view) {
   testOnlyIgnoreLazyNodeViewSet.add(view);
@@ -122,7 +122,7 @@ export var withLazyLoading = function withLazyLoading(_ref) {
       if (resolvedNodeView && !testOnlyIgnoreLazyNodeViewSet.has(view)) {
         return resolvedNodeView(node, view, getPos, decorations);
       }
-      return new LazyNodeView(node, view, getPos, requestedNodes.get(nodeName));
+      return new LazyNodeView(node, view, getPos, decorations);
     }
     var loaderPromise = loader().then(function (nodeViewFuncModule) {
       var _resolvedNodesPerEdit;
@@ -172,7 +172,7 @@ export var withLazyLoading = function withLazyLoading(_ref) {
       //   },
       // });
     }
-    return new LazyNodeView(node, view, getPos, loaderPromise);
+    return new LazyNodeView(node, view, getPos, decorations);
   };
   return createLazyNodeView;
 };

package/dist/esm/lazy-node-view/node-view.js

@@ -8,23 +8,40 @@ var getEditorLineWidth = memoize(function (view) {
   return (_view$dom = view.dom) === null || _view$dom === void 0 ? void 0 : _view$dom.clientWidth;
 });
 
+// Copied from ProseMirror NodeView
+// https://github.com/ProseMirror/prosemirror-view/blob/cfa73eb969777f63bcb39972594fd4a9110f5a93/src/viewdesc.ts#L1095-L1099
+function sameOuterDeco(a, b) {
+  if (a.length !== b.length) {
+    return false;
+  }
+  for (var i = 0; i < a.length; i++) {
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type) {
+      return false;
+    }
+
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type.eq(b[i].type)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * 🧱 Internal: Editor FE Platform
  *
  * A NodeView that serves as a placeholder until the actual NodeView is loaded.
  */
 export var LazyNodeView = /*#__PURE__*/function () {
-  function LazyNodeView(_node, view, _getPos, nodeViewLoader) {
+  function LazyNodeView(_node, view, _getPos, _outerDeco) {
     var _this = this,
       _node$type;
     _classCallCheck(this, LazyNodeView);
-    _defineProperty(this, "update", function (node) {
+    _defineProperty(this, "update", function (node, outerDeco) {
       var prevNode = _this.node;
       _this.node = node;
-
-      // Forcing NodeView to be re-created
-      // so that ProseMirror can replace LazyNodeView with the real one.
-      if (_this.isNodeViewLoaded) {
+      if (!sameOuterDeco(outerDeco, _this.outerDeco)) {
         return false;
       }
 
@@ -33,7 +50,7 @@ export var LazyNodeView = /*#__PURE__*/function () {
       return !_this.node.sameMarkup(prevNode);
     });
     this.node = _node;
-    this.isNodeViewLoaded = false;
+    this.outerDeco = _outerDeco;
     if (typeof ((_node$type = _node.type) === null || _node$type === void 0 || (_node$type = _node$type.spec) === null || _node$type === void 0 ? void 0 : _node$type.toDOM) !== 'function') {
       this.dom = document.createElement('div');
       return;
@@ -56,9 +73,6 @@ export var LazyNodeView = /*#__PURE__*/function () {
       // before the test started
       this.dom.setAttribute('data-lazy-node-view-fallback', 'true');
     }
-    nodeViewLoader.then(function () {
-      _this.isNodeViewLoaded = true;
-    });
   }
   _createClass(LazyNodeView, [{
     key: "ignoreMutation",

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 = "88.8.1";
+var packageVersion = "88.8.3";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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 = "88.8.1";
+var packageVersion = "88.8.3";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -11,7 +11,7 @@ import memoizeOne from 'memoize-one';
 import rafSchedule from 'raf-schd';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { WidthObserver } from '@atlaskit/width-detector';
-import { isSSR } from './isSSR';
+import { isSSR } from '../../core-utils/is-ssr';
 import { isSsrButNoBreakoutScriptObserved } from './isSsrButNoBreakoutScriptObserved';
 var styles = css({
   position: 'relative',

package/dist/esm/ui/WidthProvider/isSsrButNoBreakoutScriptObserved.js

@@ -1,4 +1,4 @@
-import { isSSR } from './isSSR';
+import { isSSR } from '../../core-utils/is-ssr';
 
 // export for testing
 export function isSsrButNoBreakoutScriptObserved() {

package/dist/types/code-block/index.d.ts

@@ -1,9 +1,17 @@
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import { type EditorState } from '@atlaskit/editor-prosemirror/state';
+import { type NodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export declare const defaultWordWrapState = false;
 export declare const codeBlockWrappedStates: WeakMap<PmNode, boolean | undefined>;
 export declare const isCodeBlockWordWrapEnabled: (codeBlockNode: PmNode) => boolean;
 /**
- * As the code block node is used as the key, there is instances where the node will be destroyed & recreated and is no longer a valid key.
- * In these instances, we must get the value from that old node and set it to the value of the new node.
+ * Swap the old node key with the new node key in the wrapped states WeakMap.
+ * Replaced with updateCodeBlockWrappedStateNodeKeys() under 'editor_code_block_wrapping_language_change_bug' feature gate.
  */
 export declare const transferCodeBlockWrappedValue: (oldCodeBlockNode: PmNode, newCodeBlockNode: PmNode) => void;
+/**
+ * As the code block node is used as the wrapped state key, there is instances where the node will be destroyed & recreated and is no longer a valid key.
+ * In these instances, we must get the value from that old node and set it to the value of the new node.
+ * This function takes all the given nodes, finds their old nodes from the old state and updates these old node keys.
+ */
+export declare const updateCodeBlockWrappedStateNodeKeys: (newCodeBlockNodes: NodeWithPos[], oldState: EditorState) => void;

package/dist/types/core-utils/index.d.ts

@@ -1,2 +1,3 @@
 export { insideTable } from './inside';
 export { getDocStructure } from './document-logger';
+export { isSSR } from './is-ssr';

package/dist/types/lazy-node-view/index.d.ts

@@ -35,7 +35,7 @@ export type LazyLoadingProps<NodeViewOptions> = {
  *
  * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
  *
- * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ * @deprecated DO NOT USE THIS OUTSIDE TESTS.
  */
 export declare function testOnlyIgnoreLazyNodeView(view: EditorView): void;
 /**

package/dist/types/lazy-node-view/node-view.d.ts

@@ -1,5 +1,5 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
+import type { Decoration, EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 /**
  * 🧱 Internal: Editor FE Platform
  *
@@ -9,8 +9,8 @@ export declare class LazyNodeView implements NodeView {
     dom: Node;
     contentDOM?: HTMLElement;
     private node;
-    private isNodeViewLoaded;
-    constructor(node: PMNode, view: EditorView, _getPos: () => number | undefined, nodeViewLoader: Promise<unknown>);
-    update: (node: PMNode) => boolean;
+    private outerDeco;
+    constructor(node: PMNode, view: EditorView, _getPos: () => number | undefined, outerDeco: readonly Decoration[]);
+    update: (node: PMNode, outerDeco: readonly Decoration[]) => boolean;
     ignoreMutation(): boolean;
 }

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

@@ -1,9 +1,17 @@
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import { type EditorState } from '@atlaskit/editor-prosemirror/state';
+import { type NodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export declare const defaultWordWrapState = false;
 export declare const codeBlockWrappedStates: WeakMap<PmNode, boolean | undefined>;
 export declare const isCodeBlockWordWrapEnabled: (codeBlockNode: PmNode) => boolean;
 /**
- * As the code block node is used as the key, there is instances where the node will be destroyed & recreated and is no longer a valid key.
- * In these instances, we must get the value from that old node and set it to the value of the new node.
+ * Swap the old node key with the new node key in the wrapped states WeakMap.
+ * Replaced with updateCodeBlockWrappedStateNodeKeys() under 'editor_code_block_wrapping_language_change_bug' feature gate.
  */
 export declare const transferCodeBlockWrappedValue: (oldCodeBlockNode: PmNode, newCodeBlockNode: PmNode) => void;
+/**
+ * As the code block node is used as the wrapped state key, there is instances where the node will be destroyed & recreated and is no longer a valid key.
+ * In these instances, we must get the value from that old node and set it to the value of the new node.
+ * This function takes all the given nodes, finds their old nodes from the old state and updates these old node keys.
+ */
+export declare const updateCodeBlockWrappedStateNodeKeys: (newCodeBlockNodes: NodeWithPos[], oldState: EditorState) => void;

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

@@ -1,2 +1,3 @@
 export { insideTable } from './inside';
 export { getDocStructure } from './document-logger';
+export { isSSR } from './is-ssr';

package/dist/types-ts4.5/lazy-node-view/index.d.ts

@@ -35,7 +35,7 @@ export type LazyLoadingProps<NodeViewOptions> = {
  *
  * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
  *
- * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ * @deprecated DO NOT USE THIS OUTSIDE TESTS.
  */
 export declare function testOnlyIgnoreLazyNodeView(view: EditorView): void;
 /**

package/dist/types-ts4.5/lazy-node-view/node-view.d.ts

@@ -1,5 +1,5 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
+import type { Decoration, EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 /**
  * 🧱 Internal: Editor FE Platform
  *
@@ -9,8 +9,8 @@ export declare class LazyNodeView implements NodeView {
     dom: Node;
     contentDOM?: HTMLElement;
     private node;
-    private isNodeViewLoaded;
-    constructor(node: PMNode, view: EditorView, _getPos: () => number | undefined, nodeViewLoader: Promise<unknown>);
-    update: (node: PMNode) => boolean;
+    private outerDeco;
+    constructor(node: PMNode, view: EditorView, _getPos: () => number | undefined, outerDeco: readonly Decoration[]);
+    update: (node: PMNode, outerDeco: readonly Decoration[]) => boolean;
     ignoreMutation(): boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "88.8.1",
+	"version": "88.8.3",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -119,7 +119,7 @@
 		"@atlaskit/emoji": "^67.7.0",
 		"@atlaskit/icon": "^22.15.0",
 		"@atlaskit/icon-object": "^6.5.0",
-		"@atlaskit/link-datasource": "^2.11.0",
+		"@atlaskit/link-datasource": "^2.12.0",
 		"@atlaskit/link-picker": "^1.45.0",
 		"@atlaskit/media-card": "^78.2.0",
 		"@atlaskit/media-client": "^27.6.0",
@@ -133,9 +133,9 @@
 		"@atlaskit/menu": "^2.12.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^12.1.0",
-		"@atlaskit/profilecard": "^19.25.0",
+		"@atlaskit/profilecard": "^19.26.0",
 		"@atlaskit/section-message": "^6.6.0",
-		"@atlaskit/smart-card": "^27.19.0",
+		"@atlaskit/smart-card": "^27.20.0",
 		"@atlaskit/smart-user-picker": "^6.10.0",
 		"@atlaskit/spinner": "^16.3.0",
 		"@atlaskit/task-decision": "^17.10.0",
@@ -256,6 +256,9 @@
 		"editor_support_code_block_wrapping": {
 			"type": "boolean"
 		},
+		"editor_code_block_wrapping_language_change_bug": {
+			"type": "boolean"
+		},
 		"cc_page_experiences_live_search_wysiwyg": {
 			"type": "boolean"
 		},

package/dist/cjs/ui/WidthProvider/isSSR.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isSSR = isSSR;
-function isSSR() {
-  var _process;
-  return Boolean(
-  // In most places there is no document when running on server-side
-  typeof document === 'undefined' ||
-  // When SSRing editor with full cycle mode we define the document
-  // Check Confluence specific environment variable
-  typeof process !== 'undefined' && ((_process = process) === null || _process === void 0 || (_process = _process.env) === null || _process === void 0 ? void 0 : _process.REACT_SSR));
-}

package/dist/es2019/ui/WidthProvider/isSSR.js

@@ -1,9 +0,0 @@
-export function isSSR() {
-  var _process, _process$env;
-  return Boolean(
-  // In most places there is no document when running on server-side
-  typeof document === 'undefined' ||
-  // When SSRing editor with full cycle mode we define the document
-  // Check Confluence specific environment variable
-  typeof process !== 'undefined' && ((_process = process) === null || _process === void 0 ? void 0 : (_process$env = _process.env) === null || _process$env === void 0 ? void 0 : _process$env.REACT_SSR));
-}

package/dist/esm/ui/WidthProvider/isSSR.js

@@ -1,9 +0,0 @@
-export function isSSR() {
-  var _process;
-  return Boolean(
-  // In most places there is no document when running on server-side
-  typeof document === 'undefined' ||
-  // When SSRing editor with full cycle mode we define the document
-  // Check Confluence specific environment variable
-  typeof process !== 'undefined' && ((_process = process) === null || _process === void 0 || (_process = _process.env) === null || _process === void 0 ? void 0 : _process.REACT_SSR));
-}