@atlaskit/editor-core 195.4.6 → 195.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/ui/Appearance/FullPage/FullPage.js +5 -2
  3. package/dist/cjs/version-wrapper.js +1 -1
  4. package/dist/es2019/ui/Appearance/FullPage/FullPage.js +5 -2
  5. package/dist/es2019/version-wrapper.js +1 -1
  6. package/dist/esm/ui/Appearance/FullPage/FullPage.js +5 -2
  7. package/dist/esm/version-wrapper.js +1 -1
  8. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 195.4.7
4
+
5
+ ### Patch Changes
6
+
7
+ - [#128388](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/128388)
8
+ [`d265cdbd7a602`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d265cdbd7a602) -
9
+ Render primary toolbar in SSR environment
10
+
3
11
  ## 195.4.6
4
12
 
5
13
  ### Patch Changes
package/dist/cjs/ui/Appearance/FullPage/FullPage.js CHANGED
@@ -66,8 +66,11 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
66
66
  editorViewModeState = _useSharedPluginState.editorViewModeState,
67
67
  primaryToolbarState = _useSharedPluginState.primaryToolbarState;
68
68
  var primaryToolbarComponents = props.primaryToolbarComponents;
69
- if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
70
- primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
69
+ if (Array.isArray(primaryToolbarComponents)) {
70
+ var _ref3, _primaryToolbarState$, _editorAPI$primaryToo;
71
+ // The primary toolbar state may be undefined if we are in SSR environment - in which case fallback to the current state (useLayoutEffect doesn't work in SSR)
72
+ var additionalComponents = (_ref3 = (_primaryToolbarState$ = primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) !== null && _primaryToolbarState$ !== void 0 ? _primaryToolbarState$ : editorAPI === null || editorAPI === void 0 || (_editorAPI$primaryToo = editorAPI.primaryToolbar) === null || _editorAPI$primaryToo === void 0 || (_editorAPI$primaryToo = _editorAPI$primaryToo.sharedState.currentState()) === null || _editorAPI$primaryToo === void 0 ? void 0 : _editorAPI$primaryToo.components) !== null && _ref3 !== void 0 ? _ref3 : [];
73
+ primaryToolbarComponents = additionalComponents.concat(primaryToolbarComponents);
71
74
  }
72
75
  var isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
73
76
  var popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 || (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.scrollContainer) || undefined;
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 = "195.4.6";
8
+ var version = exports.version = "195.4.7";
package/dist/es2019/ui/Appearance/FullPage/FullPage.js CHANGED
@@ -48,8 +48,11 @@ export const FullPageEditor = props => {
48
48
  primaryToolbarState
49
49
  } = useSharedPluginState(editorAPI, ['editorViewMode', 'primaryToolbar']);
50
50
  let primaryToolbarComponents = props.primaryToolbarComponents;
51
- if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
52
- primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
51
+ if (Array.isArray(primaryToolbarComponents)) {
52
+ var _ref, _primaryToolbarState$, _editorAPI$primaryToo, _editorAPI$primaryToo2;
53
+ // The primary toolbar state may be undefined if we are in SSR environment - in which case fallback to the current state (useLayoutEffect doesn't work in SSR)
54
+ const additionalComponents = (_ref = (_primaryToolbarState$ = primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) !== null && _primaryToolbarState$ !== void 0 ? _primaryToolbarState$ : editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$primaryToo = editorAPI.primaryToolbar) === null || _editorAPI$primaryToo === void 0 ? void 0 : (_editorAPI$primaryToo2 = _editorAPI$primaryToo.sharedState.currentState()) === null || _editorAPI$primaryToo2 === void 0 ? void 0 : _editorAPI$primaryToo2.components) !== null && _ref !== void 0 ? _ref : [];
55
+ primaryToolbarComponents = additionalComponents.concat(primaryToolbarComponents);
53
56
  }
54
57
  const isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
55
58
  const popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 ? void 0 : (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.scrollContainer) || undefined;
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "195.4.6";
2
+ export const version = "195.4.7";
package/dist/esm/ui/Appearance/FullPage/FullPage.js CHANGED
@@ -55,8 +55,11 @@ export var FullPageEditor = function FullPageEditor(props) {
55
55
  editorViewModeState = _useSharedPluginState.editorViewModeState,
56
56
  primaryToolbarState = _useSharedPluginState.primaryToolbarState;
57
57
  var primaryToolbarComponents = props.primaryToolbarComponents;
58
- if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
59
- primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
58
+ if (Array.isArray(primaryToolbarComponents)) {
59
+ var _ref3, _primaryToolbarState$, _editorAPI$primaryToo;
60
+ // The primary toolbar state may be undefined if we are in SSR environment - in which case fallback to the current state (useLayoutEffect doesn't work in SSR)
61
+ var additionalComponents = (_ref3 = (_primaryToolbarState$ = primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) !== null && _primaryToolbarState$ !== void 0 ? _primaryToolbarState$ : editorAPI === null || editorAPI === void 0 || (_editorAPI$primaryToo = editorAPI.primaryToolbar) === null || _editorAPI$primaryToo === void 0 || (_editorAPI$primaryToo = _editorAPI$primaryToo.sharedState.currentState()) === null || _editorAPI$primaryToo === void 0 ? void 0 : _editorAPI$primaryToo.components) !== null && _ref3 !== void 0 ? _ref3 : [];
62
+ primaryToolbarComponents = additionalComponents.concat(primaryToolbarComponents);
60
63
  }
61
64
  var isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
62
65
  var popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 || (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.scrollContainer) || undefined;
package/dist/esm/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "195.4.6";
2
+ export var version = "195.4.7";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "195.4.6",
3
+ "version": "195.4.7",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"