@atlaskit/editor-core 195.5.0 → 195.6.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 (24) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/dist/cjs/create-editor/ErrorBoundary.js +13 -26
  3. package/dist/cjs/presets/universal.js +2 -2
  4. package/dist/cjs/ui/Appearance/FullPage/FullPage.js +8 -3
  5. package/dist/cjs/version-wrapper.js +1 -1
  6. package/dist/es2019/create-editor/ErrorBoundary.js +15 -8
  7. package/dist/es2019/presets/universal.js +2 -1
  8. package/dist/es2019/ui/Appearance/FullPage/FullPage.js +8 -3
  9. package/dist/es2019/version-wrapper.js +1 -1
  10. package/dist/esm/create-editor/ErrorBoundary.js +14 -27
  11. package/dist/esm/presets/universal.js +2 -2
  12. package/dist/esm/ui/Appearance/FullPage/FullPage.js +8 -3
  13. package/dist/esm/version-wrapper.js +1 -1
  14. package/dist/types/create-editor/ErrorBoundary.d.ts +0 -1
  15. package/dist/types/create-editor/create-universal-preset.d.ts +154 -2
  16. package/dist/types/presets/default.d.ts +150 -2
  17. package/dist/types/presets/universal.d.ts +162 -3
  18. package/dist/types/presets/useUniversalPreset.d.ts +154 -2
  19. package/dist/types-ts4.5/create-editor/ErrorBoundary.d.ts +0 -1
  20. package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts +178 -2
  21. package/dist/types-ts4.5/presets/default.d.ts +174 -2
  22. package/dist/types-ts4.5/presets/universal.d.ts +186 -3
  23. package/dist/types-ts4.5/presets/useUniversalPreset.d.ts +178 -2
  24. package/package.json +8 -9
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 195.6.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#131937](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/131937)
8
+ [`64414d9668409`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/64414d9668409) -
9
+ Adding configuration to mentions plugin from confluence
10
+
11
+ ## 195.5.1
12
+
13
+ ### Patch Changes
14
+
15
+ - [#131033](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/131033)
16
+ [`725d9e6250c83`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/725d9e6250c83) -
17
+ Add feature flag to show or hide editor toolbar in SSR
18
+
3
19
  ## 195.5.0
4
20
 
5
21
  ### Minor Changes
package/dist/cjs/create-editor/ErrorBoundary.js CHANGED
@@ -179,32 +179,19 @@ var ErrorBoundaryWithEditorView = exports.ErrorBoundaryWithEditorView = /*#__PUR
179
179
  }
180
180
  });
181
181
  }
182
- }, {
183
- key: "componentDidMount",
184
- value: function () {
185
- var _componentDidMount = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
186
- return _regenerator.default.wrap(function _callee3$(_context3) {
187
- while (1) switch (_context3.prev = _context3.next) {
188
- case 0:
189
- _context3.next = 2;
190
- return (0, _utils.sniffUserBrowserExtensions)({
191
- extensions: ['grammarly'],
192
- async: true,
193
- asyncTimeoutMs: 20000
194
- });
195
- case 2:
196
- this.browserExtensions = _context3.sent;
197
- case 3:
198
- case "end":
199
- return _context3.stop();
200
- }
201
- }, _callee3, this);
202
- }));
203
- function componentDidMount() {
204
- return _componentDidMount.apply(this, arguments);
205
- }
206
- return componentDidMount;
207
- }()
182
+
183
+ // FIXME: This is causing more problems then it's solving. The async check to sniff the browser extensions is block some
184
+ // react unit tests. Essentially jest never completes and just hangs. This was code was added 3yrs ago so that errors
185
+ // would detail if the browser had grammarly extension installed or not. I'm not sure if anyone has every inspecting this
186
+ // as it doesn't look like any dashboards exist for it.
187
+ // You can see the open handles that are block tests if you run unit tests with --detectOpenHandles
188
+ // async componentDidMount() {
189
+ // this.browserExtensions = await sniffUserBrowserExtensions({
190
+ // extensions: ['grammarly'],
191
+ // async: true,
192
+ // asyncTimeoutMs: 20000,
193
+ // });
194
+ // }
208
195
  }, {
209
196
  key: "render",
210
197
  value: function render() {
package/dist/cjs/presets/universal.js CHANGED
@@ -133,13 +133,13 @@ function createUniversalPresetInternal(_ref) {
133
133
  isCopyPasteEnabled: !isMobile,
134
134
  alignLeftOnInsert: typeof ((_props$media3 = props.media) === null || _props$media3 === void 0 ? void 0 : _props$media3.alignLeftOnInsert) !== 'undefined' ? (_props$media4 = props.media) === null || _props$media4 === void 0 ? void 0 : _props$media4.alignLeftOnInsert : isComment,
135
135
  getEditorFeatureFlags: getEditorFeatureFlags
136
- })], Boolean(props.media)).maybeAdd(_mediaInsert.mediaInsertPlugin, Boolean(props.media && (0, _platformFeatureFlags.fg)('platform_editor_insert_media_plugin_phase_one'))).maybeAdd(_caption.captionPlugin, Boolean((_props$media5 = props.media) === null || _props$media5 === void 0 ? void 0 : _props$media5.allowCaptions)).maybeAdd([_mentions.mentionsPlugin, {
136
+ })], Boolean(props.media)).maybeAdd(_mediaInsert.mediaInsertPlugin, Boolean(props.media && (0, _platformFeatureFlags.fg)('platform_editor_insert_media_plugin_phase_one'))).maybeAdd(_caption.captionPlugin, Boolean((_props$media5 = props.media) === null || _props$media5 === void 0 ? void 0 : _props$media5.allowCaptions)).maybeAdd([_mentions.mentionsPlugin, _objectSpread({
137
137
  sanitizePrivateContent: props.sanitizePrivateContent,
138
138
  insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
139
139
  allowZeroWidthSpaceAfter: !isMobile,
140
140
  HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent,
141
141
  profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider
142
- }], Boolean(props.mentionProvider)).maybeAdd(_emoji.emojiPlugin, Boolean(props.emojiProvider)).maybeAdd([_table.tablesPlugin, {
142
+ }, initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.mentionsPlugin)], Boolean(props.mentionProvider)).maybeAdd(_emoji.emojiPlugin, Boolean(props.emojiProvider)).maybeAdd([_table.tablesPlugin, {
143
143
  tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
144
144
  tableResizingEnabled: isFullPage || isComment && (0, _platformFeatureFlags.fg)('platform_editor_table_support_in_comment'),
145
145
  dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && (isFullPage || (isComment || isChromeless) && (0, _platformFeatureFlags.fg)('platform_editor_table_support_in_comment')),
package/dist/cjs/ui/Appearance/FullPage/FullPage.js CHANGED
@@ -12,6 +12,7 @@ var _react2 = require("@emotion/react");
12
12
  var _hooks = require("@atlaskit/editor-common/hooks");
13
13
  var _ui = require("@atlaskit/editor-common/ui");
14
14
  var _utils = require("@atlaskit/editor-common/utils");
15
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
15
16
  var _FullPageContentArea = require("./FullPageContentArea");
16
17
  var _FullPageToolbar = require("./FullPageToolbar");
17
18
  var _StyledComponents = require("./StyledComponents");
@@ -54,7 +55,7 @@ var useShowKeyline = function useShowKeyline(contentAreaRef) {
54
55
  return showKeyline;
55
56
  };
56
57
  var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
57
- var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
58
+ var _editorAPI$primaryToo, _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
58
59
  var wrapperElementRef = (0, _react.useMemo)(function () {
59
60
  return props.innerRef;
60
61
  }, [props.innerRef]);
@@ -65,10 +66,14 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
65
66
  editorViewModeState = _useSharedPluginState.editorViewModeState,
66
67
  primaryToolbarState = _useSharedPluginState.primaryToolbarState;
67
68
  var primaryToolbarComponents = props.primaryToolbarComponents;
69
+ var toolbarComponentsSSR = (0, _platformFeatureFlags.fg)('platform_editor_toolbar_ssr') ? editorAPI === null || editorAPI === void 0 || (_editorAPI$primaryToo = editorAPI.primaryToolbar) === null || _editorAPI$primaryToo === void 0 || (_editorAPI$primaryToo = _editorAPI$primaryToo.sharedState.currentState()) === null || _editorAPI$primaryToo === void 0 ? void 0 : _editorAPI$primaryToo.components : [];
68
70
  if (Array.isArray(primaryToolbarComponents)) {
69
- var _ref3, _primaryToolbarState$, _editorAPI$primaryToo;
71
+ var _primaryToolbarState$;
72
+ var additionalComponents = (_primaryToolbarState$ = primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) !== null && _primaryToolbarState$ !== void 0 ? _primaryToolbarState$ : [];
70
73
  // The primary toolbar state may be undefined if we are in SSR environment - in which case fallback to the current state (useLayoutEffect doesn't work in SSR)
71
- var additionalComponents = (_ref3 = (_primaryToolbarState$ = primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) !== null && _primaryToolbarState$ !== void 0 ? _primaryToolbarState$ : editorAPI === null || editorAPI === void 0 || (_editorAPI$primaryToo = editorAPI.primaryToolbar) === null || _editorAPI$primaryToo === void 0 || (_editorAPI$primaryToo = _editorAPI$primaryToo.sharedState.currentState()) === null || _editorAPI$primaryToo === void 0 ? void 0 : _editorAPI$primaryToo.components) !== null && _ref3 !== void 0 ? _ref3 : [];
74
+ if (additionalComponents.length === 0) {
75
+ additionalComponents = toolbarComponentsSSR !== null && toolbarComponentsSSR !== void 0 ? toolbarComponentsSSR : [];
76
+ }
72
77
  primaryToolbarComponents = additionalComponents.concat(primaryToolbarComponents);
73
78
  }
74
79
  var isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
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 = "195.5.0";
8
+ var version = exports.version = "195.6.0";
package/dist/es2019/create-editor/ErrorBoundary.js CHANGED
@@ -6,7 +6,7 @@ import { getDocStructure } from '@atlaskit/editor-common/core-utils';
6
6
  import { logException } from '@atlaskit/editor-common/monitoring';
7
7
  import { ExperienceStore } from '@atlaskit/editor-common/ufo';
8
8
  import { IntlErrorBoundary } from '@atlaskit/editor-common/ui';
9
- import { isOutdatedBrowser, sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
9
+ import { isOutdatedBrowser } from '@atlaskit/editor-common/utils';
10
10
  import { WithEditorView } from './WithEditorView';
11
11
  export class ErrorBoundaryWithEditorView extends React.Component {
12
12
  constructor(props) {
@@ -126,13 +126,20 @@ export class ErrorBoundaryWithEditorView extends React.Component {
126
126
  }
127
127
  });
128
128
  }
129
- async componentDidMount() {
130
- this.browserExtensions = await sniffUserBrowserExtensions({
131
- extensions: ['grammarly'],
132
- async: true,
133
- asyncTimeoutMs: 20000
134
- });
135
- }
129
+
130
+ // FIXME: This is causing more problems then it's solving. The async check to sniff the browser extensions is block some
131
+ // react unit tests. Essentially jest never completes and just hangs. This was code was added 3yrs ago so that errors
132
+ // would detail if the browser had grammarly extension installed or not. I'm not sure if anyone has every inspecting this
133
+ // as it doesn't look like any dashboards exist for it.
134
+ // You can see the open handles that are block tests if you run unit tests with --detectOpenHandles
135
+ // async componentDidMount() {
136
+ // this.browserExtensions = await sniffUserBrowserExtensions({
137
+ // extensions: ['grammarly'],
138
+ // async: true,
139
+ // asyncTimeoutMs: 20000,
140
+ // });
141
+ // }
142
+
136
143
  render() {
137
144
  return /*#__PURE__*/React.createElement(IntlErrorBoundary, null, this.props.children);
138
145
  }
package/dist/es2019/presets/universal.js CHANGED
@@ -129,7 +129,8 @@ export default function createUniversalPresetInternal({
129
129
  insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
130
130
  allowZeroWidthSpaceAfter: !isMobile,
131
131
  HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent,
132
- profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider
132
+ profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider,
133
+ ...(initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.mentionsPlugin)
133
134
  }], Boolean(props.mentionProvider)).maybeAdd(emojiPlugin, Boolean(props.emojiProvider)).maybeAdd([tablesPlugin, {
134
135
  tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
135
136
  tableResizingEnabled: isFullPage || isComment && fg('platform_editor_table_support_in_comment'),
package/dist/es2019/ui/Appearance/FullPage/FullPage.js CHANGED
@@ -9,6 +9,7 @@ import { jsx } from '@emotion/react';
9
9
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
10
10
  import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
11
11
  import { browser } from '@atlaskit/editor-common/utils';
12
+ import { fg } from '@atlaskit/platform-feature-flags';
12
13
  import { FullPageContentArea } from './FullPageContentArea';
13
14
  import { FullPageToolbar } from './FullPageToolbar';
14
15
  import { fullPageEditorWrapper } from './StyledComponents';
@@ -37,7 +38,7 @@ const useShowKeyline = contentAreaRef => {
37
38
  return showKeyline;
38
39
  };
39
40
  export const FullPageEditor = props => {
40
- var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
41
+ var _editorAPI$primaryToo, _editorAPI$primaryToo2, _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
41
42
  const wrapperElementRef = useMemo(() => props.innerRef, [props.innerRef]);
42
43
  const scrollContentContainerRef = useRef(null);
43
44
  const showKeyline = useShowKeyline(scrollContentContainerRef);
@@ -47,10 +48,14 @@ export const FullPageEditor = props => {
47
48
  primaryToolbarState
48
49
  } = useSharedPluginState(editorAPI, ['editorViewMode', 'primaryToolbar']);
49
50
  let primaryToolbarComponents = props.primaryToolbarComponents;
51
+ const toolbarComponentsSSR = fg('platform_editor_toolbar_ssr') ? editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$primaryToo = editorAPI.primaryToolbar) === null || _editorAPI$primaryToo === void 0 ? void 0 : (_editorAPI$primaryToo2 = _editorAPI$primaryToo.sharedState.currentState()) === null || _editorAPI$primaryToo2 === void 0 ? void 0 : _editorAPI$primaryToo2.components : [];
50
52
  if (Array.isArray(primaryToolbarComponents)) {
51
- var _ref, _primaryToolbarState$, _editorAPI$primaryToo, _editorAPI$primaryToo2;
53
+ var _primaryToolbarState$;
54
+ let additionalComponents = (_primaryToolbarState$ = primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) !== null && _primaryToolbarState$ !== void 0 ? _primaryToolbarState$ : [];
52
55
  // The primary toolbar state may be undefined if we are in SSR environment - in which case fallback to the current state (useLayoutEffect doesn't work in SSR)
53
- const additionalComponents = (_ref = (_primaryToolbarState$ = primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) !== null && _primaryToolbarState$ !== void 0 ? _primaryToolbarState$ : editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$primaryToo = editorAPI.primaryToolbar) === null || _editorAPI$primaryToo === void 0 ? void 0 : (_editorAPI$primaryToo2 = _editorAPI$primaryToo.sharedState.currentState()) === null || _editorAPI$primaryToo2 === void 0 ? void 0 : _editorAPI$primaryToo2.components) !== null && _ref !== void 0 ? _ref : [];
56
+ if (additionalComponents.length === 0) {
57
+ additionalComponents = toolbarComponentsSSR !== null && toolbarComponentsSSR !== void 0 ? toolbarComponentsSSR : [];
58
+ }
54
59
  primaryToolbarComponents = additionalComponents.concat(primaryToolbarComponents);
55
60
  }
56
61
  const isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "195.5.0";
2
+ export const version = "195.6.0";
package/dist/esm/create-editor/ErrorBoundary.js CHANGED
@@ -18,7 +18,7 @@ import { getDocStructure } from '@atlaskit/editor-common/core-utils';
18
18
  import { logException } from '@atlaskit/editor-common/monitoring';
19
19
  import { ExperienceStore } from '@atlaskit/editor-common/ufo';
20
20
  import { IntlErrorBoundary } from '@atlaskit/editor-common/ui';
21
- import { isOutdatedBrowser, sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
21
+ import { isOutdatedBrowser } from '@atlaskit/editor-common/utils';
22
22
  import { WithEditorView } from './WithEditorView';
23
23
  export var ErrorBoundaryWithEditorView = /*#__PURE__*/function (_React$Component) {
24
24
  _inherits(ErrorBoundaryWithEditorView, _React$Component);
@@ -172,32 +172,19 @@ export var ErrorBoundaryWithEditorView = /*#__PURE__*/function (_React$Component
172
172
  }
173
173
  });
174
174
  }
175
- }, {
176
- key: "componentDidMount",
177
- value: function () {
178
- var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
179
- return _regeneratorRuntime.wrap(function _callee3$(_context3) {
180
- while (1) switch (_context3.prev = _context3.next) {
181
- case 0:
182
- _context3.next = 2;
183
- return sniffUserBrowserExtensions({
184
- extensions: ['grammarly'],
185
- async: true,
186
- asyncTimeoutMs: 20000
187
- });
188
- case 2:
189
- this.browserExtensions = _context3.sent;
190
- case 3:
191
- case "end":
192
- return _context3.stop();
193
- }
194
- }, _callee3, this);
195
- }));
196
- function componentDidMount() {
197
- return _componentDidMount.apply(this, arguments);
198
- }
199
- return componentDidMount;
200
- }()
175
+
176
+ // FIXME: This is causing more problems then it's solving. The async check to sniff the browser extensions is block some
177
+ // react unit tests. Essentially jest never completes and just hangs. This was code was added 3yrs ago so that errors
178
+ // would detail if the browser had grammarly extension installed or not. I'm not sure if anyone has every inspecting this
179
+ // as it doesn't look like any dashboards exist for it.
180
+ // You can see the open handles that are block tests if you run unit tests with --detectOpenHandles
181
+ // async componentDidMount() {
182
+ // this.browserExtensions = await sniffUserBrowserExtensions({
183
+ // extensions: ['grammarly'],
184
+ // async: true,
185
+ // asyncTimeoutMs: 20000,
186
+ // });
187
+ // }
201
188
  }, {
202
189
  key: "render",
203
190
  value: function render() {
package/dist/esm/presets/universal.js CHANGED
@@ -126,13 +126,13 @@ export default function createUniversalPresetInternal(_ref) {
126
126
  isCopyPasteEnabled: !isMobile,
127
127
  alignLeftOnInsert: typeof ((_props$media3 = props.media) === null || _props$media3 === void 0 ? void 0 : _props$media3.alignLeftOnInsert) !== 'undefined' ? (_props$media4 = props.media) === null || _props$media4 === void 0 ? void 0 : _props$media4.alignLeftOnInsert : isComment,
128
128
  getEditorFeatureFlags: getEditorFeatureFlags
129
- })], Boolean(props.media)).maybeAdd(mediaInsertPlugin, Boolean(props.media && fg('platform_editor_insert_media_plugin_phase_one'))).maybeAdd(captionPlugin, Boolean((_props$media5 = props.media) === null || _props$media5 === void 0 ? void 0 : _props$media5.allowCaptions)).maybeAdd([mentionsPlugin, {
129
+ })], Boolean(props.media)).maybeAdd(mediaInsertPlugin, Boolean(props.media && fg('platform_editor_insert_media_plugin_phase_one'))).maybeAdd(captionPlugin, Boolean((_props$media5 = props.media) === null || _props$media5 === void 0 ? void 0 : _props$media5.allowCaptions)).maybeAdd([mentionsPlugin, _objectSpread({
130
130
  sanitizePrivateContent: props.sanitizePrivateContent,
131
131
  insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
132
132
  allowZeroWidthSpaceAfter: !isMobile,
133
133
  HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent,
134
134
  profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider
135
- }], Boolean(props.mentionProvider)).maybeAdd(emojiPlugin, Boolean(props.emojiProvider)).maybeAdd([tablesPlugin, {
135
+ }, initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.mentionsPlugin)], Boolean(props.mentionProvider)).maybeAdd(emojiPlugin, Boolean(props.emojiProvider)).maybeAdd([tablesPlugin, {
136
136
  tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
137
137
  tableResizingEnabled: isFullPage || isComment && fg('platform_editor_table_support_in_comment'),
138
138
  dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && (isFullPage || (isComment || isChromeless) && fg('platform_editor_table_support_in_comment')),
package/dist/esm/ui/Appearance/FullPage/FullPage.js CHANGED
@@ -10,6 +10,7 @@ import { jsx } from '@emotion/react';
10
10
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
11
11
  import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
12
12
  import { browser } from '@atlaskit/editor-common/utils';
13
+ import { fg } from '@atlaskit/platform-feature-flags';
13
14
  import { FullPageContentArea } from './FullPageContentArea';
14
15
  import { FullPageToolbar } from './FullPageToolbar';
15
16
  import { fullPageEditorWrapper } from './StyledComponents';
@@ -43,7 +44,7 @@ var useShowKeyline = function useShowKeyline(contentAreaRef) {
43
44
  return showKeyline;
44
45
  };
45
46
  export var FullPageEditor = function FullPageEditor(props) {
46
- var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
47
+ var _editorAPI$primaryToo, _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
47
48
  var wrapperElementRef = useMemo(function () {
48
49
  return props.innerRef;
49
50
  }, [props.innerRef]);
@@ -54,10 +55,14 @@ export var FullPageEditor = function FullPageEditor(props) {
54
55
  editorViewModeState = _useSharedPluginState.editorViewModeState,
55
56
  primaryToolbarState = _useSharedPluginState.primaryToolbarState;
56
57
  var primaryToolbarComponents = props.primaryToolbarComponents;
58
+ var toolbarComponentsSSR = fg('platform_editor_toolbar_ssr') ? editorAPI === null || editorAPI === void 0 || (_editorAPI$primaryToo = editorAPI.primaryToolbar) === null || _editorAPI$primaryToo === void 0 || (_editorAPI$primaryToo = _editorAPI$primaryToo.sharedState.currentState()) === null || _editorAPI$primaryToo === void 0 ? void 0 : _editorAPI$primaryToo.components : [];
57
59
  if (Array.isArray(primaryToolbarComponents)) {
58
- var _ref3, _primaryToolbarState$, _editorAPI$primaryToo;
60
+ var _primaryToolbarState$;
61
+ var additionalComponents = (_primaryToolbarState$ = primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) !== null && _primaryToolbarState$ !== void 0 ? _primaryToolbarState$ : [];
59
62
  // The primary toolbar state may be undefined if we are in SSR environment - in which case fallback to the current state (useLayoutEffect doesn't work in SSR)
60
- var additionalComponents = (_ref3 = (_primaryToolbarState$ = primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) !== null && _primaryToolbarState$ !== void 0 ? _primaryToolbarState$ : editorAPI === null || editorAPI === void 0 || (_editorAPI$primaryToo = editorAPI.primaryToolbar) === null || _editorAPI$primaryToo === void 0 || (_editorAPI$primaryToo = _editorAPI$primaryToo.sharedState.currentState()) === null || _editorAPI$primaryToo === void 0 ? void 0 : _editorAPI$primaryToo.components) !== null && _ref3 !== void 0 ? _ref3 : [];
63
+ if (additionalComponents.length === 0) {
64
+ additionalComponents = toolbarComponentsSSR !== null && toolbarComponentsSSR !== void 0 ? toolbarComponentsSSR : [];
65
+ }
61
66
  primaryToolbarComponents = additionalComponents.concat(primaryToolbarComponents);
62
67
  }
63
68
  var isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
package/dist/esm/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "195.5.0";
2
+ export var version = "195.6.0";
package/dist/types/create-editor/ErrorBoundary.d.ts CHANGED
@@ -34,7 +34,6 @@ export declare class ErrorBoundaryWithEditorView extends React.Component<ErrorBo
34
34
  private fireAnalyticsEvent;
35
35
  private getExperienceMetadata;
36
36
  componentDidCatch(error: Error, errorInfo: ErrorInfo): void;
37
- componentDidMount(): Promise<void>;
38
37
  render(): JSX.Element;
39
38
  }
40
39
  declare const _default: (props: React.PropsWithChildren<Omit<ErrorBoundaryProps, "editorView">>) => JSX.Element;
package/dist/types/create-editor/create-universal-preset.d.ts CHANGED
@@ -696,7 +696,81 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
696
696
  setInlineCommentDraftState: (drafting: boolean, inputMethod: import("@atlaskit/editor-plugin-annotation").InlineCommentInputMethod, targetType?: import("@atlaskit/editor-plugin-annotation").TargetType | undefined, isCommentOnMediaOn?: boolean | undefined, targetNodeId?: string | undefined) => import("@atlaskit/editor-common/types").Command;
697
697
  showCommentForBlockNode: (node: import("prosemirror-model").Node | null, viewMethod?: import("@atlaskit/editor-common/analytics").VIEW_METHOD | undefined) => import("@atlaskit/editor-common/types").Command;
698
698
  };
699
- }, import("@atlaskit/editor-plugin-annotation").AnnotationProviders | undefined>>];
699
+ }, import("@atlaskit/editor-plugin-annotation").AnnotationProviders | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"mention", {
700
+ pluginConfiguration: import("@atlaskit/editor-plugin-mentions").MentionPluginOptions | undefined;
701
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
702
+ pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
703
+ sharedState: {
704
+ createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
705
+ attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
706
+ performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
707
+ };
708
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
709
+ pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
710
+ sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
711
+ }, import("@atlaskit/editor-common/types").FeatureFlags>>];
712
+ actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
713
+ }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"typeAhead", {
714
+ pluginConfiguration: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginOptions | undefined;
715
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
716
+ pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
717
+ sharedState: {
718
+ createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
719
+ attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
720
+ performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
721
+ };
722
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
723
+ pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
724
+ sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
725
+ }, import("@atlaskit/editor-common/types").FeatureFlags>>];
726
+ actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
727
+ }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
728
+ pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
729
+ sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
730
+ }, import("@atlaskit/editor-common/types").FeatureFlags>>];
731
+ sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
732
+ actions: {
733
+ isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
734
+ isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
735
+ insert: (props: {
736
+ triggerHandler: import("@atlaskit/editor-common/types").TypeAheadHandler;
737
+ contentItem: import("@atlaskit/editor-common/types").TypeAheadItem;
738
+ query: string;
739
+ sourceListItem: import("@atlaskit/editor-common/types").TypeAheadItem[];
740
+ mode?: import("@atlaskit/editor-common/type-ahead").SelectItemMode | undefined;
741
+ }) => boolean;
742
+ findHandlerByTrigger: (trigger: string) => import("@atlaskit/editor-common/types").TypeAheadHandler | null;
743
+ open: (props: {
744
+ triggerHandler: import("@atlaskit/editor-common/types").TypeAheadHandler;
745
+ inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod;
746
+ query?: string | undefined;
747
+ }) => boolean;
748
+ close: (props: {
749
+ insertCurrentQueryAsRawText: boolean;
750
+ attachCommand?: import("@atlaskit/editor-common/types").Command | undefined;
751
+ }) => boolean;
752
+ openAtTransaction: (props: {
753
+ triggerHandler: import("@atlaskit/editor-common/types").TypeAheadHandler;
754
+ inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod;
755
+ query?: string | undefined;
756
+ }) => (tr: import("prosemirror-state").Transaction) => boolean;
757
+ };
758
+ }, import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginOptions | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"contextIdentifier", {
759
+ pluginConfiguration: import("@atlaskit/editor-plugin-context-identifier").PluginConfiguration | undefined;
760
+ sharedState: import("@atlaskit/editor-plugin-context-identifier").ContextIdentifierConfiguration | undefined;
761
+ commands: {
762
+ setProvider: (config: import("@atlaskit/editor-plugin-context-identifier").ContextIdentifierConfiguration) => import("@atlaskit/editor-common/types").EditorCommand;
763
+ };
764
+ }, import("@atlaskit/editor-plugin-context-identifier").PluginConfiguration | undefined>>];
765
+ sharedState: import("@atlaskit/editor-plugin-mentions").MentionSharedState | undefined;
766
+ actions: {
767
+ openTypeAhead: (inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod) => boolean;
768
+ announceMentionsInsertion: (mentionIds: {
769
+ localId: string;
770
+ id: string;
771
+ }[]) => void;
772
+ };
773
+ }, import("@atlaskit/editor-plugin-mentions").MentionPluginOptions | undefined>>];
700
774
  sharedState: {
701
775
  lastContentPasted: import("@atlaskit/editor-plugin-paste").LastContentPasted | null;
702
776
  };
@@ -2243,6 +2317,10 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
2243
2317
  sharedState: import("@atlaskit/editor-plugin-mentions").MentionSharedState | undefined;
2244
2318
  actions: {
2245
2319
  openTypeAhead: (inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod) => boolean;
2320
+ announceMentionsInsertion: (mentionIds: {
2321
+ localId: string;
2322
+ id: string;
2323
+ }[]) => void;
2246
2324
  };
2247
2325
  }, import("@atlaskit/editor-plugin-mentions").MentionPluginOptions | undefined> | undefined, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"caption", {
2248
2326
  dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
@@ -4935,7 +5013,81 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
4935
5013
  setInlineCommentDraftState: (drafting: boolean, inputMethod: import("@atlaskit/editor-plugin-annotation").InlineCommentInputMethod, targetType?: import("@atlaskit/editor-plugin-annotation").TargetType | undefined, isCommentOnMediaOn?: boolean | undefined, targetNodeId?: string | undefined) => import("@atlaskit/editor-common/types").Command;
4936
5014
  showCommentForBlockNode: (node: import("prosemirror-model").Node | null, viewMethod?: import("@atlaskit/editor-common/analytics").VIEW_METHOD | undefined) => import("@atlaskit/editor-common/types").Command;
4937
5015
  };
4938
- }, import("@atlaskit/editor-plugin-annotation").AnnotationProviders | undefined>>];
5016
+ }, import("@atlaskit/editor-plugin-annotation").AnnotationProviders | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"mention", {
5017
+ pluginConfiguration: import("@atlaskit/editor-plugin-mentions").MentionPluginOptions | undefined;
5018
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
5019
+ pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
5020
+ sharedState: {
5021
+ createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
5022
+ attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
5023
+ performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
5024
+ };
5025
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
5026
+ pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
5027
+ sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
5028
+ }, import("@atlaskit/editor-common/types").FeatureFlags>>];
5029
+ actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
5030
+ }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"typeAhead", {
5031
+ pluginConfiguration: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginOptions | undefined;
5032
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
5033
+ pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
5034
+ sharedState: {
5035
+ createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
5036
+ attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
5037
+ performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
5038
+ };
5039
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
5040
+ pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
5041
+ sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
5042
+ }, import("@atlaskit/editor-common/types").FeatureFlags>>];
5043
+ actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
5044
+ }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
5045
+ pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
5046
+ sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
5047
+ }, import("@atlaskit/editor-common/types").FeatureFlags>>];
5048
+ sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
5049
+ actions: {
5050
+ isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
5051
+ isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
5052
+ insert: (props: {
5053
+ triggerHandler: import("@atlaskit/editor-common/types").TypeAheadHandler;
5054
+ contentItem: import("@atlaskit/editor-common/types").TypeAheadItem;
5055
+ query: string;
5056
+ sourceListItem: import("@atlaskit/editor-common/types").TypeAheadItem[];
5057
+ mode?: import("@atlaskit/editor-common/type-ahead").SelectItemMode | undefined;
5058
+ }) => boolean;
5059
+ findHandlerByTrigger: (trigger: string) => import("@atlaskit/editor-common/types").TypeAheadHandler | null;
5060
+ open: (props: {
5061
+ triggerHandler: import("@atlaskit/editor-common/types").TypeAheadHandler;
5062
+ inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod;
5063
+ query?: string | undefined;
5064
+ }) => boolean;
5065
+ close: (props: {
5066
+ insertCurrentQueryAsRawText: boolean;
5067
+ attachCommand?: import("@atlaskit/editor-common/types").Command | undefined;
5068
+ }) => boolean;
5069
+ openAtTransaction: (props: {
5070
+ triggerHandler: import("@atlaskit/editor-common/types").TypeAheadHandler;
5071
+ inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod;
5072
+ query?: string | undefined;
5073
+ }) => (tr: import("prosemirror-state").Transaction) => boolean;
5074
+ };
5075
+ }, import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginOptions | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"contextIdentifier", {
5076
+ pluginConfiguration: import("@atlaskit/editor-plugin-context-identifier").PluginConfiguration | undefined;
5077
+ sharedState: import("@atlaskit/editor-plugin-context-identifier").ContextIdentifierConfiguration | undefined;
5078
+ commands: {
5079
+ setProvider: (config: import("@atlaskit/editor-plugin-context-identifier").ContextIdentifierConfiguration) => import("@atlaskit/editor-common/types").EditorCommand;
5080
+ };
5081
+ }, import("@atlaskit/editor-plugin-context-identifier").PluginConfiguration | undefined>>];
5082
+ sharedState: import("@atlaskit/editor-plugin-mentions").MentionSharedState | undefined;
5083
+ actions: {
5084
+ openTypeAhead: (inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod) => boolean;
5085
+ announceMentionsInsertion: (mentionIds: {
5086
+ localId: string;
5087
+ id: string;
5088
+ }[]) => void;
5089
+ };
5090
+ }, import("@atlaskit/editor-plugin-mentions").MentionPluginOptions | undefined>>];
4939
5091
  sharedState: {
4940
5092
  lastContentPasted: import("@atlaskit/editor-plugin-paste").LastContentPasted | null;
4941
5093
  };