@atlaskit/editor-core 203.17.4 → 203.18.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-core
 
+## 203.18.0
+
+### Minor Changes
+
+- [#116013](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116013)
+  [`18e022766bfd3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/18e022766bfd3) -
+  [ux] ED-26464 Hiding primary toolbar and docking contextual toolbar items to top
+
+### Patch Changes
+
+- [#115715](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/115715)
+  [`cdfc0912cc98c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cdfc0912cc98c) -
+  ED-26650 LCM: Add feature flag hard coded into the legacy content macro so that it can be passed
+  down as a prop when the editor is created and prevent it from enabling render tracking. The LCM
+  was firing too many re-render events. We're aware it's an issue, but for now we want to stop the
+  event spam.
+
 ## 203.17.4
 
 ### Patch Changes

package/dist/cjs/composable-editor/editor-internal.js

@@ -54,7 +54,8 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
   var featureFlags = (0, _featureFlagsFromProps.createFeatureFlagsFromProps)(props.featureFlags);
 
   // Render tracking is firing too many events in Jira so we are disabling them for now. See - https://product-fabric.atlassian.net/browse/ED-25616
-  var renderTrackingEnabled = !(0, _platformFeatureFlags.fg)('platform_editor_disable_rerender_tracking_jira');
+  // Also firing too many events for the legacy content macro, so disabling for now. See - https://product-fabric.atlassian.net/browse/ED-26650
+  var renderTrackingEnabled = (0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro') ? !(0, _platformFeatureFlags.fg)('platform_editor_disable_rerender_tracking_jira') && !featureFlags.lcmPreventRenderTracking : !(0, _platformFeatureFlags.fg)('platform_editor_disable_rerender_tracking_jira');
   var useShallow = false;
   var _usePortalProvider = (0, _portal.usePortalProvider)(),
     _usePortalProvider2 = (0, _slicedToArray2.default)(_usePortalProvider, 2),

package/dist/cjs/create-editor/ReactEditorViewNext.js

@@ -566,13 +566,22 @@ function ReactEditorView(props) {
   // We should follow-up
   // eslint-disable-next-line react-hooks/exhaustive-deps
   [props.editorProps.assistiveLabel, props.editorProps.assistiveDescribedBy]);
+
+  // Render tracking firing too many events for the legacy content macro. We're aware of the re-render issue, but disabling this for now. See - https://product-fabric.atlassian.net/browse/ED-26650
+  var renderTrackingEnabled = !featureFlags.lcmPreventRenderTracking;
   return /*#__PURE__*/_react.default.createElement(_uiReact.ReactEditorViewContext.Provider, {
     value: {
       editorRef: editorRef,
       editorView: viewRef.current,
       popupsMountPoint: props.editorProps.popupsMountPoint
     }
-  }, /*#__PURE__*/_react.default.createElement(_RenderTracking.RenderTracking, {
+  }, (0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro') ? renderTrackingEnabled && /*#__PURE__*/_react.default.createElement(_RenderTracking.RenderTracking, {
+    componentProps: props,
+    action: _analytics.ACTION.RE_RENDERED,
+    actionSubject: _analytics.ACTION_SUBJECT.REACT_EDITOR_VIEW,
+    handleAnalyticsEvent: handleAnalyticsEvent,
+    useShallow: true
+  }) : /*#__PURE__*/_react.default.createElement(_RenderTracking.RenderTracking, {
     componentProps: props,
     action: _analytics.ACTION.RE_RENDERED,
     actionSubject: _analytics.ACTION_SUBJECT.REACT_EDITOR_VIEW,

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

@@ -12,6 +12,7 @@ var _react2 = require("@emotion/react");
 var _browser = require("@atlaskit/editor-common/browser");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _ui = require("@atlaskit/editor-common/ui");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _FullPageContentArea = require("./FullPageContentArea");
 var _FullPageToolbar = require("./FullPageToolbar");
@@ -54,6 +55,15 @@ var useShowKeyline = function useShowKeyline(contentAreaRef) {
   }, [contentAreaRef]);
   return showKeyline;
 };
+var hasCustomComponents = function hasCustomComponents(components) {
+  if (!components) {
+    return false;
+  }
+  if ('before' in components) {
+    return Array.isArray(components.before) && components.before.length > 0 || !!components.before || Array.isArray(components.after) && components.after.length > 0 || !!components.after;
+  }
+  return true;
+};
 var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
   var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _scrollContentContain4, _scrollContentContain5, _wrapperElementRef$cu;
   var wrapperElementRef = (0, _react.useMemo)(function () {
@@ -65,6 +75,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(editorAPI, ['editorViewMode', 'primaryToolbar']),
     editorViewModeState = _useSharedPluginState.editorViewModeState,
     primaryToolbarState = _useSharedPluginState.primaryToolbarState;
+  var toolbarDocking = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(editorAPI, 'selectionToolbar.toolbarDocking');
   var primaryToolbarComponents = props.primaryToolbarComponents;
   if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
     primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
@@ -87,6 +98,15 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
       }
     }
   }
+  var customPrimaryToolbarComponents = props.customPrimaryToolbarComponents;
+  if (toolbarDocking === 'none' && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
+    exposure: true
+  })) {
+    primaryToolbarComponents = [];
+    if (!hasCustomComponents(customPrimaryToolbarComponents)) {
+      isEditorToolbarHidden = true;
+    }
+  }
   var popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 || (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.containerArea) || undefined;
   return (0, _react2.jsx)(_ui.ContextPanelWidthProvider, null, (0, _react2.jsx)("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766

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 = "203.17.4";
+var version = exports.version = "203.18.0";

package/dist/es2019/composable-editor/editor-internal.js

@@ -48,7 +48,8 @@ export const EditorInternal = /*#__PURE__*/memo(({
   const featureFlags = createFeatureFlagsFromProps(props.featureFlags);
 
   // Render tracking is firing too many events in Jira so we are disabling them for now. See - https://product-fabric.atlassian.net/browse/ED-25616
-  const renderTrackingEnabled = !fg('platform_editor_disable_rerender_tracking_jira');
+  // Also firing too many events for the legacy content macro, so disabling for now. See - https://product-fabric.atlassian.net/browse/ED-26650
+  const renderTrackingEnabled = fg('platform_editor_legacy_content_macro') ? !fg('platform_editor_disable_rerender_tracking_jira') && !featureFlags.lcmPreventRenderTracking : !fg('platform_editor_disable_rerender_tracking_jira');
   const useShallow = false;
   const [portalProviderAPI, PortalRenderer] = usePortalProvider();
   const [nodeViewPortalProviderAPI, NodeViewPortalRenderer] = usePortalProvider();

package/dist/es2019/create-editor/ReactEditorViewNext.js

@@ -534,13 +534,22 @@ export function ReactEditorView(props) {
   // We should follow-up
   // eslint-disable-next-line react-hooks/exhaustive-deps
   [props.editorProps.assistiveLabel, props.editorProps.assistiveDescribedBy]);
+
+  // Render tracking firing too many events for the legacy content macro. We're aware of the re-render issue, but disabling this for now. See - https://product-fabric.atlassian.net/browse/ED-26650
+  const renderTrackingEnabled = !featureFlags.lcmPreventRenderTracking;
   return /*#__PURE__*/React.createElement(ReactEditorViewContext.Provider, {
     value: {
       editorRef: editorRef,
       editorView: viewRef.current,
       popupsMountPoint: props.editorProps.popupsMountPoint
     }
-  }, /*#__PURE__*/React.createElement(RenderTracking, {
+  }, fg('platform_editor_legacy_content_macro') ? renderTrackingEnabled && /*#__PURE__*/React.createElement(RenderTracking, {
+    componentProps: props,
+    action: ACTION.RE_RENDERED,
+    actionSubject: ACTION_SUBJECT.REACT_EDITOR_VIEW,
+    handleAnalyticsEvent: handleAnalyticsEvent,
+    useShallow: true
+  }) : /*#__PURE__*/React.createElement(RenderTracking, {
     componentProps: props,
     action: ACTION.RE_RENDERED,
     actionSubject: ACTION_SUBJECT.REACT_EDITOR_VIEW,

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

@@ -5,10 +5,11 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-import { jsx, css } from '@emotion/react';
+import { css, jsx } from '@emotion/react';
 import { browser } from '@atlaskit/editor-common/browser';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { FullPageContentArea } from './FullPageContentArea';
 import { FullPageToolbar } from './FullPageToolbar';
@@ -37,6 +38,15 @@ const useShowKeyline = contentAreaRef => {
   }, [contentAreaRef]);
   return showKeyline;
 };
+const hasCustomComponents = components => {
+  if (!components) {
+    return false;
+  }
+  if ('before' in components) {
+    return Array.isArray(components.before) && components.before.length > 0 || !!components.before || Array.isArray(components.after) && components.after.length > 0 || !!components.after;
+  }
+  return true;
+};
 export const FullPageEditor = props => {
   var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _scrollContentContain4, _scrollContentContain5, _wrapperElementRef$cu;
   const wrapperElementRef = useMemo(() => props.innerRef, [props.innerRef]);
@@ -47,6 +57,7 @@ export const FullPageEditor = props => {
     editorViewModeState,
     primaryToolbarState
   } = useSharedPluginState(editorAPI, ['editorViewMode', 'primaryToolbar']);
+  const toolbarDocking = useSharedPluginStateSelector(editorAPI, 'selectionToolbar.toolbarDocking');
   let primaryToolbarComponents = props.primaryToolbarComponents;
   if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
     primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
@@ -69,6 +80,17 @@ export const FullPageEditor = props => {
       }
     }
   }
+  const {
+    customPrimaryToolbarComponents
+  } = props;
+  if (toolbarDocking === 'none' && editorExperiment('platform_editor_controls', 'variant1', {
+    exposure: true
+  })) {
+    primaryToolbarComponents = [];
+    if (!hasCustomComponents(customPrimaryToolbarComponents)) {
+      isEditorToolbarHidden = true;
+    }
+  }
   const popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 ? void 0 : (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.containerArea) || undefined;
   return jsx(ContextPanelWidthProvider, null, jsx("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766

package/dist/es2019/version-wrapper.js

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

package/dist/esm/composable-editor/editor-internal.js

@@ -50,7 +50,8 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
   var featureFlags = createFeatureFlagsFromProps(props.featureFlags);
 
   // Render tracking is firing too many events in Jira so we are disabling them for now. See - https://product-fabric.atlassian.net/browse/ED-25616
-  var renderTrackingEnabled = !fg('platform_editor_disable_rerender_tracking_jira');
+  // Also firing too many events for the legacy content macro, so disabling for now. See - https://product-fabric.atlassian.net/browse/ED-26650
+  var renderTrackingEnabled = fg('platform_editor_legacy_content_macro') ? !fg('platform_editor_disable_rerender_tracking_jira') && !featureFlags.lcmPreventRenderTracking : !fg('platform_editor_disable_rerender_tracking_jira');
   var useShallow = false;
   var _usePortalProvider = usePortalProvider(),
     _usePortalProvider2 = _slicedToArray(_usePortalProvider, 2),

package/dist/esm/create-editor/ReactEditorViewNext.js

@@ -555,13 +555,22 @@ export function ReactEditorView(props) {
   // We should follow-up
   // eslint-disable-next-line react-hooks/exhaustive-deps
   [props.editorProps.assistiveLabel, props.editorProps.assistiveDescribedBy]);
+
+  // Render tracking firing too many events for the legacy content macro. We're aware of the re-render issue, but disabling this for now. See - https://product-fabric.atlassian.net/browse/ED-26650
+  var renderTrackingEnabled = !featureFlags.lcmPreventRenderTracking;
   return /*#__PURE__*/React.createElement(ReactEditorViewContext.Provider, {
     value: {
       editorRef: editorRef,
       editorView: viewRef.current,
       popupsMountPoint: props.editorProps.popupsMountPoint
     }
-  }, /*#__PURE__*/React.createElement(RenderTracking, {
+  }, fg('platform_editor_legacy_content_macro') ? renderTrackingEnabled && /*#__PURE__*/React.createElement(RenderTracking, {
+    componentProps: props,
+    action: ACTION.RE_RENDERED,
+    actionSubject: ACTION_SUBJECT.REACT_EDITOR_VIEW,
+    handleAnalyticsEvent: handleAnalyticsEvent,
+    useShallow: true
+  }) : /*#__PURE__*/React.createElement(RenderTracking, {
     componentProps: props,
     action: ACTION.RE_RENDERED,
     actionSubject: ACTION_SUBJECT.REACT_EDITOR_VIEW,

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

@@ -6,10 +6,11 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-import { jsx, css } from '@emotion/react';
+import { css, jsx } from '@emotion/react';
 import { browser } from '@atlaskit/editor-common/browser';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { FullPageContentArea } from './FullPageContentArea';
 import { FullPageToolbar } from './FullPageToolbar';
@@ -43,6 +44,15 @@ var useShowKeyline = function useShowKeyline(contentAreaRef) {
   }, [contentAreaRef]);
   return showKeyline;
 };
+var hasCustomComponents = function hasCustomComponents(components) {
+  if (!components) {
+    return false;
+  }
+  if ('before' in components) {
+    return Array.isArray(components.before) && components.before.length > 0 || !!components.before || Array.isArray(components.after) && components.after.length > 0 || !!components.after;
+  }
+  return true;
+};
 export var FullPageEditor = function FullPageEditor(props) {
   var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _scrollContentContain4, _scrollContentContain5, _wrapperElementRef$cu;
   var wrapperElementRef = useMemo(function () {
@@ -54,6 +64,7 @@ export var FullPageEditor = function FullPageEditor(props) {
   var _useSharedPluginState = useSharedPluginState(editorAPI, ['editorViewMode', 'primaryToolbar']),
     editorViewModeState = _useSharedPluginState.editorViewModeState,
     primaryToolbarState = _useSharedPluginState.primaryToolbarState;
+  var toolbarDocking = useSharedPluginStateSelector(editorAPI, 'selectionToolbar.toolbarDocking');
   var primaryToolbarComponents = props.primaryToolbarComponents;
   if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
     primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
@@ -76,6 +87,15 @@ export var FullPageEditor = function FullPageEditor(props) {
       }
     }
   }
+  var customPrimaryToolbarComponents = props.customPrimaryToolbarComponents;
+  if (toolbarDocking === 'none' && editorExperiment('platform_editor_controls', 'variant1', {
+    exposure: true
+  })) {
+    primaryToolbarComponents = [];
+    if (!hasCustomComponents(customPrimaryToolbarComponents)) {
+      isEditorToolbarHidden = true;
+    }
+  }
   var popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 || (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.containerArea) || undefined;
   return jsx(ContextPanelWidthProvider, null, jsx("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766

package/dist/esm/version-wrapper.js

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

package/dist/types/create-editor/create-universal-preset.d.ts

@@ -623,6 +623,9 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
     };
     sharedState: import("packages/editor/editor-plugin-hyperlink/dist/types/hyperlinkPluginType").HyperlinkPluginSharedState;
 }, import("@atlaskit/editor-common/types").HyperlinkPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selectionToolbar", {
+    sharedState: {
+        toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking;
+    };
     pluginConfiguration: {
         preferenceToolbarAboveSelection?: boolean | undefined;
     };
@@ -638,6 +641,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
     actions?: {
         suppressToolbar?: (() => boolean) | undefined;
         unsuppressToolbar?: (() => boolean) | undefined;
+        setToolbarDocking?: ((toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking) => boolean) | undefined;
     } | undefined;
 }, {
     preferenceToolbarAboveSelection?: boolean | undefined;

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

@@ -675,6 +675,9 @@ export default function createUniversalPresetInternal({ appearance, props, featu
     };
     sharedState: import("packages/editor/editor-plugin-hyperlink/dist/types/hyperlinkPluginType").HyperlinkPluginSharedState;
 }, import("@atlaskit/editor-common/types").HyperlinkPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selectionToolbar", {
+    sharedState: {
+        toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking;
+    };
     pluginConfiguration: {
         preferenceToolbarAboveSelection?: boolean | undefined;
     };
@@ -690,6 +693,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
     actions?: {
         suppressToolbar?: (() => boolean) | undefined;
         unsuppressToolbar?: (() => boolean) | undefined;
+        setToolbarDocking?: ((toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking) => boolean) | undefined;
     } | undefined;
 }, {
     preferenceToolbarAboveSelection?: boolean | undefined;

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

@@ -623,6 +623,9 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
     };
     sharedState: import("packages/editor/editor-plugin-hyperlink/dist/types/hyperlinkPluginType").HyperlinkPluginSharedState;
 }, import("@atlaskit/editor-common/types").HyperlinkPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selectionToolbar", {
+    sharedState: {
+        toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking;
+    };
     pluginConfiguration: {
         preferenceToolbarAboveSelection?: boolean | undefined;
     };
@@ -638,6 +641,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
     actions?: {
         suppressToolbar?: (() => boolean) | undefined;
         unsuppressToolbar?: (() => boolean) | undefined;
+        setToolbarDocking?: ((toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking) => boolean) | undefined;
     } | undefined;
 }, {
     preferenceToolbarAboveSelection?: boolean | undefined;

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

@@ -2,11 +2,13 @@ import { jsx } from '@emotion/react';
 import type { OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugins/editor-viewmode';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugins/primary-toolbar';
+import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugins/selection-toolbar';
 import type { EditorAppearanceComponentProps } from '../../../types';
 import type { ToolbarEditorPlugins } from './FullPageToolbar';
 type ComponentProps = EditorAppearanceComponentProps<[
     OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<PrimaryToolbarPlugin>,
+    OptionalPlugin<SelectionToolbarPlugin>,
     ...ToolbarEditorPlugins
 ]>;
 export declare const FullPageEditor: (props: ComponentProps) => jsx.JSX.Element;

package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts

@@ -813,6 +813,9 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
         sharedState: import("packages/editor/editor-plugin-hyperlink/dist/types/hyperlinkPluginType").HyperlinkPluginSharedState;
     }, import("@atlaskit/editor-common/types").HyperlinkPluginOptions | undefined>,
     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selectionToolbar", {
+        sharedState: {
+            toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking;
+        };
         pluginConfiguration: {
             preferenceToolbarAboveSelection?: boolean | undefined;
         };
@@ -831,6 +834,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
         actions?: {
             suppressToolbar?: (() => boolean) | undefined;
             unsuppressToolbar?: (() => boolean) | undefined;
+            setToolbarDocking?: ((toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking) => boolean) | undefined;
         } | undefined;
     }, {
         preferenceToolbarAboveSelection?: boolean | undefined;

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

@@ -865,6 +865,9 @@ export default function createUniversalPresetInternal({ appearance, props, featu
         sharedState: import("packages/editor/editor-plugin-hyperlink/dist/types/hyperlinkPluginType").HyperlinkPluginSharedState;
     }, import("@atlaskit/editor-common/types").HyperlinkPluginOptions | undefined>,
     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selectionToolbar", {
+        sharedState: {
+            toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking;
+        };
         pluginConfiguration: {
             preferenceToolbarAboveSelection?: boolean | undefined;
         };
@@ -883,6 +886,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
         actions?: {
             suppressToolbar?: (() => boolean) | undefined;
             unsuppressToolbar?: (() => boolean) | undefined;
+            setToolbarDocking?: ((toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking) => boolean) | undefined;
         } | undefined;
     }, {
         preferenceToolbarAboveSelection?: boolean | undefined;

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

@@ -813,6 +813,9 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
         sharedState: import("packages/editor/editor-plugin-hyperlink/dist/types/hyperlinkPluginType").HyperlinkPluginSharedState;
     }, import("@atlaskit/editor-common/types").HyperlinkPluginOptions | undefined>,
     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selectionToolbar", {
+        sharedState: {
+            toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking;
+        };
         pluginConfiguration: {
             preferenceToolbarAboveSelection?: boolean | undefined;
         };
@@ -831,6 +834,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
         actions?: {
             suppressToolbar?: (() => boolean) | undefined;
             unsuppressToolbar?: (() => boolean) | undefined;
+            setToolbarDocking?: ((toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking) => boolean) | undefined;
         } | undefined;
     }, {
         preferenceToolbarAboveSelection?: boolean | undefined;

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

@@ -2,11 +2,13 @@ import { jsx } from '@emotion/react';
 import type { OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugins/editor-viewmode';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugins/primary-toolbar';
+import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugins/selection-toolbar';
 import type { EditorAppearanceComponentProps } from '../../../types';
 import type { ToolbarEditorPlugins } from './FullPageToolbar';
 type ComponentProps = EditorAppearanceComponentProps<[
     OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<PrimaryToolbarPlugin>,
+    OptionalPlugin<SelectionToolbarPlugin>,
     ...ToolbarEditorPlugins
 ]>;
 export declare const FullPageEditor: (props: ComponentProps) => jsx.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "203.17.4",
+	"version": "203.18.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -43,7 +43,7 @@
 		"@atlaskit/analytics-next": "^10.3.0",
 		"@atlaskit/analytics-next-stable-react-context": "1.0.1",
 		"@atlaskit/button": "^20.5.0",
-		"@atlaskit/editor-common": "^99.17.0",
+		"@atlaskit/editor-common": "^99.18.0",
 		"@atlaskit/editor-json-transformer": "^8.23.0",
 		"@atlaskit/editor-performance-metrics": "1.5.0",
 		"@atlaskit/editor-plugin-quick-insert": "1.10.2",
@@ -85,7 +85,7 @@
 		"@af/visual-regression": "*",
 		"@atlaskit/adf-utils": "^19.18.0",
 		"@atlaskit/analytics-listeners": "^8.15.0",
-		"@atlaskit/collab-provider": "10.7.0",
+		"@atlaskit/collab-provider": "10.7.1",
 		"@atlaskit/editor-plugin-annotation": "1.28.1",
 		"@atlaskit/editor-plugin-card": "^4.6.0",
 		"@atlaskit/editor-plugin-list": "^3.10.0",
@@ -464,6 +464,10 @@
 		"platform_editor_nested_tables_view_mode_sort": {
 			"type": "boolean",
 			"referenceOnly": true
+		},
+		"platform_editor_legacy_content_macro": {
+			"type": "boolean",
+			"referenceOnly": true
 		}
 	},
 	"stricter": {