@atlaskit/editor-plugin-code-block 8.0.12 → 8.0.14

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-code-block
 
+## 8.0.14
+
+### Patch Changes
+
+- Updated dependencies
+
+## 8.0.13
+
+### Patch Changes
+
+- [`9674ede5cd0bf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9674ede5cd0bf) -
+  ED-29547 fg cleanup editor_code_wrapping_perf_improvement_ed-25141
+
 ## 8.0.12
 
 ### Patch Changes
@@ -310,7 +323,6 @@
   shared context or singletons.
 
   **HOW TO ADJUST:**
-
   - Consumers must now explicitly install `@atlaskit/editor-common` in their own project if they use
     any of these editor plugins.
   - Ensure the version you install matches the version required by the plugins.
@@ -930,7 +942,6 @@
 
 - [`193f8c85e1a39`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/193f8c85e1a39) -
   [ux] [ED-24635]
-
   - Disable Turn into dropdown options when wrapping is not supported
   - Update expand icon so that it can show disabled status
   - Update Turn into icon to show active status when dropdown is open
@@ -1391,7 +1402,6 @@
 
   These are no longer available via `@atlaskit/prosemirror-input-rules` but are available from
   `@atlaskit/editor-common/types`:
-
   - InputRuleWrapper
   - InputRuleHandler
   - OnHandlerApply
@@ -1401,7 +1411,6 @@
   need to instantiate a `SafePlugin` (ie. `new SafePlugin(createPlugin( ... ))`).
 
   `SafePlugin` exists in `@atlaskit/editor-common/safe-plugin`.
-
   - createPlugin
   - createInputRulePlugin
 
@@ -1568,7 +1577,6 @@
 - [#43646](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43646)
   [`d43f8e9402f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d43f8e9402f) - Make
   feature flags plugin optional in all plugins including:
-
   - analytics
   - base
   - card

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

@@ -8,7 +8,6 @@ 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");
 var DECORATION_WIDGET_TYPE = exports.DECORATION_WIDGET_TYPE = 'decorationWidgetType';
