@atlaskit/editor-core 207.2.1 → 207.4.0

package/dist/cjs/ui/EditorContentContainer/styles/mediaStyles.js

@@ -0,0 +1,230 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mediaStyles = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = require("@emotion/react");
+var _mediaInline = require("@atlaskit/editor-common/media-inline");
+var _styles = require("@atlaskit/editor-common/styles");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _mediaCard = require("@atlaskit/media-card");
+var _ProseMirror, _css; // eslint-disable-line @atlaskit/ui-styling-standard/use-compiled
+var wrappedMediaBreakoutPoint = 410;
+
+/**
+ * Reference Heights
+ *
+ * These heights enforce consistent sizes with media inline nodes due to
+ * inconsistencies with center aligned inline nodes and text.
+ *
+ * There is conversation about refactoring media inline nodes to conform to
+ * aligning correctly with the surrounding text.
+ *
+ * These constants originally came from `headingSizes` from the `theme` package
+ * and have been copied here to remove this package.
+ */
+var referenceHeights = {
+  p: 24 - 2,
+  h1: 32 + 4,
+  h2: 28 + 3,
+  h3: 24 + 1,
+  h4: 20 + 3,
+  h5: 16 + 4,
+  h6: 16 + 2
+};
+var inlineImageSelector = "> .mediaInlineView-content-wrap > .".concat(_mediaInline.INLINE_IMAGE_WRAPPER_CLASS_NAME, ", > :is(a, span[data-mark-type='border']) .mediaInlineView-content-wrap > .").concat(_mediaInline.INLINE_IMAGE_WRAPPER_CLASS_NAME, ", > .").concat(_mediaInline.INLINE_IMAGE_WRAPPER_CLASS_NAME, ", > :is(a, span[data-mark-type='border']) .").concat(_mediaInline.INLINE_IMAGE_WRAPPER_CLASS_NAME);
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles,@atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
+var mediaStyles = exports.mediaStyles = (0, _react.css)((_css = {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': (_ProseMirror = {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_ProseMirror, "li .".concat(_styles.richMediaClassName), {
+    margin: 0
+  }), '&.ua-chrome li > .mediaSingleView-content-wrap::before', {
+    content: "''",
+    display: 'block',
+    height: 0
+  }), '&.ua-firefox', {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.mediaSingleView-content-wrap': {
+      userSelect: 'none'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.captionView-content-wrap': {
+      userSelect: 'text'
+    }
+  }), ".mediaSingleView-content-wrap[layout^='wrap-']", {
+    position: 'relative',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values,@atlaskit/ui-styling-standard/no-imported-style-values
+    zIndex: _editorSharedStyles.akEditorWrappedNodeZIndex,
+    maxWidth: '100%',
+    /* overwrite default Prosemirror setting making it clear: both */
+    clear: 'inherit'
+  }), ".mediaSingleView-content-wrap[layout='center']", {
+    clear: 'both'
+  }), "table .".concat(_styles.richMediaClassName), {
+    marginTop: "var(--ds-space-150, 12px)",
+    marginBottom: "var(--ds-space-150, 12px)",
+    clear: 'both',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '&.image-wrap-left[data-layout], &.image-wrap-right[data-layout]': {
+      clear: 'none',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
+      '&:first-child': {
+        marginTop: "var(--ds-space-150, 12px)"
+      }
+    }
+  }), ".".concat(_styles.richMediaClassName, ".image-wrap-right + .").concat(_styles.richMediaClassName, ".image-wrap-left"), {
+    clear: 'both'
+  }), ".".concat(_styles.richMediaClassName, ".image-wrap-left + .").concat(_styles.richMediaClassName, ".image-wrap-right, .").concat(_styles.richMediaClassName, ".image-wrap-right + .").concat(_styles.richMediaClassName, ".image-wrap-left, .").concat(_styles.richMediaClassName, ".image-wrap-left + .").concat(_styles.richMediaClassName, ".image-wrap-left, .").concat(_styles.richMediaClassName, ".image-wrap-right + .").concat(_styles.richMediaClassName, ".image-wrap-right"), {
+    marginRight: 0,
+    marginLeft: 0
+  }), "@media all and (max-width: ".concat(wrappedMediaBreakoutPoint, "px)"), {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    "div.mediaSingleView-content-wrap[layout='wrap-left'], div.mediaSingleView-content-wrap[data-layout='wrap-left'], div.mediaSingleView-content-wrap[layout='wrap-right'], div.mediaSingleView-content-wrap[data-layout='wrap-right']": {
+      float: 'none',
+      overflow: 'auto',
+      margin: "var(--ds-space-150, 12px)".concat(" 0")
+    }
+  }), "& [layout='full-width'] .".concat(_styles.richMediaClassName, ", & [layout='wide'] .").concat(_styles.richMediaClassName), {
+    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
+    marginLeft: '50%',
+    transform: 'translateX(-50%)'
+  }), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_ProseMirror, ".media-extended-resize-experience[layout^='wrap-']", {
+    // override 'overflow: auto' when viewport <= 410 set by mediaSingleSharedStyle
+    // to prevent scroll bar
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+    overflow: 'visible !important'
+  }), "& [layout^='wrap-'] + [layout^='wrap-']", (0, _defineProperty2.default)({
+    clear: 'none',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    "& + p, & + div[class^='fabric-editor-align'], & + ul, & + ol, & + h1, & + h2, & + h3, & + h4, & + h5, & + h6": {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles,@atlaskit/ui-styling-standard/no-unsafe-values
+      clear: 'both !important'
+    }
+  }, "& .".concat(_styles.richMediaClassName), {
+    marginLeft: 0,
+    marginRight: 0
+  })), ".".concat(_mediaInline.INLINE_IMAGE_WRAPPER_CLASS_NAME), {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    height: referenceHeights['p'],
+    transform: 'translateY(-2px)'
+  }), "h1", (0, _defineProperty2.default)({}, inlineImageSelector, {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    height: referenceHeights.h1,
+    transform: "translateY(-3px)"
+  })), "h2", (0, _defineProperty2.default)({}, inlineImageSelector, {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    height: referenceHeights.h2,
+    transform: "translateY(-3px)"
+  })), "h3", (0, _defineProperty2.default)({}, inlineImageSelector, {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    height: referenceHeights.h3,
+    transform: "translateY(-2px)"
+  })), "h4", (0, _defineProperty2.default)({}, inlineImageSelector, {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    height: referenceHeights.h4,
+    transform: "translateY(-2px)"
+  })), "h5", (0, _defineProperty2.default)({}, inlineImageSelector, {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    height: referenceHeights.h5,
+    transform: "translateY(-2px)"
+  })), "h6", (0, _defineProperty2.default)({}, inlineImageSelector, {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    height: referenceHeights.h6,
+    transform: "translateY(-2px)"
+  })), ".mediaSingleView-content-wrap[layout='wrap-left']", {
+    float: 'left'
+  }), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_ProseMirror, ".mediaSingleView-content-wrap[layout='wrap-right']", {
+    float: 'right'
+  }), ".mediaSingleView-content-wrap[layout='wrap-right'] + .mediaSingleView-content-wrap[layout='wrap-left']", {
+    clear: 'both'
+  }), '& > .mediaSingleView-content-wrap', {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.richMedia-resize-handle-right': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
+      marginRight: "-".concat(_editorSharedStyles.akEditorMediaResizeHandlerPaddingWide, "px")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.richMedia-resize-handle-left': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
+      marginLeft: "-".concat(_editorSharedStyles.akEditorMediaResizeHandlerPaddingWide, "px")
+    }
+  }))
+}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_css, ".".concat(_styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT), {
+  padding: 0
+}), '.richMedia-resize-handle-right, .richMedia-resize-handle-left', {
+  display: 'flex',
+  flexDirection: 'column',
+  /* vertical align */
+  justifyContent: 'center'
+}), '.richMedia-resize-handle-right', {
+  alignItems: 'flex-end',
+  paddingRight: "var(--ds-space-150, 12px)",
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
+  marginRight: "-".concat(_editorSharedStyles.akEditorMediaResizeHandlerPadding, "px")
+}), '.richMedia-resize-handle-left', {
+  alignItems: 'flex-start',
+  paddingLeft: "var(--ds-space-150, 12px)",
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
+  marginLeft: "-".concat(_editorSharedStyles.akEditorMediaResizeHandlerPadding, "px")
+}), '.richMedia-resize-handle-right::after, .richMedia-resize-handle-left::after', {
+  content: "' '",
+  display: 'flex',
+  width: 3,
+  height: 64,
+  borderRadius: 6
+}), ".".concat(_styles.richMediaClassName, ":hover .richMedia-resize-handle-left::after, .").concat(_styles.richMediaClassName, ":hover .richMedia-resize-handle-right::after"), {
+  background: "var(--ds-border, #091E4224)"
+}), ".".concat(_editorSharedStyles.akEditorSelectedNodeClassName, " .richMedia-resize-handle-right::after, .").concat(_editorSharedStyles.akEditorSelectedNodeClassName, " .richMedia-resize-handle-left::after, .").concat(_styles.richMediaClassName, " .richMedia-resize-handle-right:hover::after, .").concat(_styles.richMediaClassName, " .richMedia-resize-handle-left:hover::after, .").concat(_styles.richMediaClassName, ".is-resizing .richMedia-resize-handle-right::after, .").concat(_styles.richMediaClassName, ".is-resizing .richMedia-resize-handle-left::after"), {
+  background: "var(--ds-border-focused, #388BFF)"
+}), '.__resizable_base__', {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+  left: 'unset !important',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+  width: 'auto !important',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+  height: 'auto !important'
+}), '.danger > div > div > .media-card-frame, .danger > span > a', {
+  backgroundColor: "var(--ds-background-danger, #FFECEB)",
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
+  boxShadow: "0px 0px 0px ".concat(_editorSharedStyles.akEditorSelectedBorderBoldSize, "px, ", "var(--ds-border-danger, #E2483D)"),
+  transition: 'background-color 0s, box-shadow 0s'
+}), '.danger', (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_styles.richMediaClassName, " .").concat(_mediaCard.fileCardImageViewSelector, "::after"), {
+  border: "1px solid ".concat("var(--ds-border-danger, #E2483D)")
+}), ".".concat(_styles.richMediaClassName, " .").concat(_mediaCard.inlinePlayerClassName, "::after"), {
+  border: "1px solid ".concat("var(--ds-border-danger, #E2483D)")
+}), ".".concat(_styles.richMediaClassName, " .").concat(_mediaCard.newFileExperienceClassName), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-danger, #E2483D)", " !important")
+}), '.richMedia-resize-handle-right::after, .richMedia-resize-handle-left::after', {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+  background: "var(--ds-icon-danger, #C9372C)".concat(" !important")
+}), '.resizer-handle-thumb', {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+  background: "var(--ds-icon-danger, #C9372C)".concat(" !important")
+}), 'div div .media-card-frame, .inlineCardView-content-wrap > span > a', {
+  backgroundColor: "var(--ds-blanket-danger, #EF5C4814)",
+  transition: "background-color 0s"
+}), 'div div .media-card-frame::after', {
+  boxShadow: 'none'
+})), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_css, '.warning', (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_styles.richMediaClassName, " .").concat(_mediaCard.fileCardImageViewSelector, "::after"), {
+  border: "1px solid ".concat("var(--ds-border-warning, #E56910)")
+}), ".".concat(_styles.richMediaClassName, " .").concat(_mediaCard.inlinePlayerClassName, "::after"), {
+  border: "1px solid ".concat("var(--ds-border-warning, #E56910)")
+}), ".".concat(_styles.richMediaClassName, " .").concat(_mediaCard.newFileExperienceClassName), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-warning, #E56910)", " !important")
+}), '.resizer-handle-thumb', {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+  background: "var(--ds-icon-warning, #E56910)".concat(" !important")
+})), '.media-filmstrip-list-item', {
+  cursor: 'pointer'
+}), ".mediaGroupView-content-wrap.".concat(_editorSharedStyles.akEditorSelectedNodeClassName, " #newFileExperienceWrapper"), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
+  boxShadow: _editorSharedStyles.akEditorSelectedBoxShadow
+}), '.ak-editor-no-interaction #newFileExperienceWrapper', {
+  boxShadow: 'none'
+})));

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

package/dist/es2019/presets/default.js

@@ -39,6 +39,8 @@ import { isFullPage as fullPageCheck } from '../utils/is-full-page';
 /**
  * Note: The order that presets are added determines
  * their placement in the editor toolbar
+ * @param options
+ * @example
  */
 export function createDefaultPreset(options) {
   var _options$featureFlags, _options$featureFlags2;
@@ -69,6 +71,12 @@ export function createDefaultPreset(options) {
   }]).add([codeBlockPlugin, options.codeBlock]);
   return preset;
 }
+
+/**
+ *
+ * @param props
+ * @example
+ */
 export function useDefaultPreset(props) {
   const preset = createDefaultPreset(props);
   return [preset];

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

@@ -7,7 +7,8 @@ import React, { Fragment } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
 import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -44,6 +45,14 @@ ContentArea.displayName = 'ContentArea';
 const EditorContainer = componentWithCondition(() => editorExperiment('platform_editor_core_static_emotion', true, {
   exposure: true
 }), EditorContentContainer, ContentArea);
+const useEditorViewModePluginState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
+  const {
+    editorViewModeState
+  } = useSharedPluginState(pluginInjectionApi, ['editorViewMode']);
+  return editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode;
+}, pluginInjectionApi => {
+  return useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
+});
 
 /**
  * Render the editor in a chromeless appearance.
@@ -78,9 +87,7 @@ export default class Editor extends React.Component {
         featureFlags
       } = this.props;
       const maxContentSizeReached = Boolean(maxContentSize === null || maxContentSize === void 0 ? void 0 : maxContentSize.maxContentSizeReached);
-      const {
-        editorViewModeState
-      } = useSharedPluginState(this.props.editorAPI, ['editorViewMode']);
+      const editorViewMode = useEditorViewModePluginState(this.props.editorAPI);
       return jsx(WithFlash, {
         animate: maxContentSizeReached
       }, jsx("div", {
@@ -102,7 +109,7 @@ export default class Editor extends React.Component {
       , {
         className: "ak-editor-content-area",
         featureFlags: featureFlags,
-        viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
+        viewMode: editorViewMode,
         appearance: this.appearance
       }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
         editorView: editorView,
@@ -122,10 +129,6 @@ export default class Editor extends React.Component {
       }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? customContentComponents.after : null)));
     });
   }
-  /**
-   *
-   * @example
-   */
   render() {
     return jsx(RenderWithPluginState, {
       editorAPI: this.props.editorAPI,
@@ -134,13 +137,28 @@ export default class Editor extends React.Component {
   }
 }
 _defineProperty(Editor, "displayName", 'ChromelessEditorAppearance');
+const useMaxContentSizePluginState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
+  const {
+    maxContentSizeState
+  } = useSharedPluginState(pluginInjectionApi, ['maxContentSize']);
+  return {
+    maxContentSizeState
+  };
+}, pluginInjectionApi => {
+  const maxContentSizeReached = useSharedPluginStateSelector(pluginInjectionApi, 'maxContentSize.maxContentSizeReached');
+  return {
+    maxContentSizeState: maxContentSizeReached === undefined ? undefined : {
+      maxContentSizeReached
+    }
+  };
+});
 function RenderWithPluginState({
   renderChrome,
   editorAPI
 }) {
   const {
     maxContentSizeState
-  } = useSharedPluginState(editorAPI, ['maxContentSize']);
+  } = useMaxContentSizePluginState(editorAPI);
   return jsx(Fragment, null, renderChrome({
     maxContentSize: maxContentSizeState
   }));

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

@@ -10,11 +10,12 @@ import classnames from 'classnames';
 import { useIntl } from 'react-intl-next';
 import ButtonGroup from '@atlaskit/button/button-group';
 import Button from '@atlaskit/button/new';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import messages from '@atlaskit/editor-common/messages';
 import { GRID_GUTTER } from '@atlaskit/editor-common/styles';
 import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { tableCommentEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
 import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
@@ -79,16 +80,36 @@ const appearance = 'comment';
 const EditorContainer = componentWithCondition(() => editorExperiment('platform_editor_core_static_emotion', true, {
   exposure: true
 }), EditorContentContainer, ContentArea);
+const useCommentEditorPluginsStates = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
+  return useSharedPluginState(pluginInjectionApi, ['maxContentSize', 'primaryToolbar', 'editorViewMode']);
+}, pluginInjectionApi => {
+  const maxContentSizeReached = useSharedPluginStateSelector(pluginInjectionApi, 'maxContentSize.maxContentSizeReached');
+  const primaryToolbarComponents = useSharedPluginStateSelector(pluginInjectionApi, 'primaryToolbar.components');
+  const editorViewMode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
+  return {
+    maxContentSizeState: maxContentSizeReached === undefined ? undefined : {
+      maxContentSizeReached
+    },
+    primaryToolbarState: !primaryToolbarComponents ? undefined : {
+      components: primaryToolbarComponents
+    },
+    editorViewModeState: !editorViewMode ? undefined : {
+      mode: editorViewMode
+    }
+  };
+});
 export const CommentEditorWithIntl = props => {
   const {
     editorAPI
   } = props;
   const {
-    mediaState,
     maxContentSizeState,
     primaryToolbarState,
     editorViewModeState
-  } = useSharedPluginState(editorAPI, ['media', 'maxContentSize', 'primaryToolbar', 'editorViewMode']);
+  } = useCommentEditorPluginsStates(editorAPI);
+  const {
+    mediaState
+  } = useSharedPluginState(editorAPI, ['media']);
   const intl = useIntl();
   const {
     editorDOMElement,

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

@@ -7,7 +7,7 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { browser } from '@atlaskit/editor-common/browser';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, 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 { fg } from '@atlaskit/platform-feature-flags';
@@ -49,6 +49,28 @@ const hasCustomComponents = components => {
   }
   return true;
 };
+const useFullPageEditorPluginsStates = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
+  return useSharedPluginState(pluginInjectionApi, ['editorViewMode', 'primaryToolbar', 'interaction']);
+}, pluginInjectionApi => {
+  const primaryToolbarComponents = useSharedPluginStateSelector(pluginInjectionApi, 'primaryToolbar.components');
+  const editorViewMode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
+  const showTopToolbar = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode._showTopToolbar');
+  const hasHadInteraction = useSharedPluginStateSelector(pluginInjectionApi, 'interaction.hasHadInteraction');
+  const interactionState = useSharedPluginStateSelector(pluginInjectionApi, 'interaction.interactionState');
+  return {
+    primaryToolbarState: !primaryToolbarComponents ? undefined : {
+      components: primaryToolbarComponents
+    },
+    editorViewModeState: !editorViewMode ? undefined : {
+      mode: editorViewMode,
+      _showTopToolbar: showTopToolbar
+    },
+    interactionState: hasHadInteraction === undefined || interactionState === undefined ? undefined : {
+      hasHadInteraction,
+      interactionState
+    }
+  };
+});
 export const FullPageEditor = props => {
   var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _scrollContentContain4, _scrollContentContain5, _wrapperElementRef$cu;
   const wrapperElementRef = useMemo(() => props.innerRef, [props.innerRef]);
@@ -59,7 +81,7 @@ export const FullPageEditor = props => {
     editorViewModeState,
     primaryToolbarState,
     interactionState
-  } = useSharedPluginState(editorAPI, ['editorViewMode', 'primaryToolbar', 'interaction']);
+  } = useFullPageEditorPluginsStates(editorAPI);
   const viewMode = getEditorViewMode(editorViewModeState, props.preset);
   const hasHadInteraction = fg('platform_editor_interaction_api_refactor') ? (interactionState === null || interactionState === void 0 ? void 0 : interactionState.interactionState) !== 'hasNotHadInteraction' : Boolean(interactionState === null || interactionState === void 0 ? void 0 : interactionState.hasHadInteraction);
   let toolbarDocking = useSharedPluginStateSelector(editorAPI, 'selectionToolbar.toolbarDocking');

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

@@ -9,7 +9,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
 const SWOOP_ANIMATION = `0.5s ${akEditorSwoopCubicBezier}`;
 const getTotalPadding = () => akEditorGutterPaddingDynamic() * 2;
-const akNestedDndGutterOffset = 8;
+const AK_NESTED_DND_GUTTER_OFFSET = 8;
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const fullPageEditorWrapper = css({
@@ -114,7 +114,7 @@ const editorContentAreaContainerStyle = () => css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '[data-layout-section]': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-      maxWidth: `calc(100% + ${(akLayoutGutterOffset + (fg('platform_editor_nested_dnd_styles_changes') ? akNestedDndGutterOffset : 0)) * 2}px)`
+      maxWidth: `calc(100% + ${(akLayoutGutterOffset + (fg('platform_editor_nested_dnd_styles_changes') ? AK_NESTED_DND_GUTTER_OFFSET : 0)) * 2}px)`
     }
   }
 });

package/dist/es2019/ui/ContentStyles/layout.js

@@ -13,7 +13,7 @@ import { tableMarginFullWidthMode } from '@atlaskit/editor-plugins/table/ui/cons
 import { akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedBorderSize, akEditorSelectedNodeClassName, akEditorSwoopCubicBezier, akLayoutGutterOffset, getSelectionStyles, gridMediumMaxWidth, SelectionStyle } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-const akNestedDndGutterOffset = 8;
+const AK_NESTED_DND_GUTTER_OFFSET = 8;
 const firstNodeWithNotMarginTop = () => fg('platform_editor_nested_dnd_styles_changes') ?
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
 css`
@@ -283,7 +283,8 @@ export const layoutStyles = viewMode => css`
 			/* Ignored via go/ees007
 			TODO: Migrate away from gridSize
 			Recommendation: Replace directly with 7px */
-			margin: ${"var(--ds-space-100, 8px)"} -${akLayoutGutterOffset + (fg('platform_editor_nested_dnd_styles_changes') ? akNestedDndGutterOffset : 0)}px 0;
+			margin: ${"var(--ds-space-100, 8px)"} -${akLayoutGutterOffset + (fg('platform_editor_nested_dnd_styles_changes') ? AK_NESTED_DND_GUTTER_OFFSET : 0)}px
+				0;
 			transition: border-color 0.3s ${akEditorSwoopCubicBezier};
 			cursor: ${viewMode === 'view' ? 'default' : 'pointer'};
 

package/dist/es2019/ui/ContextPanel/index.js

@@ -9,8 +9,9 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import Transition from 'react-transition-group/Transition';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { akEditorContextPanelWidth, akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 const ANIM_SPEED_MS = 500;
@@ -151,12 +152,17 @@ export class SwappableContentArea extends React.PureComponent {
     });
   }
 }
-export function ContextPanel(props) {
-  var _contextPanelState$co;
+const useContextPanelSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
   const {
     contextPanelState
-  } = useSharedPluginState(props.editorAPI, ['contextPanel']);
-  const firstContent = contextPanelState && (contextPanelState === null || contextPanelState === void 0 ? void 0 : (_contextPanelState$co = contextPanelState.contents) === null || _contextPanelState$co === void 0 ? void 0 : _contextPanelState$co.find(Boolean));
+  } = useSharedPluginState(pluginInjectionApi, ['contextPanel']);
+  return contextPanelState === null || contextPanelState === void 0 ? void 0 : contextPanelState.contents;
+}, pluginInjectionApi => {
+  return useSharedPluginStateSelector(pluginInjectionApi, 'contextPanel.contents');
+});
+export function ContextPanel(props) {
+  const contextPanelContents = useContextPanelSharedState(props.editorAPI);
+  const firstContent = contextPanelContents && contextPanelContents.find(Boolean);
   return (
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading

package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js

@@ -15,7 +15,7 @@ import { EmojiSharedCssClassName, defaultEmojiHeight } from '@atlaskit/editor-co
 import { MentionSharedCssClassName } from '@atlaskit/editor-common/mention';
 import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
 import { gapCursorStyles } from '@atlaskit/editor-common/selection';
-import { CodeBlockSharedCssClassName, GRID_GUTTER, MediaSharedClassNames, SmartCardSharedCssClassName, annotationSharedStyles, blockMarksSharedStyles, codeBlockInListSafariFix, codeMarkSharedStyles, dateSharedStyle, embedCardStyles, expandClassNames, getSmartCardSharedStyles, gridStyles, indentationSharedStyles, listsSharedStyles, paragraphSharedStyles, resizerStyles, pragmaticResizerStyles, shadowSharedStyle, smartCardSharedStyles, smartCardStyles, tasksAndDecisionsStyles, textColorStyles, unsupportedStyles, whitespaceSharedStyles } from '@atlaskit/editor-common/styles';
+import { CodeBlockSharedCssClassName, GRID_GUTTER, SmartCardSharedCssClassName, blockMarksSharedStyles, codeBlockInListSafariFix, codeMarkSharedStyles, dateSharedStyle, expandClassNames, getSmartCardSharedStyles, gridStyles, indentationSharedStyles, listsSharedStyles, paragraphSharedStyles, resizerStyles, pragmaticResizerStyles, shadowSharedStyle, smartCardSharedStyles, smartCardStyles, tasksAndDecisionsStyles, textColorStyles, unsupportedStyles, whitespaceSharedStyles } from '@atlaskit/editor-common/styles';
 import { blocktypeStyles } from '@atlaskit/editor-plugins/block-type/styles';
 import { findReplaceStyles } from '@atlaskit/editor-plugins/find-replace/styles';
 import { textHighlightStyle } from '@atlaskit/editor-plugins/paste-options-toolbar/styles';
@@ -31,14 +31,16 @@ import { codeBlockStyles } from '../ContentStyles/code-block';
 import { dateStyles, dateVanillaStyles } from '../ContentStyles/date';
 import { expandStyles } from '../ContentStyles/expand';
 import { extensionStyles } from '../ContentStyles/extension';
-import { mediaStyles } from '../ContentStyles/media';
 import { panelStyles } from '../ContentStyles/panel';
 import { statusStyles, vanillaStatusStyles } from '../ContentStyles/status';
 import { taskDecisionStyles, vanillaTaskDecisionIconWithoutVisualRefresh as vanillaDecisionIconWithoutVisualRefresh, vanillaTaskDecisionIconWithVisualRefresh as vanillaDecisionIconWithVisualRefresh, vanillaTaskDecisionStyles as vanillaDecisionStyles, vanillaTaskItemStyles } from '../ContentStyles/tasks-and-decisions';
 import { aiPanelBaseStyles, aiPanelDarkStyles } from './styles/ai-panel';
+import { annotationStyles } from './styles/annotationStyles';
 import { backgroundColorStyles } from './styles/backgroundColorStyles';
+import { embedCardStyles } from './styles/embedCardStyles';
 import { layoutBaseStyles, layoutViewStyles } from './styles/layout';
 import { linkStyles, linkStylesOld } from './styles/link';
+import { mediaStyles } from './styles/mediaStyles';
 import { ruleStyles } from './styles/rule';
 const vanillaMentionsStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -405,7 +407,7 @@ const contentStyles = () => css`
 
   ${ruleStyles}
 
-  ${mediaStyles()}
+  ${mediaStyles}
 
   ${fg('confluence_team_presence_scroll_to_pointer') ? telepointerStyle : telepointerStyleWithInitialOnly}
   ${gapCursorStyles};
@@ -467,7 +469,7 @@ const contentStyles = () => css`
 
   ${editorExperiment('platform_editor_vanilla_dom', true) ? vanillaStatusStyles() : null}
 
-  ${annotationSharedStyles()}
+  ${annotationStyles}
 
   ${smartCardStyles()}
 
@@ -477,7 +479,7 @@ const contentStyles = () => css`
 
 	${dateStyles}
 
-  ${embedCardStyles()}
+  ${embedCardStyles}
 
   ${unsupportedStyles}
 
@@ -537,8 +539,7 @@ const contentStyles = () => css`
 		clear: both;
 	}
 
-	.hyperlink-floating-toolbar,
-	.${MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT} {
+	.hyperlink-floating-toolbar {
 		padding: 0;
 	}
 

package/dist/es2019/ui/EditorContentContainer/styles/annotationStyles.js

@@ -0,0 +1,47 @@
+import { css } from '@emotion/react'; // eslint-disable-line @atlaskit/ui-styling-standard/use-compiled
+
+import { AnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const annotationStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
+    [`.${AnnotationSharedClassNames.blur}, .${AnnotationSharedClassNames.focus}, .${AnnotationSharedClassNames.draft}, .${AnnotationSharedClassNames.hover}`]: {
+      borderBottom: '2px solid transparent',
+      cursor: 'pointer',
+      padding: '1px 0 2px',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
+      '&:has(.card), &:has([data-inline-card])': {
+        padding: '5px 0 3px 0'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
+      '&:has(.date-lozenger-container)': {
+        paddingTop: "var(--ds-space-025, 2px)"
+      }
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
+    [`.${AnnotationSharedClassNames.focus}`]: {
+      background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
+      borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
+      boxShadow: "var(--ds-shadow-raised, 0px 1px 1px #091E4240, 0px 0px 1px #091E424f)"
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
+    [`.${AnnotationSharedClassNames.draft}`]: {
+      background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
+      borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
+      boxShadow: "var(--ds-shadow-raised, 0px 1px 1px #091E4240, 0px 0px 1px #091E424f)",
+      cursor: 'initial'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
+    [`.${AnnotationSharedClassNames.blur}`]: {
+      background: "var(--ds-background-accent-yellow-subtlest, #FFF7D6)",
+      borderBottomColor: "var(--ds-border-accent-yellow, #B38600)"
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
+    [`.${AnnotationSharedClassNames.hover}`]: {
+      background: "var(--ds-background-accent-yellow-subtlest-hovered, #F8E6A0)",
+      borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
+      boxShadow: "var(--ds-shadow-raised, 0px 1px 1px #091E4240, 0px 0px 1px #091E424f)"
+    }
+  }
+});