@atlaskit/editor-core 191.4.10 → 191.5.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 191.5.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 191.5.0
+
+### Minor Changes
+
+- [#68916](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68916) [`32c9759874ea`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/32c9759874ea) - [ux] Wrapped the FullPageToolbar with the viewMode so that it will not render if the page is in a viewMode
+
 ## 191.4.10
 
 ### Patch Changes

package/dist/cjs/ui/Appearance/FullPage/FullPageToolbar.js

@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
@@ -28,6 +29,11 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     shouldSplitToolbar = _useState2[0],
     setShouldSplitToolbar = _useState2[1];
   var editorAPI = (0, _context.usePresetContext)();
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(editorAPI, ['editorViewMode']),
+    editorViewModeState = _useSharedPluginState.editorViewModeState;
+
+  // To check if the page is in viewMode
+  var isInViewMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
 
   // When primary toolbar components is undefined, do not show two line editor toolbar
   var twoLineEditorToolbar = !!props.customPrimaryToolbarComponents && !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar);
@@ -97,6 +103,9 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     event.preventDefault();
     event.stopPropagation();
   };
+  if (isInViewMode) {
+    return null;
+  }
   return (0, _react2.jsx)(_ui.ContextPanelConsumer, null, function (_ref) {
     var contextPanelWidth = _ref.width;
     return (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "191.4.10";
+var version = exports.version = "191.5.1";

package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js

@@ -3,6 +3,7 @@
 import React, { useEffect, useState } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
@@ -14,6 +15,12 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
   var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _editorAPI$avatarGrou, _props$collabEdit, _props$collabEdit2, _props$collabEdit3;
   const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
   const editorAPI = usePresetContext();
+  const {
+    editorViewModeState
+  } = useSharedPluginState(editorAPI, ['editorViewMode']);
+
+  // To check if the page is in viewMode
+  const isInViewMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
 
   // When primary toolbar components is undefined, do not show two line editor toolbar
   const twoLineEditorToolbar = !!props.customPrimaryToolbarComponents && !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar);
@@ -81,6 +88,9 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     event.preventDefault();
     event.stopPropagation();
   };
+  if (isInViewMode) {
+    return null;
+  }
   return jsx(ContextPanelConsumer, null, ({
     width: contextPanelWidth
   }) => jsx(ToolbarArrowKeyNavigationProvider, {

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "191.4.10";
+export const version = "191.5.1";

package/dist/esm/ui/Appearance/FullPage/FullPageToolbar.js

@@ -4,6 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useEffect, useState } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
@@ -18,6 +19,11 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
     shouldSplitToolbar = _useState2[0],
     setShouldSplitToolbar = _useState2[1];
   var editorAPI = usePresetContext();
+  var _useSharedPluginState = useSharedPluginState(editorAPI, ['editorViewMode']),
+    editorViewModeState = _useSharedPluginState.editorViewModeState;
+
+  // To check if the page is in viewMode
+  var isInViewMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
 
   // When primary toolbar components is undefined, do not show two line editor toolbar
   var twoLineEditorToolbar = !!props.customPrimaryToolbarComponents && !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar);
@@ -87,6 +93,9 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
     event.preventDefault();
     event.stopPropagation();
   };
+  if (isInViewMode) {
+    return null;
+  }
   return jsx(ContextPanelConsumer, null, function (_ref) {
     var contextPanelWidth = _ref.width;
     return jsx(ToolbarArrowKeyNavigationProvider, {

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "191.4.10";
+export var version = "191.5.1";

package/dist/types/ui/Appearance/FullPage/FullPageToolbar.d.ts

@@ -33,7 +33,7 @@ export interface FullPageToolbarProps {
     featureFlags: FeatureFlags;
     hideAvatarGroup?: boolean;
 }
-export declare const EditorToolbar: React.MemoExoticComponent<(props: FullPageToolbarProps & WrappedComponentProps) => jsx.JSX.Element>;
+export declare const EditorToolbar: React.MemoExoticComponent<(props: FullPageToolbarProps & WrappedComponentProps) => jsx.JSX.Element | null>;
 export declare const FullPageToolbar: React.FC<import("react-intl-next").WithIntlProps<FullPageToolbarProps & WrappedComponentProps<"intl">>> & {
     WrappedComponent: React.ComponentType<FullPageToolbarProps & WrappedComponentProps<"intl">>;
 };

package/dist/types-ts4.5/ui/Appearance/FullPage/FullPageToolbar.d.ts

@@ -33,7 +33,7 @@ export interface FullPageToolbarProps {
     featureFlags: FeatureFlags;
     hideAvatarGroup?: boolean;
 }
-export declare const EditorToolbar: React.MemoExoticComponent<(props: FullPageToolbarProps & WrappedComponentProps) => jsx.JSX.Element>;
+export declare const EditorToolbar: React.MemoExoticComponent<(props: FullPageToolbarProps & WrappedComponentProps) => jsx.JSX.Element | null>;
 export declare const FullPageToolbar: React.FC<import("react-intl-next").WithIntlProps<FullPageToolbarProps & WrappedComponentProps<"intl">>> & {
     WrappedComponent: React.ComponentType<FullPageToolbarProps & WrappedComponentProps<"intl">>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "191.4.10",
+  "version": "191.5.1",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -95,7 +95,7 @@
     "@atlaskit/editor-plugin-list": "^3.1.0",
     "@atlaskit/editor-plugin-loom": "^0.2.0",
     "@atlaskit/editor-plugin-max-content-size": "^0.1.0",
-    "@atlaskit/editor-plugin-media": "^0.11.0",
+    "@atlaskit/editor-plugin-media": "^0.12.0",
     "@atlaskit/editor-plugin-mentions": "^0.1.0",
     "@atlaskit/editor-plugin-panel": "^0.2.0",
     "@atlaskit/editor-plugin-paste": "^0.2.0",