@atlaskit/editor-plugin-code-block-advanced 1.0.0 → 1.0.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-code-block-advanced
 
+## 1.0.1
+
+### Patch Changes
+
+- [#102828](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102828)
+  [`e9e0bd7d3c706`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e9e0bd7d3c706) -
+  [ux] Ensure lazy node view matches code block advanced snippet so there is no layout shift.
+
 ## 1.0.0
 
 ### Major Changes

package/afm-jira/tsconfig.json

@@ -0,0 +1,36 @@
+{
+	"extends": "../../../../tsconfig.entry-points.jira.json",
+	"compilerOptions": {
+		"target": "es5",
+		"outDir": "../../../../../tsDist/@atlaskit__editor-plugin-code-block-advanced/app",
+		"rootDir": "../",
+		"composite": true
+	},
+	"include": [
+		"../src/**/*.ts",
+		"../src/**/*.tsx"
+	],
+	"exclude": [
+		"../src/**/__tests__/*",
+		"../src/**/*.test.*",
+		"../src/**/test.*",
+		"../src/**/examples.*"
+	],
+	"references": [
+		{
+			"path": "../../editor-common/afm-jira/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-code-block/afm-jira/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-editor-disabled/afm-jira/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-selection/afm-jira/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/tokens/afm-jira/tsconfig.json"
+		}
+	]
+}

package/afm-post-office/tsconfig.json

@@ -0,0 +1,36 @@
+{
+	"extends": "../../../../tsconfig.entry-points.post-office.json",
+	"compilerOptions": {
+		"target": "es5",
+		"outDir": "../../../../../post-office/tsDist/@atlaskit__editor-plugin-code-block-advanced/app",
+		"rootDir": "../",
+		"composite": true
+	},
+	"include": [
+		"../src/**/*.ts",
+		"../src/**/*.tsx"
+	],
+	"exclude": [
+		"../src/**/__tests__/*",
+		"../src/**/*.test.*",
+		"../src/**/test.*",
+		"../src/**/examples.*"
+	],
+	"references": [
+		{
+			"path": "../../editor-common/afm-post-office/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-code-block/afm-post-office/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-editor-disabled/afm-post-office/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-selection/afm-post-office/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/tokens/afm-post-office/tsconfig.json"
+		}
+	]
+}

package/dist/cjs/nodeviews/codeBlockAdvanced.js

@@ -63,7 +63,12 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
         getNode: getNode,
         selectCodeBlockNode: this.selectCodeBlockNode.bind(this),
         onMaybeNodeSelection: onMaybeNodeSelection
-      }), _theme.cmTheme, (0, _language.syntaxHighlighting)(_syntaxHighlightingTheme.highlightStyle), (0, _view.lineNumbers)(), _view.EditorView.updateListener.of(function (update) {
+      }), _theme.cmTheme, (0, _language.syntaxHighlighting)(_syntaxHighlightingTheme.highlightStyle), (0, _view.lineNumbers)(),
+      // Explicitly disable "sticky" positioning on line numbers to match
+      // Renderer behaviour
+      (0, _view.gutters)({
+        fixed: false
+      }), _view.EditorView.updateListener.of(function (update) {
         return _this.forwardUpdate(update);
       }), this.readOnlyCompartment.of(_view.EditorView.editable.of(this.view.editable)), (0, _autocomplete.closeBrackets)(), _view.EditorView.editorAttributes.of({
         class: 'code-block'

package/dist/cjs/nodeviews/codeBlockNodeWithToDOMFixed.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.codeBlockNodeWithFixedToDOM = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchema = require("@atlaskit/adf-schema");
+var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _styles = require("@atlaskit/editor-common/styles");
 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; }
@@ -15,30 +16,58 @@ var codeBlockClassNames = {
   start: _styles.CodeBlockSharedCssClassName.CODEBLOCK_START,
   end: _styles.CodeBlockSharedCssClassName.CODEBLOCK_END,
   contentWrapper: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER,
-  contentWrapped: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPED,
-  gutter: _styles.CodeBlockSharedCssClassName.CODEBLOCK_LINE_NUMBER_GUTTER,
-  content: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT,
-  lineNumberWidget: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER_LINE_NUMBER_WIDGET
+  content: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
 };
+var MATCH_NEWLINES = new RegExp('\n', 'gu');
 
-// From: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
-var _toDOM = function toDOM(node, contentEditable, formattedAriaLabel) {
-  return ['div', {
-    class: codeBlockClassNames.container
+// Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
+var _toDOM = function toDOM(node, formattedAriaLabel) {
+  var totalLineCount = 1;
+  node.forEach(function (node) {
+    var text = node.text;
+    if (text) {
+      totalLineCount += (node.text.match(MATCH_NEWLINES) || []).length;
+    }
+  });
+  var maxDigits = totalLineCount.toString().length;
+  var content = node.textContent.split('\n').map(function (_, i) {
+    return i + 1;
+  }).join('\n');
+  return ['pre', {
+    class: codeBlockClassNames.container,
+    style: "--lineNumberGutterWidth:".concat(maxDigits, "ch;"),
+    'data-language': node.attrs.language || ''
   }, ['div', {
     class: codeBlockClassNames.start,
     contenteditable: 'false'
   }], ['div', {
     class: codeBlockClassNames.contentWrapper
   }, ['div', {
-    class: codeBlockClassNames.gutter,
+    // Based on packages/editor/editor-common/src/styles/shared/code-block.ts
+    // But we can't reuse that class as it adds a ::before that intefers with this approach
+    style: (0, _lazyNodeView.convertToInlineCss)({
+      backgroundColor: "var(--ds-background-neutral, #091E420F)",
+      position: 'relative',
+      width: 'var(--lineNumberGutterWidth, 2rem)',
+      padding: "var(--ds-space-100, 8px)",
+      flexShrink: 0,
+      fontSize: '0.875rem',
+      boxSizing: 'content-box'
+    }),
     contenteditable: 'false'
-  }], ['div', {
+  }, ['div', {
+    class: 'code-block-gutter-pseudo-element',
+    style: (0, _lazyNodeView.convertToInlineCss)({
+      textAlign: 'right',
+      color: "var(--ds-text-subtlest, #626F86)",
+      fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
+    }),
+    'data-label': content
+  }]], ['div', {
     class: codeBlockClassNames.content
   }, ['code', {
     'data-language': node.attrs.language || '',
     spellcheck: 'false',
-    contenteditable: contentEditable ? 'true' : 'false',
     'data-testid': 'code-block--code',
     'aria-label': formattedAriaLabel
   }, 0]]], ['div', {
@@ -49,7 +78,7 @@ var _toDOM = function toDOM(node, contentEditable, formattedAriaLabel) {
 var codeBlockNodeWithFixedToDOM = exports.codeBlockNodeWithFixedToDOM = function codeBlockNodeWithFixedToDOM() {
   return _objectSpread(_objectSpread({}, _adfSchema.codeBlock), {}, {
     toDOM: function toDOM(node) {
-      return _toDOM(node, false, '');
+      return _toDOM(node, '');
     }
   });
 };

package/dist/cjs/ui/syntaxHighlightingTheme.js

@@ -46,8 +46,11 @@ var highlightStyle = exports.highlightStyle = _language.HighlightStyle.define([{
   tag: [_highlight.tags.string, _highlight.tags.deleted],
   color: "var(--ds-text-accent-green, #216E4E)"
 }, {
-  tag: [_highlight.tags.regexp, _highlight.tags.escape, _highlight.tags.special(_highlight.tags.string)],
-  color: "var(--ds-text, #172B4D)"
+  tag: [_highlight.tags.special(_highlight.tags.string)],
+  color: "var(--ds-text-accent-green, #216E4E)"
+}, {
+  tag: [_highlight.tags.regexp, _highlight.tags.escape],
+  color: "var(--ds-text-accent-teal, #206A83)"
 }, {
   tag: _highlight.tags.definition(_highlight.tags.variableName),
   color: "var(--ds-text, #172B4D)"

package/dist/cjs/ui/theme.js

@@ -11,7 +11,6 @@ var cmTheme = exports.cmTheme = _view.EditorView.theme({
     padding: '0',
     marginTop: "var(--ds-space-100, 8px)",
     marginBottom: "var(--ds-space-100, 8px)",
-    borderRadius: "var(--ds-border-radius, 4px)",
     fontSize: '0.875rem',
     // Custom syntax styling to match existing styling
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
@@ -37,7 +36,8 @@ var cmTheme = exports.cmTheme = _view.EditorView.theme({
     // Custom syntax styling to match existing styling
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: 'unset',
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
+    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    borderRadius: "var(--ds-border-radius, 4px)"
   },
   '&.cm-focused .cm-cursor': {
     borderLeftColor: "var(--ds-text, #172B4D)"
@@ -45,7 +45,8 @@ var cmTheme = exports.cmTheme = _view.EditorView.theme({
   '.cm-gutters': {
     backgroundColor: "var(--ds-background-neutral, #091E420F)",
     border: 'none',
-    padding: "var(--ds-space-100, 8px)"
+    padding: "var(--ds-space-100, 8px)",
+    color: "var(--ds-text-subtlest, #626F86)"
   },
   '.cm-lineNumbers .cm-gutterElement': {
     paddingLeft: "var(--ds-space-0, 0px)",

package/dist/es2019/nodeviews/codeBlockAdvanced.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { closeBrackets } from '@codemirror/autocomplete';
 import { syntaxHighlighting } from '@codemirror/language';
 import { Compartment, EditorSelection } from '@codemirror/state';
-import { EditorView as CodeMirror, lineNumbers } from '@codemirror/view';
+import { EditorView as CodeMirror, lineNumbers, gutters } from '@codemirror/view';
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { highlightStyle } from '../ui/syntaxHighlightingTheme';
@@ -46,7 +46,12 @@ class CodeBlockAdvancedNodeView {
         getNode,
         selectCodeBlockNode: this.selectCodeBlockNode.bind(this),
         onMaybeNodeSelection
-      }), cmTheme, syntaxHighlighting(highlightStyle), lineNumbers(), CodeMirror.updateListener.of(update => this.forwardUpdate(update)), this.readOnlyCompartment.of(CodeMirror.editable.of(this.view.editable)), closeBrackets(), CodeMirror.editorAttributes.of({
+      }), cmTheme, syntaxHighlighting(highlightStyle), lineNumbers(),
+      // Explicitly disable "sticky" positioning on line numbers to match
+      // Renderer behaviour
+      gutters({
+        fixed: false
+      }), CodeMirror.updateListener.of(update => this.forwardUpdate(update)), this.readOnlyCompartment.of(CodeMirror.editable.of(this.view.editable)), closeBrackets(), CodeMirror.editorAttributes.of({
         class: 'code-block'
       }), bidiCharWarningExtension]
     });

package/dist/es2019/nodeviews/codeBlockNodeWithToDOMFixed.js

@@ -1,42 +1,71 @@
 import { codeBlock } from '@atlaskit/adf-schema';
+import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { CodeBlockSharedCssClassName } from '@atlaskit/editor-common/styles';
 const codeBlockClassNames = {
   container: CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER,
   start: CodeBlockSharedCssClassName.CODEBLOCK_START,
   end: CodeBlockSharedCssClassName.CODEBLOCK_END,
   contentWrapper: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER,
-  contentWrapped: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPED,
-  gutter: CodeBlockSharedCssClassName.CODEBLOCK_LINE_NUMBER_GUTTER,
-  content: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT,
-  lineNumberWidget: CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER_LINE_NUMBER_WIDGET
+  content: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
 };
+const MATCH_NEWLINES = new RegExp('\n', 'gu');
 
-// From: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
-const toDOM = (node, contentEditable, formattedAriaLabel) => ['div', {
-  class: codeBlockClassNames.container
-}, ['div', {
-  class: codeBlockClassNames.start,
-  contenteditable: 'false'
-}], ['div', {
-  class: codeBlockClassNames.contentWrapper
-}, ['div', {
-  class: codeBlockClassNames.gutter,
-  contenteditable: 'false'
-}], ['div', {
-  class: codeBlockClassNames.content
-}, ['code', {
-  'data-language': node.attrs.language || '',
-  spellcheck: 'false',
-  contenteditable: contentEditable ? 'true' : 'false',
-  'data-testid': 'code-block--code',
-  'aria-label': formattedAriaLabel
-}, 0]]], ['div', {
-  class: codeBlockClassNames.end,
-  contenteditable: 'false'
-}]];
+// Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
+const toDOM = (node, formattedAriaLabel) => {
+  let totalLineCount = 1;
+  node.forEach(node => {
+    const text = node.text;
+    if (text) {
+      totalLineCount += (node.text.match(MATCH_NEWLINES) || []).length;
+    }
+  });
+  const maxDigits = totalLineCount.toString().length;
+  const content = node.textContent.split('\n').map((_, i) => i + 1).join('\n');
+  return ['pre', {
+    class: codeBlockClassNames.container,
+    style: `--lineNumberGutterWidth:${maxDigits}ch;`,
+    'data-language': node.attrs.language || ''
+  }, ['div', {
+    class: codeBlockClassNames.start,
+    contenteditable: 'false'
+  }], ['div', {
+    class: codeBlockClassNames.contentWrapper
+  }, ['div', {
+    // Based on packages/editor/editor-common/src/styles/shared/code-block.ts
+    // But we can't reuse that class as it adds a ::before that intefers with this approach
+    style: convertToInlineCss({
+      backgroundColor: "var(--ds-background-neutral, #091E420F)",
+      position: 'relative',
+      width: 'var(--lineNumberGutterWidth, 2rem)',
+      padding: "var(--ds-space-100, 8px)",
+      flexShrink: 0,
+      fontSize: '0.875rem',
+      boxSizing: 'content-box'
+    }),
+    contenteditable: 'false'
+  }, ['div', {
+    class: 'code-block-gutter-pseudo-element',
+    style: convertToInlineCss({
+      textAlign: 'right',
+      color: "var(--ds-text-subtlest, #626F86)",
+      fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
+    }),
+    'data-label': content
+  }]], ['div', {
+    class: codeBlockClassNames.content
+  }, ['code', {
+    'data-language': node.attrs.language || '',
+    spellcheck: 'false',
+    'data-testid': 'code-block--code',
+    'aria-label': formattedAriaLabel
+  }, 0]]], ['div', {
+    class: codeBlockClassNames.end,
+    contenteditable: 'false'
+  }]];
+};
 export const codeBlockNodeWithFixedToDOM = () => {
   return {
     ...codeBlock,
-    toDOM: node => toDOM(node, false, '')
+    toDOM: node => toDOM(node, '')
   };
 };

package/dist/es2019/ui/syntaxHighlightingTheme.js

@@ -40,8 +40,11 @@ export const highlightStyle = HighlightStyle.define([{
   tag: [tags.string, tags.deleted],
   color: "var(--ds-text-accent-green, #216E4E)"
 }, {
-  tag: [tags.regexp, tags.escape, tags.special(tags.string)],
-  color: "var(--ds-text, #172B4D)"
+  tag: [tags.special(tags.string)],
+  color: "var(--ds-text-accent-green, #216E4E)"
+}, {
+  tag: [tags.regexp, tags.escape],
+  color: "var(--ds-text-accent-teal, #206A83)"
 }, {
   tag: tags.definition(tags.variableName),
   color: "var(--ds-text, #172B4D)"

package/dist/es2019/ui/theme.js

@@ -5,7 +5,6 @@ export const cmTheme = CodeMirror.theme({
     padding: '0',
     marginTop: "var(--ds-space-100, 8px)",
     marginBottom: "var(--ds-space-100, 8px)",
-    borderRadius: "var(--ds-border-radius, 4px)",
     fontSize: '0.875rem',
     // Custom syntax styling to match existing styling
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
@@ -31,7 +30,8 @@ export const cmTheme = CodeMirror.theme({
     // Custom syntax styling to match existing styling
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: 'unset',
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
+    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    borderRadius: "var(--ds-border-radius, 4px)"
   },
   '&.cm-focused .cm-cursor': {
     borderLeftColor: "var(--ds-text, #172B4D)"
@@ -39,7 +39,8 @@ export const cmTheme = CodeMirror.theme({
   '.cm-gutters': {
     backgroundColor: "var(--ds-background-neutral, #091E420F)",
     border: 'none',
-    padding: "var(--ds-space-100, 8px)"
+    padding: "var(--ds-space-100, 8px)",
+    color: "var(--ds-text-subtlest, #626F86)"
   },
   '.cm-lineNumbers .cm-gutterElement': {
     paddingLeft: "var(--ds-space-0, 0px)",

package/dist/esm/nodeviews/codeBlockAdvanced.js

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { closeBrackets } from '@codemirror/autocomplete';
 import { syntaxHighlighting } from '@codemirror/language';
 import { Compartment, EditorSelection } from '@codemirror/state';
-import { EditorView as CodeMirror, lineNumbers } from '@codemirror/view';
+import { EditorView as CodeMirror, lineNumbers, gutters } from '@codemirror/view';
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { highlightStyle } from '../ui/syntaxHighlightingTheme';
@@ -56,7 +56,12 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
         getNode: getNode,
         selectCodeBlockNode: this.selectCodeBlockNode.bind(this),
         onMaybeNodeSelection: onMaybeNodeSelection
-      }), cmTheme, syntaxHighlighting(highlightStyle), lineNumbers(), CodeMirror.updateListener.of(function (update) {
+      }), cmTheme, syntaxHighlighting(highlightStyle), lineNumbers(),
+      // Explicitly disable "sticky" positioning on line numbers to match
+      // Renderer behaviour
+      gutters({
+        fixed: false
+      }), CodeMirror.updateListener.of(function (update) {
         return _this.forwardUpdate(update);
       }), this.readOnlyCompartment.of(CodeMirror.editable.of(this.view.editable)), closeBrackets(), CodeMirror.editorAttributes.of({
         class: 'code-block'

package/dist/esm/nodeviews/codeBlockNodeWithToDOMFixed.js

@@ -2,36 +2,65 @@ 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; }
 import { codeBlock } from '@atlaskit/adf-schema';
+import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { CodeBlockSharedCssClassName } from '@atlaskit/editor-common/styles';
 var codeBlockClassNames = {
   container: CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER,
   start: CodeBlockSharedCssClassName.CODEBLOCK_START,
   end: CodeBlockSharedCssClassName.CODEBLOCK_END,
   contentWrapper: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER,
-  contentWrapped: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPED,
-  gutter: CodeBlockSharedCssClassName.CODEBLOCK_LINE_NUMBER_GUTTER,
-  content: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT,
-  lineNumberWidget: CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER_LINE_NUMBER_WIDGET
+  content: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
 };
+var MATCH_NEWLINES = new RegExp('\n', 'gu');
 
-// From: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
-var _toDOM = function toDOM(node, contentEditable, formattedAriaLabel) {
-  return ['div', {
-    class: codeBlockClassNames.container
+// Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
+var _toDOM = function toDOM(node, formattedAriaLabel) {
+  var totalLineCount = 1;
+  node.forEach(function (node) {
+    var text = node.text;
+    if (text) {
+      totalLineCount += (node.text.match(MATCH_NEWLINES) || []).length;
+    }
+  });
+  var maxDigits = totalLineCount.toString().length;
+  var content = node.textContent.split('\n').map(function (_, i) {
+    return i + 1;
+  }).join('\n');
+  return ['pre', {
+    class: codeBlockClassNames.container,
+    style: "--lineNumberGutterWidth:".concat(maxDigits, "ch;"),
+    'data-language': node.attrs.language || ''
   }, ['div', {
     class: codeBlockClassNames.start,
     contenteditable: 'false'
   }], ['div', {
     class: codeBlockClassNames.contentWrapper
   }, ['div', {
-    class: codeBlockClassNames.gutter,
+    // Based on packages/editor/editor-common/src/styles/shared/code-block.ts
+    // But we can't reuse that class as it adds a ::before that intefers with this approach
+    style: convertToInlineCss({
+      backgroundColor: "var(--ds-background-neutral, #091E420F)",
+      position: 'relative',
+      width: 'var(--lineNumberGutterWidth, 2rem)',
+      padding: "var(--ds-space-100, 8px)",
+      flexShrink: 0,
+      fontSize: '0.875rem',
+      boxSizing: 'content-box'
+    }),
     contenteditable: 'false'
-  }], ['div', {
+  }, ['div', {
+    class: 'code-block-gutter-pseudo-element',
+    style: convertToInlineCss({
+      textAlign: 'right',
+      color: "var(--ds-text-subtlest, #626F86)",
+      fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
+    }),
+    'data-label': content
+  }]], ['div', {
     class: codeBlockClassNames.content
   }, ['code', {
     'data-language': node.attrs.language || '',
     spellcheck: 'false',
-    contenteditable: contentEditable ? 'true' : 'false',
     'data-testid': 'code-block--code',
     'aria-label': formattedAriaLabel
   }, 0]]], ['div', {
@@ -42,7 +71,7 @@ var _toDOM = function toDOM(node, contentEditable, formattedAriaLabel) {
 export var codeBlockNodeWithFixedToDOM = function codeBlockNodeWithFixedToDOM() {
   return _objectSpread(_objectSpread({}, codeBlock), {}, {
     toDOM: function toDOM(node) {
-      return _toDOM(node, false, '');
+      return _toDOM(node, '');
     }
   });
 };

package/dist/esm/ui/syntaxHighlightingTheme.js

@@ -40,8 +40,11 @@ export var highlightStyle = HighlightStyle.define([{
   tag: [tags.string, tags.deleted],
   color: "var(--ds-text-accent-green, #216E4E)"
 }, {
-  tag: [tags.regexp, tags.escape, tags.special(tags.string)],
-  color: "var(--ds-text, #172B4D)"
+  tag: [tags.special(tags.string)],
+  color: "var(--ds-text-accent-green, #216E4E)"
+}, {
+  tag: [tags.regexp, tags.escape],
+  color: "var(--ds-text-accent-teal, #206A83)"
 }, {
   tag: tags.definition(tags.variableName),
   color: "var(--ds-text, #172B4D)"

package/dist/esm/ui/theme.js

@@ -5,7 +5,6 @@ export var cmTheme = CodeMirror.theme({
     padding: '0',
     marginTop: "var(--ds-space-100, 8px)",
     marginBottom: "var(--ds-space-100, 8px)",
-    borderRadius: "var(--ds-border-radius, 4px)",
     fontSize: '0.875rem',
     // Custom syntax styling to match existing styling
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
@@ -31,7 +30,8 @@ export var cmTheme = CodeMirror.theme({
     // Custom syntax styling to match existing styling
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: 'unset',
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
+    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    borderRadius: "var(--ds-border-radius, 4px)"
   },
   '&.cm-focused .cm-cursor': {
     borderLeftColor: "var(--ds-text, #172B4D)"
@@ -39,7 +39,8 @@ export var cmTheme = CodeMirror.theme({
   '.cm-gutters': {
     backgroundColor: "var(--ds-background-neutral, #091E420F)",
     border: 'none',
-    padding: "var(--ds-space-100, 8px)"
+    padding: "var(--ds-space-100, 8px)",
+    color: "var(--ds-text-subtlest, #626F86)"
   },
   '.cm-lineNumbers .cm-gutterElement': {
     paddingLeft: "var(--ds-space-0, 0px)",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block-advanced",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"description": "CodeBlockAdvanced plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,12 +33,12 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.1.0",
+		"@atlaskit/editor-common": "^99.4.0",
 		"@atlaskit/editor-plugin-code-block": "^3.5.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-selection": "^1.6.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
-		"@atlaskit/tokens": "^3.0.0",
+		"@atlaskit/tokens": "^3.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@codemirror/autocomplete": "6.18.4",
 		"@codemirror/commands": "6.7.1",

package/src/nodeviews/codeBlockAdvanced.ts

@@ -1,7 +1,7 @@
 import { closeBrackets } from '@codemirror/autocomplete';
 import { syntaxHighlighting } from '@codemirror/language';
 import { Compartment, Extension, EditorSelection } from '@codemirror/state';
-import { EditorView as CodeMirror, lineNumbers, ViewUpdate } from '@codemirror/view';
+import { EditorView as CodeMirror, lineNumbers, ViewUpdate, gutters } from '@codemirror/view';
 
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { RelativeSelectionPos } from '@atlaskit/editor-common/selection';
@@ -81,6 +81,9 @@ class CodeBlockAdvancedNodeView implements NodeView {
 				cmTheme,
 				syntaxHighlighting(highlightStyle),
 				lineNumbers(),
+				// Explicitly disable "sticky" positioning on line numbers to match
+				// Renderer behaviour
+				gutters({ fixed: false }),
 				CodeMirror.updateListener.of((update) => this.forwardUpdate(update)),
 				this.readOnlyCompartment.of(CodeMirror.editable.of(this.view.editable)),
 				closeBrackets(),

package/src/nodeviews/codeBlockNodeWithToDOMFixed.ts

@@ -1,59 +1,103 @@
 import { codeBlock } from '@atlaskit/adf-schema';
+import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { CodeBlockSharedCssClassName } from '@atlaskit/editor-common/styles';
 import type { NodeSpec, DOMOutputSpec, Node } from '@atlaskit/editor-prosemirror/model';
+import { token } from '@atlaskit/tokens';
 
 const codeBlockClassNames = {
 	container: CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER,
 	start: CodeBlockSharedCssClassName.CODEBLOCK_START,
 	end: CodeBlockSharedCssClassName.CODEBLOCK_END,
 	contentWrapper: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER,
-	contentWrapped: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPED,
-	gutter: CodeBlockSharedCssClassName.CODEBLOCK_LINE_NUMBER_GUTTER,
 	content: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT,
-	lineNumberWidget: CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER_LINE_NUMBER_WIDGET,
 };
 
-// From: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
-const toDOM = (node: Node, contentEditable: boolean, formattedAriaLabel: string): DOMOutputSpec => [
-	'div',
-	{ class: codeBlockClassNames.container },
-	['div', { class: codeBlockClassNames.start, contenteditable: 'false' }],
-	[
-		'div',
+const MATCH_NEWLINES = new RegExp('\n', 'gu');
+
+// Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
+const toDOM = (node: Node, formattedAriaLabel: string): DOMOutputSpec => {
+	let totalLineCount = 1;
+
+	node.forEach((node) => {
+		const text = node.text;
+		if (text) {
+			totalLineCount += (node.text.match(MATCH_NEWLINES) || []).length;
+		}
+	});
+
+	const maxDigits = totalLineCount.toString().length;
+
+	const content = node.textContent
+		.split('\n')
+		.map((_, i) => i + 1)
+		.join('\n');
+
+	return [
+		'pre',
 		{
-			class: codeBlockClassNames.contentWrapper,
+			class: codeBlockClassNames.container,
+			style: `--lineNumberGutterWidth:${maxDigits}ch;`,
+			'data-language': node.attrs.language || '',
 		},
+		['div', { class: codeBlockClassNames.start, contenteditable: 'false' }],
 		[
 			'div',
 			{
-				class: codeBlockClassNames.gutter,
-				contenteditable: 'false',
-			},
-		],
-		[
-			'div',
-			{
-				class: codeBlockClassNames.content,
+				class: codeBlockClassNames.contentWrapper,
 			},
 			[
-				'code',
+				'div',
 				{
-					'data-language': node.attrs.language || '',
-					spellcheck: 'false',
-					contenteditable: contentEditable ? 'true' : 'false',
-					'data-testid': 'code-block--code',
-					'aria-label': formattedAriaLabel,
+					// Based on packages/editor/editor-common/src/styles/shared/code-block.ts
+					// But we can't reuse that class as it adds a ::before that intefers with this approach
+					style: convertToInlineCss({
+						backgroundColor: token('color.background.neutral'),
+						position: 'relative',
+						width: 'var(--lineNumberGutterWidth, 2rem)',
+						padding: token('space.100'),
+						flexShrink: 0,
+						fontSize: '0.875rem',
+						boxSizing: 'content-box',
+					}),
+					contenteditable: 'false',
 				},
-				0,
+				[
+					'div',
+					{
+						class: 'code-block-gutter-pseudo-element',
+						style: convertToInlineCss({
+							textAlign: 'right',
+							color: token('color.text.subtlest'),
+							fontFamily: token('font.family.code'),
+						}),
+						'data-label': content,
+					},
+				],
+			],
+			[
+				'div',
+				{
+					class: codeBlockClassNames.content,
+				},
+				[
+					'code',
+					{
+						'data-language': node.attrs.language || '',
+						spellcheck: 'false',
+						'data-testid': 'code-block--code',
+						'aria-label': formattedAriaLabel,
+					},
+					0,
+				],
 			],
 		],
-	],
-	['div', { class: codeBlockClassNames.end, contenteditable: 'false' }],
-];
+		['div', { class: codeBlockClassNames.end, contenteditable: 'false' }],
+	];
+};
 
 export const codeBlockNodeWithFixedToDOM = (): NodeSpec => {
 	return {
 		...codeBlock,
-		toDOM: (node) => toDOM(node, false, ''),
+		toDOM: (node) => toDOM(node, ''),
 	};
 };

package/src/nodeviews/lazyCodeBlockAdvanced.ts

@@ -5,7 +5,6 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 
-
 import type { CodeBlockAdvancedPlugin } from '../codeBlockAdvancedPluginType';
 
 interface Props {

package/src/ui/syntaxHighlightingTheme.ts

@@ -38,7 +38,14 @@ export const highlightStyle = HighlightStyle.define([
 		color: token('color.text.accent.blue'),
 	},
 	{ tag: [tags.string, tags.deleted], color: token('color.text.accent.green') },
-	{ tag: [tags.regexp, tags.escape, tags.special(tags.string)], color: token('color.text') },
+	{
+		tag: [tags.special(tags.string)],
+		color: token('color.text.accent.green'),
+	},
+	{
+		tag: [tags.regexp, tags.escape],
+		color: token('color.text.accent.teal'),
+	},
 	{ tag: tags.definition(tags.variableName), color: token('color.text') },
 	{ tag: tags.local(tags.variableName), color: token('color.text') },
 	{ tag: [tags.typeName, tags.namespace], color: token('color.text.accent.blue') },

package/src/ui/theme.ts

@@ -8,7 +8,6 @@ export const cmTheme = CodeMirror.theme({
 		padding: '0',
 		marginTop: token('space.100'),
 		marginBottom: token('space.100'),
-		borderRadius: token('border.radius'),
 		fontSize: '0.875rem',
 		// Custom syntax styling to match existing styling
 		// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
@@ -35,6 +34,7 @@ export const cmTheme = CodeMirror.theme({
 		// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
 		lineHeight: 'unset',
 		fontFamily: token('font.family.code'),
+		borderRadius: token('border.radius'),
 	},
 	'&.cm-focused .cm-cursor': {
 		borderLeftColor: token('color.text'),
@@ -43,6 +43,7 @@ export const cmTheme = CodeMirror.theme({
 		backgroundColor: token('color.background.neutral'),
 		border: 'none',
 		padding: token('space.100'),
+		color: token('color.text.subtlest'),
 	},
 	'.cm-lineNumbers .cm-gutterElement': {
 		paddingLeft: token('space.0'),

package/tsconfig.app.json

@@ -0,0 +1,53 @@
+{
+	"extends": "../../../tsconfig.base.json",
+	"include": ["./src/**/*.ts", "./src/**/*.tsx"],
+	"exclude": [
+		"**/docs/**/*",
+		"**/__tests__/**/*",
+		"**/vr-tests/**/*",
+		"**/__perf__/**/*",
+		"**/*.test.*",
+		"**/test.*",
+		"**/test-*",
+		"**/examples.ts",
+		"**/examples.tsx",
+		"**/examples/*.ts",
+		"**/examples/*.tsx",
+		"**/examples/**/*.ts",
+		"**/examples/**/*.tsx",
+		"**/storybook/**/*",
+		"**/constellation/**/*",
+		".storybook/*",
+		"./__fixtures__/**/*",
+		"./__generated__/**/*",
+		"./mocks/**/*",
+		"./__mocks__/**/*",
+		"**/mock.*",
+		"**/codemods/**/*.ts",
+		"**/codemods/**/*.tsx"
+	],
+	"compilerOptions": {
+		"composite": true,
+		"outDir": "../../../tsDist/@atlaskit__editor-plugin-code-block-advanced/app"
+	},
+	"references": [
+		{
+			"path": "../../design-system/code/tsconfig.app.json"
+		},
+		{
+			"path": "../editor-common/tsconfig.app.json"
+		},
+		{
+			"path": "../editor-plugin-code-block/tsconfig.app.json"
+		},
+		{
+			"path": "../editor-plugin-editor-disabled/tsconfig.app.json"
+		},
+		{
+			"path": "../editor-plugin-selection/tsconfig.app.json"
+		},
+		{
+			"path": "../../design-system/tokens/tsconfig.app.json"
+		}
+	]
+}

package/tsconfig.dev.json

@@ -0,0 +1,47 @@
+{
+	"extends": "../../../tsconfig.base.json",
+	"include": [
+		"**/docs/**/*",
+		"**/__tests__/**/*",
+		"**/vr-tests/**/*",
+		"**/__perf__/**/*",
+		"**/*.test.*",
+		"**/test.*",
+		"**/test-*",
+		"**/examples.ts",
+		"**/examples.tsx",
+		"**/examples/*.ts",
+		"**/examples/*.tsx",
+		"**/examples/**/*.ts",
+		"**/examples/**/*.tsx",
+		"**/storybook/**/*",
+		"**/constellation/**/*",
+		".storybook/*",
+		"./__fixtures__/**/*",
+		"./__generated__/**/*",
+		"./mocks/**/*",
+		"./__mocks__/**/*",
+		"**/mock.*",
+		"**/codemods/**/*.ts",
+		"**/codemods/**/*.tsx"
+	],
+	"exclude": ["./dist/**/*", "./build/**/*", "./node_modules/**/*"],
+	"compilerOptions": {
+		"composite": true,
+		"outDir": "../../../tsDist/@atlaskit__editor-plugin-code-block-advanced/dev"
+	},
+	"references": [
+		{
+			"path": "./tsconfig.app.json"
+		},
+		{
+			"path": "../../../build/website/docs/tsconfig.app.json"
+		},
+		{
+			"path": "../editor-common/tsconfig.app.json"
+		},
+		{
+			"path": "../../design-system/tokens/tsconfig.app.json"
+		}
+	]
+}