@atlaskit/editor-core 215.12.1 → 215.13.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 +19 -0
- package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js +3 -4
- package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +8 -2
- package/dist/cjs/ui/EditorContentContainer/styles/emoji.js +98 -1
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js +3 -3
- package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +9 -3
- package/dist/es2019/ui/EditorContentContainer/styles/emoji.js +130 -1
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js +3 -4
- package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +9 -3
- package/dist/esm/ui/EditorContentContainer/styles/emoji.js +98 -1
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/ui/EditorContentContainer/styles/emoji.d.ts +2 -0
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/emoji.d.ts +2 -0
- package/package.json +5 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 215.13.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`4cab7924c4af0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4cab7924c4af0) -
|
|
8
|
+
[ux] Clean up editor_inline_comments_paste_insert_nodes
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
11
|
+
## 215.13.0
|
|
12
|
+
|
|
13
|
+
### Minor Changes
|
|
14
|
+
|
|
15
|
+
- [`a8137975c5ecb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a8137975c5ecb) -
|
|
16
|
+
[ux] [EDITOR-2459] css behind an experiment gate to scale emoji sizes with text styles
|
|
17
|
+
|
|
18
|
+
### Patch Changes
|
|
19
|
+
|
|
20
|
+
- Updated dependencies
|
|
21
|
+
|
|
3
22
|
## 215.12.1
|
|
4
23
|
|
|
5
24
|
### Patch Changes
|
|
@@ -265,10 +265,9 @@ 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)
|
|
269
|
-
// @ts-ignore
|
|
270
|
-
|
|
271
|
-
: "".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) ? // @ts-ignore
|
|
269
|
+
"".concat(akEditorUltraWideLayoutWidth + getTotalPadding(), "px") : // @ts-ignore
|
|
270
|
+
"".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
|
|
272
271
|
}
|
|
273
272
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
|
|
274
273
|
,
|
|
@@ -430,11 +430,17 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
|
|
|
430
430
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
431
431
|
_mentions.mentionsSelectionStyles,
|
|
432
432
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
433
|
+
(0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ?
|
|
434
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
435
|
+
_emoji.scaledEmojiStyles :
|
|
436
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
433
437
|
_emoji.emojiStyles,
|
|
434
438
|
// Dense emoji scaling based on base font size
|
|
435
|
-
(0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')
|
|
439
|
+
(0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? (0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ?
|
|
440
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
441
|
+
(0, _emoji.getScaledDenseEmojiStyles)(baseFontSize) :
|
|
436
442
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
437
|
-
(0, _emoji.getDenseEmojiStyles)(baseFontSize),
|
|
443
|
+
(0, _emoji.getDenseEmojiStyles)(baseFontSize) : undefined,
|
|
438
444
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
439
445
|
_panelStyles.panelViewStyles,
|
|
440
446
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -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.getDenseEmojiStyles = exports.emojiStyles = exports.emojiDangerStyles = void 0;
|
|
7
|
+
exports.scaledEmojiStyles = exports.getScaledDenseEmojiStyles = exports.getDenseEmojiStyles = exports.emojiStyles = exports.emojiDangerStyles = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _react = require("@emotion/react");
|
|
10
10
|
var _emoji = require("@atlaskit/editor-common/emoji");
|
|
@@ -38,6 +38,103 @@ _selectionStyles.boxShadowSelectionStyles,
|
|
|
38
38
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
39
39
|
_selectionStyles.hideNativeBrowserTextSelectionStyles])));
|
|
40
40
|
|
|
41
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
42
|
+
var scaledEmojiStyles = exports.scaledEmojiStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".ProseMirror .".concat(_emoji.EmojiSharedCssClassName.EMOJI_CONTAINER), {
|
|
43
|
+
display: 'inline-block'
|
|
44
|
+
}), ".ProseMirror :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
45
|
+
background: 'no-repeat transparent',
|
|
46
|
+
display: 'inline-block',
|
|
47
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
48
|
+
height: "".concat(_emoji.defaultEmojiHeight, "px"),
|
|
49
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
50
|
+
minHeight: "".concat(_emoji.defaultEmojiHeight, "px"),
|
|
51
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
52
|
+
minWidth: "".concat(_emoji.defaultEmojiHeight, "px"),
|
|
53
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
54
|
+
maxHeight: "".concat(_emoji.scaledEmojiHeightH1, "px"),
|
|
55
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
56
|
+
maxWidth: "".concat(_emoji.scaledEmojiHeightH1, "px"),
|
|
57
|
+
cursor: 'pointer',
|
|
58
|
+
verticalAlign: 'middle',
|
|
59
|
+
userSelect: 'all'
|
|
60
|
+
}), ".ProseMirror .".concat(_editorSharedStyles.akEditorSelectedNodeClassName), (0, _defineProperty2.default)({}, ".".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE), [emojiSelectionStyles,
|
|
61
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
62
|
+
_selectionStyles.blanketSelectionStyles,
|
|
63
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
64
|
+
_selectionStyles.boxShadowSelectionStyles,
|
|
65
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
66
|
+
_selectionStyles.hideNativeBrowserTextSelectionStyles])), ".ProseMirror h1 :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
67
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
68
|
+
height: "".concat(_emoji.scaledEmojiHeightH1, "px"),
|
|
69
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
70
|
+
width: "".concat(_emoji.scaledEmojiHeightH1, "px")
|
|
71
|
+
}), ".ProseMirror h2 :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
72
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
73
|
+
height: "".concat(_emoji.scaledEmojiHeightH2, "px"),
|
|
74
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
75
|
+
width: "".concat(_emoji.scaledEmojiHeightH2, "px")
|
|
76
|
+
}), ".ProseMirror h3 :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
77
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
78
|
+
height: "".concat(_emoji.scaledEmojiHeightH3, "px"),
|
|
79
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
80
|
+
width: "".concat(_emoji.scaledEmojiHeightH3, "px")
|
|
81
|
+
}), ".ProseMirror h4 :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
82
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
83
|
+
height: "".concat(_emoji.scaledEmojiHeightH4, "px"),
|
|
84
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
85
|
+
width: "".concat(_emoji.scaledEmojiHeightH4, "px")
|
|
86
|
+
}));
|
|
87
|
+
var getScaledDenseEmojiStyles = exports.getScaledDenseEmojiStyles = function getScaledDenseEmojiStyles(baseFontSize) {
|
|
88
|
+
if (!baseFontSize || baseFontSize === _editorSharedStyles.akEditorFullPageDefaultFontSize) {
|
|
89
|
+
return (0, _react.css)({});
|
|
90
|
+
}
|
|
91
|
+
return (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".ProseMirror :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
92
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
93
|
+
width: _emoji.defaultDenseEmojiHeight,
|
|
94
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
95
|
+
height: _emoji.defaultDenseEmojiHeight,
|
|
96
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
97
|
+
minHeight: _emoji.defaultDenseEmojiHeight,
|
|
98
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
99
|
+
minWidth: _emoji.defaultDenseEmojiHeight,
|
|
100
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
101
|
+
maxHeight: "".concat(_emoji.denseEmojiHeightH1, "px"),
|
|
102
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
103
|
+
maxWidth: "".concat(_emoji.denseEmojiHeightH1, "px"),
|
|
104
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
105
|
+
img: {
|
|
106
|
+
width: '100%',
|
|
107
|
+
height: '100%',
|
|
108
|
+
objectFit: 'contain'
|
|
109
|
+
}
|
|
110
|
+
}), '.ProseMirror .ak-editor-panel .ak-editor-panel__icon', {
|
|
111
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
|
|
112
|
+
height: "var(--ds-space-250, 20px)",
|
|
113
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
|
|
114
|
+
width: "var(--ds-space-250, 20px)"
|
|
115
|
+
}), ".ProseMirror h1 :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
116
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
117
|
+
height: "".concat(_emoji.denseEmojiHeightH1, "px"),
|
|
118
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
119
|
+
width: "".concat(_emoji.denseEmojiHeightH1, "px")
|
|
120
|
+
}), ".ProseMirror h2 :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
121
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
122
|
+
height: "".concat(_emoji.denseEmojiHeightH2, "px"),
|
|
123
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
124
|
+
width: "".concat(_emoji.denseEmojiHeightH2, "px")
|
|
125
|
+
}), ".ProseMirror h3 :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
126
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
127
|
+
height: "".concat(_emoji.denseEmojiHeightH3, "px"),
|
|
128
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
129
|
+
width: "".concat(_emoji.denseEmojiHeightH3, "px")
|
|
130
|
+
}), ".ProseMirror h4 :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
131
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
132
|
+
height: "".concat(_emoji.denseEmojiHeightH4, "px"),
|
|
133
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
134
|
+
width: "".concat(_emoji.denseEmojiHeightH4, "px")
|
|
135
|
+
}));
|
|
136
|
+
};
|
|
137
|
+
|
|
41
138
|
/**
|
|
42
139
|
* Gets dynamic emoji styles that scale emoji size based on the base font size.
|
|
43
140
|
* This allows emojis to scale proportionally when the base font size changes.
|
|
@@ -257,11 +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)
|
|
260
|
+
'--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ?
|
|
261
261
|
// @ts-ignore
|
|
262
|
-
|
|
262
|
+
`${akEditorUltraWideLayoutWidth + getTotalPadding()}px` :
|
|
263
263
|
// @ts-ignore
|
|
264
|
-
|
|
264
|
+
`${theme.layoutMaxWidth + getTotalPadding()}px` : `${akEditorFullWidthLayoutWidth + getTotalPadding()}px`
|
|
265
265
|
}
|
|
266
266
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
|
|
267
267
|
,
|
|
@@ -31,7 +31,7 @@ import { cursorStyles } from './styles/cursorStyles';
|
|
|
31
31
|
import { dangerDateStyles, dateStyles, dateVanillaStyles } from './styles/dateStyles';
|
|
32
32
|
import { editorUGCTokensDefault, editorUGCTokensRefreshed } from './styles/editorUGCTokenStyles';
|
|
33
33
|
import { embedCardStyles } from './styles/embedCardStyles';
|
|
34
|
-
import { emojiDangerStyles, emojiStyles, getDenseEmojiStyles } from './styles/emoji';
|
|
34
|
+
import { emojiDangerStyles, emojiStyles, scaledEmojiStyles, getDenseEmojiStyles, getScaledDenseEmojiStyles } from './styles/emoji';
|
|
35
35
|
import { expandStyles, getDenseExpandTitleStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes } from './styles/expandStyles';
|
|
36
36
|
import { getExtensionStyles } from './styles/extensionStyles';
|
|
37
37
|
import { findReplaceStyles, findReplaceStylesWithCodeblockColorContrastFix, findReplaceStylesNew, findReplaceStylesNewWithCodeblockColorContrastFix } from './styles/findReplaceStyles';
|
|
@@ -426,11 +426,17 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
426
426
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
427
427
|
mentionsSelectionStyles,
|
|
428
428
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
429
|
+
expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ?
|
|
430
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
431
|
+
scaledEmojiStyles :
|
|
432
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
429
433
|
emojiStyles,
|
|
430
434
|
// Dense emoji scaling based on base font size
|
|
431
|
-
expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')
|
|
435
|
+
expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ?
|
|
436
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
437
|
+
getScaledDenseEmojiStyles(baseFontSize) :
|
|
432
438
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
433
|
-
getDenseEmojiStyles(baseFontSize),
|
|
439
|
+
getDenseEmojiStyles(baseFontSize) : undefined,
|
|
434
440
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
435
441
|
panelViewStyles,
|
|
436
442
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
2
|
import { css } from '@emotion/react';
|
|
3
|
-
import { defaultEmojiHeight, EmojiSharedCssClassName } from '@atlaskit/editor-common/emoji';
|
|
3
|
+
import { defaultEmojiHeight, EmojiSharedCssClassName, defaultDenseEmojiHeight, scaledEmojiHeightH1, scaledEmojiHeightH2, scaledEmojiHeightH3, scaledEmojiHeightH4, denseEmojiHeightH1, denseEmojiHeightH2, denseEmojiHeightH3, denseEmojiHeightH4 } from '@atlaskit/editor-common/emoji';
|
|
4
4
|
import { akEditorFullPageDefaultFontSize, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
|
|
5
5
|
import { blanketSelectionStyles, boxShadowSelectionStyles, dangerBackgroundStyles, dangerBorderStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
|
|
6
6
|
const emojiSelectionStyles = css({
|
|
@@ -39,6 +39,135 @@ export const emojiStyles = css({
|
|
|
39
39
|
}
|
|
40
40
|
});
|
|
41
41
|
|
|
42
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
43
|
+
export const scaledEmojiStyles = css({
|
|
44
|
+
// 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
|
|
45
|
+
[`.ProseMirror .${EmojiSharedCssClassName.EMOJI_CONTAINER}`]: {
|
|
46
|
+
display: 'inline-block'
|
|
47
|
+
},
|
|
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
|
+
[`.ProseMirror :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
|
|
50
|
+
background: 'no-repeat transparent',
|
|
51
|
+
display: 'inline-block',
|
|
52
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
53
|
+
height: `${defaultEmojiHeight}px`,
|
|
54
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
55
|
+
minHeight: `${defaultEmojiHeight}px`,
|
|
56
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
57
|
+
minWidth: `${defaultEmojiHeight}px`,
|
|
58
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
59
|
+
maxHeight: `${scaledEmojiHeightH1}px`,
|
|
60
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
61
|
+
maxWidth: `${scaledEmojiHeightH1}px`,
|
|
62
|
+
cursor: 'pointer',
|
|
63
|
+
verticalAlign: 'middle',
|
|
64
|
+
userSelect: 'all'
|
|
65
|
+
},
|
|
66
|
+
// 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
|
|
67
|
+
[`.ProseMirror .${akEditorSelectedNodeClassName}`]: {
|
|
68
|
+
// 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
|
|
69
|
+
[`.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE}`]: [emojiSelectionStyles,
|
|
70
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
71
|
+
blanketSelectionStyles,
|
|
72
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
73
|
+
boxShadowSelectionStyles,
|
|
74
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
75
|
+
hideNativeBrowserTextSelectionStyles]
|
|
76
|
+
},
|
|
77
|
+
// 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
|
|
78
|
+
[`.ProseMirror h1 :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
|
|
79
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
80
|
+
height: `${scaledEmojiHeightH1}px`,
|
|
81
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
82
|
+
width: `${scaledEmojiHeightH1}px`
|
|
83
|
+
},
|
|
84
|
+
// 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
|
|
85
|
+
[`.ProseMirror h2 :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
|
|
86
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
87
|
+
height: `${scaledEmojiHeightH2}px`,
|
|
88
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
89
|
+
width: `${scaledEmojiHeightH2}px`
|
|
90
|
+
},
|
|
91
|
+
// 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
|
|
92
|
+
[`.ProseMirror h3 :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
|
|
93
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
94
|
+
height: `${scaledEmojiHeightH3}px`,
|
|
95
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
96
|
+
width: `${scaledEmojiHeightH3}px`
|
|
97
|
+
},
|
|
98
|
+
// 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
|
|
99
|
+
[`.ProseMirror h4 :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
|
|
100
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
101
|
+
height: `${scaledEmojiHeightH4}px`,
|
|
102
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
103
|
+
width: `${scaledEmojiHeightH4}px`
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
export const getScaledDenseEmojiStyles = baseFontSize => {
|
|
107
|
+
if (!baseFontSize || baseFontSize === akEditorFullPageDefaultFontSize) {
|
|
108
|
+
return css({});
|
|
109
|
+
}
|
|
110
|
+
return css({
|
|
111
|
+
// 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
|
|
112
|
+
[`.ProseMirror :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
|
|
113
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
114
|
+
width: defaultDenseEmojiHeight,
|
|
115
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
116
|
+
height: defaultDenseEmojiHeight,
|
|
117
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
118
|
+
minHeight: defaultDenseEmojiHeight,
|
|
119
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
120
|
+
minWidth: defaultDenseEmojiHeight,
|
|
121
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
122
|
+
maxHeight: `${denseEmojiHeightH1}px`,
|
|
123
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
124
|
+
maxWidth: `${denseEmojiHeightH1}px`,
|
|
125
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
126
|
+
img: {
|
|
127
|
+
width: '100%',
|
|
128
|
+
height: '100%',
|
|
129
|
+
objectFit: 'contain'
|
|
130
|
+
}
|
|
131
|
+
},
|
|
132
|
+
// Scale panel icon in dense mode
|
|
133
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
134
|
+
'.ProseMirror .ak-editor-panel .ak-editor-panel__icon': {
|
|
135
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
|
|
136
|
+
height: "var(--ds-space-250, 20px)",
|
|
137
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
|
|
138
|
+
width: "var(--ds-space-250, 20px)"
|
|
139
|
+
},
|
|
140
|
+
// 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
|
|
141
|
+
[`.ProseMirror h1 :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
|
|
142
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
143
|
+
height: `${denseEmojiHeightH1}px`,
|
|
144
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
145
|
+
width: `${denseEmojiHeightH1}px`
|
|
146
|
+
},
|
|
147
|
+
// 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
|
|
148
|
+
[`.ProseMirror h2 :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
|
|
149
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
150
|
+
height: `${denseEmojiHeightH2}px`,
|
|
151
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
152
|
+
width: `${denseEmojiHeightH2}px`
|
|
153
|
+
},
|
|
154
|
+
// 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
|
|
155
|
+
[`.ProseMirror h3 :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
|
|
156
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
157
|
+
height: `${denseEmojiHeightH3}px`,
|
|
158
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
159
|
+
width: `${denseEmojiHeightH3}px`
|
|
160
|
+
},
|
|
161
|
+
// 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
|
|
162
|
+
[`.ProseMirror h4 :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
|
|
163
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
164
|
+
height: `${denseEmojiHeightH4}px`,
|
|
165
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
166
|
+
width: `${denseEmojiHeightH4}px`
|
|
167
|
+
}
|
|
168
|
+
});
|
|
169
|
+
};
|
|
170
|
+
|
|
42
171
|
/**
|
|
43
172
|
* Gets dynamic emoji styles that scale emoji size based on the base font size.
|
|
44
173
|
* This allows emojis to scale proportionally when the base font size changes.
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "215.
|
|
2
|
+
export const version = "215.13.0";
|
|
@@ -255,10 +255,9 @@ 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)
|
|
259
|
-
// @ts-ignore
|
|
260
|
-
|
|
261
|
-
: "".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) ? // @ts-ignore
|
|
259
|
+
"".concat(akEditorUltraWideLayoutWidth + getTotalPadding(), "px") : // @ts-ignore
|
|
260
|
+
"".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
|
|
262
261
|
}
|
|
263
262
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
|
|
264
263
|
,
|
|
@@ -32,7 +32,7 @@ import { cursorStyles } from './styles/cursorStyles';
|
|
|
32
32
|
import { dangerDateStyles, dateStyles, dateVanillaStyles } from './styles/dateStyles';
|
|
33
33
|
import { editorUGCTokensDefault, editorUGCTokensRefreshed } from './styles/editorUGCTokenStyles';
|
|
34
34
|
import { embedCardStyles } from './styles/embedCardStyles';
|
|
35
|
-
import { emojiDangerStyles, emojiStyles, getDenseEmojiStyles } from './styles/emoji';
|
|
35
|
+
import { emojiDangerStyles, emojiStyles, scaledEmojiStyles, getDenseEmojiStyles, getScaledDenseEmojiStyles } from './styles/emoji';
|
|
36
36
|
import { expandStyles, getDenseExpandTitleStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes } from './styles/expandStyles';
|
|
37
37
|
import { getExtensionStyles } from './styles/extensionStyles';
|
|
38
38
|
import { findReplaceStyles, findReplaceStylesWithCodeblockColorContrastFix, findReplaceStylesNew, findReplaceStylesNewWithCodeblockColorContrastFix } from './styles/findReplaceStyles';
|
|
@@ -422,11 +422,17 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
422
422
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
423
423
|
mentionsSelectionStyles,
|
|
424
424
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
425
|
+
expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ?
|
|
426
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
427
|
+
scaledEmojiStyles :
|
|
428
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
425
429
|
emojiStyles,
|
|
426
430
|
// Dense emoji scaling based on base font size
|
|
427
|
-
expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')
|
|
431
|
+
expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ?
|
|
432
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
433
|
+
getScaledDenseEmojiStyles(baseFontSize) :
|
|
428
434
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
429
|
-
getDenseEmojiStyles(baseFontSize),
|
|
435
|
+
getDenseEmojiStyles(baseFontSize) : undefined,
|
|
430
436
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
431
437
|
panelViewStyles,
|
|
432
438
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
3
3
|
import { css } from '@emotion/react';
|
|
4
|
-
import { defaultEmojiHeight, EmojiSharedCssClassName } from '@atlaskit/editor-common/emoji';
|
|
4
|
+
import { defaultEmojiHeight, EmojiSharedCssClassName, defaultDenseEmojiHeight, scaledEmojiHeightH1, scaledEmojiHeightH2, scaledEmojiHeightH3, scaledEmojiHeightH4, denseEmojiHeightH1, denseEmojiHeightH2, denseEmojiHeightH3, denseEmojiHeightH4 } from '@atlaskit/editor-common/emoji';
|
|
5
5
|
import { akEditorFullPageDefaultFontSize, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
|
|
6
6
|
import { blanketSelectionStyles, boxShadowSelectionStyles, dangerBackgroundStyles, dangerBorderStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
|
|
7
7
|
var emojiSelectionStyles = css({
|
|
@@ -30,6 +30,103 @@ boxShadowSelectionStyles,
|
|
|
30
30
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
31
31
|
hideNativeBrowserTextSelectionStyles])));
|
|
32
32
|
|
|
33
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
34
|
+
export var scaledEmojiStyles = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".ProseMirror .".concat(EmojiSharedCssClassName.EMOJI_CONTAINER), {
|
|
35
|
+
display: 'inline-block'
|
|
36
|
+
}), ".ProseMirror :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
37
|
+
background: 'no-repeat transparent',
|
|
38
|
+
display: 'inline-block',
|
|
39
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
40
|
+
height: "".concat(defaultEmojiHeight, "px"),
|
|
41
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
42
|
+
minHeight: "".concat(defaultEmojiHeight, "px"),
|
|
43
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
44
|
+
minWidth: "".concat(defaultEmojiHeight, "px"),
|
|
45
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
46
|
+
maxHeight: "".concat(scaledEmojiHeightH1, "px"),
|
|
47
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
48
|
+
maxWidth: "".concat(scaledEmojiHeightH1, "px"),
|
|
49
|
+
cursor: 'pointer',
|
|
50
|
+
verticalAlign: 'middle',
|
|
51
|
+
userSelect: 'all'
|
|
52
|
+
}), ".ProseMirror .".concat(akEditorSelectedNodeClassName), _defineProperty({}, ".".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE), [emojiSelectionStyles,
|
|
53
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
54
|
+
blanketSelectionStyles,
|
|
55
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
56
|
+
boxShadowSelectionStyles,
|
|
57
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
58
|
+
hideNativeBrowserTextSelectionStyles])), ".ProseMirror h1 :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
59
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
60
|
+
height: "".concat(scaledEmojiHeightH1, "px"),
|
|
61
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
62
|
+
width: "".concat(scaledEmojiHeightH1, "px")
|
|
63
|
+
}), ".ProseMirror h2 :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
64
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
65
|
+
height: "".concat(scaledEmojiHeightH2, "px"),
|
|
66
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
67
|
+
width: "".concat(scaledEmojiHeightH2, "px")
|
|
68
|
+
}), ".ProseMirror h3 :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
69
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
70
|
+
height: "".concat(scaledEmojiHeightH3, "px"),
|
|
71
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
72
|
+
width: "".concat(scaledEmojiHeightH3, "px")
|
|
73
|
+
}), ".ProseMirror h4 :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
74
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
75
|
+
height: "".concat(scaledEmojiHeightH4, "px"),
|
|
76
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
77
|
+
width: "".concat(scaledEmojiHeightH4, "px")
|
|
78
|
+
}));
|
|
79
|
+
export var getScaledDenseEmojiStyles = function getScaledDenseEmojiStyles(baseFontSize) {
|
|
80
|
+
if (!baseFontSize || baseFontSize === akEditorFullPageDefaultFontSize) {
|
|
81
|
+
return css({});
|
|
82
|
+
}
|
|
83
|
+
return css(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".ProseMirror :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
84
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
85
|
+
width: defaultDenseEmojiHeight,
|
|
86
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
87
|
+
height: defaultDenseEmojiHeight,
|
|
88
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
89
|
+
minHeight: defaultDenseEmojiHeight,
|
|
90
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
91
|
+
minWidth: defaultDenseEmojiHeight,
|
|
92
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
93
|
+
maxHeight: "".concat(denseEmojiHeightH1, "px"),
|
|
94
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
95
|
+
maxWidth: "".concat(denseEmojiHeightH1, "px"),
|
|
96
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
97
|
+
img: {
|
|
98
|
+
width: '100%',
|
|
99
|
+
height: '100%',
|
|
100
|
+
objectFit: 'contain'
|
|
101
|
+
}
|
|
102
|
+
}), '.ProseMirror .ak-editor-panel .ak-editor-panel__icon', {
|
|
103
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
|
|
104
|
+
height: "var(--ds-space-250, 20px)",
|
|
105
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
|
|
106
|
+
width: "var(--ds-space-250, 20px)"
|
|
107
|
+
}), ".ProseMirror h1 :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
108
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
109
|
+
height: "".concat(denseEmojiHeightH1, "px"),
|
|
110
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
111
|
+
width: "".concat(denseEmojiHeightH1, "px")
|
|
112
|
+
}), ".ProseMirror h2 :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
113
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
114
|
+
height: "".concat(denseEmojiHeightH2, "px"),
|
|
115
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
116
|
+
width: "".concat(denseEmojiHeightH2, "px")
|
|
117
|
+
}), ".ProseMirror h3 :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
118
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
119
|
+
height: "".concat(denseEmojiHeightH3, "px"),
|
|
120
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
121
|
+
width: "".concat(denseEmojiHeightH3, "px")
|
|
122
|
+
}), ".ProseMirror h4 :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
|
|
123
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
124
|
+
height: "".concat(denseEmojiHeightH4, "px"),
|
|
125
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
126
|
+
width: "".concat(denseEmojiHeightH4, "px")
|
|
127
|
+
}));
|
|
128
|
+
};
|
|
129
|
+
|
|
33
130
|
/**
|
|
34
131
|
* Gets dynamic emoji styles that scale emoji size based on the base font size.
|
|
35
132
|
* This allows emojis to scale proportionally when the base font size changes.
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export var name = "@atlaskit/editor-core";
|
|
2
|
-
export var version = "215.
|
|
2
|
+
export var version = "215.13.0";
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { type SerializedStyles } from '@emotion/react';
|
|
2
2
|
export declare const emojiStyles: SerializedStyles;
|
|
3
|
+
export declare const scaledEmojiStyles: SerializedStyles;
|
|
4
|
+
export declare const getScaledDenseEmojiStyles: (baseFontSize?: number) => SerializedStyles;
|
|
3
5
|
/**
|
|
4
6
|
* Gets dynamic emoji styles that scale emoji size based on the base font size.
|
|
5
7
|
* This allows emojis to scale proportionally when the base font size changes.
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { type SerializedStyles } from '@emotion/react';
|
|
2
2
|
export declare const emojiStyles: SerializedStyles;
|
|
3
|
+
export declare const scaledEmojiStyles: SerializedStyles;
|
|
4
|
+
export declare const getScaledDenseEmojiStyles: (baseFontSize?: number) => SerializedStyles;
|
|
3
5
|
/**
|
|
4
6
|
* Gets dynamic emoji styles that scale emoji size based on the base font size.
|
|
5
7
|
* This allows emojis to scale proportionally when the base font size changes.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-core",
|
|
3
|
-
"version": "215.
|
|
3
|
+
"version": "215.13.1",
|
|
4
4
|
"description": "A package contains Atlassian editor core functionality",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"@atlaskit/editor-shared-styles": "^3.9.0",
|
|
56
56
|
"@atlaskit/editor-toolbar": "^0.17.0",
|
|
57
57
|
"@atlaskit/editor-toolbar-model": "^0.2.0",
|
|
58
|
-
"@atlaskit/emoji": "^69.
|
|
58
|
+
"@atlaskit/emoji": "^69.8.0",
|
|
59
59
|
"@atlaskit/icon": "^29.0.0",
|
|
60
60
|
"@atlaskit/link": "^3.2.0",
|
|
61
61
|
"@atlaskit/media-card": "^79.7.0",
|
|
@@ -64,7 +64,7 @@
|
|
|
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.
|
|
67
|
+
"@atlaskit/tmp-editor-statsig": "^13.38.0",
|
|
68
68
|
"@atlaskit/tokens": "^8.0.0",
|
|
69
69
|
"@atlaskit/tooltip": "^20.8.0",
|
|
70
70
|
"@atlaskit/width-detector": "^5.0.0",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"uuid": "^3.1.0"
|
|
82
82
|
},
|
|
83
83
|
"peerDependencies": {
|
|
84
|
-
"@atlaskit/editor-common": "^110.
|
|
84
|
+
"@atlaskit/editor-common": "^110.29.0",
|
|
85
85
|
"@atlaskit/link-provider": "^4.0.0",
|
|
86
86
|
"@atlaskit/media-core": "^37.0.0",
|
|
87
87
|
"react": "^18.2.0",
|
|
@@ -103,7 +103,7 @@
|
|
|
103
103
|
"@atlaskit/media-core": "^37.0.0",
|
|
104
104
|
"@atlaskit/media-integration-test-helpers": "workspace:^",
|
|
105
105
|
"@atlaskit/media-test-helpers": "^39.0.0",
|
|
106
|
-
"@atlaskit/modal-dialog": "^14.
|
|
106
|
+
"@atlaskit/modal-dialog": "^14.7.0",
|
|
107
107
|
"@atlaskit/primitives": "^16.1.0",
|
|
108
108
|
"@atlaskit/renderer": "^124.13.0",
|
|
109
109
|
"@atlaskit/section-message": "^8.9.0",
|
|
@@ -165,10 +165,6 @@
|
|
|
165
165
|
"type": "boolean",
|
|
166
166
|
"referenceOnly": "true"
|
|
167
167
|
},
|
|
168
|
-
"editor_inline_comments_paste_insert_nodes": {
|
|
169
|
-
"type": "boolean",
|
|
170
|
-
"referenceOnly": "true"
|
|
171
|
-
},
|
|
172
168
|
"editor_a11y_announce_status_editor_open": {
|
|
173
169
|
"type": "boolean",
|
|
174
170
|
"referenceOnly": true
|