@atlaskit/editor-plugin-code-block-advanced 7.1.0 → 7.1.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-code-block-advanced
 
+## 7.1.1
+
+### Patch Changes
+
+- [`e91ea1cbba89a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e91ea1cbba89a) -
+  JRACLOUD-96830: Fix navigating and editing codeblocks with CRLF new lines.
+- Updated dependencies
+
 ## 7.1.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/codeBlockAdvanced.js

@@ -28,6 +28,7 @@ var _updateCMSelection = require("./codemirrorSync/updateCMSelection");
 var _firstCodeBlockInDocument = require("./extensions/firstCodeBlockInDocument");
 var _foldGutter = require("./extensions/foldGutter");
 var _keymap = require("./extensions/keymap");
+var _lineSeparator = require("./extensions/lineSeparator");
 var _manageSelectionMarker = require("./extensions/manageSelectionMarker");
 var _prosemirrorDecorations = require("./extensions/prosemirrorDecorations");
 var _tripleClickExtension = require("./extensions/tripleClickExtension");
@@ -128,7 +129,7 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
         getNode: function getNode() {
           return _this.node;
         }
-      })] : []])
+      })] : [], (0, _lineSeparator.lineSeparatorExtension)()])
     });
     if (contentFormatSharedState) {
       this.unsubscribeContentFormat = contentFormatSharedState.onChange(function (_ref) {

package/dist/cjs/nodeviews/extensions/lineSeparator.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.lineSeparatorExtension = void 0;
+var _state = require("@codemirror/state");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+/**
+ * To avoid issues with CRLF (\r\n) syncing with ProseMirror,
+ * we only consider \n for line separators.
+ */
+var lineSeparatorExtension = exports.lineSeparatorExtension = function lineSeparatorExtension() {
+  if ((0, _expValEquals.expValEquals)('platform_editor_fix_advanced_codeblocks_crlf', 'isEnabled', true)) {
+    return _state.EditorState.lineSeparator.of('\n');
+  }
+  return [];
+};

package/dist/es2019/nodeviews/codeBlockAdvanced.js

@@ -18,6 +18,7 @@ import { getCMSelectionChanges } from './codemirrorSync/updateCMSelection';
 import { firstCodeBlockInDocument } from './extensions/firstCodeBlockInDocument';
 import { foldGutterExtension, getCodeBlockFoldStateEffects } from './extensions/foldGutter';
 import { keymapExtension } from './extensions/keymap';
+import { lineSeparatorExtension } from './extensions/lineSeparator';
 import { manageSelectionMarker } from './extensions/manageSelectionMarker';
 import { prosemirrorDecorationPlugin } from './extensions/prosemirrorDecorations';
 import { tripleClickSelectAllExtension } from './extensions/tripleClickExtension';
@@ -100,7 +101,7 @@ class CodeBlockAdvancedNodeView {
       }), config.allowCodeFolding ? [foldGutterExtension({
         selectNode,
         getNode: () => this.node
-      })] : []]
+      })] : [], lineSeparatorExtension()]
     });
     if (contentFormatSharedState) {
       this.unsubscribeContentFormat = contentFormatSharedState.onChange(({

package/dist/es2019/nodeviews/extensions/lineSeparator.js

@@ -0,0 +1,13 @@
+import { EditorState as CodeMirrorState } from '@codemirror/state';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
+/**
+ * To avoid issues with CRLF (\r\n) syncing with ProseMirror,
+ * we only consider \n for line separators.
+ */
+export const lineSeparatorExtension = () => {
+  if (expValEquals('platform_editor_fix_advanced_codeblocks_crlf', 'isEnabled', true)) {
+    return CodeMirrorState.lineSeparator.of('\n');
+  }
+  return [];
+};

package/dist/esm/nodeviews/codeBlockAdvanced.js

@@ -26,6 +26,7 @@ import { getCMSelectionChanges } from './codemirrorSync/updateCMSelection';
 import { firstCodeBlockInDocument } from './extensions/firstCodeBlockInDocument';
 import { foldGutterExtension, getCodeBlockFoldStateEffects } from './extensions/foldGutter';
 import { keymapExtension } from './extensions/keymap';
+import { lineSeparatorExtension } from './extensions/lineSeparator';
 import { manageSelectionMarker } from './extensions/manageSelectionMarker';
 import { prosemirrorDecorationPlugin } from './extensions/prosemirrorDecorations';
 import { tripleClickSelectAllExtension } from './extensions/tripleClickExtension';
@@ -122,7 +123,7 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
         getNode: function getNode() {
           return _this.node;
         }
-      })] : []])
+      })] : [], lineSeparatorExtension()])
     });
     if (contentFormatSharedState) {
       this.unsubscribeContentFormat = contentFormatSharedState.onChange(function (_ref) {

package/dist/esm/nodeviews/extensions/lineSeparator.js

@@ -0,0 +1,13 @@
+import { EditorState as CodeMirrorState } from '@codemirror/state';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
+/**
+ * To avoid issues with CRLF (\r\n) syncing with ProseMirror,
+ * we only consider \n for line separators.
+ */
+export var lineSeparatorExtension = function lineSeparatorExtension() {
+  if (expValEquals('platform_editor_fix_advanced_codeblocks_crlf', 'isEnabled', true)) {
+    return CodeMirrorState.lineSeparator.of('\n');
+  }
+  return [];
+};

package/dist/types/nodeviews/extensions/lineSeparator.d.ts

@@ -0,0 +1,5 @@
+/**
+ * To avoid issues with CRLF (\r\n) syncing with ProseMirror,
+ * we only consider \n for line separators.
+ */
+export declare const lineSeparatorExtension: () => import("@codemirror/state").Extension;

package/dist/types-ts4.5/nodeviews/extensions/lineSeparator.d.ts

@@ -0,0 +1,5 @@
+/**
+ * To avoid issues with CRLF (\r\n) syncing with ProseMirror,
+ * we only consider \n for line separators.
+ */
+export declare const lineSeparatorExtension: () => import("@codemirror/state").Extension;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block-advanced",
-	"version": "7.1.0",
+	"version": "7.1.1",
 	"description": "CodeBlockAdvanced plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^16.18.0",
+		"@atlaskit/tmp-editor-statsig": "^16.23.0",
 		"@atlaskit/tokens": "^9.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@codemirror/autocomplete": "6.18.4",
@@ -54,7 +54,7 @@
 		"codemirror-lang-elixir": "4.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.7.0",
+		"@atlaskit/editor-common": "^111.8.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},

package/src/nodeviews/codeBlockAdvanced.ts

@@ -43,6 +43,7 @@ import { getCMSelectionChanges } from './codemirrorSync/updateCMSelection';
 import { firstCodeBlockInDocument } from './extensions/firstCodeBlockInDocument';
 import { foldGutterExtension, getCodeBlockFoldStateEffects } from './extensions/foldGutter';
 import { keymapExtension } from './extensions/keymap';
+import { lineSeparatorExtension } from './extensions/lineSeparator';
 import { manageSelectionMarker } from './extensions/manageSelectionMarker';
 import { prosemirrorDecorationPlugin } from './extensions/prosemirrorDecorations';
 import { tripleClickSelectAllExtension } from './extensions/tripleClickExtension';
@@ -182,6 +183,7 @@ class CodeBlockAdvancedNodeView implements NodeView {
 				config.allowCodeFolding
 					? [foldGutterExtension({ selectNode, getNode: () => this.node })]
 					: [],
+				lineSeparatorExtension(),
 			],
 		});
 
@@ -366,7 +368,7 @@ class CodeBlockAdvancedNodeView implements NodeView {
 		this.updating = false;
 	}
 
-	update(node: PMNode, _: readonly Decoration[], innerDecorations: DecorationSource) {
+	update(node: PMNode, _: readonly Decoration[], innerDecorations: DecorationSource): boolean {
 		this.maybeTryingToReachNodeSelection = false;
 
 		if (node.type !== this.node.type) {
@@ -419,7 +421,7 @@ class CodeBlockAdvancedNodeView implements NodeView {
 		this.updating = false;
 	}
 
-	stopEvent(e: Event) {
+	stopEvent(e: Event): boolean {
 		// If we have selected the node we should not stop these events
 		if (
 			(e instanceof KeyboardEvent || e instanceof ClipboardEvent) &&

package/src/nodeviews/extensions/keymap/backspace.ts

@@ -12,7 +12,7 @@ interface BackspaceProps {
 	view: EditorView;
 }
 
-export const backspaceKeymap = ({ cm, view, getPos, getNode }: BackspaceProps) => {
+export const backspaceKeymap = ({ cm, view, getPos, getNode }: BackspaceProps): boolean => {
 	const ranges = cm.state.selection.ranges;
 
 	if (ranges.length > 1) {

package/src/nodeviews/extensions/lineSeparator.ts

@@ -0,0 +1,14 @@
+import { EditorState as CodeMirrorState } from '@codemirror/state';
+
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
+/**
+ * To avoid issues with CRLF (\r\n) syncing with ProseMirror,
+ * we only consider \n for line separators.
+ */
+export const lineSeparatorExtension = () => {
+	if (expValEquals('platform_editor_fix_advanced_codeblocks_crlf', 'isEnabled', true)) {
+		return CodeMirrorState.lineSeparator.of('\n');
+	}
+	return [];
+};

package/src/pm-plugins/shiftArrowKeyWorkaround.ts

@@ -1,7 +1,7 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 
-export const shiftArrowUpWorkaround = (view: EditorView, event: KeyboardEvent) => {
+export const shiftArrowUpWorkaround = (view: EditorView, event: KeyboardEvent): boolean => {
 	const {
 		doc,
 		selection: { $head, $anchor },
@@ -28,7 +28,7 @@ export const shiftArrowUpWorkaround = (view: EditorView, event: KeyboardEvent) =
 	return false;
 };
 
-export const shiftArrowDownWorkaround = (view: EditorView, event: KeyboardEvent) => {
+export const shiftArrowDownWorkaround = (view: EditorView, event: KeyboardEvent): boolean => {
 	const {
 		doc,
 		selection: { $head, $anchor },

package/tsconfig.app.json

@@ -43,6 +43,9 @@
 		{
 			"path": "../editor-plugin-code-block/tsconfig.app.json"
 		},
+		{
+			"path": "../editor-plugin-content-format/tsconfig.app.json"
+		},
 		{
 			"path": "../editor-plugin-editor-disabled/tsconfig.app.json"
 		},

package/build/tsconfig.json

@@ -1,22 +0,0 @@
-{
-  "extends": "../tsconfig",
-  "compilerOptions": {
-    "target": "es5",
-    "paths": {}
-  },
-  "include": [
-    "../src/**/*.ts",
-    "../src/**/*.tsx"
-  ],
-  "exclude": [
-    "../src/**/__tests__/*",
-    "../src/**/*.test.*",
-    "../src/**/test.*",
-    "../src/**/examples.*",
-    "../src/**/examples/*",
-    "../src/**/examples/**/*",
-    "../src/**/*.stories.*",
-    "../src/**/stories/*",
-    "../src/**/stories/**/*"
-  ]
-}