@atlaskit/editor-core 191.0.9 → 191.1.3

package/dist/esm/ui/Appearance/Comment/Toolbar.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
@@ -9,7 +10,11 @@ import { css, jsx } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
 import { akEditorToolbarKeylineHeight, akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 export var TableControlsPadding = 20;
-var mainToolbarWrapperStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  align-items: center;\n  padding: ", " ", " 0;\n  display: flex;\n  height: auto;\n  background-color: ", ";\n  box-shadow: none;\n  padding-left: ", ";\n\n  & > div {\n    > :first-child:not(style),\n    > style:first-child + * {\n      margin-left: 0;\n    }\n  }\n\n  .block-type-btn {\n    padding-left: 0;\n  }\n"])), "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-surface, white)", "var(--ds-space-250, 20px)");
+var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
+var mainToolbarWrapperStyle = function mainToolbarWrapperStyle() {
+  var isTwoLineEditorToolbar = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  align-items: center;\n  padding: ", " ", " 0;\n  display: flex;\n  height: auto;\n  background-color: ", ";\n  box-shadow: none;\n  padding-left: ", ";\n\n  & > div {\n    > :first-child:not(style),\n    > style:first-child + * {\n      margin-left: 0;\n    }\n    ", "\n  }\n\n  .block-type-btn {\n    padding-left: 0;\n  }\n"])), "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-surface, white)", "var(--ds-space-250, 20px)", isTwoLineEditorToolbar && "\n        @media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px) {\n          flex-direction: column-reverse;\n          align-items: end;\n          display: flex;\n          justify-content: flex-end;\n        }\n\n        //make this more explicit for a toolbar\n        > *:nth-child(1) {\n          @media (max-width: ").concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px) {\n            > div:nth-child(2) {\n              justify-content: flex-end;\n              display: flex;\n            }\n          }\n        }\n    "));
+};
 var stickyToolbarWrapperStyle = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  /* stylelint-disable declaration-block-no-duplicate-properties */\n  position: relative;\n  position: sticky;\n  /* stylelint-enable declaration-block-no-duplicate-properties */\n  padding-bottom: ", ";\n  z-index: ", ";\n  transition: box-shadow ease-in-out 0.2s;\n  &.show-keyline {\n    box-shadow: 0 ", "px 0 0\n      ", ";\n  }\n"])), "var(--ds-space-100, 8px)", akEditorMenuZIndex, akEditorToolbarKeylineHeight, "var(--ds-border, ".concat(N30, ")"));
 var StickyToolbar = function StickyToolbar(props) {
   var _useState = useState(0),
@@ -29,14 +34,14 @@ var StickyToolbar = function StickyToolbar(props) {
     }
   }, [props.externalToolbarRef, props.offsetTop]);
   return jsx("div", {
-    css: [mainToolbarWrapperStyle, stickyToolbarWrapperStyle, css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n          top: ", "px;\n        "])), top)],
+    css: [mainToolbarWrapperStyle(props.twoLineEditorToolbar), stickyToolbarWrapperStyle, css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n          top: ", "px;\n        "])), top)],
     "data-testid": "ak-editor-main-toolbar",
     className: 'show-keyline'
   }, props.children);
 };
 var FixedToolbar = function FixedToolbar(props) {
   return jsx("div", {
-    css: mainToolbarWrapperStyle,
+    css: mainToolbarWrapperStyle(props.twoLineEditorToolbar),
     "data-testid": "ak-editor-main-toolbar"
   }, props.children);
 };
@@ -70,10 +75,18 @@ var getStickyParameters = function getStickyParameters(configuration) {
 };
 export var MainToolbar = function MainToolbar(_ref) {
   var useStickyToolbar = _ref.useStickyToolbar,
+    twoLineEditorToolbar = _ref.twoLineEditorToolbar,
     children = _ref.children;
   if (useStickyToolbar) {
-    return jsx(StickyToolbar, getStickyParameters(useStickyToolbar), children);
+    return jsx(StickyToolbar, _extends({}, getStickyParameters(useStickyToolbar), {
+      twoLineEditorToolbar: twoLineEditorToolbar
+    }), children);
   }
-  return jsx(FixedToolbar, null, children);
+  return jsx(FixedToolbar, {
+    twoLineEditorToolbar: twoLineEditorToolbar
+  }, children);
 };
-export var mainToolbarCustomComponentsSlotStyle = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  flex-grow: 1;\n  padding-right: ", ";\n  > div {\n    display: flex;\n    flex-shrink: 0;\n  }\n"])), "var(--ds-space-250, 20px)");
+export var mainToolbarCustomComponentsSlotStyle = function mainToolbarCustomComponentsSlotStyle() {
+  var isTwoLineEditorToolbar = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  return css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  flex-grow: 1;\n  padding-right: ", ";\n  ", "\n  > div {\n    display: flex;\n    flex-shrink: 0;\n  }\n"])), "var(--ds-space-250, 20px)", isTwoLineEditorToolbar && "\n    @media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px) {\n      {\n        padding-right: 0;\n      }\n    }\n  "));
+};

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

@@ -4,7 +4,6 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useState, useEffect } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
-import AvatarsWithPluginState from '../../../plugins/avatar-group/ui';
 import Toolbar from '../../Toolbar';
 import { mainToolbarStyle, mainToolbarIconBeforeStyle, mainToolbarFirstChildStyle, mainToolbarSecondChildStyle, nonCustomToolbarWrapperStyle, customToolbarWrapperStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
@@ -13,7 +12,7 @@ import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-me
 import { usePresetContext } from '../../../presets/context';
 import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
 export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
-  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
+  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _editorAPI$avatarGrou, _props$collabEdit, _props$collabEdit2, _props$collabEdit3;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     shouldSplitToolbar = _useState2[0],
@@ -46,20 +45,15 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
     css: customToolbarWrapperStyle
   }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
     beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
-  }) : null, props.hideAvatarGroup || (props === null || props === void 0 || (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null :
-  // Avatars are moved to Confluence codebase for Edit in Context
+  }) : null, props.hideAvatarGroup || (props === null || props === void 0 || (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null : // Avatars are moved to Confluence codebase for Edit in Context
   // When Edit in Context is enabled customPrimaryToolbarComponents is undefined
   // For more details please check
   // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
-  jsx(AvatarsWithPluginState, {
+  editorAPI === null || editorAPI === void 0 || (_editorAPI$avatarGrou = editorAPI.avatarGroup) === null || _editorAPI$avatarGrou === void 0 ? void 0 : _editorAPI$avatarGrou.actions.getToolbarItem({
     editorView: props.editorView,
-    eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
     inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
-    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected,
-    featureFlags: props.featureFlags || {},
-    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions,
-    editorAPI: editorAPI
+    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected
   }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,

package/dist/esm/version-wrapper.js

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

package/dist/types/plugins/index.d.ts

@@ -1,2 +1 @@
 export { default as jiraIssuePlugin } from './jira-issue';
-export { default as avatarGroupPlugin } from './avatar-group';

package/dist/types/presets/default.d.ts

@@ -338,12 +338,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -386,12 +381,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
         }, import("@atlaskit/editor-common/types").FeatureFlags>>];
         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-    sharedState: {
-        query: string;
-        isOpen: boolean;
-        isAllowed: boolean;
-        currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-    };
+    sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
     actions: {
         isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
         isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -435,12 +425,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -834,12 +819,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -882,12 +862,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
         }, import("@atlaskit/editor-common/types").FeatureFlags>>];
         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-    sharedState: {
-        query: string;
-        isOpen: boolean;
-        isAllowed: boolean;
-        currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-    };
+    sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
     actions: {
         isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
         isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -931,12 +906,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;

package/dist/types/ui/Appearance/Comment/Toolbar.d.ts

@@ -3,7 +3,8 @@ import type { UseStickyToolbarType } from '@atlaskit/editor-common/ui';
 export declare const TableControlsPadding = 20;
 type MainToolbarProps = {
     useStickyToolbar?: UseStickyToolbarType;
+    twoLineEditorToolbar?: boolean;
 };
 export declare const MainToolbar: React.FC<MainToolbarProps>;
-export declare const mainToolbarCustomComponentsSlotStyle: import("@emotion/react").SerializedStyles;
+export declare const mainToolbarCustomComponentsSlotStyle: (isTwoLineEditorToolbar?: boolean) => import("@emotion/react").SerializedStyles;
 export {};

package/dist/types-ts4.5/plugins/index.d.ts

@@ -1,2 +1 @@
 export { default as jiraIssuePlugin } from './jira-issue';
-export { default as avatarGroupPlugin } from './avatar-group';

package/dist/types-ts4.5/presets/default.d.ts

@@ -435,12 +435,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
                         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
                     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
                 ];
-                sharedState: {
-                    query: string;
-                    isOpen: boolean;
-                    isAllowed: boolean;
-                    currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-                };
+                sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
                 actions: {
                     isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
                     isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -489,12 +484,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
                 actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
         ];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -544,12 +534,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
                         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
                     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
                 ];
-                sharedState: {
-                    query: string;
-                    isOpen: boolean;
-                    isAllowed: boolean;
-                    currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-                };
+                sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
                 actions: {
                     isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
                     isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -1054,12 +1039,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
                         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
                     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
                 ];
-                sharedState: {
-                    query: string;
-                    isOpen: boolean;
-                    isAllowed: boolean;
-                    currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-                };
+                sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
                 actions: {
                     isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
                     isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -1108,12 +1088,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
                 actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
         ];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -1163,12 +1138,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
                         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
                     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
                 ];
-                sharedState: {
-                    query: string;
-                    isOpen: boolean;
-                    isAllowed: boolean;
-                    currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-                };
+                sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
                 actions: {
                     isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
                     isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;

package/dist/types-ts4.5/ui/Appearance/Comment/Toolbar.d.ts

@@ -3,7 +3,8 @@ import type { UseStickyToolbarType } from '@atlaskit/editor-common/ui';
 export declare const TableControlsPadding = 20;
 type MainToolbarProps = {
     useStickyToolbar?: UseStickyToolbarType;
+    twoLineEditorToolbar?: boolean;
 };
 export declare const MainToolbar: React.FC<MainToolbarProps>;
-export declare const mainToolbarCustomComponentsSlotStyle: import("@emotion/react").SerializedStyles;
+export declare const mainToolbarCustomComponentsSlotStyle: (isTwoLineEditorToolbar?: boolean) => import("@emotion/react").SerializedStyles;
 export {};