@atlaskit/editor-core 198.6.4 → 198.6.5

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 (46) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/dist/cjs/composable-editor/editor-internal.js +3 -27
  3. package/dist/cjs/composable-editor/hooks/useProviders.js +3 -5
  4. package/dist/cjs/composable-editor/utils/handleProviders.js +0 -3
  5. package/dist/cjs/create-editor/ReactEditorView.js +13 -44
  6. package/dist/cjs/ui/Appearance/Chromeless.js +1 -2
  7. package/dist/cjs/ui/Appearance/Comment/Comment.js +1 -2
  8. package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js +1 -1
  9. package/dist/cjs/ui/ContentStyles/index.js +2 -7
  10. package/dist/cjs/ui/EditorContext/index.js +8 -23
  11. package/dist/cjs/version-wrapper.js +1 -1
  12. package/dist/es2019/composable-editor/editor-internal.js +4 -28
  13. package/dist/es2019/composable-editor/hooks/useProviders.js +3 -5
  14. package/dist/es2019/composable-editor/utils/handleProviders.js +0 -3
  15. package/dist/es2019/create-editor/ReactEditorView.js +13 -44
  16. package/dist/es2019/ui/Appearance/Chromeless.js +1 -2
  17. package/dist/es2019/ui/Appearance/Comment/Comment.js +1 -2
  18. package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js +1 -1
  19. package/dist/es2019/ui/ContentStyles/index.js +2 -8
  20. package/dist/es2019/ui/EditorContext/index.js +8 -23
  21. package/dist/es2019/version-wrapper.js +1 -1
  22. package/dist/esm/composable-editor/editor-internal.js +4 -28
  23. package/dist/esm/composable-editor/hooks/useProviders.js +3 -5
  24. package/dist/esm/composable-editor/utils/handleProviders.js +0 -3
  25. package/dist/esm/create-editor/ReactEditorView.js +13 -44
  26. package/dist/esm/ui/Appearance/Chromeless.js +1 -2
  27. package/dist/esm/ui/Appearance/Comment/Comment.js +1 -2
  28. package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js +1 -1
  29. package/dist/esm/ui/ContentStyles/index.js +2 -7
  30. package/dist/esm/ui/EditorContext/index.js +8 -23
  31. package/dist/esm/version-wrapper.js +1 -1
  32. package/dist/types/create-editor/ReactEditorView.d.ts +1 -2
  33. package/dist/types/create-editor/create-universal-preset.d.ts +50 -22
  34. package/dist/types/presets/default.d.ts +44 -16
  35. package/dist/types/presets/universal.d.ts +50 -22
  36. package/dist/types/presets/useUniversalPreset.d.ts +50 -22
  37. package/dist/types/ui/Appearance/FullPage/StyledComponents.d.ts +1 -1
  38. package/dist/types/ui/ContentStyles/index.d.ts +2 -2
  39. package/dist/types-ts4.5/create-editor/ReactEditorView.d.ts +1 -2
  40. package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts +54 -22
  41. package/dist/types-ts4.5/presets/default.d.ts +48 -16
  42. package/dist/types-ts4.5/presets/universal.d.ts +54 -22
  43. package/dist/types-ts4.5/presets/useUniversalPreset.d.ts +54 -22
  44. package/dist/types-ts4.5/ui/Appearance/FullPage/StyledComponents.d.ts +1 -1
  45. package/dist/types-ts4.5/ui/ContentStyles/index.d.ts +2 -2
  46. package/package.json +9 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 198.6.5
4
+
5
+ ### Patch Changes
6
+
7
+ - [#152480](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152480)
8
+ [`831fe131ac081`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/831fe131ac081) -
9
+ Remove FF platform_editor_td_provider_from_plugin_config
10
+ - [#152510](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152510)
11
+ [`dcf9edde7ac7b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dcf9edde7ac7b) -
12
+ bump adf-schema to 42.0.1
13
+ - [#152434](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152434)
14
+ [`446eacc8ed3b5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/446eacc8ed3b5) -
15
+ Cleanup FF platform_editor_remove_use_preset_context
16
+ - Updated dependencies
17
+
3
18
  ## 198.6.4
4
19
 
5
20
  ### Patch Changes
@@ -12,12 +12,10 @@ 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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
16
15
  var _ErrorBoundary = _interopRequireDefault(require("../create-editor/ErrorBoundary"));
17
16
  var _featureFlagsFromProps = require("../create-editor/feature-flags-from-props");
18
17
  var _ReactEditorView = _interopRequireDefault(require("../create-editor/ReactEditorView"));
19
18
  var _contextAdapter = require("../nodeviews/context-adapter");
20
- var _context = require("../presets/context");
21
19
  var _EditorContext = _interopRequireDefault(require("../ui/EditorContext"));
22
20
  var _IntlProviderIfMissingWrapper = require("../ui/IntlProviderIfMissingWrapper/IntlProviderIfMissingWrapper");
23
21
  var _RenderTracking = require("../utils/performance/components/RenderTracking");
@@ -143,39 +141,17 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
143
141
  });
144
142
  function ReactEditorViewContextWrapper(props) {
145
143
  var _media, _linking;
146
- // deprecated, unable to be FF due to hook usage
147
- var setInternalEditorAPI = (0, _context.useSetPresetContext)();
148
- var presetContextEditorAPI = (0, _context.usePresetContext)();
149
-
150
- // new way of storing the editorApi when FF platform_editor_remove_use_preset_context is enabled
144
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
151
145
  var _useState = (0, _react.useState)(undefined),
152
146
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
153
147
  editorAPI = _useState2[0],
154
148
  setEditorAPI = _useState2[1];
155
149
 
156
- /**
157
- * We use the context to retrieve the editorAPI
158
- * externally for consumers via `usePreset`.
159
- *
160
- * However we also may need to retrieve this value internally via context
161
- * so we should also set the value for the `EditorContext` that is used in
162
- * `EditorInternal`.
163
- */
164
- var setPresetContextEditorAPI = (0, _react.useCallback)(
165
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
166
- function (api) {
167
- if ((0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context')) {
168
- setEditorAPI(api);
169
- } else {
170
- setInternalEditorAPI === null || setInternalEditorAPI === void 0 || setInternalEditorAPI(api);
171
- }
172
- }, [setInternalEditorAPI, setEditorAPI]);
173
-
174
150
  // TODO: Remove these when we deprecate these props from editor-props - smartLinks is unfortunately still used in some places, we can sidestep this problem if we move everyone across to ComposableEditor and deprecate Editor
175
151
  var UNSAFE_cards = props.editorProps.UNSAFE_cards;
176
152
  var smartLinks = props.editorProps.smartLinks;
177
153
  (0, _useProviders.useProviders)({
178
- editorApi: (0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context') ? editorAPI : presetContextEditorAPI,
154
+ editorApi: editorAPI,
179
155
  contextIdentifierProvider: props.editorProps.contextIdentifierProvider,
180
156
  mediaProvider: (_media = props.editorProps.media) === null || _media === void 0 ? void 0 : _media.provider,
181
157
  cardProvider: ((_linking = props.editorProps.linking) === null || _linking === void 0 || (_linking = _linking.smartLinks) === null || _linking === void 0 ? void 0 : _linking.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider,
@@ -185,6 +161,6 @@ function ReactEditorViewContextWrapper(props) {
185
161
  });
186
162
  return (0, _react2.jsx)(_ReactEditorView.default, (0, _extends2.default)({}, props, {
187
163
  editorAPI: editorAPI,
188
- setEditorApi: setPresetContextEditorAPI
164
+ setEditorAPI: setEditorAPI
189
165
  }));
190
166
  }
@@ -86,11 +86,9 @@ var useProviders = exports.useProviders = function useProviders(_ref) {
86
86
  }
87
87
  }, [autoformattingProvider, editorApi]);
88
88
  (0, _react.useEffect)(function () {
89
- if ((0, _platformFeatureFlags.fg)('platform_editor_td_provider_from_plugin_config')) {
90
- if (taskDecisionProvider) {
91
- var _editorApi$taskDecisi;
92
- editorApi === null || editorApi === void 0 || (_editorApi$taskDecisi = editorApi.taskDecision) === null || _editorApi$taskDecisi === void 0 || _editorApi$taskDecisi.actions.setProvider(taskDecisionProvider);
93
- }
89
+ if (taskDecisionProvider) {
90
+ var _editorApi$taskDecisi;
91
+ editorApi === null || editorApi === void 0 || (_editorApi$taskDecisi = editorApi.taskDecision) === null || _editorApi$taskDecisi === void 0 || _editorApi$taskDecisi.actions.setProvider(taskDecisionProvider);
94
92
  }
95
93
  }, [taskDecisionProvider, editorApi]);
96
94
  };
@@ -28,9 +28,6 @@ function handleProviders(providerFactory, _ref, extensionProvider, quickInsertPr
28
28
  searchProvider = _ref.searchProvider;
29
29
  providerFactory.setProvider('emojiProvider', emojiProvider);
30
30
  providerFactory.setProvider('mentionProvider', mentionProvider);
31
- if (!(0, _platformFeatureFlags.fg)('platform_editor_td_provider_from_plugin_config')) {
32
- providerFactory.setProvider('taskDecisionProvider', taskDecisionProvider);
33
- }
34
31
  providerFactory.setProvider('contextIdentifierProvider', contextIdentifierProvider);
35
32
  providerFactory.setProvider('imageUploadProvider', imageUploadProvider);
36
33
  providerFactory.setProvider('collabEditProvider', collabEditProvider);
@@ -31,7 +31,6 @@ var _state2 = require("@atlaskit/editor-prosemirror/state");
31
31
  var _view = require("@atlaskit/editor-prosemirror/view");
32
32
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
33
33
  var _eventDispatcher = require("../event-dispatcher");
34
- var _context = require("../presets/context");
35
34
  var _findChangedNodesFromTransaction = require("../utils/findChangedNodesFromTransaction");
36
35
  var _getNodesCount = require("../utils/getNodesCount");
37
36
  var _isFullPage = require("../utils/is-full-page");
@@ -94,7 +93,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
94
93
  (0, _inherits2.default)(ReactEditorView, _React$Component);
95
94
  var _super = _createSuper(ReactEditorView);
96
95
  function ReactEditorView(props) {
97
- var _this$props$editorPro5, _props$setEditorApi, _props$editorProps;
96
+ var _this$props$editorPro5, _props$setEditorAPI, _props$editorProps;
98
97
  var _this;
99
98
  (0, _classCallCheck2.default)(this, ReactEditorView);
100
99
  _this = _super.call(this, props);
@@ -548,7 +547,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
548
547
  getEditorView: _this.getEditorView
549
548
  });
550
549
  var _api = _this.pluginInjectionAPI.api();
551
- (_props$setEditorApi = props.setEditorApi) === null || _props$setEditorApi === void 0 || _props$setEditorApi.call(props, _api);
550
+ (_props$setEditorAPI = props.setEditorAPI) === null || _props$setEditorAPI === void 0 || _props$setEditorAPI.call(props, _api);
552
551
  _this.eventDispatcher = new _eventDispatcher.EventDispatcher();
553
552
  _this.dispatch = (0, _eventDispatcher.createDispatch)(_this.eventDispatcher);
554
553
  _this.errorReporter = (0, _createEditor.createErrorReporter)(props.editorProps.errorReporterHandler);
@@ -762,36 +761,10 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
762
761
  }, {
763
762
  key: "render",
764
763
  value: function render() {
765
- var _this$props$editorPro10,
766
- _this3 = this;
764
+ var _this$props$editorPro10, _this$props$render, _this$props$render2, _this$props;
767
765
  var renderTracking = (_this$props$editorPro10 = this.props.editorProps.performanceTracking) === null || _this$props$editorPro10 === void 0 || (_this$props$editorPro10 = _this$props$editorPro10.renderTracking) === null || _this$props$editorPro10 === void 0 ? void 0 : _this$props$editorPro10.reactEditorView;
768
766
  var renderTrackingEnabled = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.enabled;
769
767
  var useShallow = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.useShallow;
770
- if ((0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context')) {
771
- var _this$props$render, _this$props$render2, _this$props;
772
- return /*#__PURE__*/_react.default.createElement(_ReactEditorViewContext.default.Provider, {
773
- value: {
774
- editorRef: this.editorRef,
775
- editorView: this.view,
776
- popupsMountPoint: this.props.editorProps.popupsMountPoint
777
- }
778
- }, renderTrackingEnabled && /*#__PURE__*/_react.default.createElement(_RenderTracking.RenderTracking, {
779
- componentProps: this.props,
780
- action: _analytics.ACTION.RE_RENDERED,
781
- actionSubject: _analytics.ACTION_SUBJECT.REACT_EDITOR_VIEW,
782
- handleAnalyticsEvent: this.handleAnalyticsEvent,
783
- useShallow: useShallow
784
- }), this.props.render ? (_this$props$render = (_this$props$render2 = (_this$props = this.props).render) === null || _this$props$render2 === void 0 ? void 0 : _this$props$render2.call(_this$props, {
785
- editor: this.editor,
786
- view: this.view,
787
- config: this.config,
788
- eventDispatcher: this.eventDispatcher,
789
- transformer: this.contentTransformer,
790
- dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
791
- editorRef: this.editorRef,
792
- editorAPI: this.props.editorAPI
793
- })) !== null && _this$props$render !== void 0 ? _this$props$render : this.editor : this.editor);
794
- }
795
768
  return /*#__PURE__*/_react.default.createElement(_ReactEditorViewContext.default.Provider, {
796
769
  value: {
797
770
  editorRef: this.editorRef,
@@ -804,20 +777,16 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
804
777
  actionSubject: _analytics.ACTION_SUBJECT.REACT_EDITOR_VIEW,
805
778
  handleAnalyticsEvent: this.handleAnalyticsEvent,
806
779
  useShallow: useShallow
807
- }), this.props.render ? /*#__PURE__*/_react.default.createElement(_context.EditorAPIContext.Consumer, null, function (_ref4) {
808
- var _this3$props$render, _this3$props$render2, _this3$props;
809
- var editorApi = _ref4.editorApi;
810
- return (_this3$props$render = (_this3$props$render2 = (_this3$props = _this3.props).render) === null || _this3$props$render2 === void 0 ? void 0 : _this3$props$render2.call(_this3$props, {
811
- editor: _this3.editor,
812
- view: _this3.view,
813
- config: _this3.config,
814
- eventDispatcher: _this3.eventDispatcher,
815
- transformer: _this3.contentTransformer,
816
- dispatchAnalyticsEvent: _this3.dispatchAnalyticsEvent,
817
- editorRef: _this3.editorRef,
818
- editorAPI: editorApi
819
- })) !== null && _this3$props$render !== void 0 ? _this3$props$render : _this3.editor;
820
- }) : this.editor);
780
+ }), this.props.render ? (_this$props$render = (_this$props$render2 = (_this$props = this.props).render) === null || _this$props$render2 === void 0 ? void 0 : _this$props$render2.call(_this$props, {
781
+ editor: this.editor,
782
+ view: this.view,
783
+ config: this.config,
784
+ eventDispatcher: this.eventDispatcher,
785
+ transformer: this.contentTransformer,
786
+ dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
787
+ editorRef: this.editorRef,
788
+ editorAPI: this.props.editorAPI
789
+ })) !== null && _this$props$render !== void 0 ? _this$props$render : this.editor : this.editor);
821
790
  }
822
791
  }]);
823
792
  return ReactEditorView;
@@ -17,7 +17,6 @@ var _react = _interopRequireWildcard(require("react"));
17
17
  var _react2 = require("@emotion/react");
18
18
  var _hooks = require("@atlaskit/editor-common/hooks");
19
19
  var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");
20
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
21
20
  var _ContentStyles = require("../ContentStyles");
22
21
  var _PluginSlot = _interopRequireDefault(require("../PluginSlot"));
23
22
  var _WithFlash = _interopRequireDefault(require("../WithFlash"));
@@ -111,7 +110,7 @@ var Editor = exports.default = /*#__PURE__*/function (_React$Component) {
111
110
  , {
112
111
  className: "ak-editor-content-area",
113
112
  featureFlags: featureFlags,
114
- viewMode: (0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context') ? editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode : undefined
113
+ viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode
115
114
  }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, (0, _react2.jsx)(_PluginSlot.default, {
116
115
  editorView: editorView,
117
116
  editorActions: editorActions,
@@ -19,7 +19,6 @@ var _ui = require("@atlaskit/editor-common/ui");
19
19
  var _uiMenu = require("@atlaskit/editor-common/ui-menu");
20
20
  var _commonStyles = require("@atlaskit/editor-plugins/table/ui/common-styles");
21
21
  var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
22
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
23
22
  var _messages = _interopRequireDefault(require("../../../messages"));
24
23
  var _Addon = require("../../Addon");
25
24
  var _ContentStyles = require("../../ContentStyles");
@@ -224,7 +223,7 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
224
223
  'less-margin': width < _editorSharedStyles.akEditorMobileBreakoutPoint
225
224
  }),
226
225
  featureFlags: featureFlags,
227
- viewMode: (0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context') ? editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode : undefined
226
+ viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode
228
227
  }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, (0, _react2.jsx)(_PluginSlot.default, {
229
228
  editorView: editorView,
230
229
  editorActions: editorActions,
@@ -61,7 +61,7 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
61
61
  className: "fabric-editor-popup-scroll-parent",
62
62
  featureFlags: props.featureFlags,
63
63
  ref: scrollContainerRef,
64
- viewMode: (0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context') ? props === null || props === void 0 ? void 0 : props.viewMode : undefined
64
+ viewMode: props === null || props === void 0 ? void 0 : props.viewMode
65
65
  }, (0, _react2.jsx)(_Addon.ClickAreaBlock, {
66
66
  editorView: props.editorView,
67
67
  editorDisabled: props.disabled
@@ -12,7 +12,6 @@ var _react2 = require("@emotion/react");
12
12
  var _browser = require("@atlaskit/editor-common/browser");
13
13
  var _collab = require("@atlaskit/editor-common/collab");
14
14
  var _emoji = require("@atlaskit/editor-common/emoji");
15
- var _hooks = require("@atlaskit/editor-common/hooks");
16
15
  var _mention = require("@atlaskit/editor-common/mention");
17
16
  var _panel = require("@atlaskit/editor-common/panel");
18
17
  var _selection = require("@atlaskit/editor-common/selection");
@@ -25,7 +24,6 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
25
24
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
26
25
  var _tokens = require("@atlaskit/tokens");
27
26
  var _getInlineNodeViewProducer = require("../../nodeviews/getInlineNodeViewProducer.styles");
28
- var _context = require("../../presets/context");
29
27
  var _aiPanels = require("./ai-panels");
30
28
  var _codeBlock = require("./code-block");
31
29
  var _date = require("./date");
@@ -99,18 +97,15 @@ var createEditorContentStyle = exports.createEditorContentStyle = function creat
99
97
  var _useThemeObserver = (0, _tokens.useThemeObserver)(),
100
98
  colorMode = _useThemeObserver.colorMode,
101
99
  typography = _useThemeObserver.typography;
102
- var editorAPI = (0, _context.usePresetContext)();
103
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(editorAPI, ['editorViewMode']),
104
- editorViewModeState = _useSharedPluginState.editorViewModeState;
105
100
  var memoizedStyle = (0, _react.useMemo)(function () {
106
101
  return contentStyles({
107
102
  theme: theme,
108
103
  colorMode: colorMode,
109
104
  featureFlags: featureFlags,
110
- viewMode: (0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context') ? props.viewMode : editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
105
+ viewMode: props.viewMode,
111
106
  typographyTheme: typography
112
107
  });
113
- }, [theme, colorMode, featureFlags, editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode, props.viewMode, typography]);
108
+ }, [theme, colorMode, featureFlags, props.viewMode, typography]);
114
109
  return (
115
110
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
116
111
  (0, _react2.jsx)("div", {
@@ -16,7 +16,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
16
16
  var _UNSAFE_do_not_use_editor_context = require("@atlaskit/editor-common/UNSAFE_do_not_use_editor_context");
17
17
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
18
18
  var _actions = _interopRequireDefault(require("../../actions"));
19
- var _context = require("../../presets/context");
20
19
  function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
21
20
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
22
21
  var useEditorContext = exports.useEditorContext = function useEditorContext() {
@@ -43,19 +42,11 @@ var LegacyEditorContext = exports.LegacyEditorContext = /*#__PURE__*/function (_
43
42
  function LegacyEditorContextNew(_ref) {
44
43
  var children = _ref.children,
45
44
  editorActions = _ref.editorActions;
46
- if ((0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context')) {
47
- return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
48
- value: {
49
- editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new _actions.default()
50
- }
51
- }, children);
52
- } else {
53
- return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
54
- value: {
55
- editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new _actions.default()
56
- }
57
- }, /*#__PURE__*/_react.default.createElement(_context.PresetContextProvider, null, children));
58
- }
45
+ return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
46
+ value: {
47
+ editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new _actions.default()
48
+ }
49
+ }, children);
59
50
  }
60
51
  var LegacyEditorContextOld = exports.default = /*#__PURE__*/function (_React$Component2) {
61
52
  (0, _inherits2.default)(LegacyEditorContextOld, _React$Component2);
@@ -77,15 +68,9 @@ var LegacyEditorContextOld = exports.default = /*#__PURE__*/function (_React$Com
77
68
  }, {
78
69
  key: "render",
79
70
  value: function render() {
80
- if ((0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context')) {
81
- return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
82
- value: this.getChildContext()
83
- }, this.props.children);
84
- } else {
85
- return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
86
- value: this.getChildContext()
87
- }, /*#__PURE__*/_react.default.createElement(_context.PresetContextProvider, null, this.props.children));
88
- }
71
+ return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
72
+ value: this.getChildContext()
73
+ }, this.props.children);
89
74
  }
90
75
  }]);
91
76
  return LegacyEditorContextOld;
@@ -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 = "198.6.4";
8
+ var version = exports.version = "198.6.5";
@@ -3,18 +3,16 @@ import _extends from "@babel/runtime/helpers/extends";
3
3
  * @jsxRuntime classic
4
4
  * @jsx jsx
5
5
  */
6
- import { Fragment, memo, useCallback, useState } from 'react';
6
+ import { Fragment, memo, useState } from 'react';
7
7
 
8
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
9
9
  import { css, jsx } from '@emotion/react';
10
10
  import { ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
11
11
  import { usePortalProvider } from '@atlaskit/editor-common/portal';
12
- import { fg } from '@atlaskit/platform-feature-flags';
13
12
  import ErrorBoundary from '../create-editor/ErrorBoundary';
14
13
  import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
15
14
  import ReactEditorView from '../create-editor/ReactEditorView';
16
15
  import { ContextAdapter } from '../nodeviews/context-adapter';
17
- import { usePresetContext, useSetPresetContext } from '../presets/context';
18
16
  import EditorContext from '../ui/EditorContext';
19
17
  import { IntlProviderIfMissingWrapper } from '../ui/IntlProviderIfMissingWrapper/IntlProviderIfMissingWrapper';
20
18
  import { RenderTracking } from '../utils/performance/components/RenderTracking';
@@ -135,36 +133,14 @@ export const EditorInternal = /*#__PURE__*/memo(({
135
133
  });
136
134
  function ReactEditorViewContextWrapper(props) {
137
135
  var _media, _linking, _linking$smartLinks;
138
- // deprecated, unable to be FF due to hook usage
139
- const setInternalEditorAPI = useSetPresetContext();
140
- const presetContextEditorAPI = usePresetContext();
141
-
142
- // new way of storing the editorApi when FF platform_editor_remove_use_preset_context is enabled
143
- const [editorAPI, setEditorAPI] = useState(undefined);
144
-
145
- /**
146
- * We use the context to retrieve the editorAPI
147
- * externally for consumers via `usePreset`.
148
- *
149
- * However we also may need to retrieve this value internally via context
150
- * so we should also set the value for the `EditorContext` that is used in
151
- * `EditorInternal`.
152
- */
153
- const setPresetContextEditorAPI = useCallback(
154
136
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
155
- api => {
156
- if (fg('platform_editor_remove_use_preset_context')) {
157
- setEditorAPI(api);
158
- } else {
159
- setInternalEditorAPI === null || setInternalEditorAPI === void 0 ? void 0 : setInternalEditorAPI(api);
160
- }
161
- }, [setInternalEditorAPI, setEditorAPI]);
137
+ const [editorAPI, setEditorAPI] = useState(undefined);
162
138
 
163
139
  // TODO: Remove these when we deprecate these props from editor-props - smartLinks is unfortunately still used in some places, we can sidestep this problem if we move everyone across to ComposableEditor and deprecate Editor
164
140
  const UNSAFE_cards = props.editorProps.UNSAFE_cards;
165
141
  const smartLinks = props.editorProps.smartLinks;
166
142
  useProviders({
167
- editorApi: fg('platform_editor_remove_use_preset_context') ? editorAPI : presetContextEditorAPI,
143
+ editorApi: editorAPI,
168
144
  contextIdentifierProvider: props.editorProps.contextIdentifierProvider,
169
145
  mediaProvider: (_media = props.editorProps.media) === null || _media === void 0 ? void 0 : _media.provider,
170
146
  cardProvider: ((_linking = props.editorProps.linking) === null || _linking === void 0 ? void 0 : (_linking$smartLinks = _linking.smartLinks) === null || _linking$smartLinks === void 0 ? void 0 : _linking$smartLinks.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider,
@@ -174,6 +150,6 @@ function ReactEditorViewContextWrapper(props) {
174
150
  });
175
151
  return jsx(ReactEditorView, _extends({}, props, {
176
152
  editorAPI: editorAPI,
177
- setEditorApi: setPresetContextEditorAPI
153
+ setEditorAPI: setEditorAPI
178
154
  }));
179
155
  }
@@ -57,11 +57,9 @@ export const useProviders = ({
57
57
  }
58
58
  }, [autoformattingProvider, editorApi]);
59
59
  useEffect(() => {
60
- if (fg('platform_editor_td_provider_from_plugin_config')) {
61
- if (taskDecisionProvider) {
62
- var _editorApi$taskDecisi;
63
- editorApi === null || editorApi === void 0 ? void 0 : (_editorApi$taskDecisi = editorApi.taskDecision) === null || _editorApi$taskDecisi === void 0 ? void 0 : _editorApi$taskDecisi.actions.setProvider(taskDecisionProvider);
64
- }
60
+ if (taskDecisionProvider) {
61
+ var _editorApi$taskDecisi;
62
+ editorApi === null || editorApi === void 0 ? void 0 : (_editorApi$taskDecisi = editorApi.taskDecision) === null || _editorApi$taskDecisi === void 0 ? void 0 : _editorApi$taskDecisi.actions.setProvider(taskDecisionProvider);
65
63
  }
66
64
  }, [taskDecisionProvider, editorApi]);
67
65
  };
@@ -24,9 +24,6 @@ export default function handleProviders(providerFactory, {
24
24
  }, extensionProvider, quickInsertProvider) {
25
25
  providerFactory.setProvider('emojiProvider', emojiProvider);
26
26
  providerFactory.setProvider('mentionProvider', mentionProvider);
27
- if (!fg('platform_editor_td_provider_from_plugin_config')) {
28
- providerFactory.setProvider('taskDecisionProvider', taskDecisionProvider);
29
- }
30
27
  providerFactory.setProvider('contextIdentifierProvider', contextIdentifierProvider);
31
28
  providerFactory.setProvider('imageUploadProvider', imageUploadProvider);
32
29
  providerFactory.setProvider('collabEditProvider', collabEditProvider);
@@ -18,7 +18,6 @@ import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemir
18
18
  import { EditorView } from '@atlaskit/editor-prosemirror/view';
19
19
  import { fg } from '@atlaskit/platform-feature-flags';
20
20
  import { createDispatch, EventDispatcher } from '../event-dispatcher';
21
- import { EditorAPIContext } from '../presets/context';
22
21
  import { findChangedNodesFromTransaction } from '../utils/findChangedNodesFromTransaction';
23
22
  import { getNodesCount } from '../utils/getNodesCount';
24
23
  import { isFullPage } from '../utils/is-full-page';
@@ -95,7 +94,7 @@ export class ReactEditorView extends React.Component {
95
94
  return ((_this$props$editorPro3 = this.props.editorProps) === null || _this$props$editorPro3 === void 0 ? void 0 : (_this$props$editorPro4 = _this$props$editorPro3.performanceTracking) === null || _this$props$editorPro4 === void 0 ? void 0 : (_this$props$editorPro5 = _this$props$editorPro4.transactionTracking) === null || _this$props$editorPro5 === void 0 ? void 0 : _this$props$editorPro5.enabled) === false;
96
95
  }
97
96
  constructor(props) {
98
- var _this$props$editorPro12, _props$setEditorApi, _props$editorProps, _props$editorProps$pe, _props$editorProps$pe2;
97
+ var _this$props$editorPro12, _props$setEditorAPI, _props$editorProps, _props$editorProps$pe, _props$editorProps$pe2;
99
98
  super(props);
100
99
  _defineProperty(this, "editorRef", /*#__PURE__*/React.createRef());
101
100
  // ProseMirror is instantiated prior to the initial React render cycle,
@@ -546,7 +545,7 @@ export class ReactEditorView extends React.Component {
546
545
  getEditorView: this.getEditorView
547
546
  });
548
547
  const _api = this.pluginInjectionAPI.api();
549
- (_props$setEditorApi = props.setEditorApi) === null || _props$setEditorApi === void 0 ? void 0 : _props$setEditorApi.call(props, _api);
548
+ (_props$setEditorAPI = props.setEditorAPI) === null || _props$setEditorAPI === void 0 ? void 0 : _props$setEditorAPI.call(props, _api);
550
549
  this.eventDispatcher = new EventDispatcher();
551
550
  this.dispatch = createDispatch(this.eventDispatcher);
552
551
  this.errorReporter = createErrorReporter(props.editorProps.errorReporterHandler);
@@ -706,35 +705,10 @@ export class ReactEditorView extends React.Component {
706
705
  return this.editorPlugins;
707
706
  }
708
707
  render() {
709
- var _this$props$editorPro14, _this$props$editorPro15;
708
+ var _this$props$editorPro14, _this$props$editorPro15, _this$props$render, _this$props$render2, _this$props;
710
709
  const renderTracking = (_this$props$editorPro14 = this.props.editorProps.performanceTracking) === null || _this$props$editorPro14 === void 0 ? void 0 : (_this$props$editorPro15 = _this$props$editorPro14.renderTracking) === null || _this$props$editorPro15 === void 0 ? void 0 : _this$props$editorPro15.reactEditorView;
711
710
  const renderTrackingEnabled = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.enabled;
712
711
  const useShallow = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.useShallow;
713
- if (fg('platform_editor_remove_use_preset_context')) {
714
- var _this$props$render, _this$props$render2, _this$props;
715
- return /*#__PURE__*/React.createElement(ReactEditorViewContext.Provider, {
716
- value: {
717
- editorRef: this.editorRef,
718
- editorView: this.view,
719
- popupsMountPoint: this.props.editorProps.popupsMountPoint
720
- }
721
- }, renderTrackingEnabled && /*#__PURE__*/React.createElement(RenderTracking, {
722
- componentProps: this.props,
723
- action: ACTION.RE_RENDERED,
724
- actionSubject: ACTION_SUBJECT.REACT_EDITOR_VIEW,
725
- handleAnalyticsEvent: this.handleAnalyticsEvent,
726
- useShallow: useShallow
727
- }), this.props.render ? (_this$props$render = (_this$props$render2 = (_this$props = this.props).render) === null || _this$props$render2 === void 0 ? void 0 : _this$props$render2.call(_this$props, {
728
- editor: this.editor,
729
- view: this.view,
730
- config: this.config,
731
- eventDispatcher: this.eventDispatcher,
732
- transformer: this.contentTransformer,
733
- dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
734
- editorRef: this.editorRef,
735
- editorAPI: this.props.editorAPI
736
- })) !== null && _this$props$render !== void 0 ? _this$props$render : this.editor : this.editor);
737
- }
738
712
  return /*#__PURE__*/React.createElement(ReactEditorViewContext.Provider, {
739
713
  value: {
740
714
  editorRef: this.editorRef,
@@ -747,21 +721,16 @@ export class ReactEditorView extends React.Component {
747
721
  actionSubject: ACTION_SUBJECT.REACT_EDITOR_VIEW,
748
722
  handleAnalyticsEvent: this.handleAnalyticsEvent,
749
723
  useShallow: useShallow
750
- }), this.props.render ? /*#__PURE__*/React.createElement(EditorAPIContext.Consumer, null, ({
751
- editorApi
752
- }) => {
753
- var _this$props$render3, _this$props$render4, _this$props2;
754
- return (_this$props$render3 = (_this$props$render4 = (_this$props2 = this.props).render) === null || _this$props$render4 === void 0 ? void 0 : _this$props$render4.call(_this$props2, {
755
- editor: this.editor,
756
- view: this.view,
757
- config: this.config,
758
- eventDispatcher: this.eventDispatcher,
759
- transformer: this.contentTransformer,
760
- dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
761
- editorRef: this.editorRef,
762
- editorAPI: editorApi
763
- })) !== null && _this$props$render3 !== void 0 ? _this$props$render3 : this.editor;
764
- }) : this.editor);
724
+ }), this.props.render ? (_this$props$render = (_this$props$render2 = (_this$props = this.props).render) === null || _this$props$render2 === void 0 ? void 0 : _this$props$render2.call(_this$props, {
725
+ editor: this.editor,
726
+ view: this.view,
727
+ config: this.config,
728
+ eventDispatcher: this.eventDispatcher,
729
+ transformer: this.contentTransformer,
730
+ dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
731
+ editorRef: this.editorRef,
732
+ editorAPI: this.props.editorAPI
733
+ })) !== null && _this$props$render !== void 0 ? _this$props$render : this.editor : this.editor);
765
734
  }
766
735
  }
767
736
  function getUAPrefix() {
@@ -9,7 +9,6 @@ import React, { Fragment } from 'react';
9
9
  import { css, jsx } from '@emotion/react';
10
10
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
11
11
  import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
12
- import { fg } from '@atlaskit/platform-feature-flags';
13
12
  import { createEditorContentStyle } from '../ContentStyles';
14
13
  import PluginSlot from '../PluginSlot';
15
14
  import WithFlash from '../WithFlash';
@@ -89,7 +88,7 @@ export default class Editor extends React.Component {
89
88
  , {
90
89
  className: "ak-editor-content-area",
91
90
  featureFlags: featureFlags,
92
- viewMode: fg('platform_editor_remove_use_preset_context') ? editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode : undefined
91
+ viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode
93
92
  }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
94
93
  editorView: editorView,
95
94
  editorActions: editorActions,
@@ -16,7 +16,6 @@ import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
16
16
  import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
17
17
  import { tableCommentEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
18
18
  import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
19
- import { fg } from '@atlaskit/platform-feature-flags';
20
19
  import messages from '../../../messages';
21
20
  import { ClickAreaBlock } from '../../Addon';
22
21
  import { createEditorContentStyle } from '../../ContentStyles';
@@ -210,7 +209,7 @@ export const CommentEditorWithIntl = props => {
210
209
  'less-margin': width < akEditorMobileBreakoutPoint
211
210
  }),
212
211
  featureFlags: featureFlags,
213
- viewMode: fg('platform_editor_remove_use_preset_context') ? editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode : undefined
212
+ viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode
214
213
  }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
215
214
  editorView: editorView,
216
215
  editorActions: editorActions,
@@ -49,7 +49,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
49
49
  className: "fabric-editor-popup-scroll-parent",
50
50
  featureFlags: props.featureFlags,
51
51
  ref: scrollContainerRef,
52
- viewMode: fg('platform_editor_remove_use_preset_context') ? props === null || props === void 0 ? void 0 : props.viewMode : undefined
52
+ viewMode: props === null || props === void 0 ? void 0 : props.viewMode
53
53
  }, jsx(ClickAreaBlock, {
54
54
  editorView: props.editorView,
55
55
  editorDisabled: props.disabled
@@ -14,7 +14,6 @@ import { css, jsx, useTheme } from '@emotion/react';
14
14
  import { browser } from '@atlaskit/editor-common/browser';
15
15
  import { telepointerStyle } from '@atlaskit/editor-common/collab';
16
16
  import { EmojiSharedCssClassName } from '@atlaskit/editor-common/emoji';
17
- import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
18
17
  import { MentionSharedCssClassName } from '@atlaskit/editor-common/mention';
19
18
  import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
20
19
  import { gapCursorStyles } from '@atlaskit/editor-common/selection';
@@ -27,7 +26,6 @@ import { akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSma
27
26
  import { fg } from '@atlaskit/platform-feature-flags';
28
27
  import { useThemeObserver } from '@atlaskit/tokens';
29
28
  import { InlineNodeViewSharedStyles } from '../../nodeviews/getInlineNodeViewProducer.styles';
30
- import { usePresetContext } from '../../presets/context';
31
29
  import { aiPanelStyles } from './ai-panels';
32
30
  import { codeBlockStyles } from './code-block';
33
31
  import { dateStyles } from './date';
@@ -376,17 +374,13 @@ export const createEditorContentStyle = styles => {
376
374
  colorMode,
377
375
  typography
378
376
  } = useThemeObserver();
379
- const editorAPI = usePresetContext();
380
- const {
381
- editorViewModeState
382
- } = useSharedPluginState(editorAPI, ['editorViewMode']);
383
377
  const memoizedStyle = useMemo(() => contentStyles({
384
378
  theme,
385
379
  colorMode,
386
380
  featureFlags,
387
- viewMode: fg('platform_editor_remove_use_preset_context') ? props.viewMode : editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
381
+ viewMode: props.viewMode,
388
382
  typographyTheme: typography
389
- }), [theme, colorMode, featureFlags, editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode, props.viewMode, typography]);
383
+ }), [theme, colorMode, featureFlags, props.viewMode, typography]);
390
384
  return (
391
385
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
392
386
  jsx("div", {