@atlaskit/editor-common 93.4.0 → 93.4.2

package/dist/es2019/styles/shared/paragraph.js

@@ -1,19 +1,32 @@
+/* eslint-disable @atlaskit/ui-styling-standard/no-exported-styles */
+/* eslint-disable @atlaskit/design-system/use-tokens-typography */
+/* eslint-disable @atlaskit/ui-styling-standard/no-unsafe-values */
+/* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 import { akEditorLineHeight, blockNodesVerticalMargin } from '@atlaskit/editor-shared-styles';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import editorUGCToken from '../../ugc-tokens/get-editor-ugc-token';
 
 // @see typography spreadsheet: https://docs.google.com/spreadsheets/d/1iYusRGCT4PoPfvxbJ8NrgjtfFgXLm5lpDWXzjua1W2E/edit#gid=93913128
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const paragraphSharedStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '& p': {
-    fontSize: '1em',
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-    lineHeight: akEditorLineHeight,
-    fontWeight: 'normal',
-    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-    marginTop: blockNodesVerticalMargin,
-    marginBottom: 0,
-    letterSpacing: '-0.005em'
-  }
-});
+export const paragraphSharedStyles = typographyTheme => {
+  return editorExperiment('typography_migration_ugc', true) ? css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '& p': {
+      font: editorUGCToken('editor.font.body', typographyTheme),
+      marginTop: blockNodesVerticalMargin,
+      marginBottom: 0
+    }
+  }) : css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '& p': {
+      fontSize: '1em',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+      lineHeight: akEditorLineHeight,
+      fontWeight: 'normal',
+      marginTop: blockNodesVerticalMargin,
+      marginBottom: 0,
+      letterSpacing: '-0.005em'
+    }
+  });
+};

package/dist/es2019/ugc-tokens/editor-ugc-token-names.js

@@ -0,0 +1,27 @@
+export const editorUGCTokens = {
+  'editor.font.heading.h1': 'normal 500 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h2': 'normal 500 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
+};
+export const editorUGCTokensModernized = {
+  'editor.font.heading.h1': 'normal 700 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h2': 'normal 700 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h3': 'normal 700 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h4': 'normal 700  1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h5': 'normal 700  0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
+};
+export const editorUGCTokensRefreshed = {
+  'editor.font.heading.h1': 'normal 700 1.71429em/1.16667 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h2': 'normal 700 1.42857em/1.2 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h3': 'normal 7001.14286em/1.25 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h4': 'normal 700  1em/1.14286 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h5': 'normal 700   0.857143em/1.33333  "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.body': 'normal 400 1em/1.714 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
+};

package/dist/es2019/ugc-tokens/get-editor-ugc-token.js

@@ -0,0 +1,17 @@
+import { editorUGCTokens, editorUGCTokensModernized, editorUGCTokensRefreshed } from './editor-ugc-token-names';
+function editorUGCToken(path, typographyTheme) {
+  let token;
+  switch (typographyTheme) {
+    case 'typography-modernized':
+      token = editorUGCTokensModernized[path];
+      break;
+    case 'typography-refreshed':
+      token = editorUGCTokensRefreshed[path];
+      break;
+    default:
+      token = editorUGCTokens[path];
+      break;
+  }
+  return token;
+}
+export default editorUGCToken;

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

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "93.4.0";
+const packageVersion = "93.4.2";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { Component } from 'react';
 import Popper from 'popper.js'; // eslint-disable-line import/extensions
 import rafSchedule from 'raf-schd';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { positionPropToPopperPosition } from './internal/helpers';
 const defaultState = {
   hasExtractedStyles: false,
@@ -49,7 +50,9 @@ export default class Layer extends Component {
     this.applyPopper(this.props);
   }
   UNSAFE_componentWillReceiveProps(nextProps) {
-    this.applyPopper(nextProps);
+    if (!fg('platform_editor_react18_phase2')) {
+      this.applyPopper(nextProps);
+    }
   }
   componentDidUpdate(prevProps, prevState) {
     const {
@@ -58,6 +61,9 @@ export default class Layer extends Component {
     const {
       hasExtractedStyles
     } = this.state;
+    if (this.props !== prevProps && fg('platform_editor_react18_phase2')) {
+      this.applyPopper(this.props);
+    }
 
     // This flag is set the first time the position is calculated from Popper and applied to the content
     if (!prevState.hasExtractedStyles && hasExtractedStyles && onPositioned) {

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

@@ -4,6 +4,7 @@ import createFocusTrap from 'focus-trap';
 import rafSchedule from 'raf-schd';
 import { createPortal, flushSync } from 'react-dom';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { calculatePlacement, calculatePosition, findOverflowScrollParent, validatePosition } from './utils';
 export default class Popup extends React.Component {
   constructor(...args) {
@@ -167,7 +168,9 @@ export default class Popup extends React.Component {
   UNSAFE_componentWillReceiveProps(newProps) {
     // We are delaying `updatePosition` otherwise it happens before the children
     // get rendered and we end up with a wrong position
-    this.scheduledUpdatePosition(newProps);
+    if (!fg('platform_editor_react18_phase2')) {
+      this.scheduledUpdatePosition(newProps);
+    }
   }
   /**
    * Cancels the initialisation of the focus trap if it has not yet occured
@@ -201,6 +204,11 @@ export default class Popup extends React.Component {
   }
   componentDidUpdate(prevProps) {
     this.handleChangedFocusTrapProp(prevProps);
+    if (fg('platform_editor_react18_phase2')) {
+      if (this.props !== prevProps) {
+        this.scheduledUpdatePosition(prevProps);
+      }
+    }
   }
   componentDidMount() {
     window.addEventListener('resize', this.onResize);

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "93.4.0";
+var packageVersion = "93.4.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/styles/shared/headings.js

@@ -1,11 +1,16 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values */
+/* eslint-disable @atlaskit/ui-styling-standard/no-unsafe-values */
+/* eslint-disable @atlaskit/ui-styling-standard/no-nested-selectors */
 /* eslint-disable @atlaskit/design-system/use-tokens-space */
 /* eslint-disable @atlaskit/design-system/use-tokens-typography */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import editorUGCToken from '../../ugc-tokens/get-editor-ugc-token';
 var headingWithAlignmentStyles = function headingWithAlignmentStyles() {
   return (
     // Override marginTop: 0 with default margin found in headingsSharedStyles for first heading in alignment block that is not the first child
@@ -42,76 +47,98 @@ var headingWithAlignmentStyles = function headingWithAlignmentStyles() {
 
 // @see typography spreadsheet: https://docs.google.com/spreadsheets/d/1iYusRGCT4PoPfvxbJ8NrgjtfFgXLm5lpDWXzjua1W2E/edit#gid=93913128
 // text sizing prototype: http://proto/fabricrender/
-export var headingsSharedStyles = function headingsSharedStyles() {
-  return css(_objectSpread({
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    '& h1': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-      fontSize: "".concat(24 / 14, "em"),
-      fontStyle: 'inherit',
-      lineHeight: 28 / 24,
-      color: "var(--ds-text, #172B4D)",
-      fontWeight: "var(--ds-font-weight-medium, 500)",
-      letterSpacing: "-0.01em",
-      marginBottom: 0,
-      marginTop: '1.667em'
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    '& h2': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-      fontSize: "".concat(20 / 14, "em"),
-      fontStyle: 'inherit',
-      lineHeight: 24 / 20,
-      color: "var(--ds-text, #172B4D)",
-      fontWeight: "var(--ds-font-weight-medium, 500)",
-      letterSpacing: "-0.008em",
-      marginTop: '1.8em',
-      marginBottom: 0
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    '& h3': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-      fontSize: "".concat(16 / 14, "em"),
-      fontStyle: 'inherit',
-      lineHeight: 20 / 16,
-      color: "var(--ds-text, #172B4D)",
-      fontWeight: "var(--ds-font-weight-semibold, 600)",
-      letterSpacing: "-0.006em",
-      marginTop: '2em',
-      marginBottom: 0
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    '& h4': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-      fontSize: "".concat(14 / 14, "em"),
-      fontStyle: 'inherit',
-      lineHeight: 16 / 14,
-      color: "var(--ds-text, #172B4D)",
-      fontWeight: "var(--ds-font-weight-semibold, 600)",
-      letterSpacing: "-0.003em",
-      marginTop: '1.357em'
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    '& h5': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-      fontSize: "".concat(12 / 14, "em"),
-      fontStyle: 'inherit',
-      lineHeight: 16 / 12,
-      color: "var(--ds-text, #172B4D)",
-      fontWeight: "var(--ds-font-weight-semibold, 600)",
-      marginTop: '1.667em',
-      textTransform: 'none'
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    '& h6': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-      fontSize: "".concat(11 / 14, "em"),
-      fontStyle: 'inherit',
-      lineHeight: 16 / 11,
-      color: "var(--ds-text-subtlest, #626F86)",
-      fontWeight: "var(--ds-font-weight-bold, 700)",
-      marginTop: '1.455em',
-      textTransform: 'none'
-    }
-  }, headingWithAlignmentStyles()));
+export var headingsSharedStyles = function headingsSharedStyles(typographyTheme) {
+  var isADSTokenMigrationEnabled = editorExperiment('typography_migration_ugc', true);
+  if (isADSTokenMigrationEnabled) {
+    return css(_objectSpread({
+      '& h1': {
+        font: editorUGCToken('editor.font.heading.h1', typographyTheme),
+        marginBottom: 0,
+        marginTop: '1.667em'
+      },
+      '& h2': {
+        font: editorUGCToken('editor.font.heading.h2', typographyTheme),
+        marginTop: '1.8em',
+        marginBottom: 0
+      },
+      '& h3': {
+        font: editorUGCToken('editor.font.heading.h3', typographyTheme),
+        marginTop: '2em',
+        marginBottom: 0
+      },
+      '& h4': {
+        font: editorUGCToken('editor.font.heading.h4', typographyTheme),
+        marginTop: '1.357em'
+      },
+      '& h5': {
+        font: editorUGCToken('editor.font.heading.h5', typographyTheme),
+        textTransform: 'none'
+      },
+      '& h6': {
+        font: editorUGCToken('editor.font.heading.h6', typographyTheme),
+        marginTop: '1.455em',
+        textTransform: 'none'
+      }
+    }, headingWithAlignmentStyles()));
+  } else {
+    return css(_objectSpread({
+      '& h1': {
+        fontSize: "".concat(24 / 14, "em"),
+        fontStyle: 'inherit',
+        lineHeight: 28 / 24,
+        color: "var(--ds-text, #172B4D)",
+        fontWeight: "var(--ds-font-weight-medium, 500)",
+        letterSpacing: "-0.01em",
+        marginBottom: 0,
+        marginTop: '1.667em'
+      },
+      '& h2': {
+        fontSize: "".concat(20 / 14, "em"),
+        fontStyle: 'inherit',
+        lineHeight: 24 / 20,
+        color: "var(--ds-text, #172B4D)",
+        fontWeight: "var(--ds-font-weight-medium, 500)",
+        letterSpacing: "-0.008em",
+        marginTop: '1.8em',
+        marginBottom: 0
+      },
+      '& h3': {
+        fontSize: "".concat(16 / 14, "em"),
+        fontStyle: 'inherit',
+        lineHeight: 20 / 16,
+        color: "var(--ds-text, #172B4D)",
+        fontWeight: "var(--ds-font-weight-semibold, 600)",
+        letterSpacing: "-0.006em",
+        marginTop: '2em',
+        marginBottom: 0
+      },
+      '& h4': {
+        fontSize: "".concat(14 / 14, "em"),
+        fontStyle: 'inherit',
+        lineHeight: 16 / 14,
+        color: "var(--ds-text, #172B4D)",
+        fontWeight: "var(--ds-font-weight-semibold, 600)",
+        letterSpacing: "-0.003em",
+        marginTop: '1.357em'
+      },
+      '& h5': {
+        fontSize: "".concat(12 / 14, "em"),
+        fontStyle: 'inherit',
+        lineHeight: 16 / 12,
+        color: "var(--ds-text, #172B4D)",
+        fontWeight: "var(--ds-font-weight-semibold, 600)",
+        marginTop: '1.667em',
+        textTransform: 'none'
+      },
+      '& h6': {
+        fontSize: "".concat(11 / 14, "em"),
+        fontStyle: 'inherit',
+        lineHeight: 16 / 11,
+        color: "var(--ds-text-subtlest, #626F86)",
+        fontWeight: "var(--ds-font-weight-bold, 700)",
+        marginTop: '1.455em',
+        textTransform: 'none'
+      }
+    }, headingWithAlignmentStyles()));
+  }
 };

package/dist/esm/styles/shared/paragraph.js

@@ -1,19 +1,32 @@
+/* eslint-disable @atlaskit/ui-styling-standard/no-exported-styles */
+/* eslint-disable @atlaskit/design-system/use-tokens-typography */
+/* eslint-disable @atlaskit/ui-styling-standard/no-unsafe-values */
+/* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 import { akEditorLineHeight, blockNodesVerticalMargin } from '@atlaskit/editor-shared-styles';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import editorUGCToken from '../../ugc-tokens/get-editor-ugc-token';
 
 // @see typography spreadsheet: https://docs.google.com/spreadsheets/d/1iYusRGCT4PoPfvxbJ8NrgjtfFgXLm5lpDWXzjua1W2E/edit#gid=93913128
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export var paragraphSharedStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '& p': {
-    fontSize: '1em',
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-    lineHeight: akEditorLineHeight,
-    fontWeight: 'normal',
-    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-    marginTop: blockNodesVerticalMargin,
-    marginBottom: 0,
-    letterSpacing: '-0.005em'
-  }
-});
+export var paragraphSharedStyles = function paragraphSharedStyles(typographyTheme) {
+  return editorExperiment('typography_migration_ugc', true) ? css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '& p': {
+      font: editorUGCToken('editor.font.body', typographyTheme),
+      marginTop: blockNodesVerticalMargin,
+      marginBottom: 0
+    }
+  }) : css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '& p': {
+      fontSize: '1em',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+      lineHeight: akEditorLineHeight,
+      fontWeight: 'normal',
+      marginTop: blockNodesVerticalMargin,
+      marginBottom: 0,
+      letterSpacing: '-0.005em'
+    }
+  });
+};

package/dist/esm/ugc-tokens/editor-ugc-token-names.js

@@ -0,0 +1,27 @@
+export var editorUGCTokens = {
+  'editor.font.heading.h1': 'normal 500 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h2': 'normal 500 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
+};
+export var editorUGCTokensModernized = {
+  'editor.font.heading.h1': 'normal 700 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h2': 'normal 700 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h3': 'normal 700 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h4': 'normal 700  1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h5': 'normal 700  0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
+};
+export var editorUGCTokensRefreshed = {
+  'editor.font.heading.h1': 'normal 700 1.71429em/1.16667 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h2': 'normal 700 1.42857em/1.2 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h3': 'normal 7001.14286em/1.25 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h4': 'normal 700  1em/1.14286 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h5': 'normal 700   0.857143em/1.33333  "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
+  'editor.font.body': 'normal 400 1em/1.714 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
+};

package/dist/esm/ugc-tokens/get-editor-ugc-token.js

@@ -0,0 +1,17 @@
+import { editorUGCTokens, editorUGCTokensModernized, editorUGCTokensRefreshed } from './editor-ugc-token-names';
+function editorUGCToken(path, typographyTheme) {
+  var token;
+  switch (typographyTheme) {
+    case 'typography-modernized':
+      token = editorUGCTokensModernized[path];
+      break;
+    case 'typography-refreshed':
+      token = editorUGCTokensRefreshed[path];
+      break;
+    default:
+      token = editorUGCTokens[path];
+      break;
+  }
+  return token;
+}
+export default editorUGCToken;

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "93.4.0";
+var packageVersion = "93.4.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/ui/Layer/index.js

@@ -12,6 +12,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import React, { Component } from 'react';
 import Popper from 'popper.js'; // eslint-disable-line import/extensions
 import rafSchedule from 'raf-schd';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { positionPropToPopperPosition } from './internal/helpers';
 var defaultState = {
   hasExtractedStyles: false,
@@ -68,13 +69,18 @@ var Layer = /*#__PURE__*/function (_Component) {
   }, {
     key: "UNSAFE_componentWillReceiveProps",
     value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      this.applyPopper(nextProps);
+      if (!fg('platform_editor_react18_phase2')) {
+        this.applyPopper(nextProps);
+      }
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
       var onPositioned = this.props.onPositioned;
       var hasExtractedStyles = this.state.hasExtractedStyles;
+      if (this.props !== prevProps && fg('platform_editor_react18_phase2')) {
+        this.applyPopper(this.props);
+      }
 
       // This flag is set the first time the position is calculated from Popper and applied to the content
       if (!prevState.hasExtractedStyles && hasExtractedStyles && onPositioned) {

package/dist/esm/ui/Popup/index.js

@@ -14,6 +14,7 @@ import createFocusTrap from 'focus-trap';
 import rafSchedule from 'raf-schd';
 import { createPortal, flushSync } from 'react-dom';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { calculatePlacement, calculatePosition as _calculatePosition, findOverflowScrollParent, validatePosition } from './utils';
 var Popup = /*#__PURE__*/function (_React$Component) {
   _inherits(Popup, _React$Component);
@@ -194,7 +195,9 @@ var Popup = /*#__PURE__*/function (_React$Component) {
     value: function UNSAFE_componentWillReceiveProps(newProps) {
       // We are delaying `updatePosition` otherwise it happens before the children
       // get rendered and we end up with a wrong position
-      this.scheduledUpdatePosition(newProps);
+      if (!fg('platform_editor_react18_phase2')) {
+        this.scheduledUpdatePosition(newProps);
+      }
     }
   }, {
     key: "destroyFocusTrap",
@@ -235,6 +238,11 @@ var Popup = /*#__PURE__*/function (_React$Component) {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       this.handleChangedFocusTrapProp(prevProps);
+      if (fg('platform_editor_react18_phase2')) {
+        if (this.props !== prevProps) {
+          this.scheduledUpdatePosition(prevProps);
+        }
+      }
     }
   }, {
     key: "componentDidMount",

package/dist/types/analytics/api.d.ts

@@ -14,6 +14,7 @@ export type EditorAnalyticsAPI = {
      * fireAnalyticsEvent is used to fire an analytics payloads directly
      *
      * @param {AnalyticsEventPayload} payload - analytics payload
+     * @param {string} [channel="editor"] - optional channel identifier
      */
-    fireAnalyticsEvent: (payload: AnalyticsEventPayload) => void | undefined;
+    fireAnalyticsEvent: (payload: AnalyticsEventPayload, channel?: string) => void | undefined;
 };

package/dist/types/styles/shared/headings.d.ts

@@ -1 +1 @@
-export declare const headingsSharedStyles: () => import("@emotion/react").SerializedStyles;
+export declare const headingsSharedStyles: (typographyTheme?: 'typography' | 'typography-adg3' | 'typography-modernized' | 'typography-refreshed') => import("@emotion/react").SerializedStyles;

package/dist/types/styles/shared/paragraph.d.ts

@@ -1 +1 @@
-export declare const paragraphSharedStyles: import("@emotion/react").SerializedStyles;
+export declare const paragraphSharedStyles: (typographyTheme?: 'typography' | 'typography-adg3' | 'typography-modernized' | 'typography-refreshed') => import("@emotion/react").SerializedStyles;

package/dist/types/ugc-tokens/editor-ugc-token-names.d.ts

@@ -0,0 +1,12 @@
+export type EditorUGCTokens = {
+    'editor.font.heading.h1': string;
+    'editor.font.heading.h2': string;
+    'editor.font.heading.h3': string;
+    'editor.font.heading.h4': string;
+    'editor.font.heading.h5': string;
+    'editor.font.heading.h6': string;
+    'editor.font.body': string;
+};
+export declare const editorUGCTokens: EditorUGCTokens;
+export declare const editorUGCTokensModernized: EditorUGCTokens;
+export declare const editorUGCTokensRefreshed: EditorUGCTokens;

package/dist/types/ugc-tokens/get-editor-ugc-token.d.ts

@@ -0,0 +1,3 @@
+import { type EditorUGCTokens } from './editor-ugc-token-names';
+declare function editorUGCToken<T extends keyof EditorUGCTokens>(path: T, typographyTheme: 'typography' | 'typography-adg3' | 'typography-modernized' | 'typography-refreshed' | undefined): string;
+export default editorUGCToken;

package/dist/types-ts4.5/analytics/api.d.ts

@@ -14,6 +14,7 @@ export type EditorAnalyticsAPI = {
      * fireAnalyticsEvent is used to fire an analytics payloads directly
      *
      * @param {AnalyticsEventPayload} payload - analytics payload
+     * @param {string} [channel="editor"] - optional channel identifier
      */
-    fireAnalyticsEvent: (payload: AnalyticsEventPayload) => void | undefined;
+    fireAnalyticsEvent: (payload: AnalyticsEventPayload, channel?: string) => void | undefined;
 };

package/dist/types-ts4.5/styles/shared/headings.d.ts

@@ -1 +1 @@
-export declare const headingsSharedStyles: () => import("@emotion/react").SerializedStyles;
+export declare const headingsSharedStyles: (typographyTheme?: 'typography' | 'typography-adg3' | 'typography-modernized' | 'typography-refreshed') => import("@emotion/react").SerializedStyles;

package/dist/types-ts4.5/styles/shared/paragraph.d.ts

@@ -1 +1 @@
-export declare const paragraphSharedStyles: import("@emotion/react").SerializedStyles;
+export declare const paragraphSharedStyles: (typographyTheme?: 'typography' | 'typography-adg3' | 'typography-modernized' | 'typography-refreshed') => import("@emotion/react").SerializedStyles;

package/dist/types-ts4.5/ugc-tokens/editor-ugc-token-names.d.ts

@@ -0,0 +1,12 @@
+export type EditorUGCTokens = {
+    'editor.font.heading.h1': string;
+    'editor.font.heading.h2': string;
+    'editor.font.heading.h3': string;
+    'editor.font.heading.h4': string;
+    'editor.font.heading.h5': string;
+    'editor.font.heading.h6': string;
+    'editor.font.body': string;
+};
+export declare const editorUGCTokens: EditorUGCTokens;
+export declare const editorUGCTokensModernized: EditorUGCTokens;
+export declare const editorUGCTokensRefreshed: EditorUGCTokens;

package/dist/types-ts4.5/ugc-tokens/get-editor-ugc-token.d.ts

@@ -0,0 +1,3 @@
+import { type EditorUGCTokens } from './editor-ugc-token-names';
+declare function editorUGCToken<T extends keyof EditorUGCTokens>(path: T, typographyTheme: 'typography' | 'typography-adg3' | 'typography-modernized' | 'typography-refreshed' | undefined): string;
+export default editorUGCToken;