@atlaskit/editor-core 215.1.2 → 215.1.3

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 (13) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +8 -0
  3. package/dist/cjs/ui/EditorContentContainer/styles/paragraphStyles.js +34 -1
  4. package/dist/cjs/version-wrapper.js +1 -1
  5. package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +9 -1
  6. package/dist/es2019/ui/EditorContentContainer/styles/paragraphStyles.js +33 -0
  7. package/dist/es2019/version-wrapper.js +1 -1
  8. package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +9 -1
  9. package/dist/esm/ui/EditorContentContainer/styles/paragraphStyles.js +33 -0
  10. package/dist/esm/version-wrapper.js +1 -1
  11. package/dist/types/ui/EditorContentContainer/styles/paragraphStyles.d.ts +2 -0
  12. package/dist/types-ts4.5/ui/EditorContentContainer/styles/paragraphStyles.d.ts +2 -0
  13. package/package.json +6 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 215.1.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [`83f9f7557b327`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/83f9f7557b327) -
8
+ [EDITOR-2007] Scale paragraph margins based on paragraph size
9
+ - Updated dependencies
10
+
3
11
  ## 215.1.2
4
12
 
5
13
  ### Patch Changes
package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -338,8 +338,16 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
338
338
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
339
339
  _dateStyles.dateVanillaStyles, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ?
