@atlaskit/editor-core 215.23.5 → 215.23.7

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,23 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 215.23.7
4
+
5
+ ### Patch Changes
6
+
7
+ - [`53aef9589ca55`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/53aef9589ca55) -
8
+ [EDITOR-3786] Make sure that for any check of `cc_editor_ai_content_mode` &&
9
+ `platform_editor_content_mode_button_mvp` in the code we are also checking
10
+ `confluence_compact_text_format`
11
+ - Updated dependencies
12
+
13
+ ## 215.23.6
14
+
15
+ ### Patch Changes
16
+
17
+ - [`9f03725ffb7b8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9f03725ffb7b8) -
18
+ Removing feature flag with changing internal use of custom icons.
19
+ - Updated dependencies
20
+
3
21
  ## 215.23.5
4
22
 
5
23
  ### Patch Changes
@@ -11,7 +11,7 @@ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
11
11
  * @returns default font size if valid
12
12
  */
13
13
  function getBaseFontSize(appearance, contentMode) {
14
- if ((0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test')) {
14
+ if ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) || (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test')) {
15
15
  if (contentMode === 'compact') {
16
16
  return _editorSharedStyles.akEditorFullPageDenseFontSize;
17
17
  }
@@ -186,7 +186,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
186
186
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
187
187
  _placeholderStyles.placeholderWrapStyles,
188
188
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
189
- _codeBlockStyles.codeBlockStyles, (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') &&
189
+ _codeBlockStyles.codeBlockStyles, contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
190
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
191
+ (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) &&
190
192
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
191
193
  _codeBlockStyles.codeBlockStylesWithEmUnits,
192
194
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -218,7 +220,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
218
220
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
219
221
  (0, _platformFeatureFlags.fg)('platform_editor_ai_generic_prep_for_aifc') && _list.diffListStyles,
220
222
  // Condense vertical spacing between list items when content mode dense is active
221
- (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') &&
223
+ contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
224
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
225
+ (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) &&
222
226
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
223
227
  (0, _list.getDenseListStyles)(baseFontSize), (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'listLayoutShiftFix', true) && isFullPage &&
224
228
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -230,7 +234,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
230
234
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
231
235
  (0, _platformFeatureFlags.fg)('platform_editor_ai_generic_prep_for_aifc_2') && _smartCardStyles.showDiffDeletedNodeStyles,
232
236
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
233
- _mediaStyles.mediaStyles, (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') &&
237
+ _mediaStyles.mediaStyles, contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
238
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
239
+ (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) &&
234
240
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
235
241
  _mediaStyles.mediaCaptionStyles,
236
242
  // merge firstWrappedMediaStyles with mediaStyles when clean up platform_editor_fix_media_in_renderer
@@ -254,7 +260,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
254
260
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
255
261
  _tasksAndDecisionsStyles.tasksAndDecisionsStyles,
256
262
  // condense vertical spacing between tasks/decisions items when content mode dense is active
257
- (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') &&
263
+ contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
264
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
265
+ (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) &&
258
266
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
259
267
  (0, _tasksAndDecisionsStyles.getDenseTasksAndDecisionsStyles)(baseFontSize),
260
268
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -268,7 +276,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
268
276
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
269
277
  (0, _platformFeatureFlags.fg)('platform_editor_ai_generic_prep_for_aifc') && _extensionStyles.extensionDiffStyles,
270
278
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
271
- _expandStyles.expandStyles, (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') &&
279
+ _expandStyles.expandStyles, contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
280
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
281
+ (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) &&
272
282
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
273
283
  (0, _expandStyles.getDenseExpandTitleStyles)(baseFontSize), (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ?
274
284
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -370,13 +380,17 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
370
380
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
371
381
  _dateStyles.dateVanillaStyles, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ?
372
382
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
373
- (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ?
383
+ contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
384
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
385
+ (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) ?
374
386
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
375
387
  _paragraphStyles.paragraphStylesWithScaledMargin :
376
388
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
377
389
  _paragraphStyles.paragraphStylesUGCRefreshed :
378
390
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
379
- (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ?
391
+ contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
392
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
393
+ (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) ?
380
394
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
381
395
  _paragraphStyles.paragraphStylesOldWithScaledMargin :
382
396
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -440,7 +454,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
440
454
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
441
455
  _emoji.emojiStyles,
442
456
  // Dense emoji scaling based on base font size
443
- (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) ?
457
+ contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
458
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
459
+ (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) ?
444
460
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
445
461
  (0, _emoji.getScaledDenseEmojiStyles)(baseFontSize) :
446
462
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -372,8 +372,8 @@ var getExtensionStyles = exports.getExtensionStyles = function getExtensionStyle
372
372
 
373
373
  // Dense content mode extensions styling fix - addresses EDITOR-1992
374
374
  // When cleaning up the experiment, move this logic into the baseExtensionStyles above
375
- var fontSize = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') ? (0, _editorSharedStyles.relativeFontSizeToBase16)(_editorSharedStyles.akEditorFullPageDenseFontSize) : undefined;
376
- var denseExtensionStyles = contentMode === 'compact' && (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? (0, _react.css)({
375
+ var fontSize = (0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) || (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') ? (0, _editorSharedStyles.relativeFontSizeToBase16)(_editorSharedStyles.akEditorFullPageDenseFontSize) : undefined;
376
+ var denseExtensionStyles = contentMode === 'compact' && (0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) || (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? (0, _react.css)({
377
377
  // Table of Contents Macro
378
378
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
379
379
  '.extension-container [data-macro-name="toc"] * :not(.status-lozenge-span *)': {
@@ -386,7 +386,7 @@ var getExtensionStyles = exports.getExtensionStyles = function getExtensionStyle
386
386
  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
387
387
  fontSize: 'var(--ak-editor-base-font-size)'
388
388
  }
389
- }) : contentMode === 'compact' && (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') ? (0, _react.css)({
389
+ }) : contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) || (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test')) ? (0, _react.css)({
390
390
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
391
391
  '.extension-container a span': {
392
392
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
@@ -280,7 +280,8 @@ var mediaAlignmentStyles = exports.mediaAlignmentStyles = (0, _react.css)({
280
280
  }
281
281
  });
282
282
 
283
- // When cleaning up platform_editor_content_mode_button_mvp, move this style into mediaStyles variable ⬆️
283
+ // When both platform_editor_content_mode_button_mvp & confluence_compact_text_format are cleaned up,
284
+ // move this style into mediaStyles variable ⬆️
284
285
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
285
286
  var mediaCaptionStyles = exports.mediaCaptionStyles = (0, _react.css)({
286
287
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -10,7 +10,8 @@ var _react = require("@emotion/react");
10
10
  var blockNodesVerticalMargin = '0.75rem';
11
11
  var scaledBlockNodesVerticalMargin = '0.75em';
12
12
 
13
- // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
13
+ // When both platform_editor_content_mode_button_mvp & confluence_compact_text_format are cleaned up,
14
+ // simplify the name/ use the other paragraph style name
14
15
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
15
16
  var paragraphStylesWithScaledMargin = exports.paragraphStylesWithScaledMargin = (0, _react.css)({
16
17
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -25,7 +26,8 @@ var paragraphStylesWithScaledMargin = exports.paragraphStylesWithScaledMargin =
25
26
  }
26
27
  });
27
28
 
28
- // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
29
+ // When both platform_editor_content_mode_button_mvp & confluence_compact_text_format are cleaned up,
30
+ // simplify the name/ use the other paragraph style name
29
31
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
30
32
  var paragraphStylesOldWithScaledMargin = exports.paragraphStylesOldWithScaledMargin = (0, _react.css)({
31
33
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -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.23.5";
8
+ var version = exports.version = "215.23.6";
@@ -6,7 +6,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
6
6
  * @returns default font size if valid
7
7
  */
8
8
  export function getBaseFontSize(appearance, contentMode) {
9
- if (expValEquals('cc_editor_ai_content_mode', 'variant', 'test')) {
9
+ if (expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test')) {
10
10
  if (contentMode === 'compact') {
11
11
  return akEditorFullPageDenseFontSize;
12
12
  }
@@ -182,7 +182,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
182
182
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
183
183
  placeholderWrapStyles,
184
184
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
185
- codeBlockStyles, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
185
+ codeBlockStyles, contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
186
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
187
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) &&
186
188
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
187
189
  codeBlockStylesWithEmUnits,
188
190
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -214,7 +216,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
214
216
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
215
217
  fg('platform_editor_ai_generic_prep_for_aifc') && diffListStyles,
216
218
  // Condense vertical spacing between list items when content mode dense is active
217
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
219
+ contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
220
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
221
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) &&
218
222
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
219
223
  getDenseListStyles(baseFontSize), expValEquals('cc_editor_ttvc_release_bundle_one', 'listLayoutShiftFix', true) && isFullPage &&
220
224
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -226,7 +230,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
226
230
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
227
231
  fg('platform_editor_ai_generic_prep_for_aifc_2') && showDiffDeletedNodeStyles,
228
232
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
229
- mediaStyles, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
233
+ mediaStyles, contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
234
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
235
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) &&
230
236
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
231
237
  mediaCaptionStyles,
232
238
  // merge firstWrappedMediaStyles with mediaStyles when clean up platform_editor_fix_media_in_renderer
@@ -250,7 +256,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
250
256
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
251
257
  tasksAndDecisionsStyles,
252
258
  // condense vertical spacing between tasks/decisions items when content mode dense is active
253
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
259
+ contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
260
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
261
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) &&
254
262
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
255
263
  getDenseTasksAndDecisionsStyles(baseFontSize),
256
264
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -264,7 +272,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
264
272
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
265
273
  fg('platform_editor_ai_generic_prep_for_aifc') && extensionDiffStyles,
266
274
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
267
- expandStyles, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
275
+ expandStyles, contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
276
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
277
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) &&
268
278
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
269
279
  getDenseExpandTitleStyles(baseFontSize), fg('platform_editor_nested_dnd_styles_changes') ?
270
280
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -366,13 +376,17 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
366
376
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
367
377
  dateVanillaStyles, fg('platform_editor_typography_ugc') ?
368
378
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
369
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ?
379
+ contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
380
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
381
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ?
370
382
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
371
383
  paragraphStylesWithScaledMargin :
372
384
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
373
385
  paragraphStylesUGCRefreshed :
374
386
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
375
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ?
387
+ contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
388
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
389
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ?
376
390
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
377
391
  paragraphStylesOldWithScaledMargin :
378
392
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -436,7 +450,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
436
450
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
437
451
  emojiStyles,
438
452
  // Dense emoji scaling based on base font size
439
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ?
453
+ contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
454
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
455
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ? expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ?
440
456
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
441
457
  getScaledDenseEmojiStyles(baseFontSize) :
442
458
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -364,8 +364,8 @@ export const getExtensionStyles = contentMode => {
364
364
 
365
365
  // Dense content mode extensions styling fix - addresses EDITOR-1992
366
366
  // When cleaning up the experiment, move this logic into the baseExtensionStyles above
367
- const fontSize = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(akEditorFullPageDenseFontSize) : undefined;
368
- const denseExtensionStyles = contentMode === 'compact' && expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
367
+ const fontSize = expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(akEditorFullPageDenseFontSize) : undefined;
368
+ const denseExtensionStyles = contentMode === 'compact' && expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
369
369
  // Table of Contents Macro
370
370
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
371
371
  '.extension-container [data-macro-name="toc"] * :not(.status-lozenge-span *)': {
@@ -378,7 +378,7 @@ export const getExtensionStyles = contentMode => {
378
378
  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
379
379
  fontSize: 'var(--ak-editor-base-font-size)'
380
380
  }
381
- }) : contentMode === 'compact' && expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? css({
381
+ }) : contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test')) ? css({
382
382
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
383
383
  '.extension-container a span': {
384
384
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
@@ -417,7 +417,8 @@ export const mediaAlignmentStyles = css({
417
417
  }
418
418
  });
419
419
 
420
- // When cleaning up platform_editor_content_mode_button_mvp, move this style into mediaStyles variable ⬆️
420
+ // When both platform_editor_content_mode_button_mvp & confluence_compact_text_format are cleaned up,
421
+ // move this style into mediaStyles variable ⬆️
421
422
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
422
423
  export const mediaCaptionStyles = css({
423
424
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -3,7 +3,8 @@ import { css } from '@emotion/react';
3
3
  const blockNodesVerticalMargin = '0.75rem';
4
4
  const scaledBlockNodesVerticalMargin = '0.75em';
5
5
 
6
- // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
6
+ // When both platform_editor_content_mode_button_mvp & confluence_compact_text_format are cleaned up,
7
+ // simplify the name/ use the other paragraph style name
7
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
8
9
  export const paragraphStylesWithScaledMargin = css({
9
10
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -18,7 +19,8 @@ export const paragraphStylesWithScaledMargin = css({
18
19
  }
19
20
  });
20
21
 
21
- // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
22
+ // When both platform_editor_content_mode_button_mvp & confluence_compact_text_format are cleaned up,
23
+ // simplify the name/ use the other paragraph style name
22
24
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
23
25
  export const paragraphStylesOldWithScaledMargin = css({
24
26
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "215.23.5";
2
+ export const version = "215.23.6";
@@ -6,7 +6,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
6
6
  * @returns default font size if valid
7
7
  */
8
8
  export function getBaseFontSize(appearance, contentMode) {
9
- if (expValEquals('cc_editor_ai_content_mode', 'variant', 'test')) {
9
+ if (expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test')) {
10
10
  if (contentMode === 'compact') {
11
11
  return akEditorFullPageDenseFontSize;
12
12
  }
@@ -178,7 +178,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
178
178
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
179
179
  placeholderWrapStyles,
180
180
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
181
- codeBlockStyles, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
181
+ codeBlockStyles, contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
182
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
183
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) &&
182
184
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
183
185
  codeBlockStylesWithEmUnits,
184
186
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -210,7 +212,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
210
212
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
211
213
  fg('platform_editor_ai_generic_prep_for_aifc') && diffListStyles,
212
214
  // Condense vertical spacing between list items when content mode dense is active
213
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
215
+ contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
216
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
217
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) &&
214
218
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
215
219
  getDenseListStyles(baseFontSize), expValEquals('cc_editor_ttvc_release_bundle_one', 'listLayoutShiftFix', true) && isFullPage &&
216
220
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -222,7 +226,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
222
226
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
223
227
  fg('platform_editor_ai_generic_prep_for_aifc_2') && showDiffDeletedNodeStyles,
224
228
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
225
- mediaStyles, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
229
+ mediaStyles, contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
230
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
231
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) &&
226
232
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
227
233
  mediaCaptionStyles,
228
234
  // merge firstWrappedMediaStyles with mediaStyles when clean up platform_editor_fix_media_in_renderer
@@ -246,7 +252,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
246
252
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
247
253
  tasksAndDecisionsStyles,
248
254
  // condense vertical spacing between tasks/decisions items when content mode dense is active
249
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
255
+ contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
256
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
257
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) &&
250
258
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
251
259
  getDenseTasksAndDecisionsStyles(baseFontSize),
252
260
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -260,7 +268,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
260
268
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
261
269
  fg('platform_editor_ai_generic_prep_for_aifc') && extensionDiffStyles,
262
270
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
263
- expandStyles, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
271
+ expandStyles, contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
272
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
273
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) &&
264
274
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
265
275
  getDenseExpandTitleStyles(baseFontSize), fg('platform_editor_nested_dnd_styles_changes') ?
266
276
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -362,13 +372,17 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
362
372
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
363
373
  dateVanillaStyles, fg('platform_editor_typography_ugc') ?
364
374
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
365
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ?
375
+ contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
376
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
377
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ?
366
378
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
367
379
  paragraphStylesWithScaledMargin :
368
380
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
369
381
  paragraphStylesUGCRefreshed :
370
382
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
371
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ?
383
+ contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
384
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
385
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ?
372
386
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
373
387
  paragraphStylesOldWithScaledMargin :
374
388
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -432,7 +446,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
432
446
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
433
447
  emojiStyles,
434
448
  // Dense emoji scaling based on base font size
435
- expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ?
449
+ contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
450
+ // eslint-disable-next-line @atlaskit/platform/no-preconditioning
451
+ expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ? expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ?
436
452
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
437
453
  getScaledDenseEmojiStyles(baseFontSize) :
438
454
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -365,8 +365,8 @@ export var getExtensionStyles = function getExtensionStyles(contentMode) {
365
365
 
366
366
  // Dense content mode extensions styling fix - addresses EDITOR-1992
367
367
  // When cleaning up the experiment, move this logic into the baseExtensionStyles above
368
- var fontSize = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(akEditorFullPageDenseFontSize) : undefined;
369
- var denseExtensionStyles = contentMode === 'compact' && expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
368
+ var fontSize = expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(akEditorFullPageDenseFontSize) : undefined;
369
+ var denseExtensionStyles = contentMode === 'compact' && expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
370
370
  // Table of Contents Macro
371
371
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
372
372
  '.extension-container [data-macro-name="toc"] * :not(.status-lozenge-span *)': {
@@ -379,7 +379,7 @@ export var getExtensionStyles = function getExtensionStyles(contentMode) {
379
379
  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
380
380
  fontSize: 'var(--ak-editor-base-font-size)'
381
381
  }
382
- }) : contentMode === 'compact' && expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? css({
382
+ }) : contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test')) ? css({
383
383
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
384
384
  '.extension-container a span': {
385
385
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
@@ -274,7 +274,8 @@ export var mediaAlignmentStyles = css({
274
274
  }
275
275
  });
276
276
 
277
- // When cleaning up platform_editor_content_mode_button_mvp, move this style into mediaStyles variable ⬆️
277
+ // When both platform_editor_content_mode_button_mvp & confluence_compact_text_format are cleaned up,
278
+ // move this style into mediaStyles variable ⬆️
278
279
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
279
280
  export var mediaCaptionStyles = css({
280
281
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -3,7 +3,8 @@ import { css } from '@emotion/react';
3
3
  var blockNodesVerticalMargin = '0.75rem';
4
4
  var scaledBlockNodesVerticalMargin = '0.75em';
5
5
 
6
- // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
6
+ // When both platform_editor_content_mode_button_mvp & confluence_compact_text_format are cleaned up,
7
+ // simplify the name/ use the other paragraph style name
7
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
8
9
  export var paragraphStylesWithScaledMargin = css({
9
10
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -18,7 +19,8 @@ export var paragraphStylesWithScaledMargin = css({
18
19
  }
19
20
  });
20
21
 
21
- // When cleaning up `platform_editor_content_mode_button_mvp` simplify the name/ use the other paragraph style name
22
+ // When both platform_editor_content_mode_button_mvp & confluence_compact_text_format are cleaned up,
23
+ // simplify the name/ use the other paragraph style name
22
24
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
23
25
  export var paragraphStylesOldWithScaledMargin = css({
24
26
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "215.23.5";
2
+ export var version = "215.23.6";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "215.23.5",
3
+ "version": "215.23.7",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -65,7 +65,7 @@
65
65
  "@atlaskit/platform-feature-flags-react": "^0.4.0",
66
66
  "@atlaskit/react-ufo": "^4.16.0",
67
67
  "@atlaskit/task-decision": "^19.2.0",
68
- "@atlaskit/tmp-editor-statsig": "^15.13.0",
68
+ "@atlaskit/tmp-editor-statsig": "^15.15.0",
69
69
  "@atlaskit/tokens": "^8.6.0",
70
70
  "@atlaskit/tooltip": "^20.11.0",
71
71
  "@atlaskit/width-detector": "^5.0.0",
@@ -382,9 +382,6 @@
382
382
  },
383
383
  "platform_editor_a11y_find_replace_focus_ring": {
384
384
  "type": "boolean"
385
- },
386
- "platform-custom-icon-migration": {
387
- "type": "boolean"
388
385
  }
389
386
  },
390
387
  "stricter": {