@atlaskit/editor-core 215.0.3 → 215.0.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-core
 
+## 215.0.4
+
+### Patch Changes
+
+- [`9c55684b00aa0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9c55684b00aa0) -
+  [EDITOR-1992] Update extension styles to include font size adjustments in all content in
+  extensions and set the style based on the contentMode prop as well as the fg
+- Updated dependencies
+
 ## 215.0.3
 
 ### Patch Changes

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

@@ -124,6 +124,7 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
         popupsBoundariesElement: props.popupsBoundariesElement,
         popupsScrollableElement: props.popupsScrollableElement,
         contentComponents: config.contentComponents,
+        contentMode: props.contentMode,
         primaryToolbarComponents: config.primaryToolbarComponents,
         primaryToolbarIconBefore: props.primaryToolbarIconBefore,
         secondaryToolbarComponents: config.secondaryToolbarComponents,

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

@@ -217,6 +217,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
     featureFlags: props.featureFlags,
     isEditorToolbarHidden: isEditorToolbarHidden,
     viewMode: state.editorViewMode,
-    hasHadInteraction: hasHadInteraction
+    hasHadInteraction: hasHadInteraction,
+    contentMode: props.contentMode
   })));
 };

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

@@ -262,7 +262,8 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     ref: scrollContainerRef,
     viewMode: props === null || props === void 0 ? void 0 : props.viewMode,
     isScrollable: true,
-    appearance: props.appearance
+    appearance: props.appearance,
+    contentMode: props.contentMode
   }, (0, _react2.jsx)(_ClickAreaBlock.default, {
     editorView: props.editorView,
     editorDisabled: props.disabled

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getExtensionStyles = void 0;
 var _react = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _selectionStyles = require("./selectionStyles");
@@ -372,7 +373,13 @@ var getExtensionStyles = exports.getExtensionStyles = function getExtensionStyle
   // When cleaning up the experiment, move this logic into the baseExtensionStyles above
   var fontSize = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') ? (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _expVal.expVal)('cc_editor_ai_content_mode', 'baseFontSize', 13)) : undefined;
   // Fixes issue where TOC links fall back to default DST styles
-  var denseContentModeTocStyles = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') ? (0, _react.css)({
+  var denseContentModeTocStyles = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? (0, _react.css)({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.extension-container *': {
+      // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
+      fontSize: 'var(--ak-editor-base-font-size)'
+    }
+  }) : (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') ? (0, _react.css)({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
     '.extension-container a span': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values

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 = "0.0.0-development";
+var version = exports.version = "215.0.3";

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

@@ -113,6 +113,7 @@ export const EditorInternal = /*#__PURE__*/memo(({
         popupsBoundariesElement: props.popupsBoundariesElement,
         popupsScrollableElement: props.popupsScrollableElement,
         contentComponents: config.contentComponents,
+        contentMode: props.contentMode,
         primaryToolbarComponents: config.primaryToolbarComponents,
         primaryToolbarIconBefore: props.primaryToolbarIconBefore,
         secondaryToolbarComponents: config.secondaryToolbarComponents,

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

@@ -202,6 +202,7 @@ export const FullPageEditor = props => {
     featureFlags: props.featureFlags,
     isEditorToolbarHidden: isEditorToolbarHidden,
     viewMode: state.editorViewMode,
-    hasHadInteraction: hasHadInteraction
+    hasHadInteraction: hasHadInteraction,
+    contentMode: props.contentMode
   })));
 };

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

@@ -254,7 +254,8 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
     ref: scrollContainerRef,
     viewMode: props === null || props === void 0 ? void 0 : props.viewMode,
     isScrollable: true,
-    appearance: props.appearance
+    appearance: props.appearance,
+    contentMode: props.contentMode
   }, jsx(ClickAreaBlock, {
     editorView: props.editorView,
     editorDisabled: props.disabled

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

@@ -1,6 +1,7 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { blanketSelectionStyles, boxShadowSelectionStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
@@ -366,7 +367,13 @@ export const getExtensionStyles = () => {
   // When cleaning up the experiment, move this logic into the baseExtensionStyles above
   const fontSize = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(expVal('cc_editor_ai_content_mode', 'baseFontSize', 13)) : undefined;
   // Fixes issue where TOC links fall back to default DST styles
-  const denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? css({
+  const denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.extension-container *': {
+      // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
+      fontSize: 'var(--ak-editor-base-font-size)'
+    }
+  }) : expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
     '.extension-container a span': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "0.0.0-development";
+export const version = "215.0.3";

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

@@ -120,6 +120,7 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
         popupsBoundariesElement: props.popupsBoundariesElement,
         popupsScrollableElement: props.popupsScrollableElement,
         contentComponents: config.contentComponents,
+        contentMode: props.contentMode,
         primaryToolbarComponents: config.primaryToolbarComponents,
         primaryToolbarIconBefore: props.primaryToolbarIconBefore,
         secondaryToolbarComponents: config.secondaryToolbarComponents,

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

@@ -207,6 +207,7 @@ export var FullPageEditor = function FullPageEditor(props) {
     featureFlags: props.featureFlags,
     isEditorToolbarHidden: isEditorToolbarHidden,
     viewMode: state.editorViewMode,
-    hasHadInteraction: hasHadInteraction
+    hasHadInteraction: hasHadInteraction,
+    contentMode: props.contentMode
   })));
 };

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

@@ -252,7 +252,8 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
     ref: scrollContainerRef,
     viewMode: props === null || props === void 0 ? void 0 : props.viewMode,
     isScrollable: true,
-    appearance: props.appearance
+    appearance: props.appearance,
+    contentMode: props.contentMode
   }, jsx(ClickAreaBlock, {
     editorView: props.editorView,
     editorDisabled: props.disabled

package/dist/esm/ui/EditorContentContainer/styles/extensionStyles.js

@@ -1,6 +1,7 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { blanketSelectionStyles, boxShadowSelectionStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
@@ -366,7 +367,13 @@ export var getExtensionStyles = function getExtensionStyles() {
   // When cleaning up the experiment, move this logic into the baseExtensionStyles above
   var fontSize = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(expVal('cc_editor_ai_content_mode', 'baseFontSize', 13)) : undefined;
   // Fixes issue where TOC links fall back to default DST styles
-  var denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? css({
+  var denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.extension-container *': {
+      // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
+      fontSize: 'var(--ak-editor-base-font-size)'
+    }
+  }) : expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
     '.extension-container a span': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "0.0.0-development";
+export var version = "215.0.3";

package/dist/types/editor-appearances/FullPageEditor.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type EditorActions from '../actions';
 import { type EditorNextProps } from '../types/editor-props';
-export type FullPageEditorProps = Pick<EditorNextProps, 'preset' | 'defaultValue' | 'disabled' | 'mentionProvider' | 'performanceTracking' | 'contextIdentifierProvider' | 'searchProvider' | 'activityProvider' | 'annotationProviders' | 'collabEditProvider' | 'collabEdit' | 'taskDecisionProvider' | 'extensionProviders' | 'shouldFocus' | 'quickInsert' | 'secondaryToolbarComponents' | 'featureFlags' | 'primaryToolbarComponents' | 'contextPanel' | 'contentComponents' | 'primaryToolbarIconBefore' | 'sanitizePrivateContent' | '__livePage'> & {
+export type FullPageEditorProps = Pick<EditorNextProps, 'preset' | 'defaultValue' | 'disabled' | 'mentionProvider' | 'performanceTracking' | 'contextIdentifierProvider' | 'searchProvider' | 'activityProvider' | 'annotationProviders' | 'collabEditProvider' | 'collabEdit' | 'contentMode' | 'taskDecisionProvider' | 'extensionProviders' | 'shouldFocus' | 'quickInsert' | 'secondaryToolbarComponents' | 'featureFlags' | 'primaryToolbarComponents' | 'contextPanel' | 'contentComponents' | 'primaryToolbarIconBefore' | 'sanitizePrivateContent' | '__livePage'> & {
     appearance: 'full-page' | 'full-width';
     onChange?: () => void;
     onEditorReady?: (editorActions: EditorActions) => void;

package/dist/types/types/editor-appearance-component.d.ts

@@ -5,7 +5,7 @@ import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { ExtensionHandlers } from '@atlaskit/editor-common/extensions';
 import type { AllEditorPresetPluginTypes, EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { EditorAppearance, FeatureFlags, NextEditorPlugin, PublicPluginAPI, ReactHookFactory, ToolbarUIComponentFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, EditorContentMode, FeatureFlags, NextEditorPlugin, PublicPluginAPI, ReactHookFactory, ToolbarUIComponentFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
 import type { UseStickyToolbarType } from '@atlaskit/editor-common/ui';
 import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -16,6 +16,7 @@ export interface EditorAppearanceComponentProps<Plugins extends NextEditorPlugin
     appearance?: EditorAppearance;
     collabEdit?: CollabEditOptions;
     contentComponents?: UIComponentFactory[];
+    contentMode?: EditorContentMode;
     contextPanel?: ReactComponents;
     customContentComponents?: ContentComponents;
     customPrimaryToolbarComponents?: PrimaryToolbarComponents;

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

@@ -8,7 +8,7 @@ import type { WrappedComponentProps } from 'react-intl-next';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { EditorAppearance, FeatureFlags, OptionalPlugin, PublicPluginAPI, ReactHookFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, EditorContentMode, FeatureFlags, OptionalPlugin, PublicPluginAPI, ReactHookFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
 import { type ContextPanelPlugin } from '@atlaskit/editor-plugins/context-panel';
 import { type ViewMode } from '@atlaskit/editor-plugins/editor-viewmode';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -18,6 +18,7 @@ import type { ScrollContainerRefs } from './types';
 interface FullPageEditorContentAreaProps {
     appearance: EditorAppearance | undefined;
     contentComponents: UIComponentFactory[] | undefined;
+    contentMode: EditorContentMode | undefined;
     contextPanel: ReactComponents | undefined;
     customContentComponents: ContentComponents | undefined;
     disabled: boolean | undefined;

package/dist/types/ui/EditorContentContainer/EditorContentContainer.d.ts

@@ -3,11 +3,12 @@
  * @jsx jsx
  */
 import React from 'react';
-import type { EditorAppearance, FeatureFlags } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, EditorContentMode, FeatureFlags } from '@atlaskit/editor-common/types';
 export type EditorContentContainerProps = {
     appearance?: EditorAppearance;
     children?: React.ReactNode;
     className?: string;
+    contentMode?: EditorContentMode;
     featureFlags?: FeatureFlags;
     isScrollable?: boolean;
     viewMode?: 'view' | 'edit';

package/dist/types-ts4.5/editor-appearances/FullPageEditor.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type EditorActions from '../actions';
 import { type EditorNextProps } from '../types/editor-props';
-export type FullPageEditorProps = Pick<EditorNextProps, 'preset' | 'defaultValue' | 'disabled' | 'mentionProvider' | 'performanceTracking' | 'contextIdentifierProvider' | 'searchProvider' | 'activityProvider' | 'annotationProviders' | 'collabEditProvider' | 'collabEdit' | 'taskDecisionProvider' | 'extensionProviders' | 'shouldFocus' | 'quickInsert' | 'secondaryToolbarComponents' | 'featureFlags' | 'primaryToolbarComponents' | 'contextPanel' | 'contentComponents' | 'primaryToolbarIconBefore' | 'sanitizePrivateContent' | '__livePage'> & {
+export type FullPageEditorProps = Pick<EditorNextProps, 'preset' | 'defaultValue' | 'disabled' | 'mentionProvider' | 'performanceTracking' | 'contextIdentifierProvider' | 'searchProvider' | 'activityProvider' | 'annotationProviders' | 'collabEditProvider' | 'collabEdit' | 'contentMode' | 'taskDecisionProvider' | 'extensionProviders' | 'shouldFocus' | 'quickInsert' | 'secondaryToolbarComponents' | 'featureFlags' | 'primaryToolbarComponents' | 'contextPanel' | 'contentComponents' | 'primaryToolbarIconBefore' | 'sanitizePrivateContent' | '__livePage'> & {
     appearance: 'full-page' | 'full-width';
     onChange?: () => void;
     onEditorReady?: (editorActions: EditorActions) => void;

package/dist/types-ts4.5/types/editor-appearance-component.d.ts

@@ -5,7 +5,7 @@ import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { ExtensionHandlers } from '@atlaskit/editor-common/extensions';
 import type { AllEditorPresetPluginTypes, EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { EditorAppearance, FeatureFlags, NextEditorPlugin, PublicPluginAPI, ReactHookFactory, ToolbarUIComponentFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, EditorContentMode, FeatureFlags, NextEditorPlugin, PublicPluginAPI, ReactHookFactory, ToolbarUIComponentFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
 import type { UseStickyToolbarType } from '@atlaskit/editor-common/ui';
 import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -16,6 +16,7 @@ export interface EditorAppearanceComponentProps<Plugins extends NextEditorPlugin
     appearance?: EditorAppearance;
     collabEdit?: CollabEditOptions;
     contentComponents?: UIComponentFactory[];
+    contentMode?: EditorContentMode;
     contextPanel?: ReactComponents;
     customContentComponents?: ContentComponents;
     customPrimaryToolbarComponents?: PrimaryToolbarComponents;

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

@@ -8,7 +8,7 @@ import type { WrappedComponentProps } from 'react-intl-next';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { EditorAppearance, FeatureFlags, OptionalPlugin, PublicPluginAPI, ReactHookFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, EditorContentMode, FeatureFlags, OptionalPlugin, PublicPluginAPI, ReactHookFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
 import { type ContextPanelPlugin } from '@atlaskit/editor-plugins/context-panel';
 import { type ViewMode } from '@atlaskit/editor-plugins/editor-viewmode';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -18,6 +18,7 @@ import type { ScrollContainerRefs } from './types';
 interface FullPageEditorContentAreaProps {
     appearance: EditorAppearance | undefined;
     contentComponents: UIComponentFactory[] | undefined;
+    contentMode: EditorContentMode | undefined;
     contextPanel: ReactComponents | undefined;
     customContentComponents: ContentComponents | undefined;
     disabled: boolean | undefined;

package/dist/types-ts4.5/ui/EditorContentContainer/EditorContentContainer.d.ts

@@ -3,11 +3,12 @@
  * @jsx jsx
  */
 import React from 'react';
-import type { EditorAppearance, FeatureFlags } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, EditorContentMode, FeatureFlags } from '@atlaskit/editor-common/types';
 export type EditorContentContainerProps = {
     appearance?: EditorAppearance;
     children?: React.ReactNode;
     className?: string;
+    contentMode?: EditorContentMode;
     featureFlags?: FeatureFlags;
     isScrollable?: boolean;
     viewMode?: 'view' | 'edit';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "215.0.3",
+	"version": "215.0.4",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -53,7 +53,7 @@
 		"@atlaskit/editor-plugins": "^11.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
-		"@atlaskit/editor-toolbar": "^0.14.0",
+		"@atlaskit/editor-toolbar": "^0.15.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/emoji": "^69.5.0",
 		"@atlaskit/icon": "^28.5.0",
@@ -64,7 +64,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
 		"@atlaskit/react-ufo": "^4.11.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^13.6.0",
+		"@atlaskit/tmp-editor-statsig": "^13.8.0",
 		"@atlaskit/tokens": "^6.4.0",
 		"@atlaskit/tooltip": "^20.5.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -276,6 +276,9 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"platform_editor_content_mode_button_mvp": {
+			"type": "boolean"
+		},
 		"platform_editor_table_column_selected_state_fix": {
 			"type": "boolean",
 			"referenceOnly": true