@atlaskit/editor-plugin-code-block-advanced 6.2.6 → 6.2.8

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-code-block-advanced
 
+## 6.2.8
+
+### Patch Changes
+
+- Updated dependencies
+
+## 6.2.7
+
+### Patch Changes
+
+- [`3649625800804`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3649625800804) -
+  Fix the codeblock shift on initial load
+
 ## 6.2.6
 
 ### Patch Changes

package/dist/cjs/nodeviews/codeBlockNodeWithToDOMFixed.js

@@ -10,6 +10,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _styles = require("@atlaskit/editor-common/styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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; }
 var codeBlockClassNames = {
@@ -20,6 +21,9 @@ var codeBlockClassNames = {
   content: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
 };
 var MATCH_NEWLINES = new RegExp('\n', 'gu');
+var getFontSize = function getFontSize() {
+  return (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
+};
 
 // Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
 var _toDOM = function toDOM(node, formattedAriaLabel, config) {
@@ -53,7 +57,7 @@ var _toDOM = function toDOM(node, formattedAriaLabel, config) {
       /* top and bottom | left and right */
       padding: config.allowCodeFolding ? "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-250, 20px)", " ", "var(--ds-space-100, 8px)", " ", "var(--ds-space-075, 6px)") : "var(--ds-space-100, 8px)",
       flexShrink: 0,
-      fontSize: '0.875rem',
+      fontSize: getFontSize(),
       boxSizing: 'content-box'
     }),
     contenteditable: 'false'

package/dist/es2019/nodeviews/codeBlockNodeWithToDOMFixed.js

@@ -2,6 +2,7 @@ import { codeBlock, codeBlockWithLocalId } from '@atlaskit/adf-schema';
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { CodeBlockSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const codeBlockClassNames = {
   container: CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER,
   start: CodeBlockSharedCssClassName.CODEBLOCK_START,
@@ -10,6 +11,7 @@ const codeBlockClassNames = {
   content: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
 };
 const MATCH_NEWLINES = new RegExp('\n', 'gu');
+const getFontSize = () => expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
 
 // Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
 const toDOM = (node, formattedAriaLabel, config) => {
@@ -41,7 +43,7 @@ const toDOM = (node, formattedAriaLabel, config) => {
       /* top and bottom | left and right */
       padding: config.allowCodeFolding ? `${"var(--ds-space-100, 8px)"} ${"var(--ds-space-250, 20px)"} ${"var(--ds-space-100, 8px)"} ${"var(--ds-space-075, 6px)"}` : "var(--ds-space-100, 8px)",
       flexShrink: 0,
-      fontSize: '0.875rem',
+      fontSize: getFontSize(),
       boxSizing: 'content-box'
     }),
     contenteditable: 'false'

package/dist/esm/nodeviews/codeBlockNodeWithToDOMFixed.js

@@ -5,6 +5,7 @@ import { codeBlock, codeBlockWithLocalId } from '@atlaskit/adf-schema';
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { CodeBlockSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var codeBlockClassNames = {
   container: CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER,
   start: CodeBlockSharedCssClassName.CODEBLOCK_START,
@@ -13,6 +14,9 @@ var codeBlockClassNames = {
   content: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
 };
 var MATCH_NEWLINES = new RegExp('\n', 'gu');
+var getFontSize = function getFontSize() {
+  return expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
+};
 
 // Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
 var _toDOM = function toDOM(node, formattedAriaLabel, config) {
@@ -46,7 +50,7 @@ var _toDOM = function toDOM(node, formattedAriaLabel, config) {
       /* top and bottom | left and right */
       padding: config.allowCodeFolding ? "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-250, 20px)", " ", "var(--ds-space-100, 8px)", " ", "var(--ds-space-075, 6px)") : "var(--ds-space-100, 8px)",
       flexShrink: 0,
-      fontSize: '0.875rem',
+      fontSize: getFontSize(),
       boxSizing: 'content-box'
     }),
     contenteditable: 'false'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block-advanced",
-	"version": "6.2.6",
+	"version": "6.2.8",
 	"description": "CodeBlockAdvanced plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,8 +40,8 @@
 		"@atlaskit/icon": "^28.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^13.22.0",
-		"@atlaskit/tokens": "^7.0.0",
+		"@atlaskit/tmp-editor-statsig": "^13.32.0",
+		"@atlaskit/tokens": "^8.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@codemirror/autocomplete": "6.18.4",
 		"@codemirror/commands": "6.7.1",
@@ -57,7 +57,7 @@
 		"codemirror-lang-elixir": "4.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.19.0",
+		"@atlaskit/editor-common": "^110.24.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},

package/src/nodeviews/codeBlockNodeWithToDOMFixed.ts

@@ -3,6 +3,7 @@ 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 { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { token } from '@atlaskit/tokens';
 
 interface Config {
@@ -19,6 +20,12 @@ const codeBlockClassNames = {
 
 const MATCH_NEWLINES = new RegExp('\n', 'gu');
 
+const getFontSize = () =>
+	expValEquals('cc_editor_ai_content_mode', 'variant', 'test') &&
+	fg('platform_editor_content_mode_button_mvp')
+		? '0.875em'
+		: '0.875rem';
+
 // Based on: `packages/editor/editor-plugin-code-block/src/nodeviews/code-block.ts`
 const toDOM = (node: Node, formattedAriaLabel: string, config: Config): DOMOutputSpec => {
 	let totalLineCount = 1;
@@ -64,7 +71,7 @@ const toDOM = (node: Node, formattedAriaLabel: string, config: Config): DOMOutpu
 							? `${token('space.100')} ${token('space.250')} ${token('space.100')} ${token('space.075')}`
 							: token('space.100'),
 						flexShrink: 0,
-						fontSize: '0.875rem',
+						fontSize: getFontSize(),
 						boxSizing: 'content-box',
 					}),
 					contenteditable: 'false',

package/afm-post-office/tsconfig.json

@@ -1,65 +0,0 @@
-{
-	"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.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../editor-plugin-block-menu/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-find-replace/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-selection/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../editor-plugin-selection-marker/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../editor-toolbar/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../platform/feature-flags/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../prosemirror-history/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../tmp-editor-statsig/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tokens/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../editor-common/afm-post-office/tsconfig.json"
-		}
-	]
-}