@atlaskit/editor-core 216.0.2 → 216.1.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 +24 -0
- package/dist/cjs/ui/Appearance/Comment/Toolbar.js +2 -2
- package/dist/cjs/ui/Appearance/FullPage/FullPageToolbarNext.js +6 -4
- package/dist/cjs/ui/Appearance/FullPage/MainToolbarWrapper.js +1 -2
- package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +3 -7
- package/dist/cjs/ui/EditorContentContainer/styles/findReplaceStyles.js +27 -32
- package/dist/cjs/ui/ExcludeFromHydration/index.js +36 -0
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/ui/Appearance/Comment/Toolbar.js +2 -2
- package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.js +5 -4
- package/dist/es2019/ui/Appearance/FullPage/MainToolbarWrapper.js +1 -2
- package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +5 -9
- package/dist/es2019/ui/EditorContentContainer/styles/findReplaceStyles.js +49 -32
- package/dist/es2019/ui/ExcludeFromHydration/index.js +27 -0
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/ui/Appearance/Comment/Toolbar.js +2 -2
- package/dist/esm/ui/Appearance/FullPage/FullPageToolbarNext.js +5 -4
- package/dist/esm/ui/Appearance/FullPage/MainToolbarWrapper.js +1 -2
- package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +5 -9
- package/dist/esm/ui/EditorContentContainer/styles/findReplaceStyles.js +27 -32
- package/dist/esm/ui/ExcludeFromHydration/index.js +30 -0
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/ui/ExcludeFromHydration/index.d.ts +12 -0
- package/dist/types-ts4.5/ui/ExcludeFromHydration/index.d.ts +12 -0
- package/exclude-from-hydration/package.json +17 -0
- package/package.json +5 -5
|
@@ -269,10 +269,7 @@ export const findReplaceStylesNew = css({
|
|
|
269
269
|
|
|
270
270
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
271
271
|
export const findReplaceStylesNewWithA11Y = css({
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
/** Light mode */
|
|
275
|
-
|
|
272
|
+
// text - inactive match - light mode
|
|
276
273
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
277
274
|
'.search-match-text': {
|
|
278
275
|
borderRadius: "var(--ds-space-050, 4px)",
|
|
@@ -285,18 +282,18 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
285
282
|
backgroundColor: `${"var(--ds-background-accent-magenta-subtler, #FDD0EC)"} !important`,
|
|
286
283
|
color: "var(--ds-text, #292A2E)"
|
|
287
284
|
},
|
|
285
|
+
// text - active match - light mode
|
|
288
286
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
289
287
|
'.search-match-text.selected-search-match': {
|
|
290
288
|
boxShadow: `
|
|
291
|
-
inset 0 0 0 1px ${"var(--ds-
|
|
289
|
+
inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
|
|
292
290
|
inset 0 0 0 5px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"}
|
|
293
291
|
`,
|
|
294
292
|
// we need to use !important here as we need to override inline selection styles
|
|
295
293
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
296
294
|
backgroundColor: `${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"} !important`
|
|
297
295
|
},
|
|
298
|
-
|
|
299
|
-
|
|
296
|
+
// text - inactive match - dark mode
|
|
300
297
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
301
298
|
'.search-match-text.search-match-dark': {
|
|
302
299
|
boxShadow: `
|
|
@@ -308,6 +305,7 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
308
305
|
backgroundColor: `${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"} !important`,
|
|
309
306
|
color: "var(--ds-text-inverse, #FFFFFF)"
|
|
310
307
|
},
|
|
308
|
+
// text - active match - dark mode
|
|
311
309
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
312
310
|
'.search-match-text.selected-search-match.search-match-dark': {
|
|
313
311
|
boxShadow: `
|
|
@@ -318,11 +316,7 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
318
316
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
319
317
|
backgroundColor: `${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"} !important`
|
|
320
318
|
},
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
/** Light mode */
|
|
324
|
-
|
|
325
|
-
/** Without node selection */
|
|
319
|
+
// block node - inactive match - light mode - without node selection
|
|
326
320
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
327
321
|
'.search-match-block': {
|
|
328
322
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -340,12 +334,13 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
340
334
|
`
|
|
341
335
|
}
|
|
342
336
|
},
|
|
337
|
+
// block node - active match - light mode - without node selection
|
|
343
338
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
344
339
|
'.search-match-block.search-match-block-selected': {
|
|
345
340
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
346
341
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
347
342
|
boxShadow: `
|
|
348
|
-
inset 0 0 0 1px ${"var(--ds-
|
|
343
|
+
inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
|
|
349
344
|
inset 0 0 0 4px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"}
|
|
350
345
|
`
|
|
351
346
|
},
|
|
@@ -353,11 +348,11 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
353
348
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
354
349
|
boxShadow: `
|
|
355
350
|
0px 0px 0px 4px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"},
|
|
356
|
-
0px 0px 0px 5px ${"var(--ds-
|
|
351
|
+
0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"}
|
|
357
352
|
`
|
|
358
353
|
}
|
|
359
354
|
},
|
|
360
|
-
|
|
355
|
+
// block node - inactive match - light mode - with node selection
|
|
361
356
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
362
357
|
'.search-match-block.ak-editor-selected-node': {
|
|
363
358
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -370,26 +365,34 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
370
365
|
},
|
|
371
366
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
372
367
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
373
|
-
boxShadow: `
|
|
368
|
+
boxShadow: `
|
|
369
|
+
0 0 0 1px ${"var(--ds-border-selected, #1868DB)"},
|
|
370
|
+
0px 0px 0px 4px ${"var(--ds-background-accent-magenta-subtler, #FDD0EC)"},
|
|
371
|
+
0px 0px 0px 5px ${"var(--ds-border-accent-magenta, #CD519D)"}
|
|
372
|
+
`
|
|
374
373
|
}
|
|
375
374
|
},
|
|
375
|
+
// block node - active match - light mode - with node selection
|
|
376
376
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
377
377
|
'.search-match-block.search-match-block-selected.ak-editor-selected-node': {
|
|
378
378
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
379
379
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
380
380
|
boxShadow: `
|
|
381
|
-
inset 0 0 0 1px ${"var(--ds-
|
|
381
|
+
inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
|
|
382
382
|
inset 0 0 0 4px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"},
|
|
383
383
|
0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}
|
|
384
384
|
`
|
|
385
385
|
},
|
|
386
386
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
387
387
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
388
|
-
boxShadow: `
|
|
388
|
+
boxShadow: `
|
|
389
|
+
0 0 0 1px ${"var(--ds-border-selected, #1868DB)"},
|
|
390
|
+
0px 0px 0px 4px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"},
|
|
391
|
+
0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"}
|
|
392
|
+
`
|
|
389
393
|
}
|
|
390
394
|
},
|
|
391
|
-
|
|
392
|
-
/** Without node selection */
|
|
395
|
+
// block node - inactive match - dark mode - without node selection
|
|
393
396
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
394
397
|
'.search-match-block.search-match-dark': {
|
|
395
398
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -401,9 +404,13 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
401
404
|
},
|
|
402
405
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
403
406
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
404
|
-
boxShadow: `
|
|
407
|
+
boxShadow: `
|
|
408
|
+
0px 0px 0px 4px ${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"},
|
|
409
|
+
0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"}
|
|
410
|
+
`
|
|
405
411
|
}
|
|
406
412
|
},
|
|
413
|
+
// block node - active match - dark mode - without node selection
|
|
407
414
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
408
415
|
'.search-match-block.search-match-block-selected.search-match-dark': {
|
|
409
416
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -415,10 +422,13 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
415
422
|
},
|
|
416
423
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
417
424
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
418
|
-
boxShadow: `
|
|
425
|
+
boxShadow: `
|
|
426
|
+
0px 0px 0px 4px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
|
|
427
|
+
0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"}
|
|
428
|
+
`
|
|
419
429
|
}
|
|
420
430
|
},
|
|
421
|
-
|
|
431
|
+
// block node - inactive match - dark mode - with node selection
|
|
422
432
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
423
433
|
'.search-match-block.search-match-dark.ak-editor-selected-node': {
|
|
424
434
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -431,9 +441,14 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
431
441
|
},
|
|
432
442
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
433
443
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
434
|
-
boxShadow: `
|
|
444
|
+
boxShadow: `
|
|
445
|
+
0 0 0 1px ${"var(--ds-border-selected, #1868DB)"},
|
|
446
|
+
0px 0px 0px 4px ${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"},
|
|
447
|
+
0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"}
|
|
448
|
+
`
|
|
435
449
|
}
|
|
436
450
|
},
|
|
451
|
+
// block node - active match - dark mode - with node selection
|
|
437
452
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
438
453
|
'.search-match-block.search-match-block-selected.search-match-dark.ak-editor-selected-node': {
|
|
439
454
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -446,13 +461,14 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
446
461
|
},
|
|
447
462
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
448
463
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
449
|
-
boxShadow: `
|
|
464
|
+
boxShadow: `
|
|
465
|
+
0 0 0 1px ${"var(--ds-border-selected, #1868DB)"},
|
|
466
|
+
0px 0px 0px 4px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
|
|
467
|
+
0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"}
|
|
468
|
+
`
|
|
450
469
|
}
|
|
451
470
|
},
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
/** Light mode */
|
|
455
|
-
|
|
471
|
+
// expand title - inactive match - light mode
|
|
456
472
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
457
473
|
'.search-match-expand-title > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
|
|
458
474
|
borderRadius: "var(--ds-space-050, 4px)",
|
|
@@ -466,16 +482,16 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
466
482
|
color: "var(--ds-text, #292A2E)"
|
|
467
483
|
}
|
|
468
484
|
},
|
|
485
|
+
// expand title - active match - light mode
|
|
469
486
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
470
487
|
'.search-match-expand-title.selected-search-match > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
|
|
471
488
|
boxShadow: `
|
|
472
|
-
inset 0 0 0 1px ${"var(--ds-
|
|
489
|
+
inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
|
|
473
490
|
inset 0 0 0 5px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"}
|
|
474
491
|
`,
|
|
475
492
|
backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"
|
|
476
493
|
},
|
|
477
|
-
|
|
478
|
-
|
|
494
|
+
// expand title - inactive match - dark mode
|
|
479
495
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
480
496
|
'.search-match-expand-title.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
|
|
481
497
|
boxShadow: `
|
|
@@ -488,6 +504,7 @@ export const findReplaceStylesNewWithA11Y = css({
|
|
|
488
504
|
color: "var(--ds-text-inverse, #FFFFFF)"
|
|
489
505
|
}
|
|
490
506
|
},
|
|
507
|
+
// expand title - active match - dark mode
|
|
491
508
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
492
509
|
'.search-match-expand-title.selected-search-match.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
|
|
493
510
|
boxShadow: `
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { useEffect, useState } from 'react';
|
|
2
|
+
import { isSSR } from '@atlaskit/editor-common/core-utils';
|
|
3
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* ExcludeFromHydration component delays rendering of its children until after the initial
|
|
7
|
+
* hydration phase, based on a feature flag check. If the feature flag is disabled,
|
|
8
|
+
* it will render children immediately after hydration.
|
|
9
|
+
* @param param0
|
|
10
|
+
* @returns
|
|
11
|
+
*/
|
|
12
|
+
function ExcludeFromHydration({
|
|
13
|
+
children
|
|
14
|
+
}) {
|
|
15
|
+
const [shouldRender, setShouldRender] = useState(false);
|
|
16
|
+
useEffect(() => {
|
|
17
|
+
if (isSSR()) {
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
setShouldRender(true);
|
|
21
|
+
}, []);
|
|
22
|
+
if (expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) && !shouldRender) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
return children;
|
|
26
|
+
}
|
|
27
|
+
export default ExcludeFromHydration;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "
|
|
2
|
+
export const version = "0.0.0-development";
|
|
@@ -100,7 +100,7 @@ var StickyToolbar = function StickyToolbar(props) {
|
|
|
100
100
|
return (
|
|
101
101
|
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
102
102
|
jsx("div", {
|
|
103
|
-
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew,
|
|
103
|
+
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && !toolbarPatch6Enabled && mainToolbarWithoutLeftPadding, props.isNewToolbarEnabled && toolbarPatch6Enabled && mainToolbarWithPadding]
|
|
104
104
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
|
|
105
105
|
,
|
|
106
106
|
style: {
|
|
@@ -117,7 +117,7 @@ var FixedToolbar = function FixedToolbar(props) {
|
|
|
117
117
|
return (
|
|
118
118
|
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
119
119
|
jsx("div", {
|
|
120
|
-
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew,
|
|
120
|
+
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle],
|
|
121
121
|
"data-testid": "ak-editor-main-toolbar"
|
|
122
122
|
}, props.children)
|
|
123
123
|
);
|
|
@@ -10,6 +10,7 @@ import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-me
|
|
|
10
10
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
11
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
12
12
|
import { isToolbar } from '../../../utils/toolbar';
|
|
13
|
+
import ExcludeFromHydration from '../../ExcludeFromHydration';
|
|
13
14
|
import { ToolbarNext } from '../../Toolbar/Toolbar';
|
|
14
15
|
import { ToolbarPortalMountPoint, useToolbarPortal } from '../../Toolbar/ToolbarPortal';
|
|
15
16
|
var styles = {
|
|
@@ -87,7 +88,7 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
|
|
|
87
88
|
}, [editorView]);
|
|
88
89
|
return /*#__PURE__*/React.createElement(ContextPanelConsumer, null, function (_ref6) {
|
|
89
90
|
var ContextPanelWidth = _ref6.width;
|
|
90
|
-
return /*#__PURE__*/React.createElement(ToolbarArrowKeyNavigationProvider, {
|
|
91
|
+
return /*#__PURE__*/React.createElement(ExcludeFromHydration, null, /*#__PURE__*/React.createElement(ToolbarArrowKeyNavigationProvider, {
|
|
91
92
|
editorView: editorView,
|
|
92
93
|
childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
|
|
93
94
|
isShortcutToFocusToolbar: isShortcutToFocusToolbar,
|
|
@@ -98,7 +99,7 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
|
|
|
98
99
|
showKeyline: showKeyline || ContextPanelWidth > 0
|
|
99
100
|
}, beforeIcon && /*#__PURE__*/React.createElement("div", {
|
|
100
101
|
className: ax([styles.mainToolbarIconBefore, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
|
|
101
|
-
}, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && (expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true)
|
|
102
|
+
}, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && (!expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
|
|
102
103
|
toolbar: toolbar,
|
|
103
104
|
components: components,
|
|
104
105
|
editorView: editorView,
|
|
@@ -111,7 +112,7 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
|
|
|
111
112
|
}, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/React.createElement("div", {
|
|
112
113
|
"data-testid": 'before-primary-toolbar-components-plugin',
|
|
113
114
|
className: ax([styles.beforePrimaryToolbarComponents])
|
|
114
|
-
}, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true)
|
|
115
|
+
}, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (!expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
|
|
115
116
|
toolbar: toolbar,
|
|
116
117
|
components: components,
|
|
117
118
|
editorView: editorView,
|
|
@@ -119,6 +120,6 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
|
|
|
119
120
|
popupsMountPoint: mountPoint,
|
|
120
121
|
editorAppearance: "full-page",
|
|
121
122
|
isDisabled: disabled
|
|
122
|
-
}))));
|
|
123
|
+
})))));
|
|
123
124
|
});
|
|
124
125
|
};
|
|
@@ -8,7 +8,6 @@ import React from 'react';
|
|
|
8
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
9
9
|
import { css, jsx } from '@emotion/react';
|
|
10
10
|
import { akEditorFloatingDialogZIndex, akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
|
|
11
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
12
11
|
import { MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
|
|
13
12
|
|
|
14
13
|
// Base styles that don't depend on feature flags
|
|
@@ -55,7 +54,7 @@ export var MainToolbarWrapper = function MainToolbarWrapper(_ref) {
|
|
|
55
54
|
testId = _ref['data-testid'];
|
|
56
55
|
return jsx("div", {
|
|
57
56
|
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
|
|
58
|
-
css: [baseToolbarStyles,
|
|
57
|
+
css: [baseToolbarStyles, flexibleIconSize, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle],
|
|
59
58
|
"data-testid": testId
|
|
60
59
|
}, children);
|
|
61
60
|
};
|
|
@@ -44,7 +44,7 @@ import { gridStyles } from './styles/gridStyles';
|
|
|
44
44
|
import { indentationStyles } from './styles/indentationStyles';
|
|
45
45
|
import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
|
|
46
46
|
import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
|
|
47
|
-
import { hyperLinkFloatingToolbarStyles,
|
|
47
|
+
import { hyperLinkFloatingToolbarStyles, linkStyles } from './styles/link';
|
|
48
48
|
import { diffListStyles, getDenseListStyles, listsStyles, listsStylesMarginLayoutShiftFix, listsStylesSafariFix } from './styles/list';
|
|
49
49
|
import { mediaAlignmentStyles, mediaCaptionStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
|
|
50
50
|
import { mentionDangerStyles, mentionNodeStyles, mentionsSelectionStyles, mentionsSelectionStylesWithSearchMatch, mentionsStyles } from './styles/mentions';
|
|
@@ -61,7 +61,7 @@ import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDe
|
|
|
61
61
|
import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
|
|
62
62
|
import { syncBlockStyles } from './styles/syncBlockStyles';
|
|
63
63
|
import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableLayoutFixes, tableEmptyRowStyles } from './styles/tableStyles';
|
|
64
|
-
import { decisionDangerStyles, decisionIconWithVisualRefresh,
|
|
64
|
+
import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
|
|
65
65
|
import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
|
|
66
66
|
import { textColorStyles } from './styles/textColorStyles';
|
|
67
67
|
import { textHighlightStyle } from './styles/textHighlightStyles';
|
|
@@ -282,7 +282,7 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
282
282
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
283
283
|
expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes,
|
|
284
284
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
285
|
-
|
|
285
|
+
expandStylesMixin_fg_platform_visual_refresh_icons, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
|
|
286
286
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
287
287
|
fg('platform_editor_a11y_find_replace_focus_ring') ?
|
|
288
288
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -304,11 +304,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
304
304
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
305
305
|
taskItemStylesWithBlockTaskItem :
|
|
306
306
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
307
|
-
taskItemStyles,
|
|
307
|
+
taskItemStyles,
|
|
308
308
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
309
|
-
decisionIconWithVisualRefresh,
|
|
310
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
311
|
-
decisionIconWithoutVisualRefresh,
|
|
309
|
+
decisionIconWithVisualRefresh,
|
|
312
310
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
313
311
|
statusStyles, fg('platform-component-visual-refresh') ? expValEqualsNoExposure('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
|
|
314
312
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -476,8 +474,6 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
476
474
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
477
475
|
hyperLinkFloatingToolbarStyles,
|
|
478
476
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
479
|
-
!fg('platform-visual-refresh-icons') && linkLegacyIconStylesFix,
|
|
480
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
481
477
|
fg('confluence_floating_toolbar_animation') && selectionToolbarAnimationStyles,
|
|
482
478
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
483
479
|
fg('platform_editor_vanilla_codebidi_warning') && codeBidiWarningStyles,
|
|
@@ -212,10 +212,7 @@ export var findReplaceStylesNew = css({
|
|
|
212
212
|
|
|
213
213
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
214
214
|
export var findReplaceStylesNewWithA11Y = css({
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
/** Light mode */
|
|
218
|
-
|
|
215
|
+
// text - inactive match - light mode
|
|
219
216
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
220
217
|
'.search-match-text': {
|
|
221
218
|
borderRadius: "var(--ds-space-050, 4px)",
|
|
@@ -225,15 +222,15 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
225
222
|
backgroundColor: "var(--ds-background-accent-magenta-subtler, #FDD0EC)".concat(" !important"),
|
|
226
223
|
color: "var(--ds-text, #292A2E)"
|
|
227
224
|
},
|
|
225
|
+
// text - active match - light mode
|
|
228
226
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
229
227
|
'.search-match-text.selected-search-match': {
|
|
230
|
-
boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-
|
|
228
|
+
boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t"),
|
|
231
229
|
// we need to use !important here as we need to override inline selection styles
|
|
232
230
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
233
231
|
backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)".concat(" !important")
|
|
234
232
|
},
|
|
235
|
-
|
|
236
|
-
|
|
233
|
+
// text - inactive match - dark mode
|
|
237
234
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
238
235
|
'.search-match-text.search-match-dark': {
|
|
239
236
|
boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", "\n\t\t"),
|
|
@@ -242,6 +239,7 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
242
239
|
backgroundColor: "var(--ds-background-accent-magenta-bolder-pressed, #77325B)".concat(" !important"),
|
|
243
240
|
color: "var(--ds-text-inverse, #FFFFFF)"
|
|
244
241
|
},
|
|
242
|
+
// text - active match - dark mode
|
|
245
243
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
246
244
|
'.search-match-text.selected-search-match.search-match-dark': {
|
|
247
245
|
boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t"),
|
|
@@ -249,11 +247,7 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
249
247
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
250
248
|
backgroundColor: "var(--ds-background-accent-magenta-bolder-hovered, #943D73)".concat(" !important")
|
|
251
249
|
},
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
/** Light mode */
|
|
255
|
-
|
|
256
|
-
/** Without node selection */
|
|
250
|
+
// block node - inactive match - light mode - without node selection
|
|
257
251
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
258
252
|
'.search-match-block': {
|
|
259
253
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -265,18 +259,19 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
265
259
|
boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-subtler, #FDD0EC)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-border-accent-magenta, #CD519D)", "\n\t\t\t")
|
|
266
260
|
}
|
|
267
261
|
},
|
|
262
|
+
// block node - active match - light mode - without node selection
|
|
268
263
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
269
264
|
'.search-match-block.search-match-block-selected': {
|
|
270
265
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
271
266
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
272
|
-
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-
|
|
267
|
+
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t\t")
|
|
273
268
|
},
|
|
274
269
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
275
270
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
276
|
-
boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-
|
|
271
|
+
boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t\t")
|
|
277
272
|
}
|
|
278
273
|
},
|
|
279
|
-
|
|
274
|
+
// block node - inactive match - light mode - with node selection
|
|
280
275
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
281
276
|
'.search-match-block.ak-editor-selected-node': {
|
|
282
277
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -285,22 +280,22 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
285
280
|
},
|
|
286
281
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
287
282
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
288
|
-
boxShadow: "
|
|
283
|
+
boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-border-accent-magenta, #CD519D)", "\n\t\t\t")
|
|
289
284
|
}
|
|
290
285
|
},
|
|
286
|
+
// block node - active match - light mode - with node selection
|
|
291
287
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
292
288
|
'.search-match-block.search-match-block-selected.ak-editor-selected-node': {
|
|
293
289
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
294
290
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
295
|
-
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-
|
|
291
|
+
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #1868DB)", "\n\t\t\t")
|
|
296
292
|
},
|
|
297
293
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
298
294
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
299
|
-
boxShadow: "
|
|
295
|
+
boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t\t")
|
|
300
296
|
}
|
|
301
297
|
},
|
|
302
|
-
|
|
303
|
-
/** Without node selection */
|
|
298
|
+
// block node - inactive match - dark mode - without node selection
|
|
304
299
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
305
300
|
'.search-match-block.search-match-dark': {
|
|
306
301
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -309,9 +304,10 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
309
304
|
},
|
|
310
305
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
311
306
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
312
|
-
boxShadow: "
|
|
307
|
+
boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
|
|
313
308
|
}
|
|
314
309
|
},
|
|
310
|
+
// block node - active match - dark mode - without node selection
|
|
315
311
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
316
312
|
'.search-match-block.search-match-block-selected.search-match-dark': {
|
|
317
313
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -320,10 +316,10 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
320
316
|
},
|
|
321
317
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
322
318
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
323
|
-
boxShadow: "
|
|
319
|
+
boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
|
|
324
320
|
}
|
|
325
321
|
},
|
|
326
|
-
|
|
322
|
+
// block node - inactive match - dark mode - with node selection
|
|
327
323
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
328
324
|
'.search-match-block.search-match-dark.ak-editor-selected-node': {
|
|
329
325
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -332,9 +328,10 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
332
328
|
},
|
|
333
329
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
334
330
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
335
|
-
boxShadow: "
|
|
331
|
+
boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
|
|
336
332
|
}
|
|
337
333
|
},
|
|
334
|
+
// block node - active match - dark mode - with node selection
|
|
338
335
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
339
336
|
'.search-match-block.search-match-block-selected.search-match-dark.ak-editor-selected-node': {
|
|
340
337
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
@@ -343,13 +340,10 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
343
340
|
},
|
|
344
341
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
345
342
|
'.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
|
|
346
|
-
boxShadow: "
|
|
343
|
+
boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
|
|
347
344
|
}
|
|
348
345
|
},
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
/** Light mode */
|
|
352
|
-
|
|
346
|
+
// expand title - inactive match - light mode
|
|
353
347
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
354
348
|
'.search-match-expand-title > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
|
|
355
349
|
borderRadius: "var(--ds-space-050, 4px)",
|
|
@@ -360,13 +354,13 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
360
354
|
color: "var(--ds-text, #292A2E)"
|
|
361
355
|
}
|
|
362
356
|
},
|
|
357
|
+
// expand title - active match - light mode
|
|
363
358
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
364
359
|
'.search-match-expand-title.selected-search-match > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
|
|
365
|
-
boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-
|
|
360
|
+
boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t"),
|
|
366
361
|
backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"
|
|
367
362
|
},
|
|
368
|
-
|
|
369
|
-
|
|
363
|
+
// expand title - inactive match - dark mode
|
|
370
364
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
371
365
|
'.search-match-expand-title.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
|
|
372
366
|
boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", "\n\t\t"),
|
|
@@ -376,6 +370,7 @@ export var findReplaceStylesNewWithA11Y = css({
|
|
|
376
370
|
color: "var(--ds-text-inverse, #FFFFFF)"
|
|
377
371
|
}
|
|
378
372
|
},
|
|
373
|
+
// expand title - active match - dark mode
|
|
379
374
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
380
375
|
'.search-match-expand-title.selected-search-match.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
|
|
381
376
|
boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t"),
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
|
+
import { useEffect, useState } from 'react';
|
|
3
|
+
import { isSSR } from '@atlaskit/editor-common/core-utils';
|
|
4
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* ExcludeFromHydration component delays rendering of its children until after the initial
|
|
8
|
+
* hydration phase, based on a feature flag check. If the feature flag is disabled,
|
|
9
|
+
* it will render children immediately after hydration.
|
|
10
|
+
* @param param0
|
|
11
|
+
* @returns
|
|
12
|
+
*/
|
|
13
|
+
function ExcludeFromHydration(_ref) {
|
|
14
|
+
var children = _ref.children;
|
|
15
|
+
var _useState = useState(false),
|
|
16
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
17
|
+
shouldRender = _useState2[0],
|
|
18
|
+
setShouldRender = _useState2[1];
|
|
19
|
+
useEffect(function () {
|
|
20
|
+
if (isSSR()) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
setShouldRender(true);
|
|
24
|
+
}, []);
|
|
25
|
+
if (expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) && !shouldRender) {
|
|
26
|
+
return null;
|
|
27
|
+
}
|
|
28
|
+
return children;
|
|
29
|
+
}
|
|
30
|
+
export default ExcludeFromHydration;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export var name = "@atlaskit/editor-core";
|
|
2
|
-
export var version = "
|
|
2
|
+
export var version = "0.0.0-development";
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type React from 'react';
|
|
2
|
+
/**
|
|
3
|
+
* ExcludeFromHydration component delays rendering of its children until after the initial
|
|
4
|
+
* hydration phase, based on a feature flag check. If the feature flag is disabled,
|
|
5
|
+
* it will render children immediately after hydration.
|
|
6
|
+
* @param param0
|
|
7
|
+
* @returns
|
|
8
|
+
*/
|
|
9
|
+
declare function ExcludeFromHydration({ children }: {
|
|
10
|
+
children: React.ReactNode;
|
|
11
|
+
}): React.ReactNode;
|
|
12
|
+
export default ExcludeFromHydration;
|