@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.
Files changed (26) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/dist/cjs/ui/Appearance/Comment/Toolbar.js +2 -2
  3. package/dist/cjs/ui/Appearance/FullPage/FullPageToolbarNext.js +6 -4
  4. package/dist/cjs/ui/Appearance/FullPage/MainToolbarWrapper.js +1 -2
  5. package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +3 -7
  6. package/dist/cjs/ui/EditorContentContainer/styles/findReplaceStyles.js +27 -32
  7. package/dist/cjs/ui/ExcludeFromHydration/index.js +36 -0
  8. package/dist/cjs/version-wrapper.js +1 -1
  9. package/dist/es2019/ui/Appearance/Comment/Toolbar.js +2 -2
  10. package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.js +5 -4
  11. package/dist/es2019/ui/Appearance/FullPage/MainToolbarWrapper.js +1 -2
  12. package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +5 -9
  13. package/dist/es2019/ui/EditorContentContainer/styles/findReplaceStyles.js +49 -32
  14. package/dist/es2019/ui/ExcludeFromHydration/index.js +27 -0
  15. package/dist/es2019/version-wrapper.js +1 -1
  16. package/dist/esm/ui/Appearance/Comment/Toolbar.js +2 -2
  17. package/dist/esm/ui/Appearance/FullPage/FullPageToolbarNext.js +5 -4
  18. package/dist/esm/ui/Appearance/FullPage/MainToolbarWrapper.js +1 -2
  19. package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +5 -9
  20. package/dist/esm/ui/EditorContentContainer/styles/findReplaceStyles.js +27 -32
  21. package/dist/esm/ui/ExcludeFromHydration/index.js +30 -0
  22. package/dist/esm/version-wrapper.js +1 -1
  23. package/dist/types/ui/ExcludeFromHydration/index.d.ts +12 -0
  24. package/dist/types-ts4.5/ui/ExcludeFromHydration/index.d.ts +12 -0
  25. package/exclude-from-hydration/package.json +17 -0
  26. package/package.json +5 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,29 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 216.1.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [`8691a6ca57af0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8691a6ca57af0) -
8
+ [ux] [A11Y-25850] update selected find/replace match focus ring color behind
9
+ platform_editor_a11y_find_replace_focus_ring
10
+ - [`f0bc994a5bdf6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f0bc994a5bdf6) -
11
+ Fixes toolbar not appearing when platform_editor_toolbar_delay_render_fix is disabled
12
+ - Updated dependencies
13
+
14
+ ## 216.1.0
15
+
16
+ ### Minor Changes
17
+
18
+ - [`00e69e0b7c839`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/00e69e0b7c839) -
19
+ Clean up and removal of the `platform-visual-refresh-icons` feature flag.
20
+
21
+ ### Patch Changes
22
+
23
+ - [`2843f9743d50a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2843f9743d50a) -
24
+ ED-29683: render editor toolbar under two stage hydration
25
+ - Updated dependencies
26
+
3
27
  ## 216.0.2
4
28
 
5
29
  ### Patch Changes
package/dist/cjs/ui/Appearance/Comment/Toolbar.js CHANGED
@@ -109,7 +109,7 @@ var StickyToolbar = function StickyToolbar(props) {
109
109
  return (
110
110
  // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
111
111
  (0, _react2.jsx)("div", {
112
- css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && !toolbarPatch6Enabled && mainToolbarWithoutLeftPadding, props.isNewToolbarEnabled && toolbarPatch6Enabled && mainToolbarWithPadding]
112
+ css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && !toolbarPatch6Enabled && mainToolbarWithoutLeftPadding, props.isNewToolbarEnabled && toolbarPatch6Enabled && mainToolbarWithPadding]
113
113
  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
114
114
  ,
115
115
  style: {
@@ -126,7 +126,7 @@ var FixedToolbar = function FixedToolbar(props) {
126
126
  return (
127
127
  // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
128
128
  (0, _react2.jsx)("div", {
129
- css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, (0, _platformFeatureFlags.fg)('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle],
129
+ css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, (0, _platformFeatureFlags.fg)('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle],
130
130
  "data-testid": "ak-editor-main-toolbar"
131
131
  }, props.children)
132
132
  );
package/dist/cjs/ui/Appearance/FullPage/FullPageToolbarNext.js CHANGED
@@ -1,6 +1,7 @@
1
1
  /* FullPageToolbarNext.tsx generated by @compiled/babel-plugin v0.38.1 */
2
2
  "use strict";
3
3
 
4
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
5
  var _typeof = require("@babel/runtime/helpers/typeof");
5
6
  Object.defineProperty(exports, "__esModule", {
6
7
  value: true
@@ -17,6 +18,7 @@ var _uiMenu = require("@atlaskit/editor-common/ui-menu");
17
18
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
18
19
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
19
20
  var _toolbar2 = require("../../../utils/toolbar");
21
+ var _ExcludeFromHydration = _interopRequireDefault(require("../../ExcludeFromHydration"));
20
22
  var _Toolbar = require("../../Toolbar/Toolbar");
21
23
  var _ToolbarPortal = require("../../Toolbar/ToolbarPortal");
22
24
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -95,7 +97,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
95
97
  }, [editorView]);
96
98
  return /*#__PURE__*/_react.default.createElement(_contextPanel.ContextPanelConsumer, null, function (_ref6) {
97
99
  var ContextPanelWidth = _ref6.width;
98
- return /*#__PURE__*/_react.default.createElement(_uiMenu.ToolbarArrowKeyNavigationProvider, {
100
+ return /*#__PURE__*/_react.default.createElement(_ExcludeFromHydration.default, null, /*#__PURE__*/_react.default.createElement(_uiMenu.ToolbarArrowKeyNavigationProvider, {
99
101
  editorView: editorView,
100
102
  childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
101
103
  isShortcutToFocusToolbar: isShortcutToFocusToolbar,
@@ -106,7 +108,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
106
108
  showKeyline: showKeyline || ContextPanelWidth > 0
107
109
  }, beforeIcon && /*#__PURE__*/_react.default.createElement("div", {
108
110
  className: (0, _runtime.ax)([styles.mainToolbarIconBefore, (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
109
- }, beforeIcon), (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || ((0, _expValEquals.expValEquals)('platform_editor_ssr_renderer', 'isEnabled', true) && (0, _coreUtils.isSSR)() || editorView) && ((0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !(0, _coreUtils.isSSR)() : !(0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) || !(0, _coreUtils.isSSR)())) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
111
+ }, beforeIcon), (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || ((0, _expValEquals.expValEquals)('platform_editor_ssr_renderer', 'isEnabled', true) && (0, _coreUtils.isSSR)() || editorView) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !(0, _coreUtils.isSSR)())) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
110
112
  toolbar: toolbar,
111
113
  components: components,
112
114
  editorView: editorView,
@@ -119,7 +121,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
119
121
  }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/_react.default.createElement("div", {
120
122
  "data-testid": 'before-primary-toolbar-components-plugin',
121
123
  className: (0, _runtime.ax)([styles.beforePrimaryToolbarComponents])
122
- }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/_react.default.createElement(_ToolbarPortal.ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && ((0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !(0, _coreUtils.isSSR)() : !(0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) || !(0, _coreUtils.isSSR)())) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
124
+ }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/_react.default.createElement(_ToolbarPortal.ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !(0, _coreUtils.isSSR)())) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
123
125
  toolbar: toolbar,
124
126
  components: components,
125
127
  editorView: editorView,
@@ -127,6 +129,6 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
127
129
  popupsMountPoint: mountPoint,
128
130
  editorAppearance: "full-page",
129
131
  isDisabled: disabled
130
- }))));
132
+ })))));
131
133
  });
132
134
  };
package/dist/cjs/ui/Appearance/FullPage/MainToolbarWrapper.js CHANGED
@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
9
9
  var _react = _interopRequireDefault(require("react"));
10
10
  var _react2 = require("@emotion/react");
11
11
  var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
12
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
13
12
  var _MainToolbar = require("./MainToolbar");
14
13
  /**
15
14
  * @jsxRuntime classic
@@ -62,7 +61,7 @@ var MainToolbarWrapper = exports.MainToolbarWrapper = function MainToolbarWrappe
62
61
  testId = _ref['data-testid'];
63
62
  return (0, _react2.jsx)("div", {
64
63
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
65
- css: [baseToolbarStyles, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && flexibleIconSize, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle],
64
+ css: [baseToolbarStyles, flexibleIconSize, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle],
66
65
  "data-testid": testId
67
66
  }, children);
68
67
  };
package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -290,7 +290,7 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
290
290
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
291
291
  _expandStyles.expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes,
292
292
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
293
- (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && _expandStyles.expandStylesMixin_fg_platform_visual_refresh_icons, (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
293
+ _expandStyles.expandStylesMixin_fg_platform_visual_refresh_icons, (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
294
294
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
295
295
  (0, _platformFeatureFlags.fg)('platform_editor_a11y_find_replace_focus_ring') ?
296
296
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -312,11 +312,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
312
312
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
313
313
  _tasksAndDecisionsStyles.taskItemStylesWithBlockTaskItem :
314
314
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
315
- _tasksAndDecisionsStyles.taskItemStyles, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') &&
315
+ _tasksAndDecisionsStyles.taskItemStyles,
316
316
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
317
- _tasksAndDecisionsStyles.decisionIconWithVisualRefresh, !(0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') &&
318
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
319
- _tasksAndDecisionsStyles.decisionIconWithoutVisualRefresh,
317
+ _tasksAndDecisionsStyles.decisionIconWithVisualRefresh,
320
318
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
321
319
  _statusStyles.statusStyles, (0, _platformFeatureFlags.fg)('platform-component-visual-refresh') ? (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
322
320
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -484,8 +482,6 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
484
482
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
485
483
  _link.hyperLinkFloatingToolbarStyles,
486
484
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
487
- !(0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && _link.linkLegacyIconStylesFix,
488
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
489
485
  (0, _platformFeatureFlags.fg)('confluence_floating_toolbar_animation') && _selectionToolbarStyles.selectionToolbarAnimationStyles,
490
486
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
491
487
  (0, _platformFeatureFlags.fg)('platform_editor_vanilla_codebidi_warning') && _codeBidiWarningStyles.codeBidiWarningStyles,
package/dist/cjs/ui/EditorContentContainer/styles/findReplaceStyles.js CHANGED
@@ -220,10 +220,7 @@ var findReplaceStylesNew = exports.findReplaceStylesNew = (0, _react.css)({
220
220
 
221
221
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
222
222
  var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _react.css)({
223
- /** Text match styles */
224
-
225
- /** Light mode */
226
-
223
+ // text - inactive match - light mode
227
224
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
228
225
  '.search-match-text': {
229
226
  borderRadius: "var(--ds-space-050, 4px)",
@@ -233,15 +230,15 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
233
230
  backgroundColor: "var(--ds-background-accent-magenta-subtler, #FDD0EC)".concat(" !important"),
234
231
  color: "var(--ds-text, #292A2E)"
235
232
  },
233
+ // text - active match - light mode
236
234
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
237
235
  '.search-match-text.selected-search-match': {
238
- boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t"),
236
+ 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"),
239
237
  // we need to use !important here as we need to override inline selection styles
240
238
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
241
239
  backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)".concat(" !important")
242
240
  },
243
- /** Dark mode */
244
-
241
+ // text - inactive match - dark mode
245
242
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
246
243
  '.search-match-text.search-match-dark': {
247
244
  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"),
@@ -250,6 +247,7 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
250
247
  backgroundColor: "var(--ds-background-accent-magenta-bolder-pressed, #77325B)".concat(" !important"),
251
248
  color: "var(--ds-text-inverse, #FFFFFF)"
252
249
  },
250
+ // text - active match - dark mode
253
251
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
254
252
  '.search-match-text.selected-search-match.search-match-dark': {
255
253
  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"),
@@ -257,11 +255,7 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
257
255
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
258
256
  backgroundColor: "var(--ds-background-accent-magenta-bolder-hovered, #943D73)".concat(" !important")
259
257
  },
260
- /** Block match styles */
261
-
262
- /** Light mode */
263
-
264
- /** Without node selection */
258
+ // block node - inactive match - light mode - without node selection
265
259
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
266
260
  '.search-match-block': {
267
261
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -273,18 +267,19 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
273
267
  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")
274
268
  }
275
269
  },
270
+ // block node - active match - light mode - without node selection
276
271
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
277
272
  '.search-match-block.search-match-block-selected': {
278
273
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
279
274
  '[data-smart-link-container="true"], .loader-wrapper>div::after': {
280
- boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t\t")
275
+ 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")
281
276
  },
282
277
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
283
278
  '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
284
- 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-border-accent-magenta, #CD519D)", "\n\t\t\t")
279
+ 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")
285
280
  }
286
281
  },
287
- /** With node selection */
282
+ // block node - inactive match - light mode - with node selection
288
283
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
289
284
  '.search-match-block.ak-editor-selected-node': {
290
285
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -293,22 +288,22 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
293
288
  },
294
289
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
295
290
  '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
296
- boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-subtler-pressed, #F797D2)")
291
+ 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")
297
292
  }
298
293
  },
294
+ // block node - active match - light mode - with node selection
299
295
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
300
296
  '.search-match-block.search-match-block-selected.ak-editor-selected-node': {
301
297
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
302
298
  '[data-smart-link-container="true"], .loader-wrapper>div::after': {
303
- boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\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")
299
+ 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")
304
300
  },
305
301
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
306
302
  '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
307
- boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-subtler-pressed, #F797D2)")
303
+ 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")
308
304
  }
309
305
  },
310
- /** Dark mode */
311
- /** Without node selection */
306
+ // block node - inactive match - dark mode - without node selection
312
307
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
313
308
  '.search-match-block.search-match-dark': {
314
309
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -317,9 +312,10 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
317
312
  },
318
313
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
319
314
  '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
320
- boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
315
+ 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")
321
316
  }
322
317
  },
318
+ // block node - active match - dark mode - without node selection
323
319
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
324
320
  '.search-match-block.search-match-block-selected.search-match-dark': {
325
321
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -328,10 +324,10 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
328
324
  },
329
325
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
330
326
  '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
331
- boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
327
+ 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")
332
328
  }
333
329
  },
334
- /** With node selection */
330
+ // block node - inactive match - dark mode - with node selection
335
331
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
336
332
  '.search-match-block.search-match-dark.ak-editor-selected-node': {
337
333
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -340,9 +336,10 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
340
336
  },
341
337
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
342
338
  '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
343
- boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
339
+ 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")
344
340
  }
345
341
  },
342
+ // block node - active match - dark mode - with node selection
346
343
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
347
344
  '.search-match-block.search-match-block-selected.search-match-dark.ak-editor-selected-node': {
348
345
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -351,13 +348,10 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
351
348
  },
352
349
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
353
350
  '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
354
- boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
351
+ 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")
355
352
  }
356
353
  },
357
- /** Expand title match styles */
358
-
359
- /** Light mode */
360
-
354
+ // expand title - inactive match - light mode
361
355
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
362
356
  '.search-match-expand-title > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
363
357
  borderRadius: "var(--ds-space-050, 4px)",
@@ -368,13 +362,13 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
368
362
  color: "var(--ds-text, #292A2E)"
369
363
  }
370
364
  },
365
+ // expand title - active match - light mode
371
366
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
372
367
  '.search-match-expand-title.selected-search-match > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
373
- boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t"),
368
+ 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"),
374
369
  backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"
375
370
  },
376
- /** Dark mode */
377
-
371
+ // expand title - inactive match - dark mode
378
372
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
379
373
  '.search-match-expand-title.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
380
374
  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"),
@@ -384,6 +378,7 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
384
378
  color: "var(--ds-text-inverse, #FFFFFF)"
385
379
  }
386
380
  },
381
+ // expand title - active match - dark mode
387
382
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
388
383
  '.search-match-expand-title.selected-search-match.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
389
384
  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"),
package/dist/cjs/ui/ExcludeFromHydration/index.js ADDED
@@ -0,0 +1,36 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.default = void 0;
8
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
9
+ var _react = require("react");
10
+ var _coreUtils = require("@atlaskit/editor-common/core-utils");
11
+ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
12
+ /**
13
+ * ExcludeFromHydration component delays rendering of its children until after the initial
14
+ * hydration phase, based on a feature flag check. If the feature flag is disabled,
15
+ * it will render children immediately after hydration.
16
+ * @param param0
17
+ * @returns
18
+ */
19
+ function ExcludeFromHydration(_ref) {
20
+ var children = _ref.children;
21
+ var _useState = (0, _react.useState)(false),
22
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
23
+ shouldRender = _useState2[0],
24
+ setShouldRender = _useState2[1];
25
+ (0, _react.useEffect)(function () {
26
+ if ((0, _coreUtils.isSSR)()) {
27
+ return;
28
+ }
29
+ setShouldRender(true);
30
+ }, []);
31
+ if ((0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) && !shouldRender) {
32
+ return null;
33
+ }
34
+ return children;
35
+ }
36
+ var _default = exports.default = ExcludeFromHydration;
package/dist/cjs/version-wrapper.js CHANGED
@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = exports.name = void 0;
7
7
  var name = exports.name = "@atlaskit/editor-core";
8
- var version = exports.version = "216.0.1";
8
+ var version = exports.version = "0.0.0-development";
package/dist/es2019/ui/Appearance/Comment/Toolbar.js CHANGED
@@ -103,7 +103,7 @@ const StickyToolbar = props => {
103
103
  return (
104
104
  // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
105
105
  jsx("div", {
106
- css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && !toolbarPatch6Enabled && mainToolbarWithoutLeftPadding, props.isNewToolbarEnabled && toolbarPatch6Enabled && mainToolbarWithPadding]
106
+ css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && !toolbarPatch6Enabled && mainToolbarWithoutLeftPadding, props.isNewToolbarEnabled && toolbarPatch6Enabled && mainToolbarWithPadding]
107
107
  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
108
108
  ,
109
109
  style: {
@@ -119,7 +119,7 @@ const StickyToolbar = props => {
119
119
  const FixedToolbar = props =>
120
120
  // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
121
121
  jsx("div", {
122
- css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle],
122
+ css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle],
123
123
  "data-testid": "ak-editor-main-toolbar"
124
124
  }, props.children);
125
125
 
package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.js CHANGED
@@ -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
  const styles = {
@@ -90,7 +91,7 @@ export const FullPageToolbarNext = ({
90
91
  }, [editorView]);
91
92
  return /*#__PURE__*/React.createElement(ContextPanelConsumer, null, ({
92
93
  width: ContextPanelWidth
93
- }) => /*#__PURE__*/React.createElement(ToolbarArrowKeyNavigationProvider, {
94
+ }) => /*#__PURE__*/React.createElement(ExcludeFromHydration, null, /*#__PURE__*/React.createElement(ToolbarArrowKeyNavigationProvider, {
94
95
  editorView: editorView,
95
96
  childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
96
97
  isShortcutToFocusToolbar: isShortcutToFocusToolbar,
@@ -101,7 +102,7 @@ export const FullPageToolbarNext = ({
101
102
  showKeyline: showKeyline || ContextPanelWidth > 0
102
103
  }, beforeIcon && /*#__PURE__*/React.createElement("div", {
103
104
  className: ax([styles.mainToolbarIconBefore, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
104
- }, 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() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
105
+ }, 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, {
105
106
  toolbar: toolbar,
106
107
  components: components,
107
108
  editorView: editorView,
@@ -114,7 +115,7 @@ export const FullPageToolbarNext = ({
114
115
  }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/React.createElement("div", {
115
116
  "data-testid": 'before-primary-toolbar-components-plugin',
116
117
  className: ax([styles.beforePrimaryToolbarComponents])
117
- }, 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() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
118
+ }, 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, {
118
119
  toolbar: toolbar,
119
120
  components: components,
120
121
  editorView: editorView,
@@ -122,5 +123,5 @@ export const FullPageToolbarNext = ({
122
123
  popupsMountPoint: mountPoint,
123
124
  editorAppearance: "full-page",
124
125
  isDisabled: disabled
125
- })))));
126
+ }))))));
126
127
  };
package/dist/es2019/ui/Appearance/FullPage/MainToolbarWrapper.js CHANGED
@@ -7,7 +7,6 @@ import React from 'react';
7
7
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
8
8
  import { css, jsx } from '@emotion/react';
9
9
  import { akEditorFloatingDialogZIndex, akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
10
- import { fg } from '@atlaskit/platform-feature-flags';
11
10
  import { MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
12
11
 
13
12
  // Base styles that don't depend on feature flags
@@ -58,7 +57,7 @@ export const MainToolbarWrapper = ({
58
57
  }) => {
59
58
  return jsx("div", {
60
59
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
61
- css: [baseToolbarStyles, fg('platform-visual-refresh-icons') && flexibleIconSize, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle],
60
+ css: [baseToolbarStyles, flexibleIconSize, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle],
62
61
  "data-testid": testId
63
62
  }, children);
64
63
  };
package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -43,7 +43,7 @@ import { gridStyles } from './styles/gridStyles';
43
43
  import { indentationStyles } from './styles/indentationStyles';
44
44
  import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
45
45
  import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
46
- import { hyperLinkFloatingToolbarStyles, linkLegacyIconStylesFix, linkStyles } from './styles/link';
46
+ import { hyperLinkFloatingToolbarStyles, linkStyles } from './styles/link';
47
47
  import { diffListStyles, getDenseListStyles, listsStyles, listsStylesMarginLayoutShiftFix, listsStylesSafariFix } from './styles/list';
48
48
  import { mediaAlignmentStyles, mediaCaptionStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
49
49
  import { mentionDangerStyles, mentionNodeStyles, mentionsSelectionStyles, mentionsSelectionStylesWithSearchMatch, mentionsStyles } from './styles/mentions';
@@ -60,7 +60,7 @@ import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDe
60
60
  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';
61
61
  import { syncBlockStyles } from './styles/syncBlockStyles';
62
62
  import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableLayoutFixes, tableEmptyRowStyles } from './styles/tableStyles';
63
- import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionIconWithoutVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
63
+ import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
64
64
  import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
65
65
  import { textColorStyles } from './styles/textColorStyles';
66
66
  import { textHighlightStyle } from './styles/textHighlightStyles';
@@ -286,7 +286,7 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
286
286
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
287
287
  expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes,
288
288
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
289
- fg('platform-visual-refresh-icons') && expandStylesMixin_fg_platform_visual_refresh_icons, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
289
+ expandStylesMixin_fg_platform_visual_refresh_icons, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
290
290
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
291
291
  fg('platform_editor_a11y_find_replace_focus_ring') ?
292
292
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -308,11 +308,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
308
308
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
309
309
  taskItemStylesWithBlockTaskItem :
310
310
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
311
- taskItemStyles, fg('platform-visual-refresh-icons') &&
311
+ taskItemStyles,
312
312
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
313
- decisionIconWithVisualRefresh, !fg('platform-visual-refresh-icons') &&
314
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
315
- decisionIconWithoutVisualRefresh,
313
+ decisionIconWithVisualRefresh,
316
314
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
317
315
  statusStyles, fg('platform-component-visual-refresh') ? expValEqualsNoExposure('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
318
316
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -480,8 +478,6 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
480
478
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
481
479
  hyperLinkFloatingToolbarStyles,
482
480
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
483
- !fg('platform-visual-refresh-icons') && linkLegacyIconStylesFix,
484
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
485
481
  fg('confluence_floating_toolbar_animation') && selectionToolbarAnimationStyles,
486
482
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
487
483
  fg('platform_editor_vanilla_codebidi_warning') && codeBidiWarningStyles,