@atlaskit/editor-core 215.0.2 → 215.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/dist/cjs/composable-editor/editor-internal.js +1 -0
  3. package/dist/cjs/ui/Appearance/Chromeless.js +18 -3
  4. package/dist/cjs/ui/Appearance/FullPage/FullPage.js +2 -1
  5. package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js +4 -2
  6. package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +1 -1
  7. package/dist/cjs/ui/EditorContentContainer/styles/extensionStyles.js +8 -1
  8. package/dist/cjs/version-wrapper.js +1 -1
  9. package/dist/es2019/composable-editor/editor-internal.js +1 -0
  10. package/dist/es2019/ui/Appearance/Chromeless.js +19 -2
  11. package/dist/es2019/ui/Appearance/FullPage/FullPage.js +2 -1
  12. package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js +5 -2
  13. package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +1 -1
  14. package/dist/es2019/ui/EditorContentContainer/styles/extensionStyles.js +8 -1
  15. package/dist/es2019/version-wrapper.js +1 -1
  16. package/dist/esm/composable-editor/editor-internal.js +1 -0
  17. package/dist/esm/ui/Appearance/Chromeless.js +18 -3
  18. package/dist/esm/ui/Appearance/FullPage/FullPage.js +2 -1
  19. package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js +4 -2
  20. package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +1 -1
  21. package/dist/esm/ui/EditorContentContainer/styles/extensionStyles.js +8 -1
  22. package/dist/esm/version-wrapper.js +1 -1
  23. package/dist/types/create-editor/create-universal-preset.d.ts +8 -2
  24. package/dist/types/editor-appearances/FullPageEditor.d.ts +1 -1
  25. package/dist/types/presets/universal.d.ts +8 -2
  26. package/dist/types/presets/useUniversalPreset.d.ts +8 -2
  27. package/dist/types/types/editor-appearance-component.d.ts +2 -1
  28. package/dist/types/ui/Appearance/FullPage/FullPageContentArea.d.ts +2 -1
  29. package/dist/types/ui/EditorContentContainer/EditorContentContainer.d.ts +2 -1
  30. package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts +8 -2
  31. package/dist/types-ts4.5/editor-appearances/FullPageEditor.d.ts +1 -1
  32. package/dist/types-ts4.5/presets/universal.d.ts +8 -2
  33. package/dist/types-ts4.5/presets/useUniversalPreset.d.ts +8 -2
  34. package/dist/types-ts4.5/types/editor-appearance-component.d.ts +2 -1
  35. package/dist/types-ts4.5/ui/Appearance/FullPage/FullPageContentArea.d.ts +2 -1
  36. package/dist/types-ts4.5/ui/EditorContentContainer/EditorContentContainer.d.ts +2 -1
  37. package/package.json +15 -15
package/CHANGELOG.md CHANGED
@@ -1,5 +1,24 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 215.0.4
4
+
5
+ ### Patch Changes
6
+
7
+ - [`9c55684b00aa0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9c55684b00aa0) -
8
+ [EDITOR-1992] Update extension styles to include font size adjustments in all content in
9
+ extensions and set the style based on the contentMode prop as well as the fg
10
+ - Updated dependencies
11
+
12
+ ## 215.0.3
13
+
14
+ ### Patch Changes
15
+
16
+ - [`6ab3011f7db68`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6ab3011f7db68) -
17
+ [ux] Fixed a bug where the ChromelessEditor's clickable area would not expand when its minHeight
18
+ was greater than its content. This is behind a feature gate,
19
+ platform_expand_editor_click_area_with_minheight .
20
+ - Updated dependencies
21
+
3
22
  ## 215.0.2
4
23
 
5
24
  ### Patch Changes
@@ -124,6 +124,7 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
124
124
  popupsBoundariesElement: props.popupsBoundariesElement,
125
125
  popupsScrollableElement: props.popupsScrollableElement,
126
126
  contentComponents: config.contentComponents,
127
+ contentMode: props.contentMode,
127
128
  primaryToolbarComponents: config.primaryToolbarComponents,
128
129
  primaryToolbarIconBefore: props.primaryToolbarIconBefore,
129
130
  secondaryToolbarComponents: config.secondaryToolbarComponents,
@@ -21,11 +21,14 @@ var _EditorContentContainer = _interopRequireDefault(require("../EditorContentCo
21
21
  var _PluginSlot = _interopRequireDefault(require("../PluginSlot"));
22
22
  var _WithFlash = _interopRequireDefault(require("../WithFlash"));
23
23
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
24
+ 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; }
25
+ 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) { (0, _defineProperty2.default)(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; }
24
26
  function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
25
27
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /**
26
28
  * @jsxRuntime classic
27
29
  * @jsx jsx
28
30
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
31
+ var AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR = '--ak-editor-chromeless-min-height';
29
32
  var scrollbarStylesNew = (0, _react2.css)({
30
33
  msOverflowStyle: '-ms-autohiding-scrollbar',
31
34
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
@@ -67,6 +70,18 @@ var chromelessEditorStylesNew = (0, _react2.css)({
67
70
  }
68
71
  }
69
72
  });
73
+
74
+ /**
75
+ * minHeight styles are needed to expand the clickable area of ProseMirror.
76
+ * Here, we propagate the minHeight that's used in the editor container to ProseMirror.
77
+ */
78
+ var minHeightStyles = (0, _react2.css)({
79
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
80
+ 'div > .ProseMirror': {
81
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
82
+ minHeight: "var(".concat(AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR, ")")
83
+ }
84
+ });
70
85
  var extraSpaceLastLineFix = (0, _react2.css)({
71
86
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
72
87
  '.ProseMirror': {
@@ -183,11 +198,11 @@ function ChromelessEditorContainer(_ref3) {
183
198
  children = _ref3.children,
184
199
  containerRef = _ref3.containerRef;
185
200
  return (0, _react2.jsx)("div", {
186
- css: [chromelessEditorStylesNew, scrollbarStylesNew, (0, _platformFeatureFlags.fg)('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
187
- style: {
201
+ css: [chromelessEditorStylesNew, scrollbarStylesNew, (0, _platformFeatureFlags.fg)('platform_expand_editor_click_area_with_minheight') && minHeightStyles, (0, _platformFeatureFlags.fg)('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
202
+ style: _objectSpread({
188
203
  maxHeight: maxHeight ? "".concat(maxHeight, "px") : undefined,
189
204
  minHeight: "".concat(minHeight, "px")
190
- },
205
+ }, (0, _platformFeatureFlags.fg)('platform_expand_editor_click_area_with_minheight') && (0, _defineProperty2.default)({}, AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR, "".concat(minHeight, "px"))),
191
206
  "data-testid": "chromeless-editor",
192
207
  id: "chromeless-editor",
193
208
  ref: containerRef
@@ -217,6 +217,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
217
217
  featureFlags: props.featureFlags,
218
218
  isEditorToolbarHidden: isEditorToolbarHidden,
219
219
  viewMode: state.editorViewMode,
220
- hasHadInteraction: hasHadInteraction
220
+ hasHadInteraction: hasHadInteraction,
221
+ contentMode: props.contentMode
221
222
  })));
222
223
  };
@@ -262,7 +262,8 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
262
262
  ref: scrollContainerRef,
263
263
  viewMode: props === null || props === void 0 ? void 0 : props.viewMode,
264
264
  isScrollable: true,
265
- appearance: props.appearance
265
+ appearance: props.appearance,
266
+ contentMode: props.contentMode
266
267
  }, (0, _react2.jsx)(_ClickAreaBlock.default, {
267
268
  editorView: props.editorView,
268
269
  editorDisabled: props.disabled
@@ -271,7 +272,8 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
271
272
  // for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
272
273
  (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !(0, _platformFeatureFlags.fg)('platform_editor_controls_no_toolbar_space') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !(0, _platformFeatureFlags.fg)('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace],
273
274
  style: {
274
- '--ak-editor-content-area-max-width': !fullWidthMode ? "".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
275
+ '--ak-editor-content-area-max-width': !fullWidthMode ? // @ts-ignore
276
+ "".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
275
277
  }
276
278
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
277
279
  ,
@@ -436,7 +436,7 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
436
436
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
437
437
  ,
438
438
  style: style
439
- // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex -- Adding tabIndex here because this is a scrollable container and it needs to be focusable so keyboard users can scroll it.
439
+ // eslint-disable-next-line @atlassian/a11y/no-noninteractive-tabindex -- Adding tabIndex here because this is a scrollable container and it needs to be focusable so keyboard users can scroll it.
440
440
  ,
441
441
  tabIndex: isScrollable ? 0 : undefined,
442
442
  role: isScrollable ? 'region' : undefined
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.getExtensionStyles = void 0;
7
7
  var _react = require("@emotion/react");
8
8
  var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
9
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
9
10
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
10
11
  var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
11
12
  var _selectionStyles = require("./selectionStyles");
@@ -372,7 +373,13 @@ var getExtensionStyles = exports.getExtensionStyles = function getExtensionStyle
372
373
  // When cleaning up the experiment, move this logic into the baseExtensionStyles above
373
374
  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;
374
375
  // Fixes issue where TOC links fall back to default DST styles
375
- var denseContentModeTocStyles = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') ? (0, _react.css)({
376
+ var denseContentModeTocStyles = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? (0, _react.css)({
377
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
378
+ '.extension-container *': {
379
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
380
+ fontSize: 'var(--ak-editor-base-font-size)'
381
+ }
382
+ }) : (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') ? (0, _react.css)({
376
383
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
377
384
  '.extension-container a span': {
378
385
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = exports.name = void 0;
7
7
  var name = exports.name = "@atlaskit/editor-core";
8
- var version = exports.version = "215.0.1";
8
+ var version = exports.version = "215.0.3";
@@ -113,6 +113,7 @@ export const EditorInternal = /*#__PURE__*/memo(({
113
113
  popupsBoundariesElement: props.popupsBoundariesElement,
114
114
  popupsScrollableElement: props.popupsScrollableElement,
115
115
  contentComponents: config.contentComponents,
116
+ contentMode: props.contentMode,
116
117
  primaryToolbarComponents: config.primaryToolbarComponents,
117
118
  primaryToolbarIconBefore: props.primaryToolbarIconBefore,
118
119
  secondaryToolbarComponents: config.secondaryToolbarComponents,
@@ -12,6 +12,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
12
12
  import EditorContentContainer from '../EditorContentContainer/EditorContentContainer';
13
13
  import PluginSlot from '../PluginSlot';
14
14
  import WithFlash from '../WithFlash';
15
+ const AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR = '--ak-editor-chromeless-min-height';
15
16
  const scrollbarStylesNew = css({
16
17
  msOverflowStyle: '-ms-autohiding-scrollbar',
17
18
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
@@ -53,6 +54,18 @@ const chromelessEditorStylesNew = css({
53
54
  }
54
55
  }
55
56
  });
57
+
58
+ /**
59
+ * minHeight styles are needed to expand the clickable area of ProseMirror.
60
+ * Here, we propagate the minHeight that's used in the editor container to ProseMirror.
61
+ */
62
+ const minHeightStyles = css({
63
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
64
+ 'div > .ProseMirror': {
65
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
66
+ minHeight: `var(${AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR})`
67
+ }
68
+ });
56
69
  const extraSpaceLastLineFix = css({
57
70
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
58
71
  '.ProseMirror': {
@@ -160,10 +173,14 @@ export function ChromelessEditorContainer({
160
173
  containerRef
161
174
  }) {
162
175
  return jsx("div", {
163
- css: [chromelessEditorStylesNew, scrollbarStylesNew, fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
176
+ css: [chromelessEditorStylesNew, scrollbarStylesNew, fg('platform_expand_editor_click_area_with_minheight') && minHeightStyles, fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
164
177
  style: {
165
178
  maxHeight: maxHeight ? `${maxHeight}px` : undefined,
166
- minHeight: `${minHeight}px`
179
+ minHeight: `${minHeight}px`,
180
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
181
+ ...(fg('platform_expand_editor_click_area_with_minheight') && {
182
+ [AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR]: `${minHeight}px`
183
+ })
167
184
  },
168
185
  "data-testid": "chromeless-editor",
169
186
  id: "chromeless-editor",
@@ -202,6 +202,7 @@ export const FullPageEditor = props => {
202
202
  featureFlags: props.featureFlags,
203
203
  isEditorToolbarHidden: isEditorToolbarHidden,
204
204
  viewMode: state.editorViewMode,
205
- hasHadInteraction: hasHadInteraction
205
+ hasHadInteraction: hasHadInteraction,
206
+ contentMode: props.contentMode
206
207
  })));
207
208
  };
@@ -254,7 +254,8 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
254
254
  ref: scrollContainerRef,
255
255
  viewMode: props === null || props === void 0 ? void 0 : props.viewMode,
256
256
  isScrollable: true,
257
- appearance: props.appearance
257
+ appearance: props.appearance,
258
+ contentMode: props.contentMode
258
259
  }, jsx(ClickAreaBlock, {
259
260
  editorView: props.editorView,
260
261
  editorDisabled: props.disabled
@@ -263,7 +264,9 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
263
264
  // for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
264
265
  expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && fg('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, fg('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !fg('platform_editor_controls_no_toolbar_space') && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !fg('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace],
265
266
  style: {
266
- '--ak-editor-content-area-max-width': !fullWidthMode ? `${theme.layoutMaxWidth + getTotalPadding()}px` : `${akEditorFullWidthLayoutWidth + getTotalPadding()}px`
267
+ '--ak-editor-content-area-max-width': !fullWidthMode ?
268
+ // @ts-ignore
269
+ `${theme.layoutMaxWidth + getTotalPadding()}px` : `${akEditorFullWidthLayoutWidth + getTotalPadding()}px`
267
270
  }
268
271
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
269
272
  ,
@@ -432,7 +432,7 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
432
432
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
433
433
  ,
434
434
  style: style
435
- // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex -- Adding tabIndex here because this is a scrollable container and it needs to be focusable so keyboard users can scroll it.
435
+ // eslint-disable-next-line @atlassian/a11y/no-noninteractive-tabindex -- Adding tabIndex here because this is a scrollable container and it needs to be focusable so keyboard users can scroll it.
436
436
  ,
437
437
  tabIndex: isScrollable ? 0 : undefined,
438
438
  role: isScrollable ? 'region' : undefined
@@ -1,6 +1,7 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
2
2
  import { css } from '@emotion/react';
3
3
  import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
4
+ import { fg } from '@atlaskit/platform-feature-flags';
4
5
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
5
6
  import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
6
7
  import { blanketSelectionStyles, boxShadowSelectionStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
@@ -366,7 +367,13 @@ export const getExtensionStyles = () => {
366
367
  // When cleaning up the experiment, move this logic into the baseExtensionStyles above
367
368
  const fontSize = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(expVal('cc_editor_ai_content_mode', 'baseFontSize', 13)) : undefined;
368
369
  // Fixes issue where TOC links fall back to default DST styles
369
- const denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? css({
370
+ const denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
371
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
372
+ '.extension-container *': {
373
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
374
+ fontSize: 'var(--ak-editor-base-font-size)'
375
+ }
376
+ }) : expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? css({
370
377
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
371
378
  '.extension-container a span': {
372
379
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "215.0.1";
2
+ export const version = "215.0.3";
@@ -120,6 +120,7 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
120
120
  popupsBoundariesElement: props.popupsBoundariesElement,
121
121
  popupsScrollableElement: props.popupsScrollableElement,
122
122
  contentComponents: config.contentComponents,
123
+ contentMode: props.contentMode,
123
124
  primaryToolbarComponents: config.primaryToolbarComponents,
124
125
  primaryToolbarIconBefore: props.primaryToolbarIconBefore,
125
126
  secondaryToolbarComponents: config.secondaryToolbarComponents,
@@ -4,6 +4,8 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
4
4
  import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
5
5
  import _inherits from "@babel/runtime/helpers/inherits";
6
6
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
7
+ 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; }
8
+ 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; }
7
9
  function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
8
10
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
9
11
  /**
@@ -19,6 +21,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
19
21
  import EditorContentContainer from '../EditorContentContainer/EditorContentContainer';
20
22
  import PluginSlot from '../PluginSlot';
21
23
  import WithFlash from '../WithFlash';
24
+ var AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR = '--ak-editor-chromeless-min-height';
22
25
  var scrollbarStylesNew = css({
23
26
  msOverflowStyle: '-ms-autohiding-scrollbar',
24
27
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
@@ -60,6 +63,18 @@ var chromelessEditorStylesNew = css({
60
63
  }
61
64
  }
62
65
  });
66
+
67
+ /**
68
+ * minHeight styles are needed to expand the clickable area of ProseMirror.
69
+ * Here, we propagate the minHeight that's used in the editor container to ProseMirror.
70
+ */
71
+ var minHeightStyles = css({
72
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
73
+ 'div > .ProseMirror': {
74
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
75
+ minHeight: "var(".concat(AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR, ")")
76
+ }
77
+ });
63
78
  var extraSpaceLastLineFix = css({
64
79
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
65
80
  '.ProseMirror': {
@@ -177,11 +192,11 @@ export function ChromelessEditorContainer(_ref3) {
177
192
  children = _ref3.children,
178
193
  containerRef = _ref3.containerRef;
179
194
  return jsx("div", {
180
- css: [chromelessEditorStylesNew, scrollbarStylesNew, fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
181
- style: {
195
+ css: [chromelessEditorStylesNew, scrollbarStylesNew, fg('platform_expand_editor_click_area_with_minheight') && minHeightStyles, fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
196
+ style: _objectSpread({
182
197
  maxHeight: maxHeight ? "".concat(maxHeight, "px") : undefined,
183
198
  minHeight: "".concat(minHeight, "px")
184
- },
199
+ }, fg('platform_expand_editor_click_area_with_minheight') && _defineProperty({}, AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR, "".concat(minHeight, "px"))),
185
200
  "data-testid": "chromeless-editor",
186
201
  id: "chromeless-editor",
187
202
  ref: containerRef
@@ -207,6 +207,7 @@ export var FullPageEditor = function FullPageEditor(props) {
207
207
  featureFlags: props.featureFlags,
208
208
  isEditorToolbarHidden: isEditorToolbarHidden,
209
209
  viewMode: state.editorViewMode,
210
- hasHadInteraction: hasHadInteraction
210
+ hasHadInteraction: hasHadInteraction,
211
+ contentMode: props.contentMode
211
212
  })));
212
213
  };
@@ -252,7 +252,8 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
252
252
  ref: scrollContainerRef,
253
253
  viewMode: props === null || props === void 0 ? void 0 : props.viewMode,
254
254
  isScrollable: true,
255
- appearance: props.appearance
255
+ appearance: props.appearance,
256
+ contentMode: props.contentMode
256
257
  }, jsx(ClickAreaBlock, {
257
258
  editorView: props.editorView,
258
259
  editorDisabled: props.disabled
@@ -261,7 +262,8 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
261
262
  // for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
262
263
  expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && fg('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, fg('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !fg('platform_editor_controls_no_toolbar_space') && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !fg('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace],
263
264
  style: {
264
- '--ak-editor-content-area-max-width': !fullWidthMode ? "".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
265
+ '--ak-editor-content-area-max-width': !fullWidthMode ? // @ts-ignore
266
+ "".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
265
267
  }
266
268
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
267
269
  ,
@@ -428,7 +428,7 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
428
428
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
429
429
  ,
430
430
  style: style
431
- // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex -- Adding tabIndex here because this is a scrollable container and it needs to be focusable so keyboard users can scroll it.
431
+ // eslint-disable-next-line @atlassian/a11y/no-noninteractive-tabindex -- Adding tabIndex here because this is a scrollable container and it needs to be focusable so keyboard users can scroll it.
432
432
  ,
433
433
  tabIndex: isScrollable ? 0 : undefined,
434
434
  role: isScrollable ? 'region' : undefined
@@ -1,6 +1,7 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
2
2
  import { css } from '@emotion/react';
3
3
  import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
4
+ import { fg } from '@atlaskit/platform-feature-flags';
4
5
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
5
6
  import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
6
7
  import { blanketSelectionStyles, boxShadowSelectionStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
@@ -366,7 +367,13 @@ export var getExtensionStyles = function getExtensionStyles() {
366
367
  // When cleaning up the experiment, move this logic into the baseExtensionStyles above
367
368
  var fontSize = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(expVal('cc_editor_ai_content_mode', 'baseFontSize', 13)) : undefined;
368
369
  // Fixes issue where TOC links fall back to default DST styles
369
- var denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? css({
370
+ var denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
371
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
372
+ '.extension-container *': {
373
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
374
+ fontSize: 'var(--ak-editor-base-font-size)'
375
+ }
376
+ }) : expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? css({
370
377
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
371
378
  '.extension-container a span': {
372
379
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "215.0.1";
2
+ export var version = "215.0.3";
@@ -363,8 +363,11 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
363
363
  performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
364
364
  };
365
365
  }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
366
+ commands: {
367
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
368
+ };
366
369
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
367
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
370
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
368
371
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
369
372
  pluginConfiguration: import("@atlaskit/editor-plugins/feature-flags").FeatureFlagsPluginOptions;
370
373
  sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
@@ -449,8 +452,11 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
449
452
  dependencies: import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginDependencies;
450
453
  pluginConfiguration: import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined;
451
454
  }, import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
455
+ commands: {
456
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
457
+ };
452
458
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
453
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
459
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
454
460
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"unsupportedContent", {}, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"placeholder", {
455
461
  commands: {
456
462
  setAnimatingPlaceholderPrompts: (placeholderPrompts: string[]) => import("@atlaskit/editor-common/types").EditorCommand;
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  import type EditorActions from '../actions';
3
3
  import { type EditorNextProps } from '../types/editor-props';
4
- 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'> & {
4
+ 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'> & {
5
5
  appearance: 'full-page' | 'full-width';
6
6
  onChange?: () => void;
7
7
  onEditorReady?: (editorActions: EditorActions) => void;
@@ -424,8 +424,11 @@ export default function createUniversalPresetInternal({ appearance, props, featu
424
424
  performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
425
425
  };
426
426
  }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
427
+ commands: {
428
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
429
+ };
427
430
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
428
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
431
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
429
432
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
430
433
  pluginConfiguration: import("@atlaskit/editor-plugins/feature-flags").FeatureFlagsPluginOptions;
431
434
  sharedState: FeatureFlags;
@@ -510,8 +513,11 @@ export default function createUniversalPresetInternal({ appearance, props, featu
510
513
  dependencies: import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginDependencies;
511
514
  pluginConfiguration: import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined;
512
515
  }, import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
516
+ commands: {
517
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
518
+ };
513
519
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
514
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
520
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
515
521
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"unsupportedContent", {}, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"placeholder", {
516
522
  commands: {
517
523
  setAnimatingPlaceholderPrompts: (placeholderPrompts: string[]) => import("@atlaskit/editor-common/types").EditorCommand;
@@ -363,8 +363,11 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
363
363
  performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
364
364
  };
365
365
  }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
366
+ commands: {
367
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
368
+ };
366
369
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
367
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
370
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
368
371
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
369
372
  pluginConfiguration: import("@atlaskit/editor-plugins/feature-flags").FeatureFlagsPluginOptions;
370
373
  sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
@@ -449,8 +452,11 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
449
452
  dependencies: import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginDependencies;
450
453
  pluginConfiguration: import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined;
451
454
  }, import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
455
+ commands: {
456
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
457
+ };
452
458
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
453
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
459
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
454
460
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"unsupportedContent", {}, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"placeholder", {
455
461
  commands: {
456
462
  setAnimatingPlaceholderPrompts: (placeholderPrompts: string[]) => import("@atlaskit/editor-common/types").EditorCommand;
@@ -5,7 +5,7 @@ import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
5
5
  import type { ExtensionHandlers } from '@atlaskit/editor-common/extensions';
6
6
  import type { AllEditorPresetPluginTypes, EditorPresetBuilder } from '@atlaskit/editor-common/preset';
7
7
  import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
8
- import type { EditorAppearance, FeatureFlags, NextEditorPlugin, PublicPluginAPI, ReactHookFactory, ToolbarUIComponentFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
8
+ import type { EditorAppearance, EditorContentMode, FeatureFlags, NextEditorPlugin, PublicPluginAPI, ReactHookFactory, ToolbarUIComponentFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
9
9
  import type { UseStickyToolbarType } from '@atlaskit/editor-common/ui';
10
10
  import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
11
11
  import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -16,6 +16,7 @@ export interface EditorAppearanceComponentProps<Plugins extends NextEditorPlugin
16
16
  appearance?: EditorAppearance;
17
17
  collabEdit?: CollabEditOptions;
18
18
  contentComponents?: UIComponentFactory[];
19
+ contentMode?: EditorContentMode;
19
20
  contextPanel?: ReactComponents;
20
21
  customContentComponents?: ContentComponents;
21
22
  customPrimaryToolbarComponents?: PrimaryToolbarComponents;
@@ -8,7 +8,7 @@ import type { WrappedComponentProps } from 'react-intl-next';
8
8
  import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
9
9
  import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
10
10
  import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
11
- import type { EditorAppearance, FeatureFlags, OptionalPlugin, PublicPluginAPI, ReactHookFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
11
+ import type { EditorAppearance, EditorContentMode, FeatureFlags, OptionalPlugin, PublicPluginAPI, ReactHookFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
12
12
  import { type ContextPanelPlugin } from '@atlaskit/editor-plugins/context-panel';
13
13
  import { type ViewMode } from '@atlaskit/editor-plugins/editor-viewmode';
14
14
  import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -18,6 +18,7 @@ import type { ScrollContainerRefs } from './types';
18
18
  interface FullPageEditorContentAreaProps {
19
19
  appearance: EditorAppearance | undefined;
20
20
  contentComponents: UIComponentFactory[] | undefined;
21
+ contentMode: EditorContentMode | undefined;
21
22
  contextPanel: ReactComponents | undefined;
22
23
  customContentComponents: ContentComponents | undefined;
23
24
  disabled: boolean | undefined;
@@ -3,11 +3,12 @@
3
3
  * @jsx jsx
4
4
  */
5
5
  import React from 'react';
6
- import type { EditorAppearance, FeatureFlags } from '@atlaskit/editor-common/types';
6
+ import type { EditorAppearance, EditorContentMode, FeatureFlags } from '@atlaskit/editor-common/types';
7
7
  export type EditorContentContainerProps = {
8
8
  appearance?: EditorAppearance;
9
9
  children?: React.ReactNode;
10
10
  className?: string;
11
+ contentMode?: EditorContentMode;
11
12
  featureFlags?: FeatureFlags;
12
13
  isScrollable?: boolean;
13
14
  viewMode?: 'view' | 'edit';
@@ -517,8 +517,11 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
517
517
  };
518
518
  }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>,
519
519
  import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
520
+ commands: {
521
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
522
+ };
520
523
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
521
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
524
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
522
525
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>>,
523
526
  import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
524
527
  pluginConfiguration: import("@atlaskit/editor-plugins/feature-flags").FeatureFlagsPluginOptions;
@@ -636,8 +639,11 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
636
639
  pluginConfiguration: import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined;
637
640
  }, import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined>,
638
641
  import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
642
+ commands: {
643
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
644
+ };
639
645
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
640
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
646
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
641
647
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>,
642
648
  import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"unsupportedContent", {}, undefined>,
643
649
  import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"placeholder", {
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  import type EditorActions from '../actions';
3
3
  import { type EditorNextProps } from '../types/editor-props';
4
- 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'> & {
4
+ 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'> & {
5
5
  appearance: 'full-page' | 'full-width';
6
6
  onChange?: () => void;
7
7
  onEditorReady?: (editorActions: EditorActions) => void;
@@ -578,8 +578,11 @@ export default function createUniversalPresetInternal({ appearance, props, featu
578
578
  };
579
579
  }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>,
580
580
  import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
581
+ commands: {
582
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
583
+ };
581
584
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
582
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
585
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
583
586
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>>,
584
587
  import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
585
588
  pluginConfiguration: import("@atlaskit/editor-plugins/feature-flags").FeatureFlagsPluginOptions;
@@ -697,8 +700,11 @@ export default function createUniversalPresetInternal({ appearance, props, featu
697
700
  pluginConfiguration: import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined;
698
701
  }, import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined>,
699
702
  import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
703
+ commands: {
704
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
705
+ };
700
706
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
701
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
707
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
702
708
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>,
703
709
  import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"unsupportedContent", {}, undefined>,
704
710
  import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"placeholder", {
@@ -517,8 +517,11 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
517
517
  };
518
518
  }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>,
519
519
  import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
520
+ commands: {
521
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
522
+ };
520
523
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
521
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
524
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
522
525
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>>,
523
526
  import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
524
527
  pluginConfiguration: import("@atlaskit/editor-plugins/feature-flags").FeatureFlagsPluginOptions;
@@ -636,8 +639,11 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
636
639
  pluginConfiguration: import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined;
637
640
  }, import("@atlaskit/editor-plugins/submit-editor").SubmitEditorPluginOptions | undefined>,
638
641
  import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
642
+ commands: {
643
+ toggleDisabled: (disabled: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
644
+ };
639
645
  pluginConfiguration: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined;
640
- sharedState: import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState;
646
+ sharedState: Pick<import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginState, "editorDisabled">;
641
647
  }, import("@atlaskit/editor-plugins/editor-disabled").EditorDisabledPluginOptions | undefined>,
642
648
  import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"unsupportedContent", {}, undefined>,
643
649
  import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"placeholder", {
@@ -5,7 +5,7 @@ import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
5
5
  import type { ExtensionHandlers } from '@atlaskit/editor-common/extensions';
6
6
  import type { AllEditorPresetPluginTypes, EditorPresetBuilder } from '@atlaskit/editor-common/preset';
7
7
  import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
8
- import type { EditorAppearance, FeatureFlags, NextEditorPlugin, PublicPluginAPI, ReactHookFactory, ToolbarUIComponentFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
8
+ import type { EditorAppearance, EditorContentMode, FeatureFlags, NextEditorPlugin, PublicPluginAPI, ReactHookFactory, ToolbarUIComponentFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
9
9
  import type { UseStickyToolbarType } from '@atlaskit/editor-common/ui';
10
10
  import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
11
11
  import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -16,6 +16,7 @@ export interface EditorAppearanceComponentProps<Plugins extends NextEditorPlugin
16
16
  appearance?: EditorAppearance;
17
17
  collabEdit?: CollabEditOptions;
18
18
  contentComponents?: UIComponentFactory[];
19
+ contentMode?: EditorContentMode;
19
20
  contextPanel?: ReactComponents;
20
21
  customContentComponents?: ContentComponents;
21
22
  customPrimaryToolbarComponents?: PrimaryToolbarComponents;
@@ -8,7 +8,7 @@ import type { WrappedComponentProps } from 'react-intl-next';
8
8
  import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
9
9
  import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
10
10
  import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
11
- import type { EditorAppearance, FeatureFlags, OptionalPlugin, PublicPluginAPI, ReactHookFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
11
+ import type { EditorAppearance, EditorContentMode, FeatureFlags, OptionalPlugin, PublicPluginAPI, ReactHookFactory, UIComponentFactory } from '@atlaskit/editor-common/types';
12
12
  import { type ContextPanelPlugin } from '@atlaskit/editor-plugins/context-panel';
13
13
  import { type ViewMode } from '@atlaskit/editor-plugins/editor-viewmode';
14
14
  import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -18,6 +18,7 @@ import type { ScrollContainerRefs } from './types';
18
18
  interface FullPageEditorContentAreaProps {
19
19
  appearance: EditorAppearance | undefined;
20
20
  contentComponents: UIComponentFactory[] | undefined;
21
+ contentMode: EditorContentMode | undefined;
21
22
  contextPanel: ReactComponents | undefined;
22
23
  customContentComponents: ContentComponents | undefined;
23
24
  disabled: boolean | undefined;
@@ -3,11 +3,12 @@
3
3
  * @jsx jsx
4
4
  */
5
5
  import React from 'react';
6
- import type { EditorAppearance, FeatureFlags } from '@atlaskit/editor-common/types';
6
+ import type { EditorAppearance, EditorContentMode, FeatureFlags } from '@atlaskit/editor-common/types';
7
7
  export type EditorContentContainerProps = {
8
8
  appearance?: EditorAppearance;
9
9
  children?: React.ReactNode;
10
10
  className?: string;
11
+ contentMode?: EditorContentMode;
11
12
  featureFlags?: FeatureFlags;
12
13
  isScrollable?: boolean;
13
14
  viewMode?: 'view' | 'edit';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "215.0.2",
3
+ "version": "215.0.4",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -53,18 +53,18 @@
53
53
  "@atlaskit/editor-plugins": "^11.0.0",
54
54
  "@atlaskit/editor-prosemirror": "7.0.0",
55
55
  "@atlaskit/editor-shared-styles": "^3.6.0",
56
- "@atlaskit/editor-toolbar": "^0.14.0",
56
+ "@atlaskit/editor-toolbar": "^0.15.0",
57
57
  "@atlaskit/editor-toolbar-model": "^0.2.0",
58
58
  "@atlaskit/emoji": "^69.5.0",
59
59
  "@atlaskit/icon": "^28.5.0",
60
60
  "@atlaskit/link": "^3.2.0",
61
61
  "@atlaskit/media-card": "^79.5.0",
62
- "@atlaskit/mention": "^24.2.0",
62
+ "@atlaskit/mention": "^24.3.0",
63
63
  "@atlaskit/platform-feature-flags": "^1.1.0",
64
64
  "@atlaskit/platform-feature-flags-react": "^0.3.0",
65
65
  "@atlaskit/react-ufo": "^4.11.0",
66
66
  "@atlaskit/task-decision": "^19.2.0",
67
- "@atlaskit/tmp-editor-statsig": "^13.6.0",
67
+ "@atlaskit/tmp-editor-statsig": "^13.8.0",
68
68
  "@atlaskit/tokens": "^6.4.0",
69
69
  "@atlaskit/tooltip": "^20.5.0",
70
70
  "@atlaskit/width-detector": "^5.0.0",
@@ -81,7 +81,7 @@
81
81
  "uuid": "^3.1.0"
82
82
  },
83
83
  "peerDependencies": {
84
- "@atlaskit/editor-common": "^110.9.0",
84
+ "@atlaskit/editor-common": "^110.10.0",
85
85
  "@atlaskit/link-provider": "^4.0.0",
86
86
  "@atlaskit/media-core": "^37.0.0",
87
87
  "react": "^18.2.0",
@@ -95,15 +95,15 @@
95
95
  "@atlaskit/analytics-listeners": "^9.1.0",
96
96
  "@atlaskit/collab-provider": "^14.0.0",
97
97
  "@atlaskit/editor-plugin-annotation": "^6.1.0",
98
- "@atlaskit/editor-plugin-card": "^11.2.0",
99
- "@atlaskit/editor-plugin-list": "^8.0.0",
100
- "@atlaskit/editor-plugin-paste": "^7.2.0",
98
+ "@atlaskit/editor-plugin-card": "^11.3.0",
99
+ "@atlaskit/editor-plugin-list": "^8.1.0",
100
+ "@atlaskit/editor-plugin-paste": "^7.3.0",
101
101
  "@atlaskit/link-provider": "^4.0.0",
102
102
  "@atlaskit/logo": "^19.9.0",
103
103
  "@atlaskit/media-core": "^37.0.0",
104
104
  "@atlaskit/media-integration-test-helpers": "workspace:^",
105
105
  "@atlaskit/media-test-helpers": "^39.0.0",
106
- "@atlaskit/modal-dialog": "^14.4.0",
106
+ "@atlaskit/modal-dialog": "^14.5.0",
107
107
  "@atlaskit/primitives": "^14.15.0",
108
108
  "@atlaskit/renderer": "^124.1.0",
109
109
  "@atlaskit/section-message": "^8.7.0",
@@ -276,6 +276,9 @@
276
276
  "type": "boolean",
277
277
  "referenceOnly": true
278
278
  },
279
+ "platform_editor_content_mode_button_mvp": {
280
+ "type": "boolean"
281
+ },
279
282
  "platform_editor_table_column_selected_state_fix": {
280
283
  "type": "boolean",
281
284
  "referenceOnly": true
@@ -419,6 +422,9 @@
419
422
  "platform_editor_controls_increase_full_page_gutter": {
420
423
  "type": "boolean"
421
424
  },
425
+ "platform_expand_editor_click_area_with_minheight": {
426
+ "type": "boolean"
427
+ },
422
428
  "cc_editor_focus_before_editor_on_load": {
423
429
  "type": "boolean"
424
430
  },
@@ -445,12 +451,6 @@
445
451
  "type": "boolean",
446
452
  "referenceOnly": true
447
453
  },
448
- "platform_editor_resolve_hyperlinks_CONFLUENCE": {
449
- "type": "boolean"
450
- },
451
- "platform_editor_resolve_hyperlinks_JIRA": {
452
- "type": "boolean"
453
- },
454
454
  "platform_editor_resolve_hyperlinks_killswitch": {
455
455
  "type": "boolean"
456
456
  },