@atlaskit/editor-plugin-code-block 3.3.11 → 3.3.13

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-code-block
 
+## 3.3.13
+
+### Patch Changes
+
+- [#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).
+
+## 3.3.12
+
+### Patch Changes
+
+- [#136348](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136348)
+  [`fb4fb56f1da7c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fb4fb56f1da7c) -
+  Use optimised entry-points on editor-common for browser.
+- Updated dependencies
+
 ## 3.3.11
 
 ### Patch Changes

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

@@ -9,13 +9,15 @@ 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 _rafSchd = _interopRequireDefault(require("raf-schd"));
+var _browser = require("@atlaskit/editor-common/browser");
 var _codeBlock = require("@atlaskit/editor-common/code-block");
-var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("../actions");
 var _mainState = require("../pm-plugins/main-state");
 var _classNames = require("../ui/class-names");
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
 var MATCH_NEWLINES = new RegExp('\n', 'g');
 var toDOM = function toDOM(node, contentEditable, formattedAriaLabel) {
   return ['div', {
@@ -167,7 +169,9 @@ var CodeBlockView = exports.CodeBlockView = /*#__PURE__*/function () {
       }
       if (node !== this.node) {
         if ((0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping')) {
-          (0, _codeBlock.transferCodeBlockWrappedValue)(this.node, node);
+          if (!(0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug')) {
+            (0, _codeBlock.transferCodeBlockWrappedValue)(this.node, node);
+          }
         }
         if (node.attrs.language !== this.node.attrs.language) {
           this.contentDOM.setAttribute('data-language', node.attrs.language || '');
@@ -178,7 +182,7 @@ var CodeBlockView = exports.CodeBlockView = /*#__PURE__*/function () {
         } else {
           this.ensureLineNumbers();
         }
-        if (_utils.browser.android) {
+        if (_browser.browser.android) {
           this.coalesceDOMElements();
           (0, _actions.resetShouldIgnoreFollowingMutations)(this.view.state, this.view.dispatch);
         }

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

@@ -8,8 +8,11 @@ exports.validateWordWrappedDecorators = exports.updateDecorationSetWithWordWrapp
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _codeBlock = require("@atlaskit/editor-common/code-block");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _classNames = require("../ui/class-names");
 var _utils = require("../utils");
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
 var DECORATION_WIDGET_TYPE = exports.DECORATION_WIDGET_TYPE = 'decorationWidgetType';
 var DECORATION_WRAPPED_BLOCK_NODE_TYPE = exports.DECORATION_WRAPPED_BLOCK_NODE_TYPE = 'decorationNodeType';
 
@@ -26,9 +29,8 @@ var generateInitialDecorations = exports.generateInitialDecorations = function g
 /**
  * Update all the decorations used by the code block.
  */
-var updateCodeBlockDecorations = exports.updateCodeBlockDecorations = function updateCodeBlockDecorations(tr, state, decorationSet) {
+var updateCodeBlockDecorations = exports.updateCodeBlockDecorations = function updateCodeBlockDecorations(tr, codeBlockNodes, decorationSet) {
   var updatedDecorationSet = decorationSet;
-  var codeBlockNodes = (0, _utils.getAllCodeBlockNodesInDoc)(state);
 
   // All the line numbers decorators are refreshed on doc change.
   updatedDecorationSet = updateDecorationSetWithLineNumberDecorators(tr, codeBlockNodes, updatedDecorationSet);
@@ -129,8 +131,14 @@ var validateWordWrappedDecorators = exports.validateWordWrappedDecorators = func
   codeBlockNodes.forEach(function (node) {
     var isCodeBlockWrappedInState = (0, _codeBlock.isCodeBlockWordWrapEnabled)(node.node);
     var isCodeBlockWrappedByDecorator = getWordWrapDecoratorsFromNodePos(node.pos, decorationSet).length !== 0;
-    if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
-      updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+    if ((0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug')) {
+      if (isCodeBlockWrappedInState !== isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
+    } else {
+      if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
     }
   });
   return updatedDecorationSet;

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

@@ -6,22 +6,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _browser = require("@atlaskit/editor-common/browser");
+var _codeBlock = require("@atlaskit/editor-common/code-block");
 var _messages = require("@atlaskit/editor-common/messages");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection = require("@atlaskit/editor-common/selection");
-var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("../actions");
-var _codeBlock = require("../nodeviews/code-block");
+var _codeBlock2 = require("../nodeviews/code-block");
 var _pluginKey = require("../plugin-key");
 var _classNames = require("../ui/class-names");
-var _utils2 = require("../utils");
+var _utils = require("../utils");
 var _actions2 = require("./actions");
 var _decorators = require("./decorators");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 var createPlugin = exports.createPlugin = function createPlugin(_ref) {
   var _ref$useLongPressSele = _ref.useLongPressSelection,
     useLongPressSelection = _ref$useLongPressSele === void 0 ? false : _ref$useLongPressSele,
@@ -38,12 +39,12 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
       var keyEvent = event;
       var eventInputType = keyEvent.inputType;
       var eventText = keyEvent.data;
-      if (_utils.browser.ios && event.composed &&
+      if (_browser.browser.ios && event.composed &&
       // insertParagraph will be the input type when the enter key is pressed.
-      eventInputType === 'insertParagraph' && (0, _utils2.findCodeBlock)(view.state, view.state.selection)) {
+      eventInputType === 'insertParagraph' && (0, _utils.findCodeBlock)(view.state, view.state.selection)) {
         event.preventDefault();
         return true;
-      } else if (_utils.browser.android && event.composed && eventInputType === 'insertCompositionText' && eventText[(eventText === null || eventText === void 0 ? void 0 : eventText.length) - 1] === '\n' && (0, _utils2.findCodeBlock)(view.state, view.state.selection)) {
+      } else if (_browser.browser.android && event.composed && eventInputType === 'insertCompositionText' && eventText[(eventText === null || eventText === void 0 ? void 0 : eventText.length) - 1] === '\n' && (0, _utils.findCodeBlock)(view.state, view.state.selection)) {
         var resultingText = event.target.outerText + '\n';
         if (resultingText.endsWith(eventText)) {
           // End of paragraph
@@ -63,7 +64,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
         }
         return true;
       }
-      if (_utils.browser.android) {
+      if (_browser.browser.android) {
         (0, _actions.resetShouldIgnoreFollowingMutations)(view.state, view.dispatch);
       }
       return false;
@@ -72,7 +73,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
   return new _safePlugin.SafePlugin({
     state: {
       init: function init(_, state) {
-        var node = (0, _utils2.findCodeBlock)(state, state.selection);
+        var node = (0, _utils.findCodeBlock)(state, state.selection);
         var initialDecorations = (0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping') ? (0, _decorators.generateInitialDecorations)(state) : [];
         return {
           pos: node ? node.pos : null,
@@ -85,19 +86,23 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
       apply: function apply(tr, pluginState, _oldState, newState) {
         var meta = tr.getMeta(_pluginKey.pluginKey);
         if ((meta === null || meta === void 0 ? void 0 : meta.type) === _actions2.ACTIONS.SET_IS_WRAPPED && (0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping')) {
-          var node = (0, _utils2.findCodeBlock)(newState, tr.selection);
+          var node = (0, _utils.findCodeBlock)(newState, tr.selection);
           return _objectSpread(_objectSpread({}, pluginState), {}, {
             decorations: (0, _decorators.updateDecorationSetWithWordWrappedDecorator)(pluginState.decorations, tr, node)
           });
         }
         if (tr.docChanged) {
-          var _node = (0, _utils2.findCodeBlock)(newState, tr.selection);
+          var _node = (0, _utils.findCodeBlock)(newState, tr.selection);
 
           // Updates mapping position of all existing decorations to new positions
           // specifically used for updating word wrap node decorators (does not cover drag & drop, validateWordWrappedDecorators does).
           var updatedDecorationSet = pluginState.decorations.map(tr.mapping, tr.doc);
           if ((0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping')) {
-            updatedDecorationSet = (0, _decorators.updateCodeBlockDecorations)(tr, newState, updatedDecorationSet);
+            var codeBlockNodes = (0, _utils.getAllCodeBlockNodesInDoc)(newState);
+            if ((0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug')) {
+              (0, _codeBlock.updateCodeBlockWrappedStateNodeKeys)(codeBlockNodes, _oldState);
+            }
+            updatedDecorationSet = (0, _decorators.updateCodeBlockDecorations)(tr, codeBlockNodes, updatedDecorationSet);
           }
           var newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
             pos: _node ? _node.pos : null,
@@ -107,7 +112,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
           return newPluginState;
         }
         if (tr.selectionSet) {
-          var _node2 = (0, _utils2.findCodeBlock)(newState, tr.selection);
+          var _node2 = (0, _utils.findCodeBlock)(newState, tr.selection);
           var _newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
             pos: _node2 ? _node2.pos : null,
             isNodeSelected: tr.selection instanceof _state.NodeSelection
@@ -139,7 +144,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
           var _getIntl = getIntl(),
             formatMessage = _getIntl.formatMessage;
           var formattedAriaLabel = formatMessage(_messages.blockTypeMessages.codeblock);
-          return (0, _codeBlock.codeBlockNodeView)(node, view, getPos, formattedAriaLabel, api);
+          return (0, _codeBlock2.codeBlockNodeView)(node, view, getPos, formattedAriaLabel, api);
         }
       },
       handleClickOn: (0, _selection.createSelectionClickHandler)(['codeBlock'], function (target) {

package/dist/cjs/refresh-browser-selection.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.refreshBrowserSelection = exports.default = void 0;
-var _utils = require("@atlaskit/editor-common/utils");
+var _browser = require("@atlaskit/editor-common/browser");
 var _pluginKey = require("./plugin-key");
 // Workaround for a firefox issue where dom selection is off sync
 // https://product-fabric.atlassian.net/browse/ED-12442
@@ -20,7 +20,7 @@ var refreshBrowserSelection = exports.refreshBrowserSelection = function refresh
 };
 var refreshBrowserSelectionOnChange = function refreshBrowserSelectionOnChange(transaction, editorState) {
   var _pluginKey$getState;
-  if (_utils.browser.gecko && transaction.docChanged &&
+  if (_browser.browser.gecko && transaction.docChanged &&
   // codeblockState.pos should be set if current selection is in a codeblock.
   typeof ((_pluginKey$getState = _pluginKey.pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.pos) === 'number') {
     refreshBrowserSelection();

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

@@ -1,7 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 import rafSchedule from 'raf-schd';
+import { browser } from '@atlaskit/editor-common/browser';
 import { codeBlockWrappedStates, defaultWordWrapState, transferCodeBlockWrappedValue } from '@atlaskit/editor-common/code-block';
-import { browser } from '@atlaskit/editor-common/utils';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { resetShouldIgnoreFollowingMutations } from '../actions';
@@ -144,7 +145,9 @@ export class CodeBlockView {
     }
     if (node !== this.node) {
       if (fg('editor_support_code_block_wrapping')) {
-        transferCodeBlockWrappedValue(this.node, node);
+        if (!fg('editor_code_block_wrapping_language_change_bug')) {
+          transferCodeBlockWrappedValue(this.node, node);
+        }
       }
       if (node.attrs.language !== this.node.attrs.language) {
         this.contentDOM.setAttribute('data-language', node.attrs.language || '');

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

@@ -1,5 +1,7 @@
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { codeBlockClassNames } from '../ui/class-names';
 import { getAllCodeBlockNodesInDoc } from '../utils';
 export const DECORATION_WIDGET_TYPE = 'decorationWidgetType';
@@ -16,9 +18,8 @@ export const generateInitialDecorations = state => {
 /**
  * Update all the decorations used by the code block.
  */
-export const updateCodeBlockDecorations = (tr, state, decorationSet) => {
+export const updateCodeBlockDecorations = (tr, codeBlockNodes, decorationSet) => {
   let updatedDecorationSet = decorationSet;
-  const codeBlockNodes = getAllCodeBlockNodesInDoc(state);
 
   // All the line numbers decorators are refreshed on doc change.
   updatedDecorationSet = updateDecorationSetWithLineNumberDecorators(tr, codeBlockNodes, updatedDecorationSet);
@@ -119,8 +120,14 @@ export const validateWordWrappedDecorators = (tr, codeBlockNodes, decorationSet)
   codeBlockNodes.forEach(node => {
     const isCodeBlockWrappedInState = isCodeBlockWordWrapEnabled(node.node);
     const isCodeBlockWrappedByDecorator = getWordWrapDecoratorsFromNodePos(node.pos, decorationSet).length !== 0;
-    if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
-      updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+    if (fg('editor_code_block_wrapping_language_change_bug')) {
+      if (isCodeBlockWrappedInState !== isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
+    } else {
+      if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
     }
   });
   return updatedDecorationSet;

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

@@ -1,7 +1,10 @@
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
+import { browser } from '@atlaskit/editor-common/browser';
+import { updateCodeBlockWrappedStateNodeKeys } from '@atlaskit/editor-common/code-block';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
-import { browser } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -9,7 +12,7 @@ import { ignoreFollowingMutations, resetShouldIgnoreFollowingMutations } from '.
 import { codeBlockNodeView } from '../nodeviews/code-block';
 import { pluginKey } from '../plugin-key';
 import { codeBlockClassNames } from '../ui/class-names';
-import { findCodeBlock } from '../utils';
+import { findCodeBlock, getAllCodeBlockNodesInDoc } from '../utils';
 import { ACTIONS } from './actions';
 import { generateInitialDecorations, updateCodeBlockDecorations, updateDecorationSetWithWordWrappedDecorator } from './decorators';
 export const createPlugin = ({
@@ -85,7 +88,11 @@ export const createPlugin = ({
           // specifically used for updating word wrap node decorators (does not cover drag & drop, validateWordWrappedDecorators does).
           let updatedDecorationSet = pluginState.decorations.map(tr.mapping, tr.doc);
           if (fg('editor_support_code_block_wrapping')) {
-            updatedDecorationSet = updateCodeBlockDecorations(tr, newState, updatedDecorationSet);
+            const codeBlockNodes = getAllCodeBlockNodesInDoc(newState);
+            if (fg('editor_code_block_wrapping_language_change_bug')) {
+              updateCodeBlockWrappedStateNodeKeys(codeBlockNodes, _oldState);
+            }
+            updatedDecorationSet = updateCodeBlockDecorations(tr, codeBlockNodes, updatedDecorationSet);
           }
           const newPluginState = {
             ...pluginState,

package/dist/es2019/refresh-browser-selection.js

@@ -1,4 +1,4 @@
-import { browser } from '@atlaskit/editor-common/utils';
+import { browser } from '@atlaskit/editor-common/browser';
 import { pluginKey } from './plugin-key';
 
 // Workaround for a firefox issue where dom selection is off sync

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

@@ -1,9 +1,10 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 import rafSchedule from 'raf-schd';
+import { browser } from '@atlaskit/editor-common/browser';
 import { codeBlockWrappedStates, defaultWordWrapState, transferCodeBlockWrappedValue } from '@atlaskit/editor-common/code-block';
-import { browser } from '@atlaskit/editor-common/utils';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { resetShouldIgnoreFollowingMutations } from '../actions';
@@ -160,7 +161,9 @@ export var CodeBlockView = /*#__PURE__*/function () {
       }
       if (node !== this.node) {
         if (fg('editor_support_code_block_wrapping')) {
-          transferCodeBlockWrappedValue(this.node, node);
+          if (!fg('editor_code_block_wrapping_language_change_bug')) {
+            transferCodeBlockWrappedValue(this.node, node);
+          }
         }
         if (node.attrs.language !== this.node.attrs.language) {
           this.contentDOM.setAttribute('data-language', node.attrs.language || '');

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

@@ -1,6 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { codeBlockClassNames } from '../ui/class-names';
 import { getAllCodeBlockNodesInDoc } from '../utils';
 export var DECORATION_WIDGET_TYPE = 'decorationWidgetType';
@@ -19,9 +21,8 @@ export var generateInitialDecorations = function generateInitialDecorations(stat
 /**
  * Update all the decorations used by the code block.
  */
-export var updateCodeBlockDecorations = function updateCodeBlockDecorations(tr, state, decorationSet) {
+export var updateCodeBlockDecorations = function updateCodeBlockDecorations(tr, codeBlockNodes, decorationSet) {
   var updatedDecorationSet = decorationSet;
-  var codeBlockNodes = getAllCodeBlockNodesInDoc(state);
 
   // All the line numbers decorators are refreshed on doc change.
   updatedDecorationSet = updateDecorationSetWithLineNumberDecorators(tr, codeBlockNodes, updatedDecorationSet);
@@ -122,8 +123,14 @@ export var validateWordWrappedDecorators = function validateWordWrappedDecorator
   codeBlockNodes.forEach(function (node) {
     var isCodeBlockWrappedInState = isCodeBlockWordWrapEnabled(node.node);
     var isCodeBlockWrappedByDecorator = getWordWrapDecoratorsFromNodePos(node.pos, decorationSet).length !== 0;
-    if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
-      updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+    if (fg('editor_code_block_wrapping_language_change_bug')) {
+      if (isCodeBlockWrappedInState !== isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
+    } else {
+      if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
     }
   });
   return updatedDecorationSet;

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

@@ -1,10 +1,13 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
+import { browser } from '@atlaskit/editor-common/browser';
+import { updateCodeBlockWrappedStateNodeKeys } from '@atlaskit/editor-common/code-block';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
-import { browser } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -12,7 +15,7 @@ import { ignoreFollowingMutations, resetShouldIgnoreFollowingMutations } from '.
 import { codeBlockNodeView } from '../nodeviews/code-block';
 import { pluginKey } from '../plugin-key';
 import { codeBlockClassNames } from '../ui/class-names';
-import { findCodeBlock } from '../utils';
+import { findCodeBlock, getAllCodeBlockNodesInDoc } from '../utils';
 import { ACTIONS } from './actions';
 import { generateInitialDecorations, updateCodeBlockDecorations, updateDecorationSetWithWordWrappedDecorator } from './decorators';
 export var createPlugin = function createPlugin(_ref) {
@@ -90,7 +93,11 @@ export var createPlugin = function createPlugin(_ref) {
           // specifically used for updating word wrap node decorators (does not cover drag & drop, validateWordWrappedDecorators does).
           var updatedDecorationSet = pluginState.decorations.map(tr.mapping, tr.doc);
           if (fg('editor_support_code_block_wrapping')) {
-            updatedDecorationSet = updateCodeBlockDecorations(tr, newState, updatedDecorationSet);
+            var codeBlockNodes = getAllCodeBlockNodesInDoc(newState);
+            if (fg('editor_code_block_wrapping_language_change_bug')) {
+              updateCodeBlockWrappedStateNodeKeys(codeBlockNodes, _oldState);
+            }
+            updatedDecorationSet = updateCodeBlockDecorations(tr, codeBlockNodes, updatedDecorationSet);
           }
           var newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
             pos: _node ? _node.pos : null,

package/dist/esm/refresh-browser-selection.js

@@ -1,4 +1,4 @@
-import { browser } from '@atlaskit/editor-common/utils';
+import { browser } from '@atlaskit/editor-common/browser';
 import { pluginKey } from './plugin-key';
 
 // Workaround for a firefox issue where dom selection is off sync

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

@@ -11,7 +11,7 @@ export declare const generateInitialDecorations: (state: EditorState) => Decorat
 /**
  * Update all the decorations used by the code block.
  */
-export declare const updateCodeBlockDecorations: (tr: ReadonlyTransaction, state: EditorState, decorationSet: DecorationSet) => DecorationSet;
+export declare const updateCodeBlockDecorations: (tr: ReadonlyTransaction, codeBlockNodes: NodeWithPos[], decorationSet: DecorationSet) => DecorationSet;
 /**
  * Update the decorations set with the line number decorators.
  */

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

@@ -11,7 +11,7 @@ export declare const generateInitialDecorations: (state: EditorState) => Decorat
 /**
  * Update all the decorations used by the code block.
  */
-export declare const updateCodeBlockDecorations: (tr: ReadonlyTransaction, state: EditorState, decorationSet: DecorationSet) => DecorationSet;
+export declare const updateCodeBlockDecorations: (tr: ReadonlyTransaction, codeBlockNodes: NodeWithPos[], decorationSet: DecorationSet) => DecorationSet;
 /**
  * Update the decorations set with the line number decorators.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "3.3.11",
+	"version": "3.3.13",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
 		"@atlaskit/code": "^15.6.0",
-		"@atlaskit/editor-common": "^88.7.0",
+		"@atlaskit/editor-common": "^88.8.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-composition": "^1.2.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
@@ -97,6 +97,9 @@
 		"code_block_auto_insertion_bug_fix": {
 			"type": "boolean"
 		},
+		"editor_code_block_wrapping_language_change_bug": {
+			"type": "boolean"
+		},
 		"platform.editor.live-view.disable-editing-in-view-mode_fi1rx": {
 			"type": "boolean"
 		}