@atlaskit/editor-plugin-media 1.29.3 → 1.29.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 (108) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/cjs/nodeviews/mediaGroup.js +4 -29
  3. package/dist/cjs/nodeviews/mediaInline.js +7 -32
  4. package/dist/cjs/nodeviews/mediaNodeView/index.js +8 -13
  5. package/dist/cjs/nodeviews/mediaSingle.js +5 -11
  6. package/dist/cjs/plugin.js +0 -6
  7. package/dist/cjs/pm-plugins/alt-text/commands.js +2 -2
  8. package/dist/cjs/pm-plugins/alt-text/index.js +2 -2
  9. package/dist/cjs/pm-plugins/keymap.js +0 -1
  10. package/dist/cjs/pm-plugins/main.js +3 -10
  11. package/dist/cjs/toolbar/alt-text.js +2 -2
  12. package/dist/cjs/toolbar/mediaInline.js +2 -2
  13. package/dist/cjs/toolbar/utils.js +2 -2
  14. package/dist/cjs/ui/MediaLinkingToolbar.js +2 -2
  15. package/dist/cjs/ui/MediaPicker/PickerFacadeProvider.js +2 -148
  16. package/dist/cjs/ui/MediaViewer/MediaViewerContainer.js +3 -3
  17. package/dist/cjs/utils/media-common.js +3 -3
  18. package/dist/cjs/utils/media-single.js +2 -12
  19. package/dist/es2019/nodeviews/mediaGroup.js +3 -28
  20. package/dist/es2019/nodeviews/mediaInline.js +6 -31
  21. package/dist/es2019/nodeviews/mediaNodeView/index.js +7 -12
  22. package/dist/es2019/nodeviews/mediaSingle.js +4 -10
  23. package/dist/es2019/plugin.js +0 -1
  24. package/dist/es2019/pm-plugins/alt-text/commands.js +1 -1
  25. package/dist/es2019/pm-plugins/alt-text/index.js +1 -1
  26. package/dist/es2019/pm-plugins/keymap.js +1 -1
  27. package/dist/es2019/pm-plugins/main.js +3 -8
  28. package/dist/es2019/toolbar/alt-text.js +1 -1
  29. package/dist/es2019/toolbar/mediaInline.js +1 -1
  30. package/dist/es2019/toolbar/utils.js +1 -1
  31. package/dist/es2019/ui/MediaLinkingToolbar.js +1 -1
  32. package/dist/es2019/ui/MediaPicker/PickerFacadeProvider.js +2 -88
  33. package/dist/es2019/ui/MediaViewer/MediaViewerContainer.js +3 -3
  34. package/dist/es2019/utils/media-common.js +2 -2
  35. package/dist/es2019/utils/media-single.js +1 -11
  36. package/dist/esm/nodeviews/mediaGroup.js +4 -29
  37. package/dist/esm/nodeviews/mediaInline.js +6 -31
  38. package/dist/esm/nodeviews/mediaNodeView/index.js +8 -13
  39. package/dist/esm/nodeviews/mediaSingle.js +5 -11
  40. package/dist/esm/plugin.js +0 -1
  41. package/dist/esm/pm-plugins/alt-text/commands.js +1 -1
  42. package/dist/esm/pm-plugins/alt-text/index.js +1 -1
  43. package/dist/esm/pm-plugins/keymap.js +1 -1
  44. package/dist/esm/pm-plugins/main.js +3 -10
  45. package/dist/esm/toolbar/alt-text.js +1 -1
  46. package/dist/esm/toolbar/mediaInline.js +1 -1
  47. package/dist/esm/toolbar/utils.js +1 -1
  48. package/dist/esm/ui/MediaLinkingToolbar.js +1 -1
  49. package/dist/esm/ui/MediaPicker/PickerFacadeProvider.js +2 -145
  50. package/dist/esm/ui/MediaViewer/MediaViewerContainer.js +3 -3
  51. package/dist/esm/utils/media-common.js +2 -2
  52. package/dist/esm/utils/media-single.js +1 -9
  53. package/dist/types/nodeviews/mediaGroup.d.ts +1 -5
  54. package/dist/types/nodeviews/mediaInline.d.ts +2 -10
  55. package/dist/types/nodeviews/mediaNodeUpdater.d.ts +2 -1
  56. package/dist/types/nodeviews/mediaNodeView/index.d.ts +3 -3
  57. package/dist/types/nodeviews/mediaSingle.d.ts +1 -1
  58. package/dist/types/picker-facade.d.ts +4 -8
  59. package/dist/types/plugin.d.ts +0 -5
  60. package/dist/types/pm-plugins/alt-text/commands.d.ts +0 -2
  61. package/dist/types/pm-plugins/alt-text/index.d.ts +0 -2
  62. package/dist/types/pm-plugins/keymap.d.ts +1 -1
  63. package/dist/types/pm-plugins/linking/actions.d.ts +5 -4
  64. package/dist/types/pm-plugins/main.d.ts +2 -2
  65. package/dist/types/toolbar/alt-text.d.ts +3 -3
  66. package/dist/types/toolbar/mediaInline.d.ts +0 -3
  67. package/dist/types/toolbar/utils.d.ts +0 -1
  68. package/dist/types/ui/Media/DropPlaceholder.d.ts +1 -1
  69. package/dist/types/ui/MediaLinkingToolbar.d.ts +2 -2
  70. package/dist/types/ui/MediaPicker/PickerFacadeProvider.d.ts +4 -3
  71. package/dist/types/ui/MediaViewer/MediaViewerContainer.d.ts +0 -1
  72. package/dist/types/ui/PixelEntry/types.d.ts +2 -1
  73. package/dist/types/ui/ToolbarMedia/index.d.ts +1 -1
  74. package/dist/types/utils/media-common.d.ts +0 -2
  75. package/dist/types/utils/media-files.d.ts +0 -4
  76. package/dist/types/utils/media-inline.d.ts +2 -1
  77. package/dist/types/utils/media-single.d.ts +0 -10
  78. package/dist/types-ts4.5/nodeviews/mediaGroup.d.ts +1 -5
  79. package/dist/types-ts4.5/nodeviews/mediaInline.d.ts +2 -10
  80. package/dist/types-ts4.5/nodeviews/mediaNodeUpdater.d.ts +2 -1
  81. package/dist/types-ts4.5/nodeviews/mediaNodeView/index.d.ts +3 -3
  82. package/dist/types-ts4.5/nodeviews/mediaSingle.d.ts +1 -1
  83. package/dist/types-ts4.5/picker-facade.d.ts +4 -8
  84. package/dist/types-ts4.5/plugin.d.ts +0 -5
  85. package/dist/types-ts4.5/pm-plugins/alt-text/commands.d.ts +0 -2
  86. package/dist/types-ts4.5/pm-plugins/alt-text/index.d.ts +0 -2
  87. package/dist/types-ts4.5/pm-plugins/keymap.d.ts +1 -1
  88. package/dist/types-ts4.5/pm-plugins/linking/actions.d.ts +5 -4
  89. package/dist/types-ts4.5/pm-plugins/main.d.ts +2 -2
  90. package/dist/types-ts4.5/toolbar/alt-text.d.ts +3 -3
  91. package/dist/types-ts4.5/toolbar/mediaInline.d.ts +0 -3
  92. package/dist/types-ts4.5/toolbar/utils.d.ts +0 -1
  93. package/dist/types-ts4.5/ui/Media/DropPlaceholder.d.ts +1 -1
  94. package/dist/types-ts4.5/ui/MediaLinkingToolbar.d.ts +2 -2
  95. package/dist/types-ts4.5/ui/MediaPicker/PickerFacadeProvider.d.ts +4 -3
  96. package/dist/types-ts4.5/ui/MediaViewer/MediaViewerContainer.d.ts +0 -1
  97. package/dist/types-ts4.5/ui/PixelEntry/types.d.ts +2 -1
  98. package/dist/types-ts4.5/ui/ToolbarMedia/index.d.ts +1 -1
  99. package/dist/types-ts4.5/utils/media-common.d.ts +0 -2
  100. package/dist/types-ts4.5/utils/media-files.d.ts +0 -4
  101. package/dist/types-ts4.5/utils/media-inline.d.ts +2 -1
  102. package/dist/types-ts4.5/utils/media-single.d.ts +0 -10
  103. package/package.json +2 -5
  104. package/dist/cjs/commands/index.js +0 -24
  105. package/dist/es2019/commands/index.js +0 -1
  106. package/dist/esm/commands/index.js +0 -1
  107. package/dist/types/commands/index.d.ts +0 -1
  108. package/dist/types-ts4.5/commands/index.d.ts +0 -1
@@ -21,7 +21,6 @@ import { isNodeSelectedOrInRange, SelectedState, setNodeSelection } from '@atlas
21
21
  import EditorCloseIcon from '@atlaskit/icon/glyph/editor/close';
22
22
  import { getMediaFeatureFlag } from '@atlaskit/media-common';
23
23
  import { Filmstrip } from '@atlaskit/media-filmstrip';
24
- import { fg } from '@atlaskit/platform-feature-flags';
25
24
  import { useMediaProvider } from '../hooks/useMediaProvider';
26
25
  import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
27
26
  import { MediaNodeUpdater } from './mediaNodeUpdater';
@@ -327,40 +326,16 @@ var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
327
326
  mediaOptions = props.mediaOptions,
328
327
  pluginInjectionApi = props.pluginInjectionApi;
329
328
  var getPos = this.getPos;
330
- return /*#__PURE__*/React.createElement(WithProviders
331
- // Cleanup: `platform_editor_media_provider_from_plugin_config`
332
- // Remove `mediaProvider`
333
- , {
334
- providers: ['mediaProvider', 'contextIdentifierProvider'],
329
+ return /*#__PURE__*/React.createElement(WithProviders, {
330
+ providers: ['contextIdentifierProvider'],
335
331
  providerFactory: providerFactory,
336
332
  renderNode: function renderNode(_ref4) {
337
- var mediaProvider = _ref4.mediaProvider,
338
- contextIdentifierProvider = _ref4.contextIdentifierProvider;
333
+ var contextIdentifierProvider = _ref4.contextIdentifierProvider;
339
334
  var renderFn = function renderFn(_ref5) {
340
335
  var editorDisabledPlugin = _ref5.editorDisabledPlugin,
341
336
  editorViewModePlugin = _ref5.editorViewModePlugin,
342
337
  mediaProviderFromState = _ref5.mediaProvider;
343
- if (fg('platform_editor_media_provider_from_plugin_config')) {
344
- var newMediaProvider = mediaProviderFromState ? Promise.resolve(mediaProviderFromState) : undefined;
345
- if (!newMediaProvider) {
346
- return null;
347
- }
348
- return /*#__PURE__*/React.createElement(IntlMediaGroup, {
349
- node: _this3.node,
350
- getPos: getPos,
351
- view: _this3.view,
352
- forwardRef: forwardRef,
353
- disabled: (editorDisabledPlugin || {}).editorDisabled,
354
- allowLazyLoading: mediaOptions.allowLazyLoading,
355
- mediaProvider: newMediaProvider,
356
- contextIdentifierProvider: contextIdentifierProvider,
357
- isCopyPasteEnabled: mediaOptions.isCopyPasteEnabled,
358
- anchorPos: _this3.view.state.selection.$anchor.pos,
359
- headPos: _this3.view.state.selection.$head.pos,
360
- mediaOptions: mediaOptions,
361
- editorViewMode: (editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode) === 'view'
362
- });
363
- }
338
+ var mediaProvider = mediaProviderFromState ? Promise.resolve(mediaProviderFromState) : undefined;
364
339
  if (!mediaProvider) {
365
340
  return null;
366
341
  }
@@ -27,11 +27,10 @@ import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-
27
27
  import { MediaInlineCard } from '@atlaskit/media-card';
28
28
  import { getMediaClient } from '@atlaskit/media-client-react';
29
29
  import { MediaInlineCardLoadingView } from '@atlaskit/media-ui';
30
- import { fg } from '@atlaskit/platform-feature-flags';
31
30
  import { MediaViewerContainer } from '../ui/MediaViewer/MediaViewerContainer';
32
31
  import { isImage } from '../utils/is-type';
33
32
  import { MediaNodeUpdater } from './mediaNodeUpdater';
34
- export var createMediaNodeUpdater = function createMediaNodeUpdater(props) {
33
+ var createMediaNodeUpdater = function createMediaNodeUpdater(props) {
35
34
  var node = props.node;
36
35
  return new MediaNodeUpdater(_objectSpread(_objectSpread({}, props), {}, {
37
36
  isMediaSingle: true,
@@ -47,7 +46,7 @@ export var createMediaNodeUpdater = function createMediaNodeUpdater(props) {
47
46
  * using the contextid
48
47
  *
49
48
  */
50
- export var updateMediaNodeAttributes = /*#__PURE__*/function () {
49
+ var updateMediaNodeAttributes = /*#__PURE__*/function () {
51
50
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(props, mediaNodeUpdater) {
52
51
  var addPendingTask, node, contextId, hasDifferentContextId, copyNode;
53
52
  return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -214,7 +213,6 @@ export var MediaInline = function MediaInline(props) {
214
213
  };
215
214
  var MediaInlineSharedState = function MediaInlineSharedState(_ref3) {
216
215
  var identifier = _ref3.identifier,
217
- mediaProvider = _ref3.mediaProvider,
218
216
  node = _ref3.node,
219
217
  isSelected = _ref3.isSelected,
220
218
  getPos = _ref3.getPos,
@@ -227,28 +225,12 @@ var MediaInlineSharedState = function MediaInlineSharedState(_ref3) {
227
225
  var newMediaProvider = useMemo(function () {
228
226
  return mediaState !== null && mediaState !== void 0 && mediaState.mediaProvider ? Promise.resolve(mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider) : undefined;
229
227
  }, [mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider]);
230
- if (fg('platform_editor_media_provider_from_plugin_config')) {
231
- if (!mediaState || !newMediaProvider) {
232
- return null;
233
- }
234
- return jsx(MediaInline, {
235
- identifier: identifier,
236
- mediaProvider: newMediaProvider,
237
- mediaPluginState: mediaState,
238
- node: node,
239
- isSelected: isSelected,
240
- view: view,
241
- getPos: getPos,
242
- contextIdentifierProvider: contextIdentifierProvider,
243
- editorViewMode: (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view'
244
- });
245
- }
246
- if (!mediaState || !mediaProvider) {
228
+ if (!mediaState || !newMediaProvider) {
247
229
  return null;
248
230
  }
249
231
  return jsx(MediaInline, {
250
232
  identifier: identifier,
251
- mediaProvider: mediaProvider,
233
+ mediaProvider: newMediaProvider,
252
234
  mediaPluginState: mediaState,
253
235
  node: node,
254
236
  isSelected: isSelected,
@@ -293,21 +275,14 @@ export var MediaInlineNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
293
275
  api = props.api;
294
276
  var view = this.view;
295
277
  var getPos = this.getPos;
296
- return jsx(WithProviders
297
- // Cleanup: `platform_editor_media_provider_from_plugin_config`
298
- // Remove `mediaProvider`
299
- , {
300
- providers: ['mediaProvider', 'contextIdentifierProvider'],
278
+ return jsx(WithProviders, {
279
+ providers: ['contextIdentifierProvider'],
301
280
  providerFactory: providerFactory,
302
281
  renderNode: function renderNode(_ref4) {
303
282
  var mediaProvider = _ref4.mediaProvider,
304
283
  contextIdentifierProvider = _ref4.contextIdentifierProvider;
305
- if (!mediaProvider && !fg('platform_editor_media_provider_from_plugin_config')) {
306
- return null;
307
- }
308
284
  return jsx(MediaInlineSharedState, {
309
285
  identifier: _this.node.attrs.id,
310
- mediaProvider: mediaProvider,
311
286
  node: _this.node,
312
287
  isSelected: _this.nodeInsideSelection(),
313
288
  view: view,
@@ -18,7 +18,6 @@ import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-comm
18
18
  import { WithProviders } from '@atlaskit/editor-common/provider-factory';
19
19
  import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
20
20
  import { getAttrsFromUrl } from '@atlaskit/media-client';
21
- import { fg } from '@atlaskit/platform-feature-flags';
22
21
  import { updateCurrentMediaNodeAttrs } from '../../commands/helpers';
23
22
  import { isMediaBlobUrlFromAttrs } from '../../utils/media-common';
24
23
  import MediaNode from './media';
@@ -30,7 +29,7 @@ var MediaNodeWithProviders = function MediaNodeWithProviders(_ref) {
30
29
  mediaState = _useSharedPluginState.mediaState;
31
30
  return innerComponent({
32
31
  width: widthState,
33
- newMediaProvider: mediaState !== null && mediaState !== void 0 && mediaState.mediaProvider ? Promise.resolve(mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider) : undefined
32
+ mediaProvider: mediaState !== null && mediaState !== void 0 && mediaState.mediaProvider ? Promise.resolve(mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider) : undefined
34
33
  });
35
34
  };
36
35
  function isMediaDecorationSpec(decoration) {
@@ -63,10 +62,10 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
63
62
  })(_this.view.state, _this.view.dispatch);
64
63
  }
65
64
  });
66
- _defineProperty(_assertThisInitialized(_this), "renderMediaNodeWithState", function (mediaProvider, contextIdentifierProvider) {
65
+ _defineProperty(_assertThisInitialized(_this), "renderMediaNodeWithState", function (contextIdentifierProvider) {
67
66
  return function (_ref2) {
68
67
  var editorWidth = _ref2.width,
69
- newMediaProvider = _ref2.newMediaProvider;
68
+ mediaProvider = _ref2.mediaProvider;
70
69
  var getPos = _this.getPos;
71
70
  var mediaOptions = _this.reactComponentProps.mediaOptions;
72
71
  var attrs = _this.getAttrs();
@@ -102,7 +101,7 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
102
101
  originalDimensions: originalDimensions,
103
102
  maxDimensions: maxDimensions,
104
103
  url: url,
105
- mediaProvider: fg('platform_editor_media_provider_from_plugin_config') ? newMediaProvider : mediaProvider,
104
+ mediaProvider: mediaProvider,
106
105
  contextIdentifierProvider: contextIdentifierProvider,
107
106
  mediaOptions: mediaOptions,
108
107
  onExternalImageLoaded: _this.onExternalImageLoaded
@@ -110,12 +109,11 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
110
109
  };
111
110
  });
112
111
  _defineProperty(_assertThisInitialized(_this), "renderMediaNodeWithProviders", function (_ref3) {
113
- var mediaProvider = _ref3.mediaProvider,
114
- contextIdentifierProvider = _ref3.contextIdentifierProvider;
112
+ var contextIdentifierProvider = _ref3.contextIdentifierProvider;
115
113
  var pluginInjectionApi = _this.reactComponentProps.pluginInjectionApi;
116
114
  return /*#__PURE__*/React.createElement(MediaNodeWithProviders, {
117
115
  pluginInjectionApi: pluginInjectionApi,
118
- innerComponent: _this.renderMediaNodeWithState(mediaProvider, contextIdentifierProvider)
116
+ innerComponent: _this.renderMediaNodeWithState(contextIdentifierProvider)
119
117
  });
120
118
  });
121
119
  return _this;
@@ -174,11 +172,8 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
174
172
  key: "render",
175
173
  value: function render() {
176
174
  var providerFactory = this.reactComponentProps.providerFactory;
177
- return /*#__PURE__*/React.createElement(WithProviders
178
- // Cleanup: `platform_editor_media_provider_from_plugin_config`
179
- // Remove `mediaProvider`
180
- , {
181
- providers: ['mediaProvider', 'contextIdentifierProvider'],
175
+ return /*#__PURE__*/React.createElement(WithProviders, {
176
+ providers: ['contextIdentifierProvider'],
182
177
  providerFactory: providerFactory,
183
178
  renderNode: this.renderMediaNodeWithProviders
184
179
  });
@@ -535,7 +535,6 @@ _defineProperty(MediaSingleNode, "displayName", 'MediaSingleNode');
535
535
  export { MediaSingleNode as default };
536
536
  var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
537
537
  var pluginInjectionApi = _ref6.pluginInjectionApi,
538
- mediaProvider = _ref6.mediaProvider,
539
538
  contextIdentifierProvider = _ref6.contextIdentifierProvider,
540
539
  node = _ref6.node,
541
540
  getPos = _ref6.getPos,
@@ -553,7 +552,7 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
553
552
  annotationState = _useSharedPluginState.annotationState,
554
553
  editorDisabledState = _useSharedPluginState.editorDisabledState,
555
554
  editorViewModeState = _useSharedPluginState.editorViewModeState;
556
- var newMediaProvider = useMemo(function () {
555
+ var mediaProvider = useMemo(function () {
557
556
  return mediaState !== null && mediaState !== void 0 && mediaState.mediaProvider ? Promise.resolve(mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider) : undefined;
558
557
  }, [mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider]);
559
558
  return jsx(MediaSingleNode, {
@@ -561,7 +560,7 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
561
560
  lineLength: widthState.lineLength,
562
561
  node: node,
563
562
  getPos: getPos,
564
- mediaProvider: fg('platform_editor_media_provider_from_plugin_config') ? newMediaProvider : mediaProvider,
563
+ mediaProvider: mediaProvider,
565
564
  contextIdentifierProvider: contextIdentifierProvider,
566
565
  mediaOptions: mediaOptions,
567
566
  view: view,
@@ -702,18 +701,13 @@ var MediaSingleNodeView = /*#__PURE__*/function (_ReactNodeView) {
702
701
 
703
702
  // getPos is a boolean for marks, since this is a node we know it must be a function
704
703
  var getPos = this.getPos;
705
- return jsx(WithProviders
706
- // Cleanup: `platform_editor_media_provider_from_plugin_config`
707
- // Remove `mediaProvider`
708
- , {
709
- providers: ['mediaProvider', 'contextIdentifierProvider'],
704
+ return jsx(WithProviders, {
705
+ providers: ['contextIdentifierProvider'],
710
706
  providerFactory: providerFactory,
711
707
  renderNode: function renderNode(_ref7) {
712
- var mediaProvider = _ref7.mediaProvider,
713
- contextIdentifierProvider = _ref7.contextIdentifierProvider;
708
+ var contextIdentifierProvider = _ref7.contextIdentifierProvider;
714
709
  return jsx(MediaSingleNodeWrapper, {
715
710
  pluginInjectionApi: pluginInjectionApi,
716
- mediaProvider: mediaProvider,
717
711
  contextIdentifierProvider: contextIdentifierProvider,
718
712
  node: _this5.node,
719
713
  getPos: getPos,
@@ -26,7 +26,6 @@ import { floatingToolbar as _floatingToolbar } from './toolbar';
26
26
  import { MediaPickerComponents } from './ui/MediaPicker';
27
27
  import ToolbarMedia from './ui/ToolbarMedia';
28
28
  import { insertMediaAsMediaSingle as _insertMediaAsMediaSingle } from './utils/media-single';
29
- export { insertMediaSingleNode } from './utils/media-single';
30
29
  var MediaPickerFunctionalComponent = function MediaPickerFunctionalComponent(_ref) {
31
30
  var api = _ref.api,
32
31
  editorDomElement = _ref.editorDomElement,
@@ -49,7 +49,7 @@ export var openMediaAltTextMenu = createCommandWithAnalytics(ACTION.OPENED, func
49
49
  }, function (tr) {
50
50
  return tr.setMeta('scrollIntoView', false);
51
51
  });
52
- export var updateAltTextTransform = function updateAltTextTransform(newAltText) {
52
+ var updateAltTextTransform = function updateAltTextTransform(newAltText) {
53
53
  return function (tr, state) {
54
54
  var mediaNode = getMediaSingleOrInlineNodeFromSelection(state);
55
55
  if (mediaNode) {
@@ -3,7 +3,7 @@ import { pluginFactory } from '@atlaskit/editor-common/utils';
3
3
  import { pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
4
4
  import { PluginKey } from '@atlaskit/editor-prosemirror/state';
5
5
  import reducer from './reducer';
6
- export var pluginKey = new PluginKey('mediaAltTextPlugin');
6
+ var pluginKey = new PluginKey('mediaAltTextPlugin');
7
7
  var _pluginFactory = pluginFactory(pluginKey, reducer, {
8
8
  onSelectionChanged: function onSelectionChanged(tr, newState) {
9
9
  // dont close alt text for undo/redo transactions (if it comes from prosemirror-history)
@@ -10,7 +10,7 @@ import { insertAndSelectCaptionFromMediaSinglePos, selectCaptionFromMediaSingleP
10
10
  import { stateKey } from '../pm-plugins/plugin-key';
11
11
  import { updateMediaSingleWidth } from '../toolbar/commands';
12
12
  import { calcNewLayout, getSelectedMediaSingle } from '../toolbar/utils';
13
- export function keymapPlugin(options, editorAnalyticsAPI, editorSelectionAPI, widthPlugin, getIntl) {
13
+ function keymapPlugin(options, editorAnalyticsAPI, editorSelectionAPI, widthPlugin, getIntl) {
14
14
  var list = {};
15
15
  bindKeymapWithCommand(undo.common, ignoreLinksInSteps, list);
16
16
  if (options !== null && options !== void 0 && options.allowCaptions) {
@@ -23,7 +23,6 @@ import { findDomRefAtPos, findParentNodeOfType, findSelectedNodeOfType, isNodeSe
23
23
  import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
24
24
  import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
25
25
  import { getMediaFeatureFlag } from '@atlaskit/media-common';
26
- import { fg } from '@atlaskit/platform-feature-flags';
27
26
  import * as helpers from '../commands/helpers';
28
27
  import { updateMediaNodeAttrs } from '../commands/helpers';
29
28
  import PickerFacade from '../picker-facade';
@@ -395,14 +394,8 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
395
394
  this.waitForMediaUpload = options.waitForMediaUpload === undefined ? true : options.waitForMediaUpload;
396
395
  var nodes = _state.schema.nodes;
397
396
  assert(nodes.media && (nodes.mediaGroup || nodes.mediaSingle), 'Editor: unable to init media plugin - media or mediaGroup/mediaSingle node absent in schema');
398
- if (fg('platform_editor_media_provider_from_plugin_config')) {
399
- if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
400
- this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
401
- }
402
- } else {
403
- options.providerFactory.subscribe('mediaProvider', function (_name, provider) {
404
- return _this.setMediaProvider(provider);
405
- });
397
+ if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
398
+ this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
406
399
  }
407
400
  if (mediaInlineImagesEnabled(getMediaFeatureFlag('mediaInline', (_this$mediaOptions2 = this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags), (_this$mediaOptions3 = this.mediaOptions) === null || _this$mediaOptions3 === void 0 ? void 0 : _this$mediaOptions3.allowMediaInlineImages)) {
408
401
  this.allowInlineImages = true;
@@ -739,7 +732,7 @@ export var createPlugin = function createPlugin(_schema, options, getIntl, plugi
739
732
  pluginState.setIsResizing(isResizing);
740
733
  nextPluginState = nextPluginState.clone();
741
734
  }
742
- if (mediaProvider && fg('platform_editor_media_provider_from_plugin_config')) {
735
+ if (mediaProvider) {
743
736
  pluginState.setMediaProvider(mediaProvider);
744
737
  }
745
738
  if (resizingWidth) {
@@ -27,7 +27,7 @@ export var altTextButton = function altTextButton(intl, state, editorAnalyticsAP
27
27
  })
28
28
  };
29
29
  };
30
- export var altTextEditComponent = function altTextEditComponent(options) {
30
+ var altTextEditComponent = function altTextEditComponent(options) {
31
31
  return {
32
32
  type: 'custom',
33
33
  fallback: [],
@@ -104,7 +104,7 @@ export var generateMediaInlineFloatingToolbar = function generateMediaInlineFloa
104
104
  }];
105
105
  return items;
106
106
  };
107
- export var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl, mediaPluginState, hoverDecoration, editorAnalyticsAPI, pluginInjectionApi, mediaLinkingState) {
107
+ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl, mediaPluginState, hoverDecoration, editorAnalyticsAPI, pluginInjectionApi, mediaLinkingState) {
108
108
  var _pluginInjectionApi$w;
109
109
  var options = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : {};
110
110
  var mediaInline = state.schema.nodes.mediaInline;
@@ -7,7 +7,7 @@ import { findParentNodeOfType, findSelectedNodeOfType, removeParentNodeOfType, r
7
7
  import { akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
8
8
  import { getMediaClient } from '@atlaskit/media-client-react';
9
9
  import { isVideo } from '../utils/media-single';
10
- export var getSelectedMediaContainerNodeAttrs = function getSelectedMediaContainerNodeAttrs(mediaPluginState) {
10
+ var getSelectedMediaContainerNodeAttrs = function getSelectedMediaContainerNodeAttrs(mediaPluginState) {
11
11
  var _mediaPluginState$sel;
12
12
  var selectedNode = (_mediaPluginState$sel = mediaPluginState.selectedMediaContainerNode) === null || _mediaPluginState$sel === void 0 ? void 0 : _mediaPluginState$sel.call(mediaPluginState);
13
13
  if (selectedNode && selectedNode.attrs) {
@@ -41,7 +41,7 @@ var buttonWrapper = css({
41
41
  });
42
42
 
43
43
  // eslint-disable-next-line @repo/internal/react/no-class-components
44
- export var LinkAddToolbar = /*#__PURE__*/function (_React$PureComponent) {
44
+ var LinkAddToolbar = /*#__PURE__*/function (_React$PureComponent) {
45
45
  _inherits(LinkAddToolbar, _React$PureComponent);
46
46
  var _super = _createSuper(LinkAddToolbar);
47
47
  function LinkAddToolbar() {
@@ -1,19 +1,9 @@
1
- import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
2
- import _createClass from "@babel/runtime/helpers/createClass";
3
- import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
4
- import _inherits from "@babel/runtime/helpers/inherits";
5
- import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
6
- import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
7
- import _defineProperty from "@babel/runtime/helpers/defineProperty";
8
1
  import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
9
2
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
10
- function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
11
- function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
12
3
  import _regeneratorRuntime from "@babel/runtime/regenerator";
13
- import React, { useCallback, useEffect, useMemo, useState } from 'react';
4
+ import { useCallback, useEffect, useMemo, useState } from 'react';
14
5
  import { flushSync } from 'react-dom';
15
6
  import { ErrorReporter } from '@atlaskit/editor-common/utils';
16
- import { fg } from '@atlaskit/platform-feature-flags';
17
7
  import PickerFacade from '../../picker-facade';
18
8
  var dummyMediaPickerObject = {
19
9
  on: function on() {},
@@ -22,7 +12,7 @@ var dummyMediaPickerObject = {
22
12
  destroy: function destroy() {},
23
13
  setUploadParams: function setUploadParams() {}
24
14
  };
25
- function PickerFacadeProviderNew(_ref) {
15
+ export default function PickerFacadeProvider(_ref) {
26
16
  var mediaState = _ref.mediaState,
27
17
  analyticsName = _ref.analyticsName,
28
18
  children = _ref.children;
@@ -120,137 +110,4 @@ function PickerFacadeProviderNew(_ref) {
120
110
  config: config,
121
111
  pickerFacadeInstance: pickerFacadeInstance
122
112
  });
123
- }
124
-
125
- // eslint-disable-next-line @repo/internal/react/no-class-components
126
- var PickerFacadeProviderOld = /*#__PURE__*/function (_React$Component) {
127
- _inherits(PickerFacadeProviderOld, _React$Component);
128
- var _super = _createSuper(PickerFacadeProviderOld);
129
- function PickerFacadeProviderOld() {
130
- var _this;
131
- _classCallCheck(this, PickerFacadeProviderOld);
132
- for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
133
- args[_key] = arguments[_key];
134
- }
135
- _this = _super.call.apply(_super, [this].concat(args));
136
- _defineProperty(_assertThisInitialized(_this), "state", {});
137
- _defineProperty(_assertThisInitialized(_this), "handleMediaProvider", /*#__PURE__*/function () {
138
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_name, provider) {
139
- var _this$props, mediaState, analyticsName, mediaProvider, resolvedMediaClientConfig, pickerFacadeConfig, pickerFacadeInstance, config;
140
- return _regeneratorRuntime.wrap(function _callee2$(_context2) {
141
- while (1) switch (_context2.prev = _context2.next) {
142
- case 0:
143
- _this$props = _this.props, mediaState = _this$props.mediaState, analyticsName = _this$props.analyticsName;
144
- _context2.next = 3;
145
- return provider;
146
- case 3:
147
- mediaProvider = _context2.sent;
148
- if (!(!mediaProvider || !mediaProvider.uploadParams)) {
149
- _context2.next = 6;
150
- break;
151
- }
152
- return _context2.abrupt("return");
153
- case 6:
154
- _context2.next = 8;
155
- return mediaProvider.uploadMediaClientConfig;
156
- case 8:
157
- _context2.t0 = _context2.sent;
158
- if (_context2.t0) {
159
- _context2.next = 13;
160
- break;
161
- }
162
- _context2.next = 12;
163
- return mediaProvider.viewMediaClientConfig;
164
- case 12:
165
- _context2.t0 = _context2.sent;
166
- case 13:
167
- resolvedMediaClientConfig = _context2.t0;
168
- if (resolvedMediaClientConfig) {
169
- _context2.next = 16;
170
- break;
171
- }
172
- return _context2.abrupt("return");
173
- case 16:
174
- pickerFacadeConfig = {
175
- mediaClientConfig: resolvedMediaClientConfig,
176
- errorReporter: mediaState.options.errorReporter || new ErrorReporter(),
177
- featureFlags: mediaState.mediaOptions && mediaState.mediaOptions.featureFlags
178
- };
179
- /**
180
- * As the first MediaPicker component to be migrated to React, we want to scope the amount of changes logic changed/moved on Editor side.
181
- * To achieve this we agreed on using `PickerFacade` 'customMediaPicker' type, since we only need this instance to reuse the logic when we subscribe
182
- * for all the different events in MediaPicker (onPreviewUpdate, onError, onProcessing, etc).
183
- * The `dummyMediaPickerObject` provided here serves as a workaround for the old picker api that `PickerFacade` will try to use.
184
- * But we don't want this to do anything since it's all part of the new React component (`Clipboard` component in this case).
185
- * Eventually PickerFacade will be removed and replaced with a new abstraction explained here https://product-fabric.atlassian.net/browse/MS-1937
186
- */
187
- _context2.next = 19;
188
- return new PickerFacade('customMediaPicker', pickerFacadeConfig, dummyMediaPickerObject, analyticsName).init();
189
- case 19:
190
- pickerFacadeInstance = _context2.sent;
191
- /**
192
- * Based on the `initPickers` method in `MediaPluginState` we need these 2 `onNewMedia` subscriptions.
193
- * First one in order to trigger the entire process of uploading a file for when `onPreviewUpdate` is called
194
- * Second one in order to track all analytics as before.
195
- */
196
- pickerFacadeInstance.onNewMedia(mediaState.insertFile);
197
- pickerFacadeInstance.setUploadParams(mediaProvider.uploadParams);
198
- config = {
199
- uploadParams: mediaProvider.uploadParams
200
- };
201
- flushSync(function () {
202
- return _this.setState({
203
- pickerFacadeInstance: pickerFacadeInstance,
204
- config: config,
205
- mediaClientConfig: resolvedMediaClientConfig
206
- });
207
- });
208
- case 24:
209
- case "end":
210
- return _context2.stop();
211
- }
212
- }, _callee2);
213
- }));
214
- return function (_x3, _x4) {
215
- return _ref3.apply(this, arguments);
216
- };
217
- }());
218
- return _this;
219
- }
220
- _createClass(PickerFacadeProviderOld, [{
221
- key: "componentDidMount",
222
- value: function componentDidMount() {
223
- var mediaProvider = this.props.mediaState.mediaProvider;
224
- if (mediaProvider && fg('platform_editor_media_provider_from_plugin_config')) {
225
- this.handleMediaProvider('mediaProvider', Promise.resolve(mediaProvider));
226
- } else {
227
- this.props.mediaState.options.providerFactory.subscribe('mediaProvider', this.handleMediaProvider);
228
- }
229
- }
230
- }, {
231
- key: "componentWillUnmount",
232
- value: function componentWillUnmount() {
233
- this.props.mediaState.options.providerFactory.unsubscribe('mediaProvider', this.handleMediaProvider);
234
- }
235
- }, {
236
- key: "render",
237
- value: function render() {
238
- var _this$state = this.state,
239
- mediaClientConfig = _this$state.mediaClientConfig,
240
- config = _this$state.config,
241
- pickerFacadeInstance = _this$state.pickerFacadeInstance;
242
- if (!mediaClientConfig || !config || !pickerFacadeInstance) {
243
- return null;
244
- }
245
- return this.props.children({
246
- mediaClientConfig: mediaClientConfig,
247
- config: config,
248
- pickerFacadeInstance: pickerFacadeInstance
249
- });
250
- }
251
- }]);
252
- return PickerFacadeProviderOld;
253
- }(React.Component);
254
- export default function PickerFacadeProvider(props) {
255
- return fg('platform_editor_media_provider_from_plugin_config') ? /*#__PURE__*/React.createElement(PickerFacadeProviderNew, props) : /*#__PURE__*/React.createElement(PickerFacadeProviderOld, props);
256
113
  }
@@ -7,14 +7,14 @@ import React, { Fragment, useEffect, 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
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
10
+ import { fg } from '@atlaskit/platform-feature-flags';
11
11
  import { getSelectedNearestMediaContainerNodeAttrs } from '../../toolbar/utils';
12
12
  import { isVideo } from '../../utils/is-type';
13
13
  import { RenderMediaViewer } from './PortalWrapper';
14
14
  var interactiveStyles = css({
15
15
  cursor: 'pointer'
16
16
  });
17
- export var mediaViewerContainerTestID = 'media-viewer-container-test';
17
+ var mediaViewerContainerTestID = 'media-viewer-container-test';
18
18
  export var MediaViewerContainer = function MediaViewerContainer(_ref) {
19
19
  var _mediaNode$firstChild;
20
20
  var mediaNode = _ref.mediaNode,
@@ -42,7 +42,7 @@ export var MediaViewerContainer = function MediaViewerContainer(_ref) {
42
42
  setShowMediaViewer(false);
43
43
  };
44
44
  var isVideoMedia = isVideo((_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.__fileMimeType);
45
- var enableMediaViewer = getBooleanFF('platform.editor.media.preview-in-full-page') && isEditorViewMode;
45
+ var enableMediaViewer = fg('platform.editor.media.preview-in-full-page') && isEditorViewMode;
46
46
  var shouldShowViewer = enableMediaViewer && showViewer && selectedNodeAttrs && mediaClientConfig && !isVideoMedia;
47
47
  return jsx(Fragment, null, enableMediaViewer ? jsx(Fragment, null, isInline ? jsx("span", {
48
48
  onClick: showMediaViewer,
@@ -24,7 +24,7 @@ export var isSelectionMediaSingleNode = function isSelectionMediaSingleNode(stat
24
24
  node = _ref2.node;
25
25
  return node && node.type === state.schema.nodes.mediaSingle;
26
26
  };
27
- export var isSelectionMediaInlineNode = function isSelectionMediaInlineNode(state) {
27
+ var isSelectionMediaInlineNode = function isSelectionMediaInlineNode(state) {
28
28
  var _ref3 = state.selection,
29
29
  node = _ref3.node;
30
30
  return node && node.type === state.schema.nodes.mediaInline;
@@ -179,7 +179,7 @@ export var getMediaNodeFromSelection = function getMediaNodeFromSelection(state)
179
179
  }
180
180
  return null;
181
181
  };
182
- export var getMediaInlineNodeFromSelection = function getMediaInlineNodeFromSelection(state) {
182
+ var getMediaInlineNodeFromSelection = function getMediaInlineNodeFromSelection(state) {
183
183
  if (!isSelectionMediaInlineNode(state)) {
184
184
  return null;
185
185
  }
@@ -189,7 +189,7 @@ export var changeFromMediaInlineToMediaSingleNode = function changeFromMediaInli
189
189
  }
190
190
  return true;
191
191
  };
192
- export var createMediaSingleNode = function createMediaSingleNode(schema, collection, maxWidth, minWidth, alignLeftOnInsert) {
192
+ var createMediaSingleNode = function createMediaSingleNode(schema, collection, maxWidth, minWidth, alignLeftOnInsert) {
193
193
  return function (mediaState) {
194
194
  var id = mediaState.id,
195
195
  dimensions = mediaState.dimensions,
@@ -245,14 +245,6 @@ var replaceWithMediaSingleNode = function replaceWithMediaSingleNode(schema, max
245
245
  return mediaSingle.createChecked(extendedMediaSingleAttrs, copiedMediaNode);
246
246
  };
247
247
  };
248
- export function isCaptionNode(editorView) {
249
- var $from = editorView.state.selection.$from;
250
- var immediateWrapperParentNode = editorView.state.doc.nodeAt($from.before(Math.max($from.depth, 1)));
251
- if (immediateWrapperParentNode && immediateWrapperParentNode.type.name === 'caption') {
252
- return true;
253
- }
254
- return false;
255
- }
256
248
  export var isVideo = memoizeOne(function (fileType) {
257
249
  return !!fileType && fileType.includes('video');
258
250
  });
@@ -6,10 +6,9 @@ import { type PortalProviderAPI } from '@atlaskit/editor-common/src/portal';
6
6
  import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
7
7
  import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
8
8
  import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
9
- import type { MediaClientConfig } from '@atlaskit/media-core';
10
9
  import type { MediaNextEditorPluginType } from '../next-plugin-type';
11
10
  import type { getPosHandler, MediaOptions } from '../types';
12
- export type MediaGroupProps = {
11
+ type MediaGroupProps = {
13
12
  forwardRef?: (ref: HTMLElement) => void;
14
13
  node: PMNode;
15
14
  view: EditorView;
@@ -24,9 +23,6 @@ export type MediaGroupProps = {
24
23
  headPos: number;
25
24
  mediaOptions: MediaOptions;
26
25
  } & WrappedComponentProps;
27
- export interface MediaGroupState {
28
- viewMediaClientConfig?: MediaClientConfig;
29
- }
30
26
  declare const IntlMediaGroup: React.FC<import("react-intl-next").WithIntlProps<MediaGroupProps>> & {
31
27
  WrappedComponent: React.ComponentType<MediaGroupProps>;
32
28
  };