@atlaskit/editor-core 195.0.4 → 195.1.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-core
 
+## 195.1.0
+
+### Minor Changes
+
+- [#126478](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/126478)
+  [`d4759f0dd6f74`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d4759f0dd6f74) -
+  [ED-24247] Added 'mediaInsertPlugin' to the universal preset behind a fg
+  "platform_editor_insert_media_plugin_phase_one" and also only if the mediaPlugin is added
+
+## 195.0.9
+
+### Patch Changes
+
+- [#125980](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/125980)
+  [`93070430085a6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/93070430085a6) -
+  add editor content area as default popup boundaries element for full page editor and comment
+  editor
+- [#125082](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/125082)
+  [`ba605ab4da0e1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ba605ab4da0e1) -
+  [ED-23977] This change cleans up the use of the feature flag
+  'platform.editor.a11y-main-toolbar-navigation_osrty'.
+- Updated dependencies
+
 ## 195.0.4
 
 ### Patch Changes

package/dist/cjs/presets/universal.js

@@ -41,6 +41,7 @@ var _layout = require("@atlaskit/editor-plugins/layout");
 var _list = require("@atlaskit/editor-plugins/list");
 var _maxContentSize = require("@atlaskit/editor-plugins/max-content-size");
 var _media = require("@atlaskit/editor-plugins/media");
+var _mediaInsert = require("@atlaskit/editor-plugins/media-insert");
 var _mentions = require("@atlaskit/editor-plugins/mentions");
 var _panel = require("@atlaskit/editor-plugins/panel");
 var _pasteOptionsToolbar = require("@atlaskit/editor-plugins/paste-options-toolbar");
@@ -121,7 +122,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     isCopyPasteEnabled: !isMobile,
     alignLeftOnInsert: typeof ((_props$media3 = props.media) === null || _props$media3 === void 0 ? void 0 : _props$media3.alignLeftOnInsert) !== 'undefined' ? (_props$media4 = props.media) === null || _props$media4 === void 0 ? void 0 : _props$media4.alignLeftOnInsert : isComment,
     getEditorFeatureFlags: getEditorFeatureFlags
-  })], Boolean(props.media)).maybeAdd(_caption.captionPlugin, Boolean((_props$media5 = props.media) === null || _props$media5 === void 0 ? void 0 : _props$media5.allowCaptions)).maybeAdd([_mentions.mentionsPlugin, {
+  })], Boolean(props.media)).maybeAdd(_mediaInsert.mediaInsertPlugin, Boolean(props.media && (0, _platformFeatureFlags.fg)('platform_editor_insert_media_plugin_phase_one'))).maybeAdd(_caption.captionPlugin, Boolean((_props$media5 = props.media) === null || _props$media5 === void 0 ? void 0 : _props$media5.allowCaptions)).maybeAdd([_mentions.mentionsPlugin, {
     sanitizePrivateContent: props.sanitizePrivateContent,
     insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
     allowZeroWidthSpaceAfter: !isMobile,

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

@@ -55,7 +55,7 @@ var useShowKeyline = function useShowKeyline(contentAreaRef) {
   return showKeyline;
 };
 var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
-  var _scrollContentContain, _scrollContentContain2, _wrapperElementRef$cu;
+  var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
   var wrapperElementRef = (0, _react.useMemo)(function () {
     return props.innerRef;
   }, [props.innerRef]);
@@ -70,6 +70,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
     primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
   }
   var isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
+  var popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 || (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.scrollContainer) || 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
     css: _StyledComponents.fullPageEditorWrapper
@@ -81,7 +82,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
     appearance: props.appearance,
     beforeIcon: props.primaryToolbarIconBefore,
     collabEdit: props.collabEdit,
-    containerElement: (_scrollContentContain = (_scrollContentContain2 = scrollContentContainerRef.current) === null || _scrollContentContain2 === void 0 ? void 0 : _scrollContentContain2.scrollContainer) !== null && _scrollContentContain !== void 0 ? _scrollContentContain : null,
+    containerElement: (_scrollContentContain2 = (_scrollContentContain3 = scrollContentContainerRef.current) === null || _scrollContentContain3 === void 0 ? void 0 : _scrollContentContain3.scrollContainer) !== null && _scrollContentContain2 !== void 0 ? _scrollContentContain2 : null,
     customPrimaryToolbarComponents: props.customPrimaryToolbarComponents,
     disabled: !!props.disabled,
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
@@ -110,7 +111,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
     editorDOMElement: props.editorDOMElement,
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,
-    popupsBoundariesElement: props.popupsBoundariesElement,
+    popupsBoundariesElement: popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
     providerFactory: props.providerFactory,

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

@@ -75,7 +75,7 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
         ref: contentAreaRef
       }, (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
-        css: _StyledComponents.editorContentGutterStyle
+        css: (0, _StyledComponents.editorContentGutterStyle)()
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         ,
         className: ['ak-editor-content-area', fullWidthMode ? 'fabric-editor--full-width-mode' : ''].join(' '),

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

@@ -100,8 +100,10 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
   };
   var handleEscape = function handleEscape(event) {
     var _props$editorView;
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-main-toolbar-navigation_osrty') && !props.popupsMountPoint) {
-      return;
+    if (!(0, _platformFeatureFlags.fg)('editor-fix-esc-main-toolbar-navigation')) {
+      if (!props.popupsMountPoint) {
+        return;
+      }
     }
     if (!((_props$editorView = props.editorView) !== null && _props$editorView !== void 0 && _props$editorView.hasFocus())) {
       var _props$editorView2;

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

@@ -16,39 +16,45 @@ var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = exports.MAXIMUM_TWO_LINE_TOOLBAR_BREAK
 // box-shadow is overriden by the mainToolbar
 var mainToolbarWithKeyline = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  boxShadow: (0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)" : // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  boxShadow: (0, _platformFeatureFlags.fg)('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)" : // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
   "0 ".concat(_editorSharedStyles.akEditorToolbarKeylineHeight, "px 0 0 ", "var(--ds-background-accent-gray-subtlest, #F1F2F4)")
 });
-var mainToolbarTwoLineStyle = (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
-  flexWrap: 'wrap',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  height: "calc(".concat((0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(), " * 2)")
-}));
-var mainToolbar = (0, _react.css)((0, _defineProperty2.default)({
-  position: 'relative',
-  alignItems: 'center',
-  boxShadow: 'none',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  borderBottom: (0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "1px solid ".concat("var(--ds-border, #091E4224)") : undefined,
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  transition: "box-shadow 200ms ".concat(_editorSharedStyles.akEditorSwoopCubicBezier),
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex,
-  display: 'flex',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  height: (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(),
-  flexShrink: 0,
-  backgroundColor: "var(--ds-surface, white)",
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '& object': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
-    height: '0 !important'
-  }
-}, "@media (max-width: ".concat(_editorSharedStyles.akEditorMobileMaxWidth, "px)"), {
-  display: 'grid',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  height: "calc(".concat((0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(), " * 2)")
-}));
+var mainToolbarTwoLineStyle = function mainToolbarTwoLineStyle() {
+  var editorToolbarHeight = (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)();
+  return (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
+    flexWrap: 'wrap',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: "calc(".concat(editorToolbarHeight, " * 2)")
+  }));
+};
+var mainToolbar = function mainToolbar() {
+  var editorToolbarHeight = (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)();
+  return (0, _react.css)((0, _defineProperty2.default)({
+    position: 'relative',
+    alignItems: 'center',
+    boxShadow: 'none',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    borderBottom: (0, _platformFeatureFlags.fg)('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "1px solid ".concat("var(--ds-border, #091E4224)") : undefined,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    transition: "box-shadow 200ms ".concat(_editorSharedStyles.akEditorSwoopCubicBezier),
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex,
+    display: 'flex',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: editorToolbarHeight,
+    flexShrink: 0,
+    backgroundColor: "var(--ds-surface, white)",
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '& object': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
+      height: '0 !important'
+    }
+  }, "@media (max-width: ".concat(_editorSharedStyles.akEditorMobileMaxWidth, "px)"), {
+    display: 'grid',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: "calc(".concat(editorToolbarHeight, " * 2)")
+  }));
+};
 var mainToolbarStyle = exports.mainToolbarStyle = function mainToolbarStyle(showKeyline, twoLineEditorToolbar) {
   return [mainToolbar, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle];
 };
