@atlaskit/editor-core 215.11.2 → 215.12.1

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,26 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 215.12.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [`9e7aa73151ed0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9e7aa73151ed0) -
8
+ [ux] EDITOR-2670 add selected state for sync block when selection is inside
9
+ - [`0b00861d972cd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0b00861d972cd) -
10
+ [EDITOR-2668] refactored deleted mediaSingle decorations to maintain alignment/wrap on diff view
11
+ - Updated dependencies
12
+
13
+ ## 215.12.0
14
+
15
+ ### Minor Changes
16
+
17
+ - [`71fde95667d6f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/71fde95667d6f) -
18
+ [EDITOR-2426] Fix more types for Editor Appearance so they work with Confluence
19
+
20
+ ### Patch Changes
21
+
22
+ - Updated dependencies
23
+
3
24
  ## 215.11.2
4
25
 
5
26
  ### Patch Changes
@@ -265,7 +265,10 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
265
265
  // for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
266
266
  (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !(0, _platformFeatureFlags.fg)('platform_editor_controls_no_toolbar_space') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !(0, _platformFeatureFlags.fg)('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace],
267
267
  style: {
268
- '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? "".concat(akEditorUltraWideLayoutWidth + getTotalPadding(), "px") : "".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
268
+ '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true)
269
+ // @ts-ignore
270
+ ? "".concat(akEditorUltraWideLayoutWidth + getTotalPadding(), "px") // @ts-ignore
271
+ : "".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
269
272
  }
270
273
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
271
274
  ,
@@ -43,12 +43,13 @@ var showDiffDeletedNodeStyles = exports.showDiffDeletedNodeStyles = (0, _react.c
43
43
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
44
44
  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #7D818A)"),
45
45
  borderColor: 'transparent'
46
- })), '.mediaSingleView-content-wrap.show-diff-deleted-node', {
46
+ })), '.show-diff-deleted-node .media-card-wrapper', {
47
47
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
48
48
  '& > div': {
49
49
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
50
50
  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #7D818A)"),
51
- borderRadius: "var(--ds-radius-small, 4px)"
51
+ borderRadius: "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)"),
52
+ opacity: 0.6
52
53
  }
53
54
  }));
54
55
 
@@ -12,39 +12,11 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
12
12
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
13
13
 
14
14
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
15
- var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
15
+ var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)((0, _defineProperty2.default)({
16
16
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
17
- '.ProseMirror': (0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockSharedCssClassName.prefix, ", .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix), (0, _defineProperty2.default)((0, _defineProperty2.default)({
17
+ '.ProseMirror': (0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockSharedCssClassName.prefix, ", .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
18
18
  position: 'relative',
19
19
  cursor: 'pointer',
20
- /* Danger when top level node */
21
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
22
- '&.danger': (0, _defineProperty2.default)({
23
- boxShadow: "0 0 0 1px ".concat("var(--ds-border-danger, #E2483D)"),
24
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
25
- backgroundColor: "var(--ds-background-danger, #FFECEB)".concat(" !important"),
26
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
27
- '.ak-editor-panel__icon': {
28
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
29
- color: "var(--ds-icon-danger, #C9372C)".concat(" !important")
30
- }
31
- }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
32
- backgroundColor: "var(--ds-background-danger, #FFECEB)",
33
- '&::before': {
34
- content: '""',
35
- position: 'absolute',
36
- top: '-1px',
37
- left: '-1px',
38
- right: '-1px',
39
- bottom: '-1px',
40
- border: "1px solid ".concat("var(--ds-border-danger, #E2483D)"),
41
- borderRadius: "var(--ds-radius-small, 3px)",
42
- mask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
43
- WebkitMask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
44
- pointerEvents: 'none',
45
- zIndex: -1
46
- }
47
- }),
48
20
  borderRadius: "var(--ds-radius-small, 3px)",
49
21
  marginTop: "var(--ds-space-150, 12px)",
50
22
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
@@ -55,49 +27,80 @@ var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)((0, _definePrope
55
27
  paddingTop: "var(--ds-space-050, 4px)",
56
28
  paddingBottom: "var(--ds-space-050, 4px)",
57
29
  color: 'inherit',
58
- '&:hover': {
30
+ /* Hover state */
31
+ '&:hover': (0, _defineProperty2.default)({
59
32
  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
60
33
  boxShadow: "0px 0px 0px 1px ".concat("var(--ds-border, #0B120E24)")
34
+ }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
35
+ opacity: 1,
36
+ visibility: 'visible'
37
+ })
38
+ }, "&.".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.selectionInside), (0, _defineProperty2.default)({
39
+ boxShadow: "0 0 0 1px ".concat("var(--ds-border-focused, #4688EC)")
40
+ }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
41
+ opacity: 1,
42
+ visibility: 'visible'
43
+ })), '&.ak-editor-selected-node', (0, _defineProperty2.default)({
44
+ boxShadow: "0 0 0 1px ".concat("var(--ds-border-focused, #4688EC)"),
45
+ backgroundColor: "var(--ds-background-selected, #E9F2FE)"
46
+ }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
47
+ opacity: 1,
48
+ visibility: 'visible',
49
+ backgroundColor: "var(--ds-background-selected, #E9F2FE)",
50
+ '&::before': {
51
+ content: '""',
52
+ position: 'absolute',
53
+ top: '-1px',
54
+ left: '-1px',
55
+ right: '-1px',
56
+ bottom: '-1px',
57
+ border: "1px solid ".concat("var(--ds-border-focused, #4688EC)"),
58
+ borderRadius: "var(--ds-radius-small, 3px)",
59
+ mask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
60
+ WebkitMask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
61
+ pointerEvents: 'none',
62
+ zIndex: -1
63
+ }
64
+ })), '&.danger', (0, _defineProperty2.default)({
65
+ boxShadow: "0 0 0 1px ".concat("var(--ds-border-danger, #E2483D)"),
66
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
67
+ backgroundColor: "var(--ds-background-danger, #FFECEB)".concat(" !important"),
68
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
69
+ '.ak-editor-panel__icon': {
70
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
71
+ color: "var(--ds-icon-danger, #C9372C)".concat(" !important")
72
+ }
73
+ }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
74
+ backgroundColor: "var(--ds-background-danger, #FFECEB)",
75
+ '&::before': {
76
+ content: '""',
77
+ position: 'absolute',
78
+ top: '-1px',
79
+ left: '-1px',
80
+ right: '-1px',
81
+ bottom: '-1px',
82
+ border: "1px solid ".concat("var(--ds-border-danger, #E2483D)"),
83
+ borderRadius: "var(--ds-radius-small, 3px)",
84
+ mask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
85
+ WebkitMask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
86
+ pointerEvents: 'none',
87
+ zIndex: -1
61
88
  }
62
- }, ".".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.content), {
89
+ })), "&has(.".concat(_syncBlock.SyncBlockSharedCssClassName.error, ")"), (0, _defineProperty2.default)({
90
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
91
+ '&:hover:not(.ak-editor-selected-node)': {
92
+ boxShadow: 'none'
93
+ }
94
+ }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
95
+ opacity: 0,
96
+ visibility: 'hidden'
97
+ })), ".".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.content), {
63
98
  padding: '0 32px',
64
99
  cursor: 'text'
65
100
  }), ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer), {
66
101
  padding: '0 32px'
67
102
  }))
68
- }, ".".concat(_syncBlock.SyncBlockSharedCssClassName.prefix, ".ak-editor-selected-node:not(.danger), .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix, ".ak-editor-selected-node:not(.danger)"), (0, _defineProperty2.default)({
69
- boxShadow: "0 0 0 1px ".concat("var(--ds-border-focused, #4688EC)"),
70
- backgroundColor: "var(--ds-background-selected, #E9F2FE)"
71
103
  }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
72
- backgroundColor: "var(--ds-background-selected, #E9F2FE)",
73
- '&::before': {
74
- content: '""',
75
- position: 'absolute',
76
- top: '-1px',
77
- left: '-1px',
78
- right: '-1px',
79
- bottom: '-1px',
80
- border: "1px solid ".concat("var(--ds-border-focused, #4688EC)"),
81
- borderRadius: "var(--ds-radius-small, 3px)",
82
- mask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
83
- WebkitMask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
84
- pointerEvents: 'none',
85
- zIndex: -1
86
- }
87
- })), ".".concat(_syncBlock.SyncBlockSharedCssClassName.prefix, ".ak-editor-selected-node, .").concat(_syncBlock.SyncBlockSharedCssClassName.prefix, ":hover, .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix, ".ak-editor-selected-node, .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix, ":hover, .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix, ".danger, ").concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName, ":hover"), (0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
88
- opacity: 1,
89
- visibility: 'visible'
90
- })), ".".concat(_syncBlock.SyncBlockSharedCssClassName.prefix, ":has(.").concat(_syncBlock.SyncBlockSharedCssClassName.error, "), .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix, ":has(.").concat(_syncBlock.SyncBlockSharedCssClassName.error, ")"), {
91
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
92
- '&:hover:not(.ak-editor-selected-node)': {
93
- boxShadow: 'none'
94
- },
95
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
96
- '&.ak-editor-selected-node, &:hover': (0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
97
- opacity: 0,
98
- visibility: 'hidden'
99
- })
100
- }), ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
101
104
  color: "var(--ds-text-subtle, #505258)",
102
105
  borderRadius: "var(--ds-radius-small, 3px)",
103
106
  position: 'absolute',
@@ -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.11.1";
8
+ var version = exports.version = "215.12.0";
@@ -257,7 +257,11 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
257
257
  // for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
258
258
  expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && fg('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, fg('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !fg('platform_editor_controls_no_toolbar_space') && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !fg('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace],
259
259
  style: {
260
- '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? `${akEditorUltraWideLayoutWidth + getTotalPadding()}px` : `${theme.layoutMaxWidth + getTotalPadding()}px` : `${akEditorFullWidthLayoutWidth + getTotalPadding()}px`
260
+ '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true)
261
+ // @ts-ignore
262
+ ? `${akEditorUltraWideLayoutWidth + getTotalPadding()}px`
263
+ // @ts-ignore
264
+ : `${theme.layoutMaxWidth + getTotalPadding()}px` : `${akEditorFullWidthLayoutWidth + getTotalPadding()}px`
261
265
  }
262
266
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
263
267
  ,
@@ -50,12 +50,13 @@ export const showDiffDeletedNodeStyles = css({
50
50
  }
51
51
  },
52
52
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
53
- '.mediaSingleView-content-wrap.show-diff-deleted-node': {
53
+ '.show-diff-deleted-node .media-card-wrapper': {
54
54
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
55
55
  '& > div': {
56
56
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
57
57
  boxShadow: `0 0 0 1px ${"var(--ds-border-accent-gray, #7D818A)"}`,
58
- borderRadius: "var(--ds-radius-small, 4px)"
58
+ borderRadius: `calc(${"var(--ds-radius-xsmall, 2px)"} + 1px)`,
59
+ opacity: 0.6
59
60
  }
60
61
  }
61
62
  });
@@ -10,7 +10,63 @@ export const syncBlockStyles = css({
10
10
  [`.${SyncBlockSharedCssClassName.prefix}, .${BodiedSyncBlockSharedCssClassName.prefix}`]: {
11
11
  position: 'relative',
12
12
  cursor: 'pointer',
13
- /* Danger when top level node */
13
+ borderRadius: "var(--ds-radius-small, 3px)",
14
+ marginTop: "var(--ds-space-150, 12px)",
15
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
16
+ marginRight: `-${akEditorGutterPadding}px`,
17
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
18
+ marginLeft: `-${akEditorGutterPadding}px`,
19
+ marginBottom: 0,
20
+ paddingTop: "var(--ds-space-050, 4px)",
21
+ paddingBottom: "var(--ds-space-050, 4px)",
22
+ color: 'inherit',
23
+ /* Hover state */
24
+ '&:hover': {
25
+ // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
26
+ boxShadow: `0px 0px 0px 1px ${"var(--ds-border, #0B120E24)"}`,
27
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
28
+ [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
29
+ opacity: 1,
30
+ visibility: 'visible'
31
+ }
32
+ },
33
+ /* Selection state when cursor inside sync block */
34
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
35
+ [`&.${BodiedSyncBlockSharedCssClassName.selectionInside}`]: {
36
+ boxShadow: `0 0 0 1px ${"var(--ds-border-focused, #4688EC)"}`,
37
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
38
+ [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
39
+ opacity: 1,
40
+ visibility: 'visible'
41
+ }
42
+ },
43
+ /* Node selection state */
44
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
45
+ '&.ak-editor-selected-node': {
46
+ boxShadow: `0 0 0 1px ${"var(--ds-border-focused, #4688EC)"}`,
47
+ backgroundColor: "var(--ds-background-selected, #E9F2FE)",
48
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
49
+ [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
50
+ opacity: 1,
51
+ visibility: 'visible',
52
+ backgroundColor: "var(--ds-background-selected, #E9F2FE)",
53
+ '&::before': {
54
+ content: '""',
55
+ position: 'absolute',
56
+ top: '-1px',
57
+ left: '-1px',
58
+ right: '-1px',
59
+ bottom: '-1px',
60
+ border: `1px solid ${"var(--ds-border-focused, #4688EC)"}`,
61
+ borderRadius: "var(--ds-radius-small, 3px)",
62
+ mask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
63
+ WebkitMask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
64
+ pointerEvents: 'none',
65
+ zIndex: -1
66
+ }
67
+ }
68
+ },
69
+ /* Danger state */
14
70
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
15
71
  '&.danger': {
16
72
  boxShadow: `0 0 0 1px ${"var(--ds-border-danger, #E2483D)"}`,
@@ -40,19 +96,19 @@ export const syncBlockStyles = css({
40
96
  }
41
97
  }
42
98
  },
43
- borderRadius: "var(--ds-radius-small, 3px)",
44
- marginTop: "var(--ds-space-150, 12px)",
45
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
46
- marginRight: `-${akEditorGutterPadding}px`,
47
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
48
- marginLeft: `-${akEditorGutterPadding}px`,
49
- marginBottom: 0,
50
- paddingTop: "var(--ds-space-050, 4px)",
51
- paddingBottom: "var(--ds-space-050, 4px)",
52
- color: 'inherit',
53
- '&:hover': {
54
- // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
55
- boxShadow: `0px 0px 0px 1px ${"var(--ds-border, #0B120E24)"}`
99
+ /* Error state */
100
+ /* In error state sync block should not have hover styles or show the label */
101
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
102
+ [`&has(.${SyncBlockSharedCssClassName.error})`]: {
103
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
104
+ '&:hover:not(.ak-editor-selected-node)': {
105
+ boxShadow: 'none'
106
+ },
107
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
108
+ [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
109
+ opacity: 0,
110
+ visibility: 'hidden'
111
+ }
56
112
  },
57
113
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
58
114
  [`.${BodiedSyncBlockSharedCssClassName.content}`]: {
@@ -65,52 +121,6 @@ export const syncBlockStyles = css({
65
121
  }
66
122
  }
67
123
  },
68
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
69
- [`.${SyncBlockSharedCssClassName.prefix}.ak-editor-selected-node:not(.danger), .${BodiedSyncBlockSharedCssClassName.prefix}.ak-editor-selected-node:not(.danger)`]: {
70
- boxShadow: `0 0 0 1px ${"var(--ds-border-focused, #4688EC)"}`,
71
- backgroundColor: "var(--ds-background-selected, #E9F2FE)",
72
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
73
- [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
74
- backgroundColor: "var(--ds-background-selected, #E9F2FE)",
75
- '&::before': {
76
- content: '""',
77
- position: 'absolute',
78
- top: '-1px',
79
- left: '-1px',
80
- right: '-1px',
81
- bottom: '-1px',
82
- border: `1px solid ${"var(--ds-border-focused, #4688EC)"}`,
83
- borderRadius: "var(--ds-radius-small, 3px)",
84
- mask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
85
- WebkitMask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
86
- pointerEvents: 'none',
87
- zIndex: -1
88
- }
89
- }
90
- },
91
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
92
- [`.${SyncBlockSharedCssClassName.prefix}.ak-editor-selected-node, .${SyncBlockSharedCssClassName.prefix}:hover, .${BodiedSyncBlockSharedCssClassName.prefix}.ak-editor-selected-node, .${BodiedSyncBlockSharedCssClassName.prefix}:hover, .${BodiedSyncBlockSharedCssClassName.prefix}.danger, ${SyncBlockLabelSharedCssClassName.labelClassName}:hover`]: {
93
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
94
- [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
95
- opacity: 1,
96
- visibility: 'visible'
97
- }
98
- },
99
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
100
- [`.${SyncBlockSharedCssClassName.prefix}:has(.${SyncBlockSharedCssClassName.error}), .${BodiedSyncBlockSharedCssClassName.prefix}:has(.${SyncBlockSharedCssClassName.error})`]: {
101
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
102
- '&:hover:not(.ak-editor-selected-node)': {
103
- boxShadow: 'none'
104
- },
105
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
106
- '&.ak-editor-selected-node, &:hover': {
107
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
108
- [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
109
- opacity: 0,
110
- visibility: 'hidden'
111
- }
112
- }
113
- },
114
124
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
115
125
  [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
116
126
  color: "var(--ds-text-subtle, #505258)",
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "215.11.1";
2
+ export const version = "215.12.0";
@@ -255,7 +255,10 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
255
255
  // for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
256
256
  expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && fg('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, fg('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !fg('platform_editor_controls_no_toolbar_space') && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !fg('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace],
257
257
  style: {
258
- '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? "".concat(akEditorUltraWideLayoutWidth + getTotalPadding(), "px") : "".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
258
+ '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true)
259
+ // @ts-ignore
260
+ ? "".concat(akEditorUltraWideLayoutWidth + getTotalPadding(), "px") // @ts-ignore
261
+ : "".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
259
262
  }
260
263
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
261
264
  ,
@@ -35,12 +35,13 @@ export var showDiffDeletedNodeStyles = css(_defineProperty(_defineProperty({}, "
35
35
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
36
36
  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #7D818A)"),
37
37
  borderColor: 'transparent'
38
- })), '.mediaSingleView-content-wrap.show-diff-deleted-node', {
38
+ })), '.show-diff-deleted-node .media-card-wrapper', {
39
39
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
40
40
  '& > div': {
41
41
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
42
42
  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #7D818A)"),
43
- borderRadius: "var(--ds-radius-small, 4px)"
43
+ borderRadius: "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)"),
44
+ opacity: 0.6
44
45
  }
45
46
  }));
46
47
 
@@ -4,39 +4,11 @@ import { css } from '@emotion/react';
4
4
  import { BodiedSyncBlockSharedCssClassName, SyncBlockSharedCssClassName, SyncBlockLabelSharedCssClassName } from '@atlaskit/editor-common/sync-block';
5
5
  import { akEditorGutterPadding } from '@atlaskit/editor-shared-styles';
6
6
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
7
- export var syncBlockStyles = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
7
+ export var syncBlockStyles = css(_defineProperty({
8
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
9
- '.ProseMirror': _defineProperty({}, ".".concat(SyncBlockSharedCssClassName.prefix, ", .").concat(BodiedSyncBlockSharedCssClassName.prefix), _defineProperty(_defineProperty({
9
+ '.ProseMirror': _defineProperty({}, ".".concat(SyncBlockSharedCssClassName.prefix, ", .").concat(BodiedSyncBlockSharedCssClassName.prefix), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
10
10
  position: 'relative',
11
11
  cursor: 'pointer',
12
- /* Danger when top level node */
13
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
14
- '&.danger': _defineProperty({
15
- boxShadow: "0 0 0 1px ".concat("var(--ds-border-danger, #E2483D)"),
16
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
17
- backgroundColor: "var(--ds-background-danger, #FFECEB)".concat(" !important"),
18
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
19
- '.ak-editor-panel__icon': {
20
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
21
- color: "var(--ds-icon-danger, #C9372C)".concat(" !important")
22
- }
23
- }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
24
- backgroundColor: "var(--ds-background-danger, #FFECEB)",
25
- '&::before': {
26
- content: '""',
27
- position: 'absolute',
28
- top: '-1px',
29
- left: '-1px',
30
- right: '-1px',
31
- bottom: '-1px',
32
- border: "1px solid ".concat("var(--ds-border-danger, #E2483D)"),
33
- borderRadius: "var(--ds-radius-small, 3px)",
34
- mask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
35
- WebkitMask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
36
- pointerEvents: 'none',
37
- zIndex: -1
38
- }
39
- }),
40
12
  borderRadius: "var(--ds-radius-small, 3px)",
41
13
  marginTop: "var(--ds-space-150, 12px)",
42
14
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
@@ -47,49 +19,80 @@ export var syncBlockStyles = css(_defineProperty(_defineProperty(_defineProperty
47
19
  paddingTop: "var(--ds-space-050, 4px)",
48
20
  paddingBottom: "var(--ds-space-050, 4px)",
49
21
  color: 'inherit',
50
- '&:hover': {
22
+ /* Hover state */
23
+ '&:hover': _defineProperty({
51
24
  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
52
25
  boxShadow: "0px 0px 0px 1px ".concat("var(--ds-border, #0B120E24)")
26
+ }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
27
+ opacity: 1,
28
+ visibility: 'visible'
29
+ })
30
+ }, "&.".concat(BodiedSyncBlockSharedCssClassName.selectionInside), _defineProperty({
31
+ boxShadow: "0 0 0 1px ".concat("var(--ds-border-focused, #4688EC)")
32
+ }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
33
+ opacity: 1,
34
+ visibility: 'visible'
35
+ })), '&.ak-editor-selected-node', _defineProperty({
36
+ boxShadow: "0 0 0 1px ".concat("var(--ds-border-focused, #4688EC)"),
37
+ backgroundColor: "var(--ds-background-selected, #E9F2FE)"
38
+ }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
39
+ opacity: 1,
40
+ visibility: 'visible',
41
+ backgroundColor: "var(--ds-background-selected, #E9F2FE)",
42
+ '&::before': {
43
+ content: '""',
44
+ position: 'absolute',
45
+ top: '-1px',
46
+ left: '-1px',
47
+ right: '-1px',
48
+ bottom: '-1px',
49
+ border: "1px solid ".concat("var(--ds-border-focused, #4688EC)"),
50
+ borderRadius: "var(--ds-radius-small, 3px)",
51
+ mask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
52
+ WebkitMask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
53
+ pointerEvents: 'none',
54
+ zIndex: -1
55
+ }
56
+ })), '&.danger', _defineProperty({
57
+ boxShadow: "0 0 0 1px ".concat("var(--ds-border-danger, #E2483D)"),
58
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
59
+ backgroundColor: "var(--ds-background-danger, #FFECEB)".concat(" !important"),
60
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
61
+ '.ak-editor-panel__icon': {
62
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
63
+ color: "var(--ds-icon-danger, #C9372C)".concat(" !important")
64
+ }
65
+ }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
66
+ backgroundColor: "var(--ds-background-danger, #FFECEB)",
67
+ '&::before': {
68
+ content: '""',
69
+ position: 'absolute',
70
+ top: '-1px',
71
+ left: '-1px',
72
+ right: '-1px',
73
+ bottom: '-1px',
74
+ border: "1px solid ".concat("var(--ds-border-danger, #E2483D)"),
75
+ borderRadius: "var(--ds-radius-small, 3px)",
76
+ mask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
77
+ WebkitMask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
78
+ pointerEvents: 'none',
79
+ zIndex: -1
53
80
  }
54
- }, ".".concat(BodiedSyncBlockSharedCssClassName.content), {
81
+ })), "&has(.".concat(SyncBlockSharedCssClassName.error, ")"), _defineProperty({
82
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
83
+ '&:hover:not(.ak-editor-selected-node)': {
84
+ boxShadow: 'none'
85
+ }
86
+ }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
87
+ opacity: 0,
88
+ visibility: 'hidden'
89
+ })), ".".concat(BodiedSyncBlockSharedCssClassName.content), {
55
90
  padding: '0 32px',
56
91
  cursor: 'text'
57
92
  }), ".".concat(SyncBlockSharedCssClassName.renderer), {
58
93
  padding: '0 32px'
59
94
  }))
60
- }, ".".concat(SyncBlockSharedCssClassName.prefix, ".ak-editor-selected-node:not(.danger), .").concat(BodiedSyncBlockSharedCssClassName.prefix, ".ak-editor-selected-node:not(.danger)"), _defineProperty({
61
- boxShadow: "0 0 0 1px ".concat("var(--ds-border-focused, #4688EC)"),
62
- backgroundColor: "var(--ds-background-selected, #E9F2FE)"
63
95
  }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
64
- backgroundColor: "var(--ds-background-selected, #E9F2FE)",
65
- '&::before': {
66
- content: '""',
67
- position: 'absolute',
68
- top: '-1px',
69
- left: '-1px',
70
- right: '-1px',
71
- bottom: '-1px',
72
- border: "1px solid ".concat("var(--ds-border-focused, #4688EC)"),
73
- borderRadius: "var(--ds-radius-small, 3px)",
74
- mask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
75
- WebkitMask: 'linear-gradient(to bottom, black 55%, transparent 55%)',
76
- pointerEvents: 'none',
77
- zIndex: -1
78
- }
79
- })), ".".concat(SyncBlockSharedCssClassName.prefix, ".ak-editor-selected-node, .").concat(SyncBlockSharedCssClassName.prefix, ":hover, .").concat(BodiedSyncBlockSharedCssClassName.prefix, ".ak-editor-selected-node, .").concat(BodiedSyncBlockSharedCssClassName.prefix, ":hover, .").concat(BodiedSyncBlockSharedCssClassName.prefix, ".danger, ").concat(SyncBlockLabelSharedCssClassName.labelClassName, ":hover"), _defineProperty({}, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
80
- opacity: 1,
81
- visibility: 'visible'
82
- })), ".".concat(SyncBlockSharedCssClassName.prefix, ":has(.").concat(SyncBlockSharedCssClassName.error, "), .").concat(BodiedSyncBlockSharedCssClassName.prefix, ":has(.").concat(SyncBlockSharedCssClassName.error, ")"), {
83
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
84
- '&:hover:not(.ak-editor-selected-node)': {
85
- boxShadow: 'none'
86
- },
87
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
88
- '&.ak-editor-selected-node, &:hover': _defineProperty({}, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
89
- opacity: 0,
90
- visibility: 'hidden'
91
- })
92
- }), ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
93
96
  color: "var(--ds-text-subtle, #505258)",
94
97
  borderRadius: "var(--ds-radius-small, 3px)",
95
98
  position: 'absolute',
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "215.11.1";
2
+ export var version = "215.12.0";
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import type EditorActions from '../actions';
3
3
  import { type EditorNextProps } from '../types/editor-props';
4
4
  export type FullPageEditorProps = Pick<EditorNextProps, 'preset' | 'defaultValue' | 'disabled' | 'mentionProvider' | 'performanceTracking' | 'contextIdentifierProvider' | 'searchProvider' | 'activityProvider' | 'annotationProviders' | 'collabEditProvider' | 'collabEdit' | 'contentMode' | 'taskDecisionProvider' | 'extensionProviders' | 'shouldFocus' | 'quickInsert' | 'secondaryToolbarComponents' | 'featureFlags' | 'primaryToolbarComponents' | 'contextPanel' | 'contentComponents' | 'primaryToolbarIconBefore' | 'sanitizePrivateContent' | '__livePage'> & {
5
- appearance: 'full-page' | 'full-width';
5
+ appearance: 'full-page' | 'full-width' | 'max';
6
6
  onChange?: () => void;
7
7
  onEditorReady?: (editorActions: EditorActions) => void;
8
8
  };
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import type EditorActions from '../actions';
3
3
  import { type EditorNextProps } from '../types/editor-props';
4
4
  export type FullPageEditorProps = Pick<EditorNextProps, 'preset' | 'defaultValue' | 'disabled' | 'mentionProvider' | 'performanceTracking' | 'contextIdentifierProvider' | 'searchProvider' | 'activityProvider' | 'annotationProviders' | 'collabEditProvider' | 'collabEdit' | 'contentMode' | 'taskDecisionProvider' | 'extensionProviders' | 'shouldFocus' | 'quickInsert' | 'secondaryToolbarComponents' | 'featureFlags' | 'primaryToolbarComponents' | 'contextPanel' | 'contentComponents' | 'primaryToolbarIconBefore' | 'sanitizePrivateContent' | '__livePage'> & {
5
- appearance: 'full-page' | 'full-width';
5
+ appearance: 'full-page' | 'full-width' | 'max';
6
6
  onChange?: () => void;
7
7
  onEditorReady?: (editorActions: EditorActions) => void;
8
8
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "215.11.2",
3
+ "version": "215.12.1",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -58,13 +58,13 @@
58
58
  "@atlaskit/emoji": "^69.7.0",
59
59
  "@atlaskit/icon": "^29.0.0",
60
60
  "@atlaskit/link": "^3.2.0",
61
- "@atlaskit/media-card": "^79.6.0",
61
+ "@atlaskit/media-card": "^79.7.0",
62
62
  "@atlaskit/mention": "^24.4.0",
63
63
  "@atlaskit/platform-feature-flags": "^1.1.0",
64
64
  "@atlaskit/platform-feature-flags-react": "^0.4.0",
65
65
  "@atlaskit/react-ufo": "^4.14.0",
66
66
  "@atlaskit/task-decision": "^19.2.0",
67
- "@atlaskit/tmp-editor-statsig": "^13.35.0",
67
+ "@atlaskit/tmp-editor-statsig": "^13.36.0",
68
68
  "@atlaskit/tokens": "^8.0.0",
69
69
  "@atlaskit/tooltip": "^20.8.0",
70
70
  "@atlaskit/width-detector": "^5.0.0",
@@ -105,7 +105,7 @@
105
105
  "@atlaskit/media-test-helpers": "^39.0.0",
106
106
  "@atlaskit/modal-dialog": "^14.6.0",
107
107
  "@atlaskit/primitives": "^16.1.0",
108
- "@atlaskit/renderer": "^124.12.0",
108
+ "@atlaskit/renderer": "^124.13.0",
109
109
  "@atlaskit/section-message": "^8.9.0",
110
110
  "@atlaskit/smart-card": "^43.6.0",
111
111
  "@atlaskit/synchrony-test-helpers": "workspace:^",