@atlaskit/editor-core 216.0.2 → 216.1.0

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 (23) hide show
  1. package/CHANGELOG.md +13 -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/ExcludeFromHydration/index.js +36 -0
  7. package/dist/cjs/version-wrapper.js +1 -1
  8. package/dist/es2019/ui/Appearance/Comment/Toolbar.js +2 -2
  9. package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.js +5 -4
  10. package/dist/es2019/ui/Appearance/FullPage/MainToolbarWrapper.js +1 -2
  11. package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +5 -9
  12. package/dist/es2019/ui/ExcludeFromHydration/index.js +27 -0
  13. package/dist/es2019/version-wrapper.js +1 -1
  14. package/dist/esm/ui/Appearance/Comment/Toolbar.js +2 -2
  15. package/dist/esm/ui/Appearance/FullPage/FullPageToolbarNext.js +5 -4
  16. package/dist/esm/ui/Appearance/FullPage/MainToolbarWrapper.js +1 -2
  17. package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +5 -9
  18. package/dist/esm/ui/ExcludeFromHydration/index.js +30 -0
  19. package/dist/esm/version-wrapper.js +1 -1
  20. package/dist/types/ui/ExcludeFromHydration/index.d.ts +12 -0
  21. package/dist/types-ts4.5/ui/ExcludeFromHydration/index.d.ts +12 -0
  22. package/exclude-from-hydration/package.json +17 -0
  23. package/package.json +4 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,18 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 216.1.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`00e69e0b7c839`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/00e69e0b7c839) -
8
+ Clean up and removal of the `platform-visual-refresh-icons` feature flag.
9
+
10
+ ### Patch Changes
11
+
12
+ - [`2843f9743d50a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2843f9743d50a) -
13
+ ED-29683: render editor toolbar under two stage hydration
14
+ - Updated dependencies
15
+
3
16
  ## 216.0.2
4
17
 
5
18
  ### 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/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 = "216.0.2";
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,
package/dist/es2019/ui/ExcludeFromHydration/index.js ADDED
@@ -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;
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "216.0.1";
2
+ export const version = "216.0.2";
package/dist/esm/ui/Appearance/Comment/Toolbar.js CHANGED
@@ -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, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && !toolbarPatch6Enabled && mainToolbarWithoutLeftPadding, props.isNewToolbarEnabled && toolbarPatch6Enabled && mainToolbarWithPadding]
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, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle],
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
  );
package/dist/esm/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
  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) ? !isSSR() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
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) ? !isSSR() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
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
  };
package/dist/esm/ui/Appearance/FullPage/MainToolbarWrapper.js CHANGED
@@ -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, fg('platform-visual-refresh-icons') && flexibleIconSize, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle],
57
+ css: [baseToolbarStyles, flexibleIconSize, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle],
59
58
  "data-testid": testId
60
59
  }, children);
61
60
  };
package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -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, linkLegacyIconStylesFix, linkStyles } from './styles/link';
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, decisionIconWithoutVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
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
- fg('platform-visual-refresh-icons') && expandStylesMixin_fg_platform_visual_refresh_icons, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
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, fg('platform-visual-refresh-icons') &&
307
+ taskItemStyles,
308
308
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
309
- decisionIconWithVisualRefresh, !fg('platform-visual-refresh-icons') &&
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,
package/dist/esm/ui/ExcludeFromHydration/index.js ADDED
@@ -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;
package/dist/esm/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "216.0.1";
2
+ export var version = "216.0.2";
package/dist/types/ui/ExcludeFromHydration/index.d.ts ADDED
@@ -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;
package/dist/types-ts4.5/ui/ExcludeFromHydration/index.d.ts ADDED
@@ -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;
package/exclude-from-hydration/package.json ADDED
@@ -0,0 +1,17 @@
1
+ {
2
+ "name": "@atlaskit/editor-core/exclude-from-hydration",
3
+ "main": "../dist/cjs/ui/ExcludeFromHydration/index.js",
4
+ "module": "../dist/esm/ui/ExcludeFromHydration/index.js",
5
+ "module:es2019": "../dist/es2019/ui/ExcludeFromHydration/index.js",
6
+ "sideEffects": [
7
+ "*.compiled.css"
8
+ ],
9
+ "types": "../dist/types/ui/ExcludeFromHydration/index.d.ts",
10
+ "typesVersions": {
11
+ ">=4.5 <5.9": {
12
+ "*": [
13
+ "../dist/types-ts4.5/ui/ExcludeFromHydration/index.d.ts"
14
+ ]
15
+ }
16
+ }
17
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "216.0.2",
3
+ "version": "216.1.0",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -59,8 +59,8 @@
59
59
  "@atlaskit/editor-toolbar-model": "^0.2.0",
60
60
  "@atlaskit/emoji": "^69.9.0",
61
61
  "@atlaskit/icon": "^29.3.0",
62
- "@atlaskit/link": "^3.2.0",
63
- "@atlaskit/media-card": "^79.11.0",
62
+ "@atlaskit/link": "^3.3.0",
63
+ "@atlaskit/media-card": "^79.12.0",
64
64
  "@atlaskit/mention": "^24.4.0",
65
65
  "@atlaskit/platform-feature-flags": "^1.1.0",
66
66
  "@atlaskit/platform-feature-flags-react": "^0.4.0",
@@ -83,7 +83,7 @@
83
83
  "uuid": "^3.1.0"
84
84
  },
85
85
  "peerDependencies": {
86
- "@atlaskit/editor-common": "^111.0.0",
86
+ "@atlaskit/editor-common": "^111.1.0",
87
87
  "@atlaskit/link-provider": "^4.0.0",
88
88
  "@atlaskit/media-core": "^37.0.0",
89
89
  "react": "^18.2.0",