@@ -69,28 +75,34 @@ var mainToolbarFirstChild = (0, _react.css)((0, _defineProperty2.default)({
   gridColumn: 1,
   gridRow: 1
 }));
-var mainToolbarFirstChildTowLine = (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
-  flex: '1 1 100%',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  height: (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(),
-  justifyContent: 'flex-end',
-  minWidth: 'fit-content'
-}));
+var mainToolbarFirstChildTowLine = function mainToolbarFirstChildTowLine() {
+  var editorToolbarHeight = (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)();
+  return (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
+    flex: '1 1 100%',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: editorToolbarHeight,
+    justifyContent: 'flex-end',
+    minWidth: 'fit-content'
+  }));
+};
 var mainToolbarFirstChildStyle = exports.mainToolbarFirstChildStyle = function mainToolbarFirstChildStyle(twoLineEditorToolbar) {
   return [mainToolbarFirstChild, twoLineEditorToolbar && mainToolbarFirstChildTowLine];
 };
 var mainToolbarSecondChild = (0, _react.css)({
   minWidth: 'fit-content'
 });
-var mainToolbarSecondChildTwoLine = (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
-  display: 'flex',
-  flexGrow: 1,
-  flex: '1 1 100%',
-  margin: 'auto',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  height: (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(),
-  minWidth: 0
-}));
+var mainToolbarSecondChildTwoLine = function mainToolbarSecondChildTwoLine() {
+  var editorToolbarHeight = (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)();
+  return (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
+    display: 'flex',
+    flexGrow: 1,
+    flex: '1 1 100%',
+    margin: 'auto',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: editorToolbarHeight,
+    minWidth: 0
+  }));
+};
 var mainToolbarSecondChildStyle = exports.mainToolbarSecondChildStyle = function mainToolbarSecondChildStyle(twoLineEditorToolbar) {
   return [mainToolbarSecondChild, twoLineEditorToolbar && mainToolbarSecondChildTwoLine];
 };

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

@@ -63,17 +63,20 @@ var positionedOverEditorStyle = exports.positionedOverEditorStyle = (0, _react.c
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-var contentArea = exports.contentArea = (0, _react.css)({
-  display: 'flex',
-  flexDirection: 'row',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  height: "calc(100% - ".concat((0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(), ")"),
-  boxSizing: 'border-box',
-  margin: 0,
-  padding: 0,
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  transition: "padding 0ms ".concat(_editorSharedStyles.akEditorSwoopCubicBezier)
-});
+var contentArea = exports.contentArea = function contentArea() {
+  var editorToolbarHeight = (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)();
+  return (0, _react.css)({
+    display: 'flex',
+    flexDirection: 'row',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: "calc(100% - ".concat(editorToolbarHeight, ")"),
+    boxSizing: 'border-box',
+    margin: 0,
+    padding: 0,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    transition: "padding 0ms ".concat(_editorSharedStyles.akEditorSwoopCubicBezier)
+  });
+};
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var contentAreaHeightNoToolbar = exports.contentAreaHeightNoToolbar = (0, _react.css)({
@@ -194,9 +197,12 @@ _commonStyles.tableFullPageEditorStyles, {
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-var editorContentGutterStyle = exports.editorContentGutterStyle = (0, _react.css)({
-  boxSizing: 'border-box',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  padding: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.core.increase-full-page-guttering') ? // there is no space token for 52px
-  "0 52px" : "0 ".concat("var(--ds-space-400, 32px)")
-});
+var editorContentGutterStyle = exports.editorContentGutterStyle = function editorContentGutterStyle() {
+  var padding = (0, _platformFeatureFlags.fg)('platform.editor.core.increase-full-page-guttering') ? // there is no space token for 52px
+  "0 52px" : "0 ".concat("var(--ds-space-400, 32px)");
+  return (0, _react.css)({
+    boxSizing: 'border-box',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    padding: padding
+  });
+};

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

package/dist/es2019/presets/universal.js

@@ -31,6 +31,7 @@ import { layoutPlugin } from '@atlaskit/editor-plugins/layout';
 import { listPlugin } from '@atlaskit/editor-plugins/list';
 import { maxContentSizePlugin } from '@atlaskit/editor-plugins/max-content-size';
 import { mediaPlugin } from '@atlaskit/editor-plugins/media';
+import { mediaInsertPlugin } from '@atlaskit/editor-plugins/media-insert';
 import { mentionsPlugin } from '@atlaskit/editor-plugins/mentions';
 import { panelPlugin } from '@atlaskit/editor-plugins/panel';
 import { pasteOptionsToolbarPlugin } from '@atlaskit/editor-plugins/paste-options-toolbar';
@@ -110,7 +111,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     isCopyPasteEnabled: !isMobile,
     alignLeftOnInsert: typeof ((_props$media3 = props.media) === null || _props$media3 === void 0 ? void 0 : _props$media3.alignLeftOnInsert) !== 'undefined' ? (_props$media4 = props.media) === null || _props$media4 === void 0 ? void 0 : _props$media4.alignLeftOnInsert : isComment,
     getEditorFeatureFlags
-  }], Boolean(props.media)).maybeAdd(captionPlugin, Boolean((_props$media5 = props.media) === null || _props$media5 === void 0 ? void 0 : _props$media5.allowCaptions)).maybeAdd([mentionsPlugin, {
+  }], Boolean(props.media)).maybeAdd(mediaInsertPlugin, Boolean(props.media && fg('platform_editor_insert_media_plugin_phase_one'))).maybeAdd(captionPlugin, Boolean((_props$media5 = props.media) === null || _props$media5 === void 0 ? void 0 : _props$media5.allowCaptions)).maybeAdd([mentionsPlugin, {
     sanitizePrivateContent: props.sanitizePrivateContent,
     insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
     allowZeroWidthSpaceAfter: !isMobile,

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

@@ -38,7 +38,7 @@ const useShowKeyline = contentAreaRef => {
   return showKeyline;
 };
 export const FullPageEditor = props => {
-  var _scrollContentContain, _scrollContentContain2, _wrapperElementRef$cu;
+  var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
   const wrapperElementRef = useMemo(() => props.innerRef, [props.innerRef]);
   const scrollContentContainerRef = useRef(null);
   const showKeyline = useShowKeyline(scrollContentContainerRef);
@@ -52,6 +52,7 @@ export const FullPageEditor = props => {
     primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
   }
   const isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
+  const popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 ? void 0 : (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.scrollContainer) || 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
     css: fullPageEditorWrapper
@@ -63,7 +64,7 @@ export const FullPageEditor = props => {
     appearance: props.appearance,
     beforeIcon: props.primaryToolbarIconBefore,
     collabEdit: props.collabEdit,
-    containerElement: (_scrollContentContain = (_scrollContentContain2 = scrollContentContainerRef.current) === null || _scrollContentContain2 === void 0 ? void 0 : _scrollContentContain2.scrollContainer) !== null && _scrollContentContain !== void 0 ? _scrollContentContain : null,
+    containerElement: (_scrollContentContain2 = (_scrollContentContain3 = scrollContentContainerRef.current) === null || _scrollContentContain3 === void 0 ? void 0 : _scrollContentContain3.scrollContainer) !== null && _scrollContentContain2 !== void 0 ? _scrollContentContain2 : null,
     customPrimaryToolbarComponents: props.customPrimaryToolbarComponents,
     disabled: !!props.disabled,
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
@@ -92,7 +93,7 @@ export const FullPageEditor = props => {
     editorDOMElement: props.editorDOMElement,
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,
-    popupsBoundariesElement: props.popupsBoundariesElement,
+    popupsBoundariesElement: popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
     providerFactory: props.providerFactory,

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

@@ -64,7 +64,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
       ref: contentAreaRef
     }, 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
-      css: editorContentGutterStyle
+      css: editorContentGutterStyle()
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
       className: ['ak-editor-content-area', fullWidthMode ? 'fabric-editor--full-width-mode' : ''].join(' '),

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

@@ -11,7 +11,7 @@ import { injectIntl } from 'react-intl-next';
 import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { usePresetContext } from '../../../presets/context';
 import Toolbar from '../../Toolbar';
 import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
@@ -84,8 +84,10 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
   };
   const handleEscape = event => {
     var _props$editorView;
-    if (getBooleanFF('platform.editor.a11y-main-toolbar-navigation_osrty') && !props.popupsMountPoint) {
-      return;
+    if (!fg('editor-fix-esc-main-toolbar-navigation')) {
+      if (!props.popupsMountPoint) {
+        return;
+      }
     }
     if (!((_props$editorView = props.editorView) !== null && _props$editorView !== void 0 && _props$editorView.hasFocus())) {
       var _props$editorView2;

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

@@ -1,51 +1,57 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 import { akEditorFloatingDialogZIndex, akEditorMobileMaxWidth, akEditorSwoopCubicBezier, akEditorToolbarKeylineHeight, FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 868;
 
 // box-shadow is overriden by the mainToolbar
 const mainToolbarWithKeyline = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  boxShadow: getBooleanFF('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? `${"var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)"}` :
+  boxShadow: fg('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? `${"var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)"}` :
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
   `0 ${akEditorToolbarKeylineHeight}px 0 0 ${"var(--ds-background-accent-gray-subtlest, #F1F2F4)"}`
 });
-const mainToolbarTwoLineStyle = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
-    flexWrap: 'wrap',
+const mainToolbarTwoLineStyle = () => {
+  const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
+  return css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
+      flexWrap: 'wrap',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+      height: `calc(${editorToolbarHeight} * 2)`
+    }
+  });
+};
+const mainToolbar = () => {
+  const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
+  return css({
+    position: 'relative',
+    alignItems: 'center',
+    boxShadow: 'none',
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-    height: `calc(${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()} * 2)`
-  }
-});
-const mainToolbar = css({
-  position: 'relative',
-  alignItems: 'center',
-  boxShadow: 'none',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  borderBottom: getBooleanFF('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? `1px solid ${"var(--ds-border, #091E4224)"}` : undefined,
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  transition: `box-shadow 200ms ${akEditorSwoopCubicBezier}`,
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  zIndex: akEditorFloatingDialogZIndex,
-  display: 'flex',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  height: FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(),
-  flexShrink: 0,
-  backgroundColor: "var(--ds-surface, white)",
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '& object': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
-    height: '0 !important'
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-  [`@media (max-width: ${akEditorMobileMaxWidth}px)`]: {
-    display: 'grid',
+    borderBottom: fg('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? `1px solid ${"var(--ds-border, #091E4224)"}` : undefined,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-    height: `calc(${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()} * 2)`
-  }
-});
+    transition: `box-shadow 200ms ${akEditorSwoopCubicBezier}`,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    zIndex: akEditorFloatingDialogZIndex,
+    display: 'flex',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: editorToolbarHeight,
+    flexShrink: 0,
+    backgroundColor: "var(--ds-surface, white)",
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '& object': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
+      height: '0 !important'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+    [`@media (max-width: ${akEditorMobileMaxWidth}px)`]: {
+      display: 'grid',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+      height: `calc(${editorToolbarHeight} * 2)`
+    }
+  });
+};
 export const mainToolbarStyle = (showKeyline, twoLineEditorToolbar) => [mainToolbar, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle];
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
@@ -68,32 +74,38 @@ const mainToolbarFirstChild = css({
     gridRow: 1
   }
 });
-const mainToolbarFirstChildTowLine = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
-    flex: '1 1 100%',
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-    height: FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(),
-    justifyContent: 'flex-end',
-    minWidth: 'fit-content'
-  }
-});
+const mainToolbarFirstChildTowLine = () => {
+  const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
+  return css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
+      flex: '1 1 100%',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+      height: editorToolbarHeight,
+      justifyContent: 'flex-end',
+      minWidth: 'fit-content'
+    }
+  });
+};
 export const mainToolbarFirstChildStyle = twoLineEditorToolbar => [mainToolbarFirstChild, twoLineEditorToolbar && mainToolbarFirstChildTowLine];
 const mainToolbarSecondChild = css({
   minWidth: 'fit-content'
 });
-const mainToolbarSecondChildTwoLine = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
-    display: 'flex',
-    flexGrow: 1,
-    flex: '1 1 100%',
-    margin: 'auto',
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-    height: FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(),
-    minWidth: 0
-  }
-});
+const mainToolbarSecondChildTwoLine = () => {
+  const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
+  return css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
+      display: 'flex',
+      flexGrow: 1,
+      flex: '1 1 100%',
+      margin: 'auto',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+      height: editorToolbarHeight,
+      minWidth: 0
+    }
+  });
+};
 export const mainToolbarSecondChildStyle = twoLineEditorToolbar => [mainToolbarSecondChild, twoLineEditorToolbar && mainToolbarSecondChildTwoLine];
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766

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

@@ -5,7 +5,7 @@ import { tableFullPageEditorStyles } from '@atlaskit/editor-plugins/table/ui/com
 import { tableMarginFullWidthMode } from '@atlaskit/editor-plugins/table/ui/consts';
 import { akEditorContextPanelWidth, akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic, akEditorSwoopCubicBezier, akLayoutGutterOffset, FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
 import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createEditorContentStyle } from '../../ContentStyles';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -54,17 +54,20 @@ export const positionedOverEditorStyle = css({
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const contentArea = css({
-  display: 'flex',
-  flexDirection: 'row',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  height: `calc(100% - ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()})`,
-  boxSizing: 'border-box',
-  margin: 0,
-  padding: 0,
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  transition: `padding 0ms ${akEditorSwoopCubicBezier}`
-});
+export const contentArea = () => {
+  const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
+  return css({
+    display: 'flex',
+    flexDirection: 'row',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: `calc(100% - ${editorToolbarHeight})`,
+    boxSizing: 'border-box',
+    margin: 0,
+    padding: 0,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    transition: `padding 0ms ${akEditorSwoopCubicBezier}`
+  });
+};
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const contentAreaHeightNoToolbar = css({
@@ -184,10 +187,13 @@ tableFullPageEditorStyles, {
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const editorContentGutterStyle = css({
-  boxSizing: 'border-box',
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  padding: getBooleanFF('platform.editor.core.increase-full-page-guttering') ?
+export const editorContentGutterStyle = () => {
+  const padding = fg('platform.editor.core.increase-full-page-guttering') ?
   // there is no space token for 52px
-  `0 52px` : `0 ${"var(--ds-space-400, 32px)"}`
-});
+  `0 52px` : `0 ${"var(--ds-space-400, 32px)"}`;
+  return css({
+    boxSizing: 'border-box',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    padding: padding
+  });
+};

package/dist/es2019/version-wrapper.js

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