340
340
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
341
+ (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ?
342
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
343
+ _paragraphStyles.paragraphStylesWithScaledMargin :
344
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
341
345
  _paragraphStyles.paragraphStylesUGCRefreshed :
342
346
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
347
+ (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ?
348
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
349
+ _paragraphStyles.paragraphStylesOldWithScaledMargin :
350
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
343
351
  _paragraphStyles.paragraphStylesOld,
344
352
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
345
353
  _link.linkStyles,
package/dist/cjs/ui/EditorContentContainer/styles/paragraphStyles.js CHANGED
@@ -3,11 +3,44 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.paragraphStylesUGCRefreshed = exports.paragraphStylesUGCModernized = exports.paragraphStylesOld = void 0;
6
+ exports.paragraphStylesWithScaledMargin = exports.paragraphStylesUGCRefreshed = exports.paragraphStylesUGCModernized = exports.paragraphStylesOldWithScaledMargin = exports.paragraphStylesOld = void 0;
7
7
  var _react = require("@emotion/react");
8
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
9
9
 
10
10
  var blockNodesVerticalMargin = '0.75rem';
11
+ var scaledBlockNodesVerticalMargin = '0.75em';
12
+
13
+ // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
14
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
15
+ var paragraphStylesWithScaledMargin = exports.paragraphStylesWithScaledMargin = (0, _react.css)({
16
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
17
+ '.ProseMirror p': {
18
+ // The `editor.font.body` token is used for the UGC typography theme.
19
+ // We don't use `editorUGCToken('editor.font.body')` here because we want to build this styles statically.
20
+ // See platform/packages/editor/editor-common/src/ugc-tokens/get-editor-ugc-token.tsx
21
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
22
+ font: 'normal 400 1em/1.714 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
23
+ marginTop: scaledBlockNodesVerticalMargin,
24
+ marginBottom: 0
25
+ }
26
+ });
27
+
28
+ // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
29
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
30
+ var paragraphStylesOldWithScaledMargin = exports.paragraphStylesOldWithScaledMargin = (0, _react.css)({
31
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
32
+ '.ProseMirror p': {
33
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
34
+ fontSize: '1em',
35
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
36
+ lineHeight: 1.714,
37
+ fontWeight: "var(--ds-font-weight-regular, 400)",
38
+ marginTop: scaledBlockNodesVerticalMargin,
39
+ marginBottom: 0,
40
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
41
+ letterSpacing: '-0.005em'
42
+ }
43
+ });
11
44
 
12
45
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
13
46
  var paragraphStylesUGCRefreshed = exports.paragraphStylesUGCRefreshed = (0, _react.css)({
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 = "215.1.1";
8
+ var version = exports.version = "215.1.2";
package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -48,7 +48,7 @@ import { listsStyles, listsStylesSafariFix } from './styles/list';
48
48
  import { mediaAlignmentStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
49
49
  import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles, mentionsStylesMixin_platform_editor_centre_mention_padding, mentionsSelectionStylesWithSearchMatch, mentionDangerStyles } from './styles/mentions';
50
50
  import { panelStyles, panelStylesMixin, nestedPanelBorderStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles, nestedPanelDangerStyles } from './styles/panelStyles';
51
- import { paragraphStylesOld, paragraphStylesUGCRefreshed } from './styles/paragraphStyles';
51
+ import { paragraphStylesOld, paragraphStylesOldWithScaledMargin, paragraphStylesUGCRefreshed, paragraphStylesWithScaledMargin } from './styles/paragraphStyles';
52
52
  import { placeholderOverflowStyles, placeholderStyles, placeholderTextStyles, placeholderWrapStyles } from './styles/placeholderStyles';
53
53
  import { pragmaticResizerStyles, pragmaticResizerStylesNew, pragmaticStylesLayoutFirstNodeResizeHandleFix, pragmaticResizerStylesForTooltip, pragmaticResizerStylesWithReducedEditorGutter, resizerStyles } from './styles/resizerStyles';
54
54
  import { dangerRuleStyles, ruleStyles } from './styles/rule';
@@ -334,8 +334,16 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
334
334
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
335
335
  dateVanillaStyles, fg('platform_editor_typography_ugc') ?
336
336
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
337
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ?
338
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
339
+ paragraphStylesWithScaledMargin :
340
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
337
341
  paragraphStylesUGCRefreshed :
338
342
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
343
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ?
344
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
345
+ paragraphStylesOldWithScaledMargin :
346
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
339
347
  paragraphStylesOld,
340
348
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
341
349
  linkStyles,
package/dist/es2019/ui/EditorContentContainer/styles/paragraphStyles.js CHANGED
@@ -1,6 +1,39 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
2
2
  import { css } from '@emotion/react';
3
3
  const blockNodesVerticalMargin = '0.75rem';
4
+ const scaledBlockNodesVerticalMargin = '0.75em';
5
+
6
+ // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
7
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
8
+ export const paragraphStylesWithScaledMargin = css({
9
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
10
+ '.ProseMirror p': {
11
+ // The `editor.font.body` token is used for the UGC typography theme.
12
+ // We don't use `editorUGCToken('editor.font.body')` here because we want to build this styles statically.
13
+ // See platform/packages/editor/editor-common/src/ugc-tokens/get-editor-ugc-token.tsx
14
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
15
+ font: 'normal 400 1em/1.714 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
16
+ marginTop: scaledBlockNodesVerticalMargin,
17
+ marginBottom: 0
18
+ }
19
+ });
20
+
21
+ // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
22
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
23
+ export const paragraphStylesOldWithScaledMargin = css({
24
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
25
+ '.ProseMirror p': {
26
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
27
+ fontSize: '1em',
28
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
29
+ lineHeight: 1.714,
30
+ fontWeight: "var(--ds-font-weight-regular, 400)",
31
+ marginTop: scaledBlockNodesVerticalMargin,
32
+ marginBottom: 0,
33
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
34
+ letterSpacing: '-0.005em'
35
+ }
36
+ });
4
37
 
5
38
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
6
39
  export const paragraphStylesUGCRefreshed = css({
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "215.1.1";
2
+ export const version = "215.1.2";
package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -49,7 +49,7 @@ import { listsStyles, listsStylesSafariFix } from './styles/list';
49
49
  import { mediaAlignmentStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
50
50
  import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles, mentionsStylesMixin_platform_editor_centre_mention_padding, mentionsSelectionStylesWithSearchMatch, mentionDangerStyles } from './styles/mentions';
51
51
  import { panelStyles, panelStylesMixin, nestedPanelBorderStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles, nestedPanelDangerStyles } from './styles/panelStyles';
52
- import { paragraphStylesOld, paragraphStylesUGCRefreshed } from './styles/paragraphStyles';
52
+ import { paragraphStylesOld, paragraphStylesOldWithScaledMargin, paragraphStylesUGCRefreshed, paragraphStylesWithScaledMargin } from './styles/paragraphStyles';
53
53
  import { placeholderOverflowStyles, placeholderStyles, placeholderTextStyles, placeholderWrapStyles } from './styles/placeholderStyles';
54
54
  import { pragmaticResizerStyles, pragmaticResizerStylesNew, pragmaticStylesLayoutFirstNodeResizeHandleFix, pragmaticResizerStylesForTooltip, pragmaticResizerStylesWithReducedEditorGutter, resizerStyles } from './styles/resizerStyles';
55
55
  import { dangerRuleStyles, ruleStyles } from './styles/rule';
@@ -330,8 +330,16 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
330
330
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
331
331
  dateVanillaStyles, fg('platform_editor_typography_ugc') ?
332
332
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
333
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ?
334
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
335
+ paragraphStylesWithScaledMargin :
336
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
333
337
  paragraphStylesUGCRefreshed :
334
338
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
339
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ?
340
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
341
+ paragraphStylesOldWithScaledMargin :
342
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
335
343
  paragraphStylesOld,
336
344
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
337
345
  linkStyles,
package/dist/esm/ui/EditorContentContainer/styles/paragraphStyles.js CHANGED
@@ -1,6 +1,39 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
2
2
  import { css } from '@emotion/react';
3
3
  var blockNodesVerticalMargin = '0.75rem';
4
+ var scaledBlockNodesVerticalMargin = '0.75em';
5
+
6
+ // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
7
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
8
+ export var paragraphStylesWithScaledMargin = css({
9
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
10
+ '.ProseMirror p': {
11
+ // The `editor.font.body` token is used for the UGC typography theme.
12
+ // We don't use `editorUGCToken('editor.font.body')` here because we want to build this styles statically.
13
+ // See platform/packages/editor/editor-common/src/ugc-tokens/get-editor-ugc-token.tsx
14
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
15
+ font: 'normal 400 1em/1.714 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
16
+ marginTop: scaledBlockNodesVerticalMargin,
17
+ marginBottom: 0
18
+ }
19
+ });
20
+
21
+ // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
22
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
23
+ export var paragraphStylesOldWithScaledMargin = css({
24
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
25
+ '.ProseMirror p': {
26
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
27
+ fontSize: '1em',
28
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
29
+ lineHeight: 1.714,
30
+ fontWeight: "var(--ds-font-weight-regular, 400)",
31
+ marginTop: scaledBlockNodesVerticalMargin,
32
+ marginBottom: 0,
33
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
34
+ letterSpacing: '-0.005em'
35
+ }
36
+ });
4
37
 
5
38
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
6
39
  export var paragraphStylesUGCRefreshed = css({
package/dist/esm/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "215.1.1";
2
+ export var version = "215.1.2";
package/dist/types/ui/EditorContentContainer/styles/paragraphStyles.d.ts CHANGED
@@ -1,4 +1,6 @@
1
1
  import { type SerializedStyles } from '@emotion/react';
2
+ export declare const paragraphStylesWithScaledMargin: SerializedStyles;
3
+ export declare const paragraphStylesOldWithScaledMargin: SerializedStyles;
2
4
  export declare const paragraphStylesUGCRefreshed: SerializedStyles;
3
5
  export declare const paragraphStylesUGCModernized: SerializedStyles;
4
6
  export declare const paragraphStylesOld: SerializedStyles;
package/dist/types-ts4.5/ui/EditorContentContainer/styles/paragraphStyles.d.ts CHANGED
@@ -1,4 +1,6 @@
1
1
  import { type SerializedStyles } from '@emotion/react';
2
+ export declare const paragraphStylesWithScaledMargin: SerializedStyles;
3
+ export declare const paragraphStylesOldWithScaledMargin: SerializedStyles;
2
4
  export declare const paragraphStylesUGCRefreshed: SerializedStyles;
3
5
  export declare const paragraphStylesUGCModernized: SerializedStyles;
4
6
  export declare const paragraphStylesOld: SerializedStyles;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "215.1.2",
3
+ "version": "215.1.3",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -45,7 +45,7 @@
45
45
  "@atlaskit/analytics-next": "^11.1.0",
46
46
  "@atlaskit/analytics-next-stable-react-context": "1.0.1",
47
47
  "@atlaskit/button": "^23.5.0",
48
- "@atlaskit/css": "^0.14.0",
48
+ "@atlaskit/css": "^0.15.0",
49
49
  "@atlaskit/editor-json-transformer": "^8.30.0",
50
50
  "@atlaskit/editor-performance-metrics": "^2.1.0",
51
51
  "@atlaskit/editor-plugin-quick-insert": "^6.0.0",
@@ -55,7 +55,7 @@
55
55
  "@atlaskit/editor-shared-styles": "^3.7.0",
56
56
  "@atlaskit/editor-toolbar": "^0.15.0",
57
57
  "@atlaskit/editor-toolbar-model": "^0.2.0",
58
- "@atlaskit/emoji": "^69.5.0",
58
+ "@atlaskit/emoji": "^69.6.0",
59
59
  "@atlaskit/icon": "^28.5.0",
60
60
  "@atlaskit/link": "^3.2.0",
61
61
  "@atlaskit/media-card": "^79.5.0",
@@ -65,7 +65,7 @@
65
65
  "@atlaskit/react-ufo": "^4.11.0",
66
66
  "@atlaskit/task-decision": "^19.2.0",
67
67
  "@atlaskit/tmp-editor-statsig": "^13.10.0",
68
- "@atlaskit/tokens": "^6.4.0",
68
+ "@atlaskit/tokens": "^6.5.0",
69
69
  "@atlaskit/tooltip": "^20.5.0",
70
70
  "@atlaskit/width-detector": "^5.0.0",
71
71
  "@babel/runtime": "^7.0.0",
@@ -81,7 +81,7 @@
81
81
  "uuid": "^3.1.0"
82
82
  },
83
83
  "peerDependencies": {
84
- "@atlaskit/editor-common": "^110.11.0",
84
+ "@atlaskit/editor-common": "^110.12.0",
85
85
  "@atlaskit/link-provider": "^4.0.0",
86
86
  "@atlaskit/media-core": "^37.0.0",
87
87
  "react": "^18.2.0",
@@ -104,7 +104,7 @@
104
104
  "@atlaskit/media-integration-test-helpers": "workspace:^",
105
105
  "@atlaskit/media-test-helpers": "^39.0.0",
106
106
  "@atlaskit/modal-dialog": "^14.5.0",
107
- "@atlaskit/primitives": "^14.15.0",
107
+ "@atlaskit/primitives": "^15.0.0",
108
108
  "@atlaskit/renderer": "^124.4.0",
109
109
  "@atlaskit/section-message": "^8.7.0",
110
110
  "@atlaskit/smart-card": "^43.1.0",