@atlaskit/editor-core 213.5.5 → 213.6.0

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

@@ -1,65 +1,8 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
-import { akEditorFloatingDialogZIndex, akEditorMobileMaxWidth, akEditorSwoopCubicBezier, FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { akEditorMobileMaxWidth, FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
 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: `${"var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)"}`
-});
-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 flexibleIconSize = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '& span svg': {
-    maxWidth: '100%'
-  }
-});
-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
-    borderBottom: `${"var(--ds-border-width, 1px)"} solid ${"var(--ds-border, #091E4224)"}`,
-    // 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: 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)`
-    }
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/platform/ensure-feature-flag-registration, @atlaskit/ui-styling-standard/no-unsafe-values
-  fg('platform-visual-refresh-icons') && flexibleIconSize);
-};
-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
 export const mainToolbarIconBeforeStyle = css({
   margin: "var(--ds-space-200, 16px)",

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

@@ -8,9 +8,7 @@ import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { akEditorFloatingDialogZIndex, akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { mainToolbarStyle as mainToolbarStyleDynamic, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
+import { MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
 
 // Base styles that don't depend on feature flags
 const baseToolbarStyles = css({
@@ -52,7 +50,7 @@ const mainToolbarTwoLineStyle = css({
     height: `calc(var(--ak-editor-fullpage-toolbar-height) * 2)`
   }
 });
-const MainToolbarWrapperNext = ({
+export const MainToolbarWrapper = ({
   showKeyline,
   twoLineEditorToolbar,
   children,
@@ -63,30 +61,4 @@ const MainToolbarWrapperNext = ({
     css: [baseToolbarStyles, fg('platform-visual-refresh-icons') && flexibleIconSize, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle],
     "data-testid": testId
   }, children);
-};
-
-/**
- * Original version of the toolbar wrapper using dynamic styles
- */
-const MainToolbarWrapperOld = ({
-  showKeyline,
-  twoLineEditorToolbar,
-  children,
-  'data-testid': testId
-}) => {
-  return jsx("div", {
-    css:
-    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-    mainToolbarStyleDynamic(showKeyline, twoLineEditorToolbar),
-    "data-testid": testId
-  }, children);
-};
-
-/**
- * Wrapper component for the main toolbar that handles feature flag based styling
- * @example
- * <MainToolbarWrapper showKeyline={true} twoLineEditorToolbar={false}>
- *   <ToolbarContent />
- * </MainToolbarWrapper>
- */
-export const MainToolbarWrapper = componentWithCondition(() => expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true), MainToolbarWrapperNext, MainToolbarWrapperOld);
+};

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

@@ -1,6 +1,5 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
-import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const fullPageEditorWrapper = css({
@@ -11,29 +10,6 @@ export const fullPageEditorWrapper = css({
   boxSizing: 'border-box'
 });
 
-// delete when cleaning up experiment `platform_editor_core_static_emotion_non_central`
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-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})`,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
-    '&.ak-editor-content-area-no-toolbar': {
-      // The editor toolbar height is 1px off (from the border) -- so we need to add 1px to the height
-      // to match the toolbar height
-      height: `calc(100% + 1px)`
-    },
-    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
 export const contentAreaWrapper = css({
   width: '100%',

package/dist/es2019/ui/Toolbar/ToolbarWithSizeDetector.js

@@ -1,4 +1,3 @@
-import _extends from "@babel/runtime/helpers/extends";
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -9,77 +8,17 @@ import React, { useMemo } from 'react';
 import { css, jsx } from '@emotion/react';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
-import { akEditorMobileMaxWidth } from '@atlaskit/editor-shared-styles';
-import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { WidthObserver } from '@atlaskit/width-detector';
 import { isFullPage } from '../../utils/is-full-page';
 import { useElementWidth } from './hooks';
 import { Toolbar } from './Toolbar';
 import { toolbarSizeToWidth, widthToToolbarSize } from './toolbar-size';
-// Remove when platform_editor_core_static_emotion_non_central is cleaned up
 const toolbar = css({
-  width: '100%',
-  position: 'relative',
-  // 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)`]: {
-    gridColumn: '1 / 2',
-    gridRow: 2,
-    width: 'calc(100% - 30px)',
-    margin: `0 ${"var(--ds-space-200, 16px)"}`
-  }
-});
-
-// Rename to toolbar when platform_editor_core_static_emotion_non_central is cleaned up
-const staticToolbar = css({
   width: '100%',
   position: 'relative'
-  // The media query below has been commented out as akEditorMobileMaxWidth is 0px  and thus the styles are never applied.
-  // [`@media (max-width: ${akEditorMobileMaxWidth}px)`]: {
-  //   gridColumn: '1 / 2',
-  //   gridRow: 2,
-  //   width: 'calc(100% - 30px)',
-  //   margin: `0 ${token('space.200', '16px')}`,
-  // },
 });
-const DynamicStyleToolbarWithSizeDetector = props => {
-  const ref = React.useRef(null);
-  const [width, setWidth] = React.useState(undefined);
-  const elementWidth = useElementWidth(ref, {
-    skip: typeof width !== 'undefined'
-  });
-  const defaultToolbarSize = isSSR() && isFullPage(props.appearance) ? ToolbarSize.XXL : undefined;
-  const toolbarSize = typeof width === 'undefined' && typeof elementWidth === 'undefined' ? defaultToolbarSize :
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  widthToToolbarSize(width || elementWidth, props.appearance);
-  const toolbarStyle = useMemo(() => {
-    const toolbarWidth = isFullPage(props.appearance) && props.twoLineEditorToolbar ? ToolbarSize.S : ToolbarSize.M;
-    const toolbarMinWidth = toolbarSizeToWidth(toolbarWidth, props.appearance);
-    const isPreviewPanelResponsivenessEnabled = editorExperiment('platform_editor_preview_panel_responsiveness', true, {
-      exposure: true
-    });
-    const minWidth = `min-width: ${props.hasMinWidth ? `${toolbarMinWidth}px` : isPreviewPanelResponsivenessEnabled ? 'fit-content' : '254px'}`;
-    return [toolbar, minWidth];
-  }, [props.appearance, props.hasMinWidth, props.twoLineEditorToolbar]);
-  return (
-    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    jsx("div", {
-      css: toolbarStyle
-    }, jsx(WidthObserver, {
-      setWidth: setWidth
-    }), props.editorView && toolbarSize ?
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    jsx(Toolbar, _extends({}, props, {
-      toolbarSize: toolbarSize
-    })) : jsx("div", {
-      ref: ref
-    }))
-  );
-};
-const StaticStyleToolbarWithSizeDetector = props => {
+export const ToolbarWithSizeDetector = props => {
   const ref = React.useRef(null);
   const [width, setWidth] = React.useState(undefined);
   const elementWidth = useElementWidth(ref, {
@@ -102,7 +41,7 @@ const StaticStyleToolbarWithSizeDetector = props => {
     }
   }, [props.appearance, props.hasMinWidth, props.twoLineEditorToolbar]);
   return jsx("div", {
-    css: staticToolbar,
+    css: toolbar,
     style: {
       minWidth: minWidthValue
     }
@@ -127,5 +66,4 @@ const StaticStyleToolbarWithSizeDetector = props => {
   }) : jsx("div", {
     ref: ref
   }));
-};
-export const ToolbarWithSizeDetector = componentWithCondition(() => expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true), StaticStyleToolbarWithSizeDetector, DynamicStyleToolbarWithSizeDetector);
+};

package/dist/es2019/utils/validateNodes.js

@@ -1,48 +1,6 @@
-import { Mark } from '@atlaskit/editor-prosemirror/model';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-
-// We don't want to use memoize from lodash, because we need to use WeakMap or WeakSet
-// to avoid memory leaks, but lodash allow to change the cache type only globally
-// like `memoize.Cache = WeakMap`, and we don't want to do that.
-// So we use our own cache implementation.
-const cache = new WeakSet();
-
-// See https://github.com/ProseMirror/prosemirror-model/blob/20d26c9843d6a69a1d417d937c401537ee0b2342/src/node.ts#L303
-function checkNode(node) {
-  if (cache.has(node)) {
-    return;
-  }
-
-  // @ts-expect-error - This is internal ProseMirror API, but we okay with it
-  node.type.checkContent(node.content);
-  // @ts-expect-error - This is internal ProseMirror API, but we okay with it
-  node.type.checkAttrs(node.attrs);
-  let copy = Mark.none;
-  for (let i = 0; i < node.marks.length; i++) {
-    const mark = node.marks[i];
-    // @ts-expect-error - This is internal ProseMirror API, but we okay with it
-    mark.type.checkAttrs(mark.attrs);
-    copy = mark.addToSet(copy);
-  }
-  if (!Mark.sameSet(copy, node.marks)) {
-    throw new RangeError(`Invalid collection of marks for node ${node.type.name}: ${node.marks.map(m => m.type.name)}`);
-  }
-  node.content.forEach(node => checkNode(node));
-
-  // The set value should be added in the end of the function,
-  // because any previous check can throw an error,
-  // and we don't want to add invalid node to the cache.
-  cache.add(node);
-}
 export const validNode = node => {
   try {
-    if (editorExperiment('platform_editor_memoized_node_check', true, {
-      exposure: true
-    })) {
-      checkNode(node);
-    } else {
-      node.check();
-    }
+    node.check();
   } catch (error) {
     return false;
   }

package/dist/es2019/version-wrapper.js

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

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

@@ -1,7 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject;
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -19,7 +17,6 @@ import messages from '@atlaskit/editor-common/messages';
 import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
@@ -57,12 +54,6 @@ var secondaryToolbarStyles = css({
   display: 'flex',
   padding: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-025, 2px)")
 });
-var mainToolbarCustomComponentsSlotStyle = function mainToolbarCustomComponentsSlotStyle() {
-  var isTwoLineEditorToolbar = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  return (// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
-    css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t\tdisplay: flex;\n\t\tjustify-content: flex-end;\n\t\talign-items: center;\n\t\tflex-grow: 1;\n\t\tpadding-right: ", ";\n\t\t> div {\n\t\t\tdisplay: flex;\n\t\t\tflex-shrink: 0;\n\t\t}\n\t\t", "\n\t"])), "var(--ds-space-250, 20px)", isTwoLineEditorToolbar && "\n    @media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px) {\n      {\n        padding-right: 0;\n      }\n    }\n  "))
-  );
-};
 var mainToolbarCustomComponentsSlotStyleNew = css({
   display: 'flex',
   justifyContent: 'flex-end',
@@ -168,8 +159,7 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
     primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
   }
   var customToolbarSlot = jsx("div", {
-    css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarCustomComponentsSlotStyleNew, isTwoLineToolbarEnabled && mainToolbarCustomComponentsSlotStyleTwoLineToolbarNew] : /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */
-    mainToolbarCustomComponentsSlotStyle(isTwoLineToolbarEnabled)
+    css: [mainToolbarCustomComponentsSlotStyleNew, isTwoLineToolbarEnabled && mainToolbarCustomComponentsSlotStyleTwoLineToolbarNew]
   }, customPrimaryToolbarComponents);
   var isToolbarAIFCEnabled = Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true);
   return jsx(WithFlash, {

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

@@ -2,8 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject, _templateObject2;
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -14,15 +12,9 @@ import React, { useEffect, 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 { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
 var akEditorMenuZIndex = 500;
 var akEditorToolbarKeylineHeight = 2;
-var mainToolbarWrapperStyle = function mainToolbarWrapperStyle() {
-  var isTwoLineEditorToolbar = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  var isToolbarAifcEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\tposition: relative;\n\talign-items: center;\n\tpadding: ", " ", " 0;\n\tdisplay: flex;\n\theight: auto;\n\tbackground-color: ", ";\n\tbox-shadow: none;\n\t", "\n\n\t& > div {\n\t\t> :first-child:not(style),\n\t\t> style:first-child + * {\n\t\t\tmargin-left: 0;\n\t\t}\n\t\t", "\n\t}\n\n\t.block-type-btn {\n\t\tpadding-left: 0;\n\t}\n\n\t", "\n"])), "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-surface, white)", isToolbarAifcEnabled ? '' : "padding-left: ".concat("var(--ds-space-250, 20px)", ";"), isTwoLineEditorToolbar && "\n        @media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px) {\n          flex-direction: column-reverse;\n          align-items: end;\n          display: flex;\n          justify-content: flex-end;\n        }\n\n        /* make this more explicit for a toolbar */\n        > *:nth-child(1) {\n          @media (max-width: ").concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px) {\n            > div:nth-child(2) {\n              justify-content: flex-end;\n              display: flex;\n            }\n          }\n        }\n    "), fg('platform-visual-refresh-icons') && 'span svg { max-width: 100%; }');
-};
 var mainToolbarWrapperStyleNew = css({
   position: 'relative',
   alignItems: 'center',
@@ -70,11 +62,6 @@ var mainToolbarWrapperStylesVisualRefresh = css({
     maxWidth: '100%'
   }
 });
-
-/* eslint-enable @atlaskit/platform/ensure-feature-flag-registration */
-
-// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-var stickyToolbarWrapperStyle = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n\t/* stylelint-disable declaration-block-no-duplicate-properties */\n\tposition: relative;\n\tposition: sticky;\n\t/* stylelint-enable declaration-block-no-duplicate-properties */\n\tpadding-bottom: ", ";\n\tz-index: ", ";\n\ttransition: box-shadow ease-in-out 0.2s;\n\t&.show-keyline {\n\t\tbox-shadow: 0 ", "px 0 0\n\t\t\t", ";\n\t}\n"])), "var(--ds-space-100, 8px)", akEditorMenuZIndex, akEditorToolbarKeylineHeight, "var(--ds-background-accent-gray-subtlest, #F1F2F4)");
 var stickyToolbarWrapperStyleNew = css({
   position: 'sticky',
   paddingBottom: "var(--ds-space-100, 8px)",
@@ -105,11 +92,7 @@ var StickyToolbar = function StickyToolbar(props) {
   return (
     // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
     jsx("div", {
-      css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding] : [
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-      mainToolbarWrapperStyle(props.twoLineEditorToolbar,
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-      props.isNewToolbarEnabled), stickyToolbarWrapperStyle]
+      css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding]
       // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
       ,
       style: {
@@ -126,11 +109,7 @@ var FixedToolbar = function FixedToolbar(props) {
   return (
     // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
     jsx("div", {
-      css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding] :
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-      mainToolbarWrapperStyle(props.twoLineEditorToolbar,
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-      props.isNewToolbarEnabled),
+      css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding],
       "data-testid": "ak-editor-main-toolbar"
     }, props.children)
   );

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

@@ -6,9 +6,6 @@ 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 { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { mainToolbarFirstChildStyle, mainToolbarSecondChildStyle } from './MainToolbar';
 // Pre-computed static styles for first- and second-child wrappers.
 // These contain no runtime logic and are safe for static-emotion mode.
 
@@ -47,7 +44,7 @@ var secondChildStaticTwoLine = css({
 });
 
 // ---------------- First child wrapper ----------------
-var FirstChildWrapperStatic = function FirstChildWrapperStatic(_ref) {
+export var MainToolbarForFirstChildWrapper = function MainToolbarForFirstChildWrapper(_ref) {
   var twoLineEditorToolbar = _ref.twoLineEditorToolbar,
     children = _ref.children,
     role = _ref.role,
@@ -60,52 +57,18 @@ var FirstChildWrapperStatic = function FirstChildWrapperStatic(_ref) {
     "data-testid": testId
   }, children);
 };
-var FirstChildWrapperDynamic = function FirstChildWrapperDynamic(_ref2) {
+
+// ---------------- Second child wrapper ----------------
+export var MainToolbarForSecondChildWrapper = function MainToolbarForSecondChildWrapper(_ref2) {
   var twoLineEditorToolbar = _ref2.twoLineEditorToolbar,
     children = _ref2.children,
     role = _ref2.role,
     ariaLabel = _ref2['aria-label'],
     testId = _ref2['data-testid'];
-  return jsx("div", {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/design-system/consistent-css-prop-usage
-    css: mainToolbarFirstChildStyle(twoLineEditorToolbar),
-    role: role,
-    "aria-label": ariaLabel,
-    "data-testid": testId
-  }, children);
-};
-export var MainToolbarForFirstChildWrapper = componentWithCondition(function () {
-  return expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true);
-}, FirstChildWrapperStatic, FirstChildWrapperDynamic);
-
-// ---------------- Second child wrapper ----------------
-var SecondChildWrapperStatic = function SecondChildWrapperStatic(_ref3) {
-  var twoLineEditorToolbar = _ref3.twoLineEditorToolbar,
-    children = _ref3.children,
-    role = _ref3.role,
-    ariaLabel = _ref3['aria-label'],
-    testId = _ref3['data-testid'];
   return jsx("div", {
     css: [secondChildStaticBase, twoLineEditorToolbar && secondChildStaticTwoLine],
     role: role,
     "aria-label": ariaLabel,
     "data-testid": testId
   }, children);
-};
-var SecondChildWrapperDynamic = function SecondChildWrapperDynamic(_ref4) {
-  var twoLineEditorToolbar = _ref4.twoLineEditorToolbar,
-    children = _ref4.children,
-    role = _ref4.role,
-    ariaLabel = _ref4['aria-label'],
-    testId = _ref4['data-testid'];
-  return jsx("div", {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/design-system/consistent-css-prop-usage
-    css: mainToolbarSecondChildStyle(twoLineEditorToolbar),
-    role: role,
-    "aria-label": ariaLabel,
-    "data-testid": testId
-  }, children);
-};
-export var MainToolbarForSecondChildWrapper = componentWithCondition(function () {
-  return expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true);
-}, SecondChildWrapperStatic, SecondChildWrapperDynamic);
+};