@atlaskit/editor-core 208.6.4 → 208.6.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/afm-volt/tsconfig.json +103 -0
  3. package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +2 -0
  4. package/dist/cjs/ui/EditorContentContainer/styles/codeBlockStyles.js +6 -2
  5. package/dist/cjs/version-wrapper.js +1 -1
  6. package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +3 -1
  7. package/dist/es2019/ui/EditorContentContainer/styles/codeBlockStyles.js +8 -1
  8. package/dist/es2019/version-wrapper.js +1 -1
  9. package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +3 -1
  10. package/dist/esm/ui/EditorContentContainer/styles/codeBlockStyles.js +5 -1
  11. package/dist/esm/version-wrapper.js +1 -1
  12. package/dist/types/ui/EditorContentContainer/styles/codeBlockStyles.d.ts +1 -0
  13. package/dist/types-ts4.5/ui/EditorContentContainer/styles/codeBlockStyles.d.ts +1 -0
  14. package/package.json +7 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 208.6.5
4
+
5
+ ### Patch Changes
6
+
7
+ - [#179427](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/179427)
8
+ [`8b13d4c49c4ac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8b13d4c49c4ac) -
9
+ [CONFCLOUD-71644] Fix: code block doesn't have the correct backaground color in page include macro
10
+
3
11
  ## 208.6.4
4
12
 
5
13
  ### Patch Changes
package/afm-volt/tsconfig.json ADDED
@@ -0,0 +1,103 @@
1
+ {
2
+ "extends": "../../../../tsconfig.entry-points.volt.json",
3
+ "compilerOptions": {
4
+ "declaration": true,
5
+ "target": "es5",
6
+ "outDir": "../../../../../volt/tsDist/@atlaskit__editor-core/app",
7
+ "rootDir": "../",
8
+ "composite": true
9
+ },
10
+ "include": [
11
+ "../src/**/*.ts",
12
+ "../src/**/*.tsx"
13
+ ],
14
+ "exclude": [
15
+ "../src/**/__tests__/*",
16
+ "../src/**/*.test.*",
17
+ "../src/**/test.*",
18
+ "../src/stories/*"
19
+ ],
20
+ "references": [
21
+ {
22
+ "path": "../../activity-provider/afm-volt/tsconfig.json"
23
+ },
24
+ {
25
+ "path": "../../../analytics/analytics-namespaced-context/afm-volt/tsconfig.json"
26
+ },
27
+ {
28
+ "path": "../../../analytics/analytics-next/afm-volt/tsconfig.json"
29
+ },
30
+ {
31
+ "path": "../../../design-system/button/afm-volt/tsconfig.json"
32
+ },
33
+ {
34
+ "path": "../../../design-system/css/afm-volt/tsconfig.json"
35
+ },
36
+ {
37
+ "path": "../../editor-common/afm-volt/tsconfig.json"
38
+ },
39
+ {
40
+ "path": "../../editor-json-transformer/afm-volt/tsconfig.json"
41
+ },
42
+ {
43
+ "path": "../../editor-performance-metrics/afm-volt/tsconfig.json"
44
+ },
45
+ {
46
+ "path": "../../editor-plugin-quick-insert/afm-volt/tsconfig.json"
47
+ },
48
+ {
49
+ "path": "../../editor-plugin-user-preferences/afm-volt/tsconfig.json"
50
+ },
51
+ {
52
+ "path": "../../editor-plugins/afm-volt/tsconfig.json"
53
+ },
54
+ {
55
+ "path": "../../editor-shared-styles/afm-volt/tsconfig.json"
56
+ },
57
+ {
58
+ "path": "../../../elements/emoji/afm-volt/tsconfig.json"
59
+ },
60
+ {
61
+ "path": "../../../design-system/icon/afm-volt/tsconfig.json"
62
+ },
63
+ {
64
+ "path": "../../../design-system/link/afm-volt/tsconfig.json"
65
+ },
66
+ {
67
+ "path": "../../../media/media-card/afm-volt/tsconfig.json"
68
+ },
69
+ {
70
+ "path": "../../../elements/mention/afm-volt/tsconfig.json"
71
+ },
72
+ {
73
+ "path": "../../../platform/feature-flags/afm-volt/tsconfig.json"
74
+ },
75
+ {
76
+ "path": "../../../platform/feature-flags-react/afm-volt/tsconfig.json"
77
+ },
78
+ {
79
+ "path": "../../../react-ufo/atlaskit/afm-volt/tsconfig.json"
80
+ },
81
+ {
82
+ "path": "../../../elements/task-decision/afm-volt/tsconfig.json"
83
+ },
84
+ {
85
+ "path": "../../tmp-editor-statsig/afm-volt/tsconfig.json"
86
+ },
87
+ {
88
+ "path": "../../../design-system/tokens/afm-volt/tsconfig.json"
89
+ },
90
+ {
91
+ "path": "../../../design-system/tooltip/afm-volt/tsconfig.json"
92
+ },
93
+ {
94
+ "path": "../../../design-system/width-detector/afm-volt/tsconfig.json"
95
+ },
96
+ {
97
+ "path": "../../../linking-platform/link-provider/afm-volt/tsconfig.json"
98
+ },
99
+ {
100
+ "path": "../../../media/media-core/afm-volt/tsconfig.json"
101
+ }
102
+ ]
103
+ }
package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -127,6 +127,8 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
127
127
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
128
128
  _codeBlockStyles.codeBlockStyles,
129
129
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
130
+ !(0, _platformFeatureFlags.fg)('platform_editor_fix_code_block_bg_color_in_macro_2') && _codeBlockStyles.codeBgColorStyles,
131
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
130
132
  !(0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && _editorUGCTokenStyles.editorUGCTokensDefault, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') &&
131
133
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
132
134
  _editorUGCTokenStyles.editorUGCTokensRefreshed,
package/dist/cjs/ui/EditorContentContainer/styles/codeBlockStyles.js CHANGED
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.firstCodeBlockWithNoMarginOld = exports.firstCodeBlockWithNoMargin = exports.codeBlockStyles = exports.CodeBlockSharedCssClassName = void 0;
7
+ exports.firstCodeBlockWithNoMarginOld = exports.firstCodeBlockWithNoMargin = exports.codeBlockStyles = exports.codeBgColorStyles = exports.CodeBlockSharedCssClassName = void 0;
8
8
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
9
  var _react = require("@emotion/react");
10
10
  var _overflowShadowStyles = require("./overflowShadowStyles");
@@ -56,7 +56,6 @@ var codeBlockStyles = exports.codeBlockStyles = (0, _react.css)({
56
56
  whiteSpace: 'pre'
57
57
  }
58
58
  }), ".".concat(CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
59
- '--ds--code--bg-color': 'transparent',
60
59
  position: 'relative',
61
60
  backgroundColor: "var(--ds-surface-raised, #FFFFFF)",
62
61
  borderRadius: "var(--ds-border-radius, 3px)",
@@ -185,6 +184,11 @@ var codeBlockStyles = exports.codeBlockStyles = (0, _react.css)({
185
184
  }))
186
185
  });
187
186
 
187
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
188
+ var codeBgColorStyles = exports.codeBgColorStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER), {
189
+ '--ds--code--bg-color': 'transparent'
190
+ }));
191
+
188
192
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
189
193
  var firstCodeBlockWithNoMargin = exports.firstCodeBlockWithNoMargin = (0, _react.css)({
190
194
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
package/dist/cjs/version-wrapper.js CHANGED
@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = exports.name = void 0;
7
7
  var name = exports.name = "@atlaskit/editor-core";
8
- var version = exports.version = "208.6.3";
8
+ var version = exports.version = "208.6.4";
package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -21,7 +21,7 @@ import { backgroundColorStyles } from './styles/backgroundColorStyles';
21
21
  import { baseStyles } from './styles/baseStyles';
22
22
  import { blockMarksStyles } from './styles/blockMarksStyles';
23
23
  import { blocktypeStyles, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
24
- import { codeBlockStyles, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
24
+ import { codeBlockStyles, codeBgColorStyles, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
25
25
  import { codeMarkStyles } from './styles/codeMarkStyles';
26
26
  import { commentEditorStyles } from './styles/commentEditorStyles';
27
27
  import { cursorStyles } from './styles/cursorStyles';
@@ -122,6 +122,8 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
122
122
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
123
123
  codeBlockStyles,
124
124
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
125
+ !fg('platform_editor_fix_code_block_bg_color_in_macro_2') && codeBgColorStyles,
126
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
125
127
  !fg('platform_editor_typography_ugc') && editorUGCTokensDefault, fg('platform_editor_typography_ugc') &&
126
128
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
127
129
  editorUGCTokensRefreshed,
package/dist/es2019/ui/EditorContentContainer/styles/codeBlockStyles.js CHANGED
@@ -53,7 +53,6 @@ export const codeBlockStyles = css({
53
53
  },
54
54
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
55
55
  [`.${CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER}`]: {
56
- '--ds--code--bg-color': 'transparent',
57
56
  position: 'relative',
58
57
  backgroundColor: "var(--ds-surface-raised, #FFFFFF)",
59
58
  borderRadius: "var(--ds-border-radius, 3px)",
@@ -235,6 +234,14 @@ export const codeBlockStyles = css({
235
234
  }
236
235
  });
237
236
 
237
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
238
+ export const codeBgColorStyles = css({
239
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
240
+ [`.${CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER}`]: {
241
+ '--ds--code--bg-color': 'transparent'
242
+ }
243
+ });
244
+
238
245
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
239
246
  export const firstCodeBlockWithNoMargin = css({
240
247
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "208.6.3";
2
+ export const version = "208.6.4";
package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -21,7 +21,7 @@ import { backgroundColorStyles } from './styles/backgroundColorStyles';
21
21
  import { baseStyles } from './styles/baseStyles';
22
22
  import { blockMarksStyles } from './styles/blockMarksStyles';
23
23
  import { blocktypeStyles, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
24
- import { codeBlockStyles, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
24
+ import { codeBlockStyles, codeBgColorStyles, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
25
25
  import { codeMarkStyles } from './styles/codeMarkStyles';
26
26
  import { commentEditorStyles } from './styles/commentEditorStyles';
27
27
  import { cursorStyles } from './styles/cursorStyles';
@@ -119,6 +119,8 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
119
119
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
120
120
  codeBlockStyles,
121
121
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
122
+ !fg('platform_editor_fix_code_block_bg_color_in_macro_2') && codeBgColorStyles,
123
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
122
124
  !fg('platform_editor_typography_ugc') && editorUGCTokensDefault, fg('platform_editor_typography_ugc') &&
123
125
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
124
126
  editorUGCTokensRefreshed,
package/dist/esm/ui/EditorContentContainer/styles/codeBlockStyles.js CHANGED
@@ -48,7 +48,6 @@ export var codeBlockStyles = css({
48
48
  whiteSpace: 'pre'
49
49
  }
50
50
  }), ".".concat(CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
51
- '--ds--code--bg-color': 'transparent',
52
51
  position: 'relative',
53
52
  backgroundColor: "var(--ds-surface-raised, #FFFFFF)",
54
53
  borderRadius: "var(--ds-border-radius, 3px)",
@@ -177,6 +176,11 @@ export var codeBlockStyles = css({
177
176
  }))
178
177
  });
179
178
 
179
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
180
+ export var codeBgColorStyles = css(_defineProperty({}, ".".concat(CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER), {
181
+ '--ds--code--bg-color': 'transparent'
182
+ }));
183
+
180
184
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
181
185
  export var firstCodeBlockWithNoMargin = css({
182
186
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
package/dist/esm/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "208.6.3";
2
+ export var version = "208.6.4";
package/dist/types/ui/EditorContentContainer/styles/codeBlockStyles.d.ts CHANGED
@@ -10,5 +10,6 @@ export declare const CodeBlockSharedCssClassName: {
10
10
  CODEBLOCK_CONTAINER_LINE_NUMBER_WIDGET: string;
11
11
  };
12
12
  export declare const codeBlockStyles: import("@emotion/react").SerializedStyles;
13
+ export declare const codeBgColorStyles: import("@emotion/react").SerializedStyles;
13
14
  export declare const firstCodeBlockWithNoMargin: import("@emotion/react").SerializedStyles;
14
15
  export declare const firstCodeBlockWithNoMarginOld: import("@emotion/react").SerializedStyles;
package/dist/types-ts4.5/ui/EditorContentContainer/styles/codeBlockStyles.d.ts CHANGED
@@ -10,5 +10,6 @@ export declare const CodeBlockSharedCssClassName: {
10
10
  CODEBLOCK_CONTAINER_LINE_NUMBER_WIDGET: string;
11
11
  };
12
12
  export declare const codeBlockStyles: import("@emotion/react").SerializedStyles;
13
+ export declare const codeBgColorStyles: import("@emotion/react").SerializedStyles;
13
14
  export declare const firstCodeBlockWithNoMargin: import("@emotion/react").SerializedStyles;
14
15
  export declare const firstCodeBlockWithNoMarginOld: import("@emotion/react").SerializedStyles;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "208.6.4",
3
+ "version": "208.6.5",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -35,8 +35,7 @@
35
35
  "desktop-firefox",
36
36
  "desktop-webkit"
37
37
  ]
38
- },
39
- "runReact18": true
38
+ }
40
39
  },
41
40
  "dependencies": {
42
41
  "@atlaskit/activity-provider": "^2.5.0",
@@ -97,7 +96,7 @@
97
96
  "@atlaskit/editor-plugin-list": "^4.2.0",
98
97
  "@atlaskit/editor-plugin-paste": "^3.3.0",
99
98
  "@atlaskit/link-provider": "^3.4.0",
100
- "@atlaskit/logo": "^19.4.0",
99
+ "@atlaskit/logo": "^19.5.0",
101
100
  "@atlaskit/media-core": "^37.0.0",
102
101
  "@atlaskit/media-integration-test-helpers": "workspace:^",
103
102
  "@atlaskit/media-test-helpers": "^37.0.0",
@@ -105,7 +104,7 @@
105
104
  "@atlaskit/primitives": "^14.10.0",
106
105
  "@atlaskit/renderer": "^119.3.0",
107
106
  "@atlaskit/section-message": "^8.2.0",
108
- "@atlaskit/smart-card": "^38.19.0",
107
+ "@atlaskit/smart-card": "^38.20.0",
109
108
  "@atlaskit/synchrony-test-helpers": "workspace:^",
110
109
  "@atlaskit/toggle": "^15.0.0",
111
110
  "@atlaskit/util-data-test": "^18.0.0",
@@ -580,6 +579,9 @@
580
579
  },
581
580
  "platform_vc_ignore_no_ls_mutation_marker": {
582
581
  "type": "boolean"
582
+ },
583
+ "platform_editor_fix_code_block_bg_color_in_macro_2": {
584
+ "type": "boolean"
583
585
  }
584
586
  },
585
587
  "stricter": {