@@ -43,29 +42,19 @@ var updateCodeBlockDecorations = exports.updateCodeBlockDecorations = function u
  */
 var updateDecorationSetWithLineNumberDecorators = exports.updateDecorationSetWithLineNumberDecorators = function updateDecorationSetWithLineNumberDecorators(tr, codeBlockNodes, decorationSet) {
   var updatedDecorationSet = decorationSet;
-  if (!(0, _platformFeatureFlags.fg)('editor_code_wrapping_perf_improvement_ed-25141')) {
-    var children = updatedDecorationSet.find(undefined, undefined, function (spec) {
-      return spec.type === DECORATION_WIDGET_TYPE;
-    });
-    updatedDecorationSet = updatedDecorationSet.remove(children);
-  }
   var lineNumberDecorators = [];
   codeBlockNodes.forEach(function (node) {
-    if ((0, _platformFeatureFlags.fg)('editor_code_wrapping_perf_improvement_ed-25141')) {
-      var existingWidgetsOnNode = updatedDecorationSet.find(node.pos, node.pos + node.node.nodeSize, function (spec) {
-        return spec.type === DECORATION_WIDGET_TYPE;
-      });
-      var newLineAttributes = generateLineAttributesFromNode(node);
+    var existingWidgetsOnNode = updatedDecorationSet.find(node.pos, node.pos + node.node.nodeSize, function (spec) {
+      return spec.type === DECORATION_WIDGET_TYPE;
+    });
+    var newLineAttributes = generateLineAttributesFromNode(node);
 
-      // There will be no widgets on initialisation. If the number of existing widgets does not equal the amount of lines, regenerate the widgets.
-      // There may be a case where the number of existing widgets and the number of lines are the same, that's why we track totalLineCount. This allows
-      // us to know how many lines there were when the widget was created. It avoids a break in line numbers, e.g. "1, 2, 3, 5, 6". Happens on line removal.
-      if (existingWidgetsOnNode.length === 0 || existingWidgetsOnNode.length !== newLineAttributes.length || existingWidgetsOnNode[0].spec.totalLineCount !== newLineAttributes.length) {
-        updatedDecorationSet = updatedDecorationSet.remove(existingWidgetsOnNode);
-        lineNumberDecorators.push.apply(lineNumberDecorators, (0, _toConsumableArray2.default)(createDecorationSetFromLineAttributes(newLineAttributes)));
-      }
-    } else {
-      lineNumberDecorators.push.apply(lineNumberDecorators, (0, _toConsumableArray2.default)(createDecorationSetFromLineAttributes(generateLineAttributesFromNode(node))));
+    // There will be no widgets on initialisation. If the number of existing widgets does not equal the amount of lines, regenerate the widgets.
+    // There may be a case where the number of existing widgets and the number of lines are the same, that's why we track totalLineCount. This allows
+    // us to know how many lines there were when the widget was created. It avoids a break in line numbers, e.g. "1, 2, 3, 5, 6". Happens on line removal.
+    if (existingWidgetsOnNode.length === 0 || existingWidgetsOnNode.length !== newLineAttributes.length || existingWidgetsOnNode[0].spec.totalLineCount !== newLineAttributes.length) {
+      updatedDecorationSet = updatedDecorationSet.remove(existingWidgetsOnNode);
+      lineNumberDecorators.push.apply(lineNumberDecorators, (0, _toConsumableArray2.default)(createDecorationSetFromLineAttributes(newLineAttributes)));
     }
   });
   return updatedDecorationSet.add(tr.doc, [].concat(lineNumberDecorators));
@@ -124,7 +113,7 @@ var createDecorationSetFromLineAttributes = exports.createDecorationSetFromLineA
     return _view.Decoration.widget(lineStart, createLineNumberWidget, {
       type: DECORATION_WIDGET_TYPE,
       side: -1,
-      totalLineCount: (0, _platformFeatureFlags.fg)('editor_code_wrapping_perf_improvement_ed-25141') ? lineAttributes.length : undefined
+      totalLineCount: lineAttributes.length
     });
   });
   return widgetDecorations;

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

@@ -14,7 +14,6 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorCommands = require("../editor-commands");
 var _codeBlock2 = require("../nodeviews/code-block");
@@ -113,7 +112,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
           // 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);
-          var codeBlockNodes = (0, _platformFeatureFlags.fg)('editor_code_wrapping_perf_improvement_ed-25141') ? (0, _utils.getAllChangedCodeBlocksInTransaction)(tr) : (0, _utils.getAllCodeBlockNodesInDoc)(newState);
+          var codeBlockNodes = (0, _utils.getAllChangedCodeBlocksInTransaction)(tr);
           if (codeBlockNodes) {
             (0, _codeBlock.updateCodeBlockWrappedStateNodeKeys)(codeBlockNodes, _oldState);
             // Disabled when using advanced code block for performance reasons

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

@@ -9,8 +9,6 @@ exports.getCursor = getCursor;
 function getCursor(selection) {
   return selection.$cursor || undefined;
 }
-
-// Replaced by getAllChangedCodeBlocksInTransaction with FG editor_code_wrapping_perf_improvement_ed-25141.
 function getAllCodeBlockNodesInDoc(state) {
   var codeBlockNodes = [];
   state.doc.descendants(function (node, pos) {

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

@@ -1,6 +1,5 @@
 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';
@@ -33,25 +32,17 @@ export const updateCodeBlockDecorations = (tr, codeBlockNodes, decorationSet) =>
  */
 export const updateDecorationSetWithLineNumberDecorators = (tr, codeBlockNodes, decorationSet) => {
   let updatedDecorationSet = decorationSet;
-  if (!fg('editor_code_wrapping_perf_improvement_ed-25141')) {
-    const children = updatedDecorationSet.find(undefined, undefined, spec => spec.type === DECORATION_WIDGET_TYPE);
-    updatedDecorationSet = updatedDecorationSet.remove(children);
-  }
   const lineNumberDecorators = [];
   codeBlockNodes.forEach(node => {
-    if (fg('editor_code_wrapping_perf_improvement_ed-25141')) {
-      const existingWidgetsOnNode = updatedDecorationSet.find(node.pos, node.pos + node.node.nodeSize, spec => spec.type === DECORATION_WIDGET_TYPE);
-      const newLineAttributes = generateLineAttributesFromNode(node);
+    const existingWidgetsOnNode = updatedDecorationSet.find(node.pos, node.pos + node.node.nodeSize, spec => spec.type === DECORATION_WIDGET_TYPE);
+    const newLineAttributes = generateLineAttributesFromNode(node);
 
-      // There will be no widgets on initialisation. If the number of existing widgets does not equal the amount of lines, regenerate the widgets.
-      // There may be a case where the number of existing widgets and the number of lines are the same, that's why we track totalLineCount. This allows
-      // us to know how many lines there were when the widget was created. It avoids a break in line numbers, e.g. "1, 2, 3, 5, 6". Happens on line removal.
-      if (existingWidgetsOnNode.length === 0 || existingWidgetsOnNode.length !== newLineAttributes.length || existingWidgetsOnNode[0].spec.totalLineCount !== newLineAttributes.length) {
-        updatedDecorationSet = updatedDecorationSet.remove(existingWidgetsOnNode);
-        lineNumberDecorators.push(...createDecorationSetFromLineAttributes(newLineAttributes));
-      }
-    } else {
-      lineNumberDecorators.push(...createDecorationSetFromLineAttributes(generateLineAttributesFromNode(node)));
+    // There will be no widgets on initialisation. If the number of existing widgets does not equal the amount of lines, regenerate the widgets.
+    // There may be a case where the number of existing widgets and the number of lines are the same, that's why we track totalLineCount. This allows
+    // us to know how many lines there were when the widget was created. It avoids a break in line numbers, e.g. "1, 2, 3, 5, 6". Happens on line removal.
+    if (existingWidgetsOnNode.length === 0 || existingWidgetsOnNode.length !== newLineAttributes.length || existingWidgetsOnNode[0].spec.totalLineCount !== newLineAttributes.length) {
+      updatedDecorationSet = updatedDecorationSet.remove(existingWidgetsOnNode);
+      lineNumberDecorators.push(...createDecorationSetFromLineAttributes(newLineAttributes));
     }
   });
   return updatedDecorationSet.add(tr.doc, [...lineNumberDecorators]);
@@ -114,7 +105,7 @@ export const createDecorationSetFromLineAttributes = lineAttributes => {
     return Decoration.widget(lineStart, createLineNumberWidget, {
       type: DECORATION_WIDGET_TYPE,
       side: -1,
-      totalLineCount: fg('editor_code_wrapping_perf_improvement_ed-25141') ? lineAttributes.length : undefined
+      totalLineCount: lineAttributes.length
     });
   });
   return widgetDecorations;

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

@@ -6,7 +6,6 @@ import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { findCodeBlock } from '@atlaskit/editor-common/transforms';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ignoreFollowingMutations, resetShouldIgnoreFollowingMutations } from '../editor-commands';
 import { codeBlockNodeView } from '../nodeviews/code-block';
@@ -14,7 +13,7 @@ import { codeBlockClassNames } from '../ui/class-names';
 import { ACTIONS } from './actions';
 import { generateInitialDecorations, updateCodeBlockDecorations, updateDecorationSetWithWordWrappedDecorator } from './decorators';
 import { pluginKey } from './plugin-key';
-import { getAllChangedCodeBlocksInTransaction, getAllCodeBlockNodesInDoc } from './utils';
+import { getAllChangedCodeBlocksInTransaction } from './utils';
 export const createPlugin = ({
   useLongPressSelection = false,
   getIntl,
@@ -101,7 +100,7 @@ export const createPlugin = ({
           // 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).
           let updatedDecorationSet = pluginState.decorations.map(tr.mapping, tr.doc);
-          const codeBlockNodes = fg('editor_code_wrapping_perf_improvement_ed-25141') ? getAllChangedCodeBlocksInTransaction(tr) : getAllCodeBlockNodesInDoc(newState);
+          const codeBlockNodes = getAllChangedCodeBlocksInTransaction(tr);
           if (codeBlockNodes) {
             updateCodeBlockWrappedStateNodeKeys(codeBlockNodes, _oldState);
             // Disabled when using advanced code block for performance reasons

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

@@ -1,8 +1,6 @@
 export function getCursor(selection) {
   return selection.$cursor || undefined;
 }
-
-// Replaced by getAllChangedCodeBlocksInTransaction with FG editor_code_wrapping_perf_improvement_ed-25141.
 export function getAllCodeBlockNodesInDoc(state) {
   const codeBlockNodes = [];
   state.doc.descendants((node, pos) => {

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

@@ -1,7 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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';
@@ -36,29 +35,19 @@ export var updateCodeBlockDecorations = function updateCodeBlockDecorations(tr,
  */
 export var updateDecorationSetWithLineNumberDecorators = function updateDecorationSetWithLineNumberDecorators(tr, codeBlockNodes, decorationSet) {
   var updatedDecorationSet = decorationSet;
-  if (!fg('editor_code_wrapping_perf_improvement_ed-25141')) {
-    var children = updatedDecorationSet.find(undefined, undefined, function (spec) {
-      return spec.type === DECORATION_WIDGET_TYPE;
-    });
-    updatedDecorationSet = updatedDecorationSet.remove(children);
-  }
   var lineNumberDecorators = [];
   codeBlockNodes.forEach(function (node) {
-    if (fg('editor_code_wrapping_perf_improvement_ed-25141')) {
-      var existingWidgetsOnNode = updatedDecorationSet.find(node.pos, node.pos + node.node.nodeSize, function (spec) {
-        return spec.type === DECORATION_WIDGET_TYPE;
-      });
-      var newLineAttributes = generateLineAttributesFromNode(node);
+    var existingWidgetsOnNode = updatedDecorationSet.find(node.pos, node.pos + node.node.nodeSize, function (spec) {
+      return spec.type === DECORATION_WIDGET_TYPE;
+    });
+    var newLineAttributes = generateLineAttributesFromNode(node);
 
-      // There will be no widgets on initialisation. If the number of existing widgets does not equal the amount of lines, regenerate the widgets.
-      // There may be a case where the number of existing widgets and the number of lines are the same, that's why we track totalLineCount. This allows
-      // us to know how many lines there were when the widget was created. It avoids a break in line numbers, e.g. "1, 2, 3, 5, 6". Happens on line removal.
-      if (existingWidgetsOnNode.length === 0 || existingWidgetsOnNode.length !== newLineAttributes.length || existingWidgetsOnNode[0].spec.totalLineCount !== newLineAttributes.length) {
-        updatedDecorationSet = updatedDecorationSet.remove(existingWidgetsOnNode);
-        lineNumberDecorators.push.apply(lineNumberDecorators, _toConsumableArray(createDecorationSetFromLineAttributes(newLineAttributes)));
-      }
-    } else {
-      lineNumberDecorators.push.apply(lineNumberDecorators, _toConsumableArray(createDecorationSetFromLineAttributes(generateLineAttributesFromNode(node))));
+    // There will be no widgets on initialisation. If the number of existing widgets does not equal the amount of lines, regenerate the widgets.
+    // There may be a case where the number of existing widgets and the number of lines are the same, that's why we track totalLineCount. This allows
+    // us to know how many lines there were when the widget was created. It avoids a break in line numbers, e.g. "1, 2, 3, 5, 6". Happens on line removal.
+    if (existingWidgetsOnNode.length === 0 || existingWidgetsOnNode.length !== newLineAttributes.length || existingWidgetsOnNode[0].spec.totalLineCount !== newLineAttributes.length) {
+      updatedDecorationSet = updatedDecorationSet.remove(existingWidgetsOnNode);
+      lineNumberDecorators.push.apply(lineNumberDecorators, _toConsumableArray(createDecorationSetFromLineAttributes(newLineAttributes)));
     }
   });
   return updatedDecorationSet.add(tr.doc, [].concat(lineNumberDecorators));
@@ -117,7 +106,7 @@ export var createDecorationSetFromLineAttributes = function createDecorationSetF
     return Decoration.widget(lineStart, createLineNumberWidget, {
       type: DECORATION_WIDGET_TYPE,
       side: -1,
-      totalLineCount: fg('editor_code_wrapping_perf_improvement_ed-25141') ? lineAttributes.length : undefined
+      totalLineCount: lineAttributes.length
     });
   });
   return widgetDecorations;

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

@@ -9,7 +9,6 @@ import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { findCodeBlock } from '@atlaskit/editor-common/transforms';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ignoreFollowingMutations, resetShouldIgnoreFollowingMutations } from '../editor-commands';
 import { codeBlockNodeView } from '../nodeviews/code-block';
@@ -17,7 +16,7 @@ import { codeBlockClassNames } from '../ui/class-names';
 import { ACTIONS } from './actions';
 import { generateInitialDecorations, updateCodeBlockDecorations, updateDecorationSetWithWordWrappedDecorator } from './decorators';
 import { pluginKey } from './plugin-key';
-import { getAllChangedCodeBlocksInTransaction, getAllCodeBlockNodesInDoc } from './utils';
+import { getAllChangedCodeBlocksInTransaction } from './utils';
 export var createPlugin = function createPlugin(_ref) {
   var _ref$useLongPressSele = _ref.useLongPressSelection,
     useLongPressSelection = _ref$useLongPressSele === void 0 ? false : _ref$useLongPressSele,
@@ -106,7 +105,7 @@ export var createPlugin = function createPlugin(_ref) {
           // 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);
-          var codeBlockNodes = fg('editor_code_wrapping_perf_improvement_ed-25141') ? getAllChangedCodeBlocksInTransaction(tr) : getAllCodeBlockNodesInDoc(newState);
+          var codeBlockNodes = getAllChangedCodeBlocksInTransaction(tr);
           if (codeBlockNodes) {
             updateCodeBlockWrappedStateNodeKeys(codeBlockNodes, _oldState);
             // Disabled when using advanced code block for performance reasons

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

@@ -1,8 +1,6 @@
 export function getCursor(selection) {
   return selection.$cursor || undefined;
 }
-
-// Replaced by getAllChangedCodeBlocksInTransaction with FG editor_code_wrapping_perf_improvement_ed-25141.
 export function getAllCodeBlockNodesInDoc(state) {
   var codeBlockNodes = [];
   state.doc.descendants(function (node, pos) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "8.0.12",
+	"version": "8.0.14",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^6.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^8.0.0",
-		"@atlaskit/editor-plugin-interaction": "^8.0.0",
+		"@atlaskit/editor-plugin-interaction": "^9.0.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-toolbar": "^3.3.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -43,11 +43,11 @@
 		"@atlaskit/icon": "^28.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.5.0",
-		"@atlaskit/tmp-editor-statsig": "^13.10.0",
+		"@atlaskit/tmp-editor-statsig": "^13.13.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.12.0",
+		"@atlaskit/editor-common": "^110.13.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -96,9 +96,6 @@
 		"code_block_auto_insertion_bug_fix": {
 			"type": "boolean"
 		},
-		"editor_code_wrapping_perf_improvement_ed-25141": {
-			"type": "boolean"
-		},
 		"editor_a11y_remove_unwrap_button": {
 			"type": "boolean"
 		},