@atlaskit/editor-core 193.29.0 → 193.29.3

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 (10) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/composable-editor/editor-internal.js +54 -64
  3. package/dist/cjs/version-wrapper.js +1 -1
  4. package/dist/es2019/composable-editor/editor-internal.js +58 -66
  5. package/dist/es2019/version-wrapper.js +1 -1
  6. package/dist/esm/composable-editor/editor-internal.js +55 -65
  7. package/dist/esm/version-wrapper.js +1 -1
  8. package/dist/types/composable-editor/editor-internal.d.ts +1 -2
  9. package/dist/types-ts4.5/composable-editor/editor-internal.d.ts +1 -2
  10. package/package.json +2 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 193.29.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [#115286](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/115286)
8
+ [`cd387e8052aaa`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cd387e8052aaa) -
9
+ Removed FF platform.editor.react-18-portal
10
+
3
11
  ## 193.29.0
4
12
 
5
13
  ### Minor Changes
package/dist/cjs/composable-editor/editor-internal.js CHANGED
@@ -12,9 +12,7 @@ var _react = require("react");
12
12
  var _react2 = require("@emotion/react");
13
13
  var _analytics = require("@atlaskit/editor-common/analytics");
14
14
  var _portal = require("@atlaskit/editor-common/portal");
15
- var _portalProvider = require("@atlaskit/editor-common/portal-provider");
16
15
  var _ui = require("@atlaskit/editor-common/ui");
17
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
18
16
  var _createEditor = require("../create-editor");
19
17
  var _ErrorBoundary = _interopRequireDefault(require("../create-editor/ErrorBoundary"));
20
18
  var _featureFlagsFromProps = require("../create-editor/feature-flags-from-props");
@@ -60,8 +58,8 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
60
58
  var useShallow = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.useShallow;
61
59
  var _usePortalProvider = (0, _portal.usePortalProvider)(),
62
60
  _usePortalProvider2 = (0, _slicedToArray2.default)(_usePortalProvider, 2),
63
- nextPortalProviderAPI = _usePortalProvider2[0],
64
- NextPortalRenderer = _usePortalProvider2[1];
61
+ portalProviderAPI = _usePortalProvider2[0],
62
+ PortalRenderer = _usePortalProvider2[1];
65
63
 
66
64
  // ED-16320: Check for explicit disable so that by default
67
65
  // it will still be enabled as it currently is. Then we can
@@ -85,69 +83,61 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
85
83
  })
86
84
  }, (0, _react2.jsx)(_EditorContext.default, {
87
85
  editorActions: editorActions
88
- }, (0, _react2.jsx)(_contextAdapter.ContextAdapter, null, (0, _react2.jsx)(_portalProvider.PortalProviderWithThemeProviders, {
89
- onAnalyticsEvent: handleAnalyticsEvent,
90
- useAnalyticsContext: props.UNSAFE_useAnalyticsContext,
91
- render: function render(legacyPortalProviderAPI) {
92
- return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(ReactEditorViewContextWrapper, {
93
- editorProps: overriddenEditorProps,
94
- createAnalyticsEvent: createAnalyticsEvent,
95
- portalProviderAPI: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.react-18-portal') ? nextPortalProviderAPI : legacyPortalProviderAPI,
96
- providerFactory: providerFactory,
97
- onEditorCreated: onEditorCreated,
98
- onEditorDestroyed: onEditorDestroyed,
86
+ }, (0, _react2.jsx)(_contextAdapter.ContextAdapter, null, (0, _react2.jsx)(_ui.IntlProviderIfMissingWrapper, null, (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(ReactEditorViewContextWrapper, {
87
+ editorProps: overriddenEditorProps,
88
+ createAnalyticsEvent: createAnalyticsEvent,
89
+ portalProviderAPI: portalProviderAPI,
90
+ providerFactory: providerFactory,
91
+ onEditorCreated: onEditorCreated,
92
+ onEditorDestroyed: onEditorDestroyed,
93
+ disabled: props.disabled,
94
+ preset: preset,
95
+ setEditorApi: setEditorApi,
96
+ render: function render(_ref2) {
97
+ var _props$featureFlags, _props$featureFlags2;
98
+ var editor = _ref2.editor,
99
+ view = _ref2.view,
100
+ eventDispatcher = _ref2.eventDispatcher,
101
+ config = _ref2.config,
102
+ dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
103
+ editorRef = _ref2.editorRef;
104
+ return (0, _react2.jsx)(_ui.BaseTheme, {
105
+ baseFontSize: (0, _getBaseFontSize.getBaseFontSize)(props.appearance)
106
+ }, (0, _react2.jsx)(Component, {
107
+ innerRef: editorRef,
108
+ appearance: props.appearance,
99
109
  disabled: props.disabled,
100
- preset: preset,
101
- setEditorApi: setEditorApi,
102
- render: function render(_ref2) {
103
- var _props$featureFlags, _props$featureFlags2;
104
- var editor = _ref2.editor,
105
- view = _ref2.view,
106
- eventDispatcher = _ref2.eventDispatcher,
107
- config = _ref2.config,
108
- dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
109
- editorRef = _ref2.editorRef;
110
- return (0, _react2.jsx)(_ui.BaseTheme, {
111
- baseFontSize: (0, _getBaseFontSize.getBaseFontSize)(props.appearance)
112
- }, (0, _react2.jsx)(Component, {
113
- innerRef: editorRef,
114
- appearance: props.appearance,
115
- disabled: props.disabled,
116
- editorActions: editorActions,
117
- editorDOMElement: editor,
118
- editorView: view,
119
- providerFactory: providerFactory,
120
- eventDispatcher: eventDispatcher,
121
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
122
- maxHeight: props.maxHeight,
123
- minHeight: props.minHeight,
124
- onSave: props.onSave ? handleSave : undefined,
125
- onCancel: props.onCancel,
126
- popupsMountPoint: props.popupsMountPoint,
127
- popupsBoundariesElement: props.popupsBoundariesElement,
128
- popupsScrollableElement: props.popupsScrollableElement,
129
- contentComponents: config.contentComponents,
130
- primaryToolbarComponents: config.primaryToolbarComponents,
131
- primaryToolbarIconBefore: props.primaryToolbarIconBefore,
132
- secondaryToolbarComponents: config.secondaryToolbarComponents,
133
- customContentComponents: props.contentComponents,
134
- customPrimaryToolbarComponents: props.primaryToolbarComponents,
135
- customSecondaryToolbarComponents: props.secondaryToolbarComponents,
136
- contextPanel: props.contextPanel,
137
- collabEdit: props.collabEdit,
138
- persistScrollGutter: props.persistScrollGutter,
139
- enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
140
- useStickyToolbar: props.useStickyToolbar,
141
- featureFlags: featureFlags,
142
- pluginHooks: config.pluginHooks,
143
- hideAvatarGroup: props.hideAvatarGroup
144
- }));
145
- }
146
- }), (0, _platformFeatureFlags.getBooleanFF)('platform.editor.react-18-portal') ? (0, _react2.jsx)(NextPortalRenderer, null) : (0, _react2.jsx)(_portalProvider.PortalRenderer, {
147
- portalProviderAPI: legacyPortalProviderAPI
110
+ editorActions: editorActions,
111
+ editorDOMElement: editor,
112
+ editorView: view,
113
+ providerFactory: providerFactory,
114
+ eventDispatcher: eventDispatcher,
115
+ dispatchAnalyticsEvent: dispatchAnalyticsEvent,
116
+ maxHeight: props.maxHeight,
117
+ minHeight: props.minHeight,
118
+ onSave: props.onSave ? handleSave : undefined,
119
+ onCancel: props.onCancel,
120
+ popupsMountPoint: props.popupsMountPoint,
121
+ popupsBoundariesElement: props.popupsBoundariesElement,
122
+ popupsScrollableElement: props.popupsScrollableElement,
123
+ contentComponents: config.contentComponents,
124
+ primaryToolbarComponents: config.primaryToolbarComponents,
125
+ primaryToolbarIconBefore: props.primaryToolbarIconBefore,
126
+ secondaryToolbarComponents: config.secondaryToolbarComponents,
127
+ customContentComponents: props.contentComponents,
128
+ customPrimaryToolbarComponents: props.primaryToolbarComponents,
129
+ customSecondaryToolbarComponents: props.secondaryToolbarComponents,
130
+ contextPanel: props.contextPanel,
131
+ collabEdit: props.collabEdit,
132
+ persistScrollGutter: props.persistScrollGutter,
133
+ enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
134
+ useStickyToolbar: props.useStickyToolbar,
135
+ featureFlags: featureFlags,
136
+ pluginHooks: config.pluginHooks,
137
+ hideAvatarGroup: props.hideAvatarGroup
148
138
  }));
149
139
  }
150
- }))))));
140
+ }), (0, _react2.jsx)(PortalRenderer, null))))))));
151
141
  });
152
142
  function ReactEditorViewContextWrapper(props) {
153
143
  var setInternalEditorAPI = (0, _context.useSetPresetContext)();
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 = "193.29.0";
8
+ var version = exports.version = "193.29.3";
package/dist/es2019/composable-editor/editor-internal.js CHANGED
@@ -6,9 +6,7 @@ import { Fragment, memo, useCallback } from 'react';
6
6
  import { css, jsx } from '@emotion/react';
7
7
  import { ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
8
8
  import { usePortalProvider } from '@atlaskit/editor-common/portal';
9
- import { PortalProviderWithThemeProviders, PortalRenderer } from '@atlaskit/editor-common/portal-provider';
10
- import { BaseTheme, WidthProvider } from '@atlaskit/editor-common/ui';
11
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
9
+ import { BaseTheme, IntlProviderIfMissingWrapper, WidthProvider } from '@atlaskit/editor-common/ui';
12
10
  import { getUiComponent } from '../create-editor';
13
11
  import ErrorBoundary from '../create-editor/ErrorBoundary';
14
12
  import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
@@ -52,7 +50,7 @@ export const EditorInternal = /*#__PURE__*/memo(({
52
50
  const renderTracking = (_props$performanceTra = props.performanceTracking) === null || _props$performanceTra === void 0 ? void 0 : (_props$performanceTra2 = _props$performanceTra.renderTracking) === null || _props$performanceTra2 === void 0 ? void 0 : _props$performanceTra2.editor;
53
51
  const renderTrackingEnabled = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.enabled;
54
52
  const useShallow = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.useShallow;
55
- const [nextPortalProviderAPI, NextPortalRenderer] = usePortalProvider();
53
+ const [portalProviderAPI, PortalRenderer] = usePortalProvider();
56
54
 
57
55
  // ED-16320: Check for explicit disable so that by default
58
56
  // it will still be enabled as it currently is. Then we can
@@ -76,68 +74,62 @@ export const EditorInternal = /*#__PURE__*/memo(({
76
74
  })
77
75
  }, jsx(EditorContext, {
78
76
  editorActions: editorActions
79
- }, jsx(ContextAdapter, null, jsx(PortalProviderWithThemeProviders, {
80
- onAnalyticsEvent: handleAnalyticsEvent,
81
- useAnalyticsContext: props.UNSAFE_useAnalyticsContext,
82
- render: legacyPortalProviderAPI => jsx(Fragment, null, jsx(ReactEditorViewContextWrapper, {
83
- editorProps: overriddenEditorProps,
84
- createAnalyticsEvent: createAnalyticsEvent,
85
- portalProviderAPI: getBooleanFF('platform.editor.react-18-portal') ? nextPortalProviderAPI : legacyPortalProviderAPI,
86
- providerFactory: providerFactory,
87
- onEditorCreated: onEditorCreated,
88
- onEditorDestroyed: onEditorDestroyed,
89
- disabled: props.disabled,
90
- preset: preset,
91
- setEditorApi: setEditorApi,
92
- render: ({
93
- editor,
94
- view,
95
- eventDispatcher,
96
- config,
97
- dispatchAnalyticsEvent,
98
- editorRef
99
- }) => {
100
- var _props$featureFlags, _props$featureFlags2;
101
- return jsx(BaseTheme, {
102
- baseFontSize: getBaseFontSize(props.appearance)
103
- }, jsx(Component, {
104
- innerRef: editorRef,
105
- appearance: props.appearance,
106
- disabled: props.disabled,
107
- editorActions: editorActions,
108
- editorDOMElement: editor,
109
- editorView: view,
110
- providerFactory: providerFactory,
111
- eventDispatcher: eventDispatcher,
112
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
113
- maxHeight: props.maxHeight,
114
- minHeight: props.minHeight,
115
- onSave: props.onSave ? handleSave : undefined,
116
- onCancel: props.onCancel,
117
- popupsMountPoint: props.popupsMountPoint,
118
- popupsBoundariesElement: props.popupsBoundariesElement,
119
- popupsScrollableElement: props.popupsScrollableElement,
120
- contentComponents: config.contentComponents,
121
- primaryToolbarComponents: config.primaryToolbarComponents,
122
- primaryToolbarIconBefore: props.primaryToolbarIconBefore,
123
- secondaryToolbarComponents: config.secondaryToolbarComponents,
124
- customContentComponents: props.contentComponents,
125
- customPrimaryToolbarComponents: props.primaryToolbarComponents,
126
- customSecondaryToolbarComponents: props.secondaryToolbarComponents,
127
- contextPanel: props.contextPanel,
128
- collabEdit: props.collabEdit,
129
- persistScrollGutter: props.persistScrollGutter,
130
- enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
131
- useStickyToolbar: props.useStickyToolbar,
132
- featureFlags: featureFlags,
133
- pluginHooks: config.pluginHooks,
134
- hideAvatarGroup: props.hideAvatarGroup
135
- }));
136
- }
137
- }), getBooleanFF('platform.editor.react-18-portal') ? jsx(NextPortalRenderer, null) : jsx(PortalRenderer, {
138
- portalProviderAPI: legacyPortalProviderAPI
139
- }))
140
- }))))));
77
+ }, jsx(ContextAdapter, null, jsx(IntlProviderIfMissingWrapper, null, jsx(Fragment, null, jsx(ReactEditorViewContextWrapper, {
78
+ editorProps: overriddenEditorProps,
79
+ createAnalyticsEvent: createAnalyticsEvent,
80
+ portalProviderAPI: portalProviderAPI,
81
+ providerFactory: providerFactory,
82
+ onEditorCreated: onEditorCreated,
83
+ onEditorDestroyed: onEditorDestroyed,
84
+ disabled: props.disabled,
85
+ preset: preset,
86
+ setEditorApi: setEditorApi,
87
+ render: ({
88
+ editor,
89
+ view,
90
+ eventDispatcher,
91
+ config,
92
+ dispatchAnalyticsEvent,
93
+ editorRef
94
+ }) => {
95
+ var _props$featureFlags, _props$featureFlags2;
96
+ return jsx(BaseTheme, {
97
+ baseFontSize: getBaseFontSize(props.appearance)
98
+ }, jsx(Component, {
99
+ innerRef: editorRef,
100
+ appearance: props.appearance,
101
+ disabled: props.disabled,
102
+ editorActions: editorActions,
103
+ editorDOMElement: editor,
104
+ editorView: view,
105
+ providerFactory: providerFactory,
106
+ eventDispatcher: eventDispatcher,
107
+ dispatchAnalyticsEvent: dispatchAnalyticsEvent,
108
+ maxHeight: props.maxHeight,
109
+ minHeight: props.minHeight,
110
+ onSave: props.onSave ? handleSave : undefined,
111
+ onCancel: props.onCancel,
112
+ popupsMountPoint: props.popupsMountPoint,
113
+ popupsBoundariesElement: props.popupsBoundariesElement,
114
+ popupsScrollableElement: props.popupsScrollableElement,
115
+ contentComponents: config.contentComponents,
116
+ primaryToolbarComponents: config.primaryToolbarComponents,
117
+ primaryToolbarIconBefore: props.primaryToolbarIconBefore,
118
+ secondaryToolbarComponents: config.secondaryToolbarComponents,
119
+ customContentComponents: props.contentComponents,
120
+ customPrimaryToolbarComponents: props.primaryToolbarComponents,
121
+ customSecondaryToolbarComponents: props.secondaryToolbarComponents,
122
+ contextPanel: props.contextPanel,
123
+ collabEdit: props.collabEdit,
124
+ persistScrollGutter: props.persistScrollGutter,
125
+ enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
126
+ useStickyToolbar: props.useStickyToolbar,
127
+ featureFlags: featureFlags,
128
+ pluginHooks: config.pluginHooks,
129
+ hideAvatarGroup: props.hideAvatarGroup
130
+ }));
131
+ }
132
+ }), jsx(PortalRenderer, null))))))));
141
133
  });
142
134
  function ReactEditorViewContextWrapper(props) {
143
135
  const setInternalEditorAPI = useSetPresetContext();
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "193.29.0";
2
+ export const version = "193.29.3";
package/dist/esm/composable-editor/editor-internal.js CHANGED
@@ -10,9 +10,7 @@ import { Fragment, memo, useCallback } from 'react';
10
10
  import { css, jsx } from '@emotion/react';
11
11
  import { ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
12
12
  import { usePortalProvider } from '@atlaskit/editor-common/portal';
13
- import { PortalProviderWithThemeProviders, PortalRenderer } from '@atlaskit/editor-common/portal-provider';
14
- import { BaseTheme, WidthProvider } from '@atlaskit/editor-common/ui';
15
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
13
+ import { BaseTheme, IntlProviderIfMissingWrapper, WidthProvider } from '@atlaskit/editor-common/ui';
16
14
  import { getUiComponent } from '../create-editor';
17
15
  import ErrorBoundary from '../create-editor/ErrorBoundary';
18
16
  import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
@@ -56,8 +54,8 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
56
54
  var useShallow = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.useShallow;
57
55
  var _usePortalProvider = usePortalProvider(),
58
56
  _usePortalProvider2 = _slicedToArray(_usePortalProvider, 2),
59
- nextPortalProviderAPI = _usePortalProvider2[0],
60
- NextPortalRenderer = _usePortalProvider2[1];
57
+ portalProviderAPI = _usePortalProvider2[0],
58
+ PortalRenderer = _usePortalProvider2[1];
61
59
 
62
60
  // ED-16320: Check for explicit disable so that by default
63
61
  // it will still be enabled as it currently is. Then we can
@@ -81,69 +79,61 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
81
79
  })
82
80
  }, jsx(EditorContext, {
83
81
  editorActions: editorActions
84
- }, jsx(ContextAdapter, null, jsx(PortalProviderWithThemeProviders, {
85
- onAnalyticsEvent: handleAnalyticsEvent,
86
- useAnalyticsContext: props.UNSAFE_useAnalyticsContext,
87
- render: function render(legacyPortalProviderAPI) {
88
- return jsx(Fragment, null, jsx(ReactEditorViewContextWrapper, {
89
- editorProps: overriddenEditorProps,
90
- createAnalyticsEvent: createAnalyticsEvent,
91
- portalProviderAPI: getBooleanFF('platform.editor.react-18-portal') ? nextPortalProviderAPI : legacyPortalProviderAPI,
92
- providerFactory: providerFactory,
93
- onEditorCreated: onEditorCreated,
94
- onEditorDestroyed: onEditorDestroyed,
82
+ }, jsx(ContextAdapter, null, jsx(IntlProviderIfMissingWrapper, null, jsx(Fragment, null, jsx(ReactEditorViewContextWrapper, {
83
+ editorProps: overriddenEditorProps,
84
+ createAnalyticsEvent: createAnalyticsEvent,
85
+ portalProviderAPI: portalProviderAPI,
86
+ providerFactory: providerFactory,
87
+ onEditorCreated: onEditorCreated,
88
+ onEditorDestroyed: onEditorDestroyed,
89
+ disabled: props.disabled,
90
+ preset: preset,
91
+ setEditorApi: setEditorApi,
92
+ render: function render(_ref2) {
93
+ var _props$featureFlags, _props$featureFlags2;
94
+ var editor = _ref2.editor,
95
+ view = _ref2.view,
96
+ eventDispatcher = _ref2.eventDispatcher,
97
+ config = _ref2.config,
98
+ dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
99
+ editorRef = _ref2.editorRef;
100
+ return jsx(BaseTheme, {
101
+ baseFontSize: getBaseFontSize(props.appearance)
102
+ }, jsx(Component, {
103
+ innerRef: editorRef,
104
+ appearance: props.appearance,
95
105
  disabled: props.disabled,
96
- preset: preset,
97
- setEditorApi: setEditorApi,
98
- render: function render(_ref2) {
99
- var _props$featureFlags, _props$featureFlags2;
100
- var editor = _ref2.editor,
101
- view = _ref2.view,
102
- eventDispatcher = _ref2.eventDispatcher,
103
- config = _ref2.config,
104
- dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
105
- editorRef = _ref2.editorRef;
106
- return jsx(BaseTheme, {
107
- baseFontSize: getBaseFontSize(props.appearance)
108
- }, jsx(Component, {
109
- innerRef: editorRef,
110
- appearance: props.appearance,
111
- disabled: props.disabled,
112
- editorActions: editorActions,
113
- editorDOMElement: editor,
114
- editorView: view,
115
- providerFactory: providerFactory,
116
- eventDispatcher: eventDispatcher,
117
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
118
- maxHeight: props.maxHeight,
119
- minHeight: props.minHeight,
120
- onSave: props.onSave ? handleSave : undefined,
121
- onCancel: props.onCancel,
122
- popupsMountPoint: props.popupsMountPoint,
123
- popupsBoundariesElement: props.popupsBoundariesElement,
124
- popupsScrollableElement: props.popupsScrollableElement,
125
- contentComponents: config.contentComponents,
126
- primaryToolbarComponents: config.primaryToolbarComponents,
127
- primaryToolbarIconBefore: props.primaryToolbarIconBefore,
128
- secondaryToolbarComponents: config.secondaryToolbarComponents,
129
- customContentComponents: props.contentComponents,
130
- customPrimaryToolbarComponents: props.primaryToolbarComponents,
131
- customSecondaryToolbarComponents: props.secondaryToolbarComponents,
132
- contextPanel: props.contextPanel,
133
- collabEdit: props.collabEdit,
134
- persistScrollGutter: props.persistScrollGutter,
135
- enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
136
- useStickyToolbar: props.useStickyToolbar,
137
- featureFlags: featureFlags,
138
- pluginHooks: config.pluginHooks,
139
- hideAvatarGroup: props.hideAvatarGroup
140
- }));
141
- }
142
- }), getBooleanFF('platform.editor.react-18-portal') ? jsx(NextPortalRenderer, null) : jsx(PortalRenderer, {
143
- portalProviderAPI: legacyPortalProviderAPI
106
+ editorActions: editorActions,
107
+ editorDOMElement: editor,
108
+ editorView: view,
109
+ providerFactory: providerFactory,
110
+ eventDispatcher: eventDispatcher,
111
+ dispatchAnalyticsEvent: dispatchAnalyticsEvent,
112
+ maxHeight: props.maxHeight,
113
+ minHeight: props.minHeight,
114
+ onSave: props.onSave ? handleSave : undefined,
115
+ onCancel: props.onCancel,
116
+ popupsMountPoint: props.popupsMountPoint,
117
+ popupsBoundariesElement: props.popupsBoundariesElement,
118
+ popupsScrollableElement: props.popupsScrollableElement,
119
+ contentComponents: config.contentComponents,
120
+ primaryToolbarComponents: config.primaryToolbarComponents,
121
+ primaryToolbarIconBefore: props.primaryToolbarIconBefore,
122
+ secondaryToolbarComponents: config.secondaryToolbarComponents,
123
+ customContentComponents: props.contentComponents,
124
+ customPrimaryToolbarComponents: props.primaryToolbarComponents,
125
+ customSecondaryToolbarComponents: props.secondaryToolbarComponents,
126
+ contextPanel: props.contextPanel,
127
+ collabEdit: props.collabEdit,
128
+ persistScrollGutter: props.persistScrollGutter,
129
+ enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
130
+ useStickyToolbar: props.useStickyToolbar,
131
+ featureFlags: featureFlags,
132
+ pluginHooks: config.pluginHooks,
133
+ hideAvatarGroup: props.hideAvatarGroup
144
134
  }));
145
135
  }
146
- }))))));
136
+ }), jsx(PortalRenderer, null))))))));
147
137
  });
148
138
  function ReactEditorViewContextWrapper(props) {
149
139
  var setInternalEditorAPI = useSetPresetContext();
package/dist/esm/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "193.29.0";
2
+ export var version = "193.29.3";
package/dist/types/composable-editor/editor-internal.d.ts CHANGED
@@ -2,8 +2,7 @@
2
2
  import { jsx } from '@emotion/react';
3
3
  import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
4
4
  import type { FireAnalyticsCallback } from '@atlaskit/editor-common/analytics';
5
- import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
6
- import type { AllEditorPresetPluginTypes } from '@atlaskit/editor-common/preset';
5
+ import type { AllEditorPresetPluginTypes, EditorPresetBuilder } from '@atlaskit/editor-common/preset';
7
6
  import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
8
7
  import type { Transformer } from '@atlaskit/editor-common/types';
9
8
  import type { EditorView } from '@atlaskit/editor-prosemirror/view';
package/dist/types-ts4.5/composable-editor/editor-internal.d.ts CHANGED
@@ -2,8 +2,7 @@
2
2
  import { jsx } from '@emotion/react';
3
3
  import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
4
4
  import type { FireAnalyticsCallback } from '@atlaskit/editor-common/analytics';
5
- import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
6
- import type { AllEditorPresetPluginTypes } from '@atlaskit/editor-common/preset';
5
+ import type { AllEditorPresetPluginTypes, EditorPresetBuilder } from '@atlaskit/editor-common/preset';
7
6
  import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
8
7
  import type { Transformer } from '@atlaskit/editor-common/types';
9
8
  import type { EditorView } from '@atlaskit/editor-prosemirror/view';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "193.29.0",
3
+ "version": "193.29.3",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -100,7 +100,7 @@
100
100
  "@atlaskit/media-test-helpers": "^33.0.27",
101
101
  "@atlaskit/modal-dialog": "^12.14.0",
102
102
  "@atlaskit/primitives": "^9.0.0",
103
- "@atlaskit/renderer": "^109.38.0",
103
+ "@atlaskit/renderer": "^109.39.0",
104
104
  "@atlaskit/smart-card": "^27.8.0",
105
105
  "@atlaskit/synchrony-test-helpers": "^2.4.0",
106
106
  "@atlaskit/toggle": "^13.2.0",
@@ -311,9 +311,6 @@
311
311
  "type": "boolean",
312
312
  "referenceOnly": "true"
313
313
  },
314
- "platform.editor.react-18-portal": {
315
- "type": "boolean"
316
- },
317
314
  "platform.editor.table.allow-table-alignment": {
318
315
  "type": "boolean"
319
316
  },