@atlaskit/editor-plugin-code-block 3.4.3 → 3.4.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-code-block
 
+## 3.4.4
+
+### Patch Changes
+
+- [#149910](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/149910)
+  [`bfb321d2bd9fd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bfb321d2bd9fd) -
+  ED-25141 - state.doc.nodesBetween was being called and could go beyond the range of the document
+  and therefore throw an error. Occured when entering an inline code snippet with the back quote
+  shortcut. See HOT-112305 for more details.
+
 ## 3.4.3
 
 ### Patch Changes

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

@@ -98,7 +98,7 @@ var createPlugin = exports.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 ((0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping')) {
-            var codeBlockNodes = (0, _platformFeatureFlags.fg)('editor_code_wrapping_perf_improvement_ed-25141') ? (0, _utils.getAllChangedCodeBlocksInTransaction)(tr, newState) : (0, _utils.getAllCodeBlockNodesInDoc)(newState);
+            var codeBlockNodes = (0, _platformFeatureFlags.fg)('editor_code_wrapping_perf_improvement_ed-25141') ? (0, _utils.getAllChangedCodeBlocksInTransaction)(tr) : (0, _utils.getAllCodeBlockNodesInDoc)(newState);
             if (codeBlockNodes) {
               if ((0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug')) {
                 (0, _codeBlock.updateCodeBlockWrappedStateNodeKeys)(codeBlockNodes, _oldState);

package/dist/cjs/utils.js

@@ -44,13 +44,13 @@ function getAllCodeBlockNodesInDoc(state) {
   });
   return codeBlockNodes;
 }
-function getAllChangedCodeBlocksInTransaction(tr, state) {
+function getAllChangedCodeBlocksInTransaction(tr) {
   var changedCodeBlocks = [];
   var nodePositions = new Set();
   tr.steps.forEach(function (step) {
     var mapResult = step.getMap();
     mapResult.forEach(function (oldStart, oldEnd, newStart, newEnd) {
-      state.doc.nodesBetween(newStart, newEnd, function (node, pos) {
+      tr.doc.nodesBetween(newStart, Math.min(newEnd, tr.doc.content.size), function (node, pos) {
         if (node.type.name === 'codeBlock') {
           if (!nodePositions.has(pos)) {
             nodePositions.add(pos);

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

@@ -88,7 +88,7 @@ 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')) {
-            const codeBlockNodes = fg('editor_code_wrapping_perf_improvement_ed-25141') ? getAllChangedCodeBlocksInTransaction(tr, newState) : getAllCodeBlockNodesInDoc(newState);
+            const codeBlockNodes = fg('editor_code_wrapping_perf_improvement_ed-25141') ? getAllChangedCodeBlocksInTransaction(tr) : getAllCodeBlockNodesInDoc(newState);
             if (codeBlockNodes) {
               if (fg('editor_code_block_wrapping_language_change_bug')) {
                 updateCodeBlockWrappedStateNodeKeys(codeBlockNodes, _oldState);

package/dist/es2019/utils.js

@@ -18,13 +18,13 @@ export function getAllCodeBlockNodesInDoc(state) {
   });
   return codeBlockNodes;
 }
-export function getAllChangedCodeBlocksInTransaction(tr, state) {
+export function getAllChangedCodeBlocksInTransaction(tr) {
   const changedCodeBlocks = [];
   const nodePositions = new Set();
   tr.steps.forEach(step => {
     const mapResult = step.getMap();
     mapResult.forEach((oldStart, oldEnd, newStart, newEnd) => {
-      state.doc.nodesBetween(newStart, newEnd, (node, pos) => {
+      tr.doc.nodesBetween(newStart, Math.min(newEnd, tr.doc.content.size), (node, pos) => {
         if (node.type.name === 'codeBlock') {
           if (!nodePositions.has(pos)) {
             nodePositions.add(pos);

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

@@ -93,7 +93,7 @@ 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')) {
-            var codeBlockNodes = fg('editor_code_wrapping_perf_improvement_ed-25141') ? getAllChangedCodeBlocksInTransaction(tr, newState) : getAllCodeBlockNodesInDoc(newState);
+            var codeBlockNodes = fg('editor_code_wrapping_perf_improvement_ed-25141') ? getAllChangedCodeBlocksInTransaction(tr) : getAllCodeBlockNodesInDoc(newState);
             if (codeBlockNodes) {
               if (fg('editor_code_block_wrapping_language_change_bug')) {
                 updateCodeBlockWrappedStateNodeKeys(codeBlockNodes, _oldState);

package/dist/esm/utils.js

@@ -18,13 +18,13 @@ export function getAllCodeBlockNodesInDoc(state) {
   });
   return codeBlockNodes;
 }
-export function getAllChangedCodeBlocksInTransaction(tr, state) {
+export function getAllChangedCodeBlocksInTransaction(tr) {
   var changedCodeBlocks = [];
   var nodePositions = new Set();
   tr.steps.forEach(function (step) {
     var mapResult = step.getMap();
     mapResult.forEach(function (oldStart, oldEnd, newStart, newEnd) {
-      state.doc.nodesBetween(newStart, newEnd, function (node, pos) {
+      tr.doc.nodesBetween(newStart, Math.min(newEnd, tr.doc.content.size), function (node, pos) {
         if (node.type.name === 'codeBlock') {
           if (!nodePositions.has(pos)) {
             nodePositions.add(pos);

package/dist/types/utils.d.ts

@@ -4,4 +4,4 @@ import type { EditorState, ReadonlyTransaction, Selection } from '@atlaskit/edit
 import type { NodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export declare function getCursor(selection: Selection): ResolvedPos | undefined;
 export declare function getAllCodeBlockNodesInDoc(state: EditorState): NodeWithPos[];
-export declare function getAllChangedCodeBlocksInTransaction(tr: ReadonlyTransaction, state: EditorState): NodeWithPos[] | null;
+export declare function getAllChangedCodeBlocksInTransaction(tr: ReadonlyTransaction): NodeWithPos[] | null;

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

@@ -4,4 +4,4 @@ import type { EditorState, ReadonlyTransaction, Selection } from '@atlaskit/edit
 import type { NodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export declare function getCursor(selection: Selection): ResolvedPos | undefined;
 export declare function getAllCodeBlockNodesInDoc(state: EditorState): NodeWithPos[];
-export declare function getAllChangedCodeBlocksInTransaction(tr: ReadonlyTransaction, state: EditorState): NodeWithPos[] | null;
+export declare function getAllChangedCodeBlocksInTransaction(tr: ReadonlyTransaction): NodeWithPos[] | null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "3.4.3",
+	"version": "3.4.4",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
-		"@atlaskit/icon": "^22.20.0",
+		"@atlaskit/icon": "^22.22.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
 		"@babel/runtime": "^7.0.0",