@atlaskit/editor-core 215.27.2 → 215.28.0

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 (22) hide show
  1. package/CHANGELOG.md +20 -0
  2. package/dist/cjs/ui/Appearance/FullPage/FullPageToolbarNext.js +5 -3
  3. package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +2 -0
  4. package/dist/cjs/ui/EditorContentContainer/styles/blockTypeStyles.js +10 -1
  5. package/dist/cjs/version-wrapper.js +1 -1
  6. package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.js +6 -4
  7. package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +3 -1
  8. package/dist/es2019/ui/EditorContentContainer/styles/blockTypeStyles.js +9 -0
  9. package/dist/es2019/version-wrapper.js +1 -1
  10. package/dist/esm/ui/Appearance/FullPage/FullPageToolbarNext.js +6 -4
  11. package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +3 -1
  12. package/dist/esm/ui/EditorContentContainer/styles/blockTypeStyles.js +9 -0
  13. package/dist/esm/version-wrapper.js +1 -1
  14. package/dist/types/create-editor/create-universal-preset.d.ts +0 -4
  15. package/dist/types/presets/universal.d.ts +0 -4
  16. package/dist/types/presets/useUniversalPreset.d.ts +0 -4
  17. package/dist/types/ui/EditorContentContainer/styles/blockTypeStyles.d.ts +1 -0
  18. package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts +0 -4
  19. package/dist/types-ts4.5/presets/universal.d.ts +0 -4
  20. package/dist/types-ts4.5/presets/useUniversalPreset.d.ts +0 -4
  21. package/dist/types-ts4.5/ui/EditorContentContainer/styles/blockTypeStyles.d.ts +1 -0
  22. package/package.json +5 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 215.28.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`3323827ca91e6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3323827ca91e6) -
8
+ [ux] EDITOR-4139 Refactor existing image editing functionality into its own plugin
9
+ editor-plugin-media-editing
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
15
+ ## 215.27.3
16
+
17
+ ### Patch Changes
18
+
19
+ - [`d49db3470d1e0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d49db3470d1e0) -
20
+ [ux] Editor-4040 Added danger style for quote node
21
+ - Updated dependencies
22
+
3
23
  ## 215.27.2
4
24
 
5
25
  ### Patch Changes
package/dist/cjs/ui/Appearance/FullPage/FullPageToolbarNext.js CHANGED
@@ -57,7 +57,7 @@ var SecondChildWrapper = function SecondChildWrapper(_ref3) {
57
57
  }, children);
58
58
  };
59
59
  var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
60
- var _editorAPI$toolbar, _useToolbarPortal;
60
+ var _editorAPI$toolbar, _editorAPI$toolbar2, _useToolbarPortal;
61
61
  var editorAPI = _ref4.editorAPI,
62
62
  beforeIcon = _ref4.beforeIcon,
63
63
  toolbarDockingPosition = _ref4.toolbarDockingPosition,
@@ -67,10 +67,12 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
67
67
  customPrimaryToolbarComponents = _ref4.customPrimaryToolbarComponents,
68
68
  disabled = _ref4.disabled;
69
69
  var components = editorAPI === null || editorAPI === void 0 || (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
70
+ var contextualFormattingEnabled = editorAPI === null || editorAPI === void 0 || (_editorAPI$toolbar2 = editorAPI.toolbar) === null || _editorAPI$toolbar2 === void 0 ? void 0 : _editorAPI$toolbar2.actions.contextualFormattingMode();
70
71
  var intl = (0, _reactIntlNext.useIntl)();
71
72
  var toolbar = components === null || components === void 0 ? void 0 : components.find(function (component) {
72
73
  return component.key === _toolbar.TOOLBARS.PRIMARY_TOOLBAR;
73
74
  });
75
+ var primaryToolbarDockingConfigEnabled = (0, _toolbar.shouldShowPrimaryToolbar)(contextualFormattingEnabled, toolbarDockingPosition);
74
76
 
75
77
  // When a toolbar portal context is provided, render the toolbar inside a portal.
76
78
  // Otherwise fall back to a fragment just to avoid forking rendering logic.
@@ -104,7 +106,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
104
106
  showKeyline: showKeyline || ContextPanelWidth > 0
105
107
  }, beforeIcon && /*#__PURE__*/_react.default.createElement("div", {
106
108
  className: (0, _runtime.ax)([styles.mainToolbarIconBefore, (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
107
- }, beforeIcon), (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FirstChildWrapper, null, toolbarDockingPosition !== 'none' && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || ((0, _expValEquals.expValEquals)('platform_editor_ssr_renderer', 'isEnabled', true) && (0, _coreUtils.isSSR)() || editorView) && ((0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !(0, _coreUtils.isSSR)() : !(0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) || !(0, _coreUtils.isSSR)())) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
109
+ }, beforeIcon), (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || ((0, _expValEquals.expValEquals)('platform_editor_ssr_renderer', 'isEnabled', true) && (0, _coreUtils.isSSR)() || editorView) && ((0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !(0, _coreUtils.isSSR)() : !(0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) || !(0, _coreUtils.isSSR)())) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
108
110
  toolbar: toolbar,
109
111
  components: components,
110
112
  editorView: editorView,
@@ -117,7 +119,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
117
119
  }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/_react.default.createElement("div", {
118
120
  "data-testid": 'before-primary-toolbar-components-plugin',
119
121
  className: (0, _runtime.ax)([styles.beforePrimaryToolbarComponents])
120
- }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/_react.default.createElement(_ToolbarPortal.ToolbarPortalMountPoint, null)) : toolbarDockingPosition !== 'none' && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && ((0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !(0, _coreUtils.isSSR)() : !(0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) || !(0, _coreUtils.isSSR)())) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
122
+ }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/_react.default.createElement(_ToolbarPortal.ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && ((0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !(0, _coreUtils.isSSR)() : !(0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) || !(0, _coreUtils.isSSR)())) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
121
123
  toolbar: toolbar,
122
124
  components: components,
123
125
  editorView: editorView,
package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -492,6 +492,8 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
492
492
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
493
493
  (0, _expVal.expValNoExposure)('platform_editor_block_menu', 'isEnabled', false) && [
494
494
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
495
+ _blockTypeStyles.blockquoteDangerStyles,
496
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
495
497
  _dateStyles.dangerDateStyles,
496
498
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
497
499
  _emoji.emojiDangerStyles,
package/dist/cjs/ui/EditorContentContainer/styles/blockTypeStyles.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.blocktypeStyles_without_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes = exports.blocktypeStyles = exports.blockquoteZeroPadding = exports.blockquoteSelectedNodeStyles = void 0;
6
+ exports.blocktypeStyles_without_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes = exports.blocktypeStyles = exports.blockquoteZeroPadding = exports.blockquoteSelectedNodeStyles = exports.blockquoteDangerStyles = void 0;
7
7
  var _react = require("@emotion/react");
8
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
9
9
 
@@ -117,6 +117,15 @@ var blocktypeStyles = exports.blocktypeStyles = (0, _react.css)({
117
117
  }
118
118
  });
119
119
 
120
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
121
+ var blockquoteDangerStyles = exports.blockquoteDangerStyles = (0, _react.css)({
122
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
123
+ '.ProseMirror blockquote.danger': {
124
+ backgroundColor: "var(--ds-background-danger, #FFECEB)",
125
+ borderLeftColor: "var(--ds-border-danger, #E2483D)"
126
+ }
127
+ });
128
+
120
129
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
121
130
  var blockquoteSelectedNodeStyles = exports.blockquoteSelectedNodeStyles = (0, _react.css)({
122
131
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
package/dist/cjs/version-wrapper.js CHANGED
@@ -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.27.1";
8
+ var version = exports.version = "215.27.3";
package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.js CHANGED
@@ -5,7 +5,7 @@ import React, { useCallback } from 'react';
5
5
  import { useIntl } from 'react-intl-next';
6
6
  import { ContextPanelConsumer } from '@atlaskit/editor-common/context-panel';
7
7
  import { isSSR } from '@atlaskit/editor-common/core-utils';
8
- import { TOOLBARS } from '@atlaskit/editor-common/toolbar';
8
+ import { shouldShowPrimaryToolbar, TOOLBARS } from '@atlaskit/editor-common/toolbar';
9
9
  import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
10
10
  import { fg } from '@atlaskit/platform-feature-flags';
11
11
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -61,10 +61,12 @@ export const FullPageToolbarNext = ({
61
61
  customPrimaryToolbarComponents,
62
62
  disabled
63
63
  }) => {
64
- var _editorAPI$toolbar, _useToolbarPortal;
64
+ var _editorAPI$toolbar, _editorAPI$toolbar2, _useToolbarPortal;
65
65
  const components = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
66
+ const contextualFormattingEnabled = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$toolbar2 = editorAPI.toolbar) === null || _editorAPI$toolbar2 === void 0 ? void 0 : _editorAPI$toolbar2.actions.contextualFormattingMode();
66
67
  const intl = useIntl();
67
68
  const toolbar = components === null || components === void 0 ? void 0 : components.find(component => component.key === TOOLBARS.PRIMARY_TOOLBAR);
69
+ const primaryToolbarDockingConfigEnabled = shouldShowPrimaryToolbar(contextualFormattingEnabled, toolbarDockingPosition);
68
70
 
69
71
  // When a toolbar portal context is provided, render the toolbar inside a portal.
70
72
  // Otherwise fall back to a fragment just to avoid forking rendering logic.
@@ -99,7 +101,7 @@ export const FullPageToolbarNext = ({
99
101
  showKeyline: showKeyline || ContextPanelWidth > 0
100
102
  }, beforeIcon && /*#__PURE__*/React.createElement("div", {
101
103
  className: ax([styles.mainToolbarIconBefore, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
102
- }, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && (expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !isSSR() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
104
+ }, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && (expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !isSSR() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
103
105
  toolbar: toolbar,
104
106
  components: components,
105
107
  editorView: editorView,
@@ -112,7 +114,7 @@ export const FullPageToolbarNext = ({
112
114
  }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/React.createElement("div", {
113
115
  "data-testid": 'before-primary-toolbar-components-plugin',
114
116
  className: ax([styles.beforePrimaryToolbarComponents])
115
- }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !isSSR() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
117
+ }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !isSSR() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
116
118
  toolbar: toolbar,
117
119
  components: components,
118
120
  editorView: editorView,
package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -22,7 +22,7 @@ import { annotationStyles } from './styles/annotationStyles';
22
22
  import { backgroundColorStyles, textHighlightPaddingStyles } from './styles/backgroundColorStyles';
23
23
  import { baseStyles, baseStylesMaxContainerWidthFixes, editorLargeGutterPuddingBaseStyles, editorLargeGutterPuddingBaseStylesEditorControls, editorLargeGutterPuddingReducedBaseStyles } from './styles/baseStyles';
24
24
  import { blockMarksStyles } from './styles/blockMarksStyles';
25
- import { blockquoteSelectedNodeStyles, blocktypeStyles, blockquoteZeroPadding, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
25
+ import { blockquoteSelectedNodeStyles, blockquoteDangerStyles, blocktypeStyles, blockquoteZeroPadding, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
26
26
  import { codeBidiWarningStyles } from './styles/codeBidiWarningStyles';
27
27
  import { codeBgColorStyles, codeBlockStyles, codeBlockStylesWithEmUnits, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
28
28
  import { codeMarkStyles } from './styles/codeMarkStyles';
@@ -488,6 +488,8 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
488
488
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
489
489
  expValNoExposure('platform_editor_block_menu', 'isEnabled', false) && [
490
490
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
491
+ blockquoteDangerStyles,
492
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
491
493
  dangerDateStyles,
492
494
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
493
495
  emojiDangerStyles,
package/dist/es2019/ui/EditorContentContainer/styles/blockTypeStyles.js CHANGED
@@ -110,6 +110,15 @@ export const blocktypeStyles = css({
110
110
  }
111
111
  });
112
112
 
113
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
114
+ export const blockquoteDangerStyles = css({
115
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
116
+ '.ProseMirror blockquote.danger': {
117
+ backgroundColor: `${"var(--ds-background-danger, #FFECEB)"}`,
118
+ borderLeftColor: `${"var(--ds-border-danger, #E2483D)"}`
119
+ }
120
+ });
121
+
113
122
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
114
123
  export const blockquoteSelectedNodeStyles = css({
115
124
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "215.27.1";
2
+ export const version = "215.27.3";
package/dist/esm/ui/Appearance/FullPage/FullPageToolbarNext.js CHANGED
@@ -5,7 +5,7 @@ import React, { useCallback } from 'react';
5
5
  import { useIntl } from 'react-intl-next';
6
6
  import { ContextPanelConsumer } from '@atlaskit/editor-common/context-panel';
7
7
  import { isSSR } from '@atlaskit/editor-common/core-utils';
8
- import { TOOLBARS } from '@atlaskit/editor-common/toolbar';
8
+ import { shouldShowPrimaryToolbar, TOOLBARS } from '@atlaskit/editor-common/toolbar';
9
9
  import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
10
10
  import { fg } from '@atlaskit/platform-feature-flags';
11
11
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -49,7 +49,7 @@ var SecondChildWrapper = function SecondChildWrapper(_ref3) {
49
49
  }, children);
50
50
  };
51
51
  export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
52
- var _editorAPI$toolbar, _useToolbarPortal;
52
+ var _editorAPI$toolbar, _editorAPI$toolbar2, _useToolbarPortal;
53
53
  var editorAPI = _ref4.editorAPI,
54
54
  beforeIcon = _ref4.beforeIcon,
55
55
  toolbarDockingPosition = _ref4.toolbarDockingPosition,
@@ -59,10 +59,12 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
59
59
  customPrimaryToolbarComponents = _ref4.customPrimaryToolbarComponents,
60
60
  disabled = _ref4.disabled;
61
61
  var components = editorAPI === null || editorAPI === void 0 || (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
62
+ var contextualFormattingEnabled = editorAPI === null || editorAPI === void 0 || (_editorAPI$toolbar2 = editorAPI.toolbar) === null || _editorAPI$toolbar2 === void 0 ? void 0 : _editorAPI$toolbar2.actions.contextualFormattingMode();
62
63
  var intl = useIntl();
63
64
  var toolbar = components === null || components === void 0 ? void 0 : components.find(function (component) {
64
65
  return component.key === TOOLBARS.PRIMARY_TOOLBAR;
65
66
  });
67
+ var primaryToolbarDockingConfigEnabled = shouldShowPrimaryToolbar(contextualFormattingEnabled, toolbarDockingPosition);
66
68
 
67
69
  // When a toolbar portal context is provided, render the toolbar inside a portal.
68
70
  // Otherwise fall back to a fragment just to avoid forking rendering logic.
@@ -96,7 +98,7 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
96
98
  showKeyline: showKeyline || ContextPanelWidth > 0
97
99
  }, beforeIcon && /*#__PURE__*/React.createElement("div", {
98
100
  className: ax([styles.mainToolbarIconBefore, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
99
- }, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && (expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !isSSR() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
101
+ }, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && (expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !isSSR() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
100
102
  toolbar: toolbar,
101
103
  components: components,
102
104
  editorView: editorView,
@@ -109,7 +111,7 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
109
111
  }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/React.createElement("div", {
110
112
  "data-testid": 'before-primary-toolbar-components-plugin',
111
113
  className: ax([styles.beforePrimaryToolbarComponents])
112
- }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !isSSR() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
114
+ }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) ? !isSSR() : !expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
113
115
  toolbar: toolbar,
114
116
  components: components,
115
117
  editorView: editorView,
package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -23,7 +23,7 @@ import { annotationStyles } from './styles/annotationStyles';
23
23
  import { backgroundColorStyles, textHighlightPaddingStyles } from './styles/backgroundColorStyles';
24
24
  import { baseStyles, baseStylesMaxContainerWidthFixes, editorLargeGutterPuddingBaseStyles, editorLargeGutterPuddingBaseStylesEditorControls, editorLargeGutterPuddingReducedBaseStyles } from './styles/baseStyles';
25
25
  import { blockMarksStyles } from './styles/blockMarksStyles';
26
- import { blockquoteSelectedNodeStyles, blocktypeStyles, blockquoteZeroPadding, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
26
+ import { blockquoteSelectedNodeStyles, blockquoteDangerStyles, blocktypeStyles, blockquoteZeroPadding, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
27
27
  import { codeBidiWarningStyles } from './styles/codeBidiWarningStyles';
28
28
  import { codeBgColorStyles, codeBlockStyles, codeBlockStylesWithEmUnits, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
29
29
  import { codeMarkStyles } from './styles/codeMarkStyles';
@@ -484,6 +484,8 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
484
484
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
485
485
  expValNoExposure('platform_editor_block_menu', 'isEnabled', false) && [
486
486
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
487
+ blockquoteDangerStyles,
488
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
487
489
  dangerDateStyles,
488
490
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
489
491
  emojiDangerStyles,
package/dist/esm/ui/EditorContentContainer/styles/blockTypeStyles.js CHANGED
@@ -110,6 +110,15 @@ export var blocktypeStyles = css({
110
110
  }
111
111
  });
112
112
 
113
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
114
+ export var blockquoteDangerStyles = css({
115
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
116
+ '.ProseMirror blockquote.danger': {
117
+ backgroundColor: "var(--ds-background-danger, #FFECEB)",
118
+ borderLeftColor: "var(--ds-border-danger, #E2483D)"
119
+ }
120
+ });
121
+
113
122
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
114
123
  export var blockquoteSelectedNodeStyles = css({
115
124
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
package/dist/esm/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "215.27.1";
2
+ export var version = "215.27.3";
package/dist/types/create-editor/create-universal-preset.d.ts CHANGED
@@ -174,9 +174,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
174
174
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
175
175
  };
176
176
  commands: {
177
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
178
177
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
179
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
180
178
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
181
179
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
182
180
  };
@@ -257,9 +255,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
257
255
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
258
256
  };
259
257
  commands: {
260
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
261
258
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
262
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
263
259
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
264
260
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
265
261
  };
package/dist/types/presets/universal.d.ts CHANGED
@@ -247,9 +247,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
247
247
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
248
248
  };
249
249
  commands: {
250
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
251
250
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
252
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
253
251
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
254
252
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
255
253
  };
@@ -330,9 +328,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
330
328
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
331
329
  };
332
330
  commands: {
333
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
334
331
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
335
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
336
332
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
337
333
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
338
334
  };
package/dist/types/presets/useUniversalPreset.d.ts CHANGED
@@ -174,9 +174,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
174
174
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
175
175
  };
176
176
  commands: {
177
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
178
177
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
179
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
180
178
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
181
179
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
182
180
  };
@@ -257,9 +255,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
257
255
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
258
256
  };
259
257
  commands: {
260
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
261
258
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
262
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
263
259
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
264
260
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
265
261
  };
package/dist/types/ui/EditorContentContainer/styles/blockTypeStyles.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { type SerializedStyles } from '@emotion/react';
2
2
  export declare const blockquoteZeroPadding: SerializedStyles;
3
3
  export declare const blocktypeStyles: SerializedStyles;
4
+ export declare const blockquoteDangerStyles: SerializedStyles;
4
5
  export declare const blockquoteSelectedNodeStyles: SerializedStyles;
5
6
  export declare const blocktypeStyles_fg_platform_editor_typography_ugc: SerializedStyles;
6
7
  export declare const blocktypeStyles_without_fg_platform_editor_typography_ugc: SerializedStyles;
package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts CHANGED
@@ -295,9 +295,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
295
295
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
296
296
  };
297
297
  commands: {
298
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
299
298
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
300
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
301
299
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
302
300
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
303
301
  };
@@ -389,9 +387,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
389
387
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
390
388
  };
391
389
  commands: {
392
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
393
390
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
394
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
395
391
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
396
392
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
397
393
  };
package/dist/types-ts4.5/presets/universal.d.ts CHANGED
@@ -368,9 +368,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
368
368
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
369
369
  };
370
370
  commands: {
371
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
372
371
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
373
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
374
372
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
375
373
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
376
374
  };
@@ -462,9 +460,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
462
460
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
463
461
  };
464
462
  commands: {
465
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
466
463
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
467
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
468
464
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
469
465
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
470
466
  };
package/dist/types-ts4.5/presets/useUniversalPreset.d.ts CHANGED
@@ -295,9 +295,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
295
295
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
296
296
  };
297
297
  commands: {
298
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
299
298
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
300
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
301
299
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
302
300
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
303
301
  };
@@ -389,9 +387,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
389
387
  setProvider: (provider: Promise<import("@atlaskit/editor-common/provider-factory").MediaProvider>) => boolean;
390
388
  };
391
389
  commands: {
392
- hideImageEditor: import("@atlaskit/editor-common/types").EditorCommand;
393
390
  hideMediaViewer: import("@atlaskit/editor-common/types").EditorCommand;
394
- showImageEditor: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
395
391
  showMediaViewer: (media: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
396
392
  trackMediaPaste: (attrs: import("@atlaskit/adf-schema").MediaADFAttrs) => import("@atlaskit/editor-common/types").EditorCommand;
397
393
  };
package/dist/types-ts4.5/ui/EditorContentContainer/styles/blockTypeStyles.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { type SerializedStyles } from '@emotion/react';
2
2
  export declare const blockquoteZeroPadding: SerializedStyles;
3
3
  export declare const blocktypeStyles: SerializedStyles;
4
+ export declare const blockquoteDangerStyles: SerializedStyles;
4
5
  export declare const blockquoteSelectedNodeStyles: SerializedStyles;
5
6
  export declare const blocktypeStyles_fg_platform_editor_typography_ugc: SerializedStyles;
6
7
  export declare const blocktypeStyles_without_fg_platform_editor_typography_ugc: SerializedStyles;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "215.27.2",
3
+ "version": "215.28.0",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -51,7 +51,7 @@
51
51
  "@atlaskit/editor-plugin-connectivity": "^6.1.0",
52
52
  "@atlaskit/editor-plugin-quick-insert": "^6.2.0",
53
53
  "@atlaskit/editor-plugin-user-preferences": "^4.0.0",
54
- "@atlaskit/editor-plugins": "^11.1.0",
54
+ "@atlaskit/editor-plugins": "^11.2.0",
55
55
  "@atlaskit/editor-prosemirror": "^7.2.0",
56
56
  "@atlaskit/editor-shared-styles": "^3.10.0",
57
57
  "@atlaskit/editor-ssr-renderer": "^1.6.0",
@@ -361,6 +361,9 @@
361
361
  "platform_editor_toolbar_aifc_patch_7": {
362
362
  "type": "boolean"
363
363
  },
364
+ "platform_editor_toolbar_aifc_placement_overridden": {
365
+ "type": "boolean"
366
+ },
364
367
  "confluence-whiteboards-quick-insert-l10n-eligible": {
365
368
  "type": "boolean"
366
369
  },