@atlaskit/editor-plugin-media 5.4.2 → 5.4.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 (35) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/mediaPlugin.js +7 -28
  3. package/dist/cjs/nodeviews/mediaGroup.js +3 -14
  4. package/dist/cjs/nodeviews/mediaInline.js +9 -26
  5. package/dist/cjs/nodeviews/mediaNodeView/index.js +3 -18
  6. package/dist/cjs/nodeviews/mediaSingle.js +9 -29
  7. package/dist/cjs/ui/CommentBadge/index.js +8 -19
  8. package/dist/cjs/ui/MediaPicker/DropzoneWrapper.js +3 -13
  9. package/dist/cjs/ui/MediaPicker/PickerFacadeProvider.js +5 -20
  10. package/dist/cjs/ui/MediaPicker/index.js +4 -17
  11. package/dist/cjs/ui/ToolbarMedia/index.js +3 -13
  12. package/dist/cjs/ui/hooks/useMediaProvider.js +2 -11
  13. package/dist/es2019/mediaPlugin.js +3 -26
  14. package/dist/es2019/nodeviews/mediaGroup.js +2 -14
  15. package/dist/es2019/nodeviews/mediaInline.js +2 -20
  16. package/dist/es2019/nodeviews/mediaNodeView/index.js +4 -20
  17. package/dist/es2019/nodeviews/mediaSingle.js +2 -23
  18. package/dist/es2019/ui/CommentBadge/index.js +3 -15
  19. package/dist/es2019/ui/MediaPicker/DropzoneWrapper.js +2 -13
  20. package/dist/es2019/ui/MediaPicker/PickerFacadeProvider.js +3 -17
  21. package/dist/es2019/ui/MediaPicker/index.js +2 -16
  22. package/dist/es2019/ui/ToolbarMedia/index.js +2 -13
  23. package/dist/es2019/ui/hooks/useMediaProvider.js +2 -12
  24. package/dist/esm/mediaPlugin.js +8 -29
  25. package/dist/esm/nodeviews/mediaGroup.js +4 -15
  26. package/dist/esm/nodeviews/mediaInline.js +10 -27
  27. package/dist/esm/nodeviews/mediaNodeView/index.js +4 -19
  28. package/dist/esm/nodeviews/mediaSingle.js +10 -30
  29. package/dist/esm/ui/CommentBadge/index.js +9 -20
  30. package/dist/esm/ui/MediaPicker/DropzoneWrapper.js +4 -14
  31. package/dist/esm/ui/MediaPicker/PickerFacadeProvider.js +7 -22
  32. package/dist/esm/ui/MediaPicker/index.js +5 -18
  33. package/dist/esm/ui/ToolbarMedia/index.js +4 -14
  34. package/dist/esm/ui/hooks/useMediaProvider.js +3 -12
  35. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-plugin-media
2
2
 
3
+ ## 5.4.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [`c2f5cb191fe33`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c2f5cb191fe33) -
8
+ PR to cleanup platform_editor_usesharedpluginstatewithselector for `media`
9
+ - Updated dependencies
10
+
3
11
  ## 5.4.2
4
12
 
5
13
  ### Patch Changes
@@ -48,23 +48,13 @@ var selector = function selector(states) {
48
48
  setBrowseFn: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.setBrowseFn
49
49
  };
50
50
  };
51
- var useMediaPickerSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
52
- return (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector);
53
- }, function (api) {
54
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['media']),
55
- mediaState = _useSharedPluginState.mediaState;
56
- return {
57
- onPopupToggle: mediaState === null || mediaState === void 0 ? void 0 : mediaState.onPopupToggle,
58
- setBrowseFn: mediaState === null || mediaState === void 0 ? void 0 : mediaState.setBrowseFn
59
- };
60
- });
61
51
  var MediaPickerFunctionalComponent = function MediaPickerFunctionalComponent(_ref) {
62
52
  var api = _ref.api,
63
53
  editorDomElement = _ref.editorDomElement,
64
54
  appearance = _ref.appearance;
65
- var _useMediaPickerShared = useMediaPickerSharedState(api),
66
- onPopupToggle = _useMediaPickerShared.onPopupToggle,
67
- setBrowseFn = _useMediaPickerShared.setBrowseFn;
55
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector),
56
+ onPopupToggle = _useSharedPluginState.onPopupToggle,
57
+ setBrowseFn = _useSharedPluginState.setBrowseFn;
68
58
  if (!onPopupToggle || !setBrowseFn) {
69
59
  return null;
70
60
  }
@@ -84,26 +74,15 @@ var mediaViewerStateSelector = function mediaViewerStateSelector(states) {
84
74
  mediaClientConfig: (_states$mediaState5 = states.mediaState) === null || _states$mediaState5 === void 0 ? void 0 : _states$mediaState5.mediaClientConfig
85
75
  };
86
76
  };
87
- var useMediaViewerSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
88
- return (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], mediaViewerStateSelector);
89
- }, function (api) {
90
- var _useSharedPluginState2 = (0, _hooks.useSharedPluginState)(api, ['media']),
91
- mediaState = _useSharedPluginState2.mediaState;
92
- return {
93
- isMediaViewerVisible: mediaState === null || mediaState === void 0 ? void 0 : mediaState.isMediaViewerVisible,
94
- mediaViewerSelectedMedia: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaViewerSelectedMedia,
95
- mediaClientConfig: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaClientConfig
96
- };
97
- });
98
77
  var MediaViewerFunctionalComponent = function MediaViewerFunctionalComponent(_ref2) {
99
78
  var api = _ref2.api,
100
79
  editorView = _ref2.editorView;
101
80
  // Only traverse document once when media viewer is visible, media viewer items will not update
102
81
  // when document changes are made while media viewer is open
103
- var _useMediaViewerShared = useMediaViewerSharedState(api),
104
- isMediaViewerVisible = _useMediaViewerShared.isMediaViewerVisible,
105
- mediaViewerSelectedMedia = _useMediaViewerShared.mediaViewerSelectedMedia,
106
- mediaClientConfig = _useMediaViewerShared.mediaClientConfig;
82
+ var _useSharedPluginState2 = (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], mediaViewerStateSelector),
83
+ isMediaViewerVisible = _useSharedPluginState2.isMediaViewerVisible,
84
+ mediaViewerSelectedMedia = _useSharedPluginState2.mediaViewerSelectedMedia,
85
+ mediaClientConfig = _useSharedPluginState2.mediaClientConfig;
107
86
  var mediaItems = (0, _react.useMemo)(function () {
108
87
  if (isMediaViewerVisible) {
109
88
  var mediaNodes = (0, _mediaCommon2.extractMediaNodes)(editorView.state.doc);
@@ -25,23 +25,12 @@ var selector = function selector(states) {
25
25
  editorViewMode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode
26
26
  };
27
27
  };
28
- var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
29
- return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['editorDisabled', 'editorViewMode'], selector);
30
- }, function (pluginInjectionApi) {
31
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['editorDisabled', 'editorViewMode']),
32
- editorDisabledPlugin = _useSharedPluginState.editorDisabledState,
33
- editorViewModePlugin = _useSharedPluginState.editorViewModeState;
34
- return {
35
- editorDisabled: editorDisabledPlugin === null || editorDisabledPlugin === void 0 ? void 0 : editorDisabledPlugin.editorDisabled,
36
- editorViewMode: editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode
37
- };
38
- });
39
28
  function MediaGroupNodeViewInternal(_ref) {
40
29
  var renderFn = _ref.renderFn,
41
30
  pluginInjectionApi = _ref.pluginInjectionApi;
42
- var _useSharedState = useSharedState(pluginInjectionApi),
43
- editorDisabled = _useSharedState.editorDisabled,
44
- editorViewMode = _useSharedState.editorViewMode;
31
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['editorDisabled', 'editorViewMode'], selector),
32
+ editorDisabled = _useSharedPluginState.editorDisabled,
33
+ editorViewMode = _useSharedPluginState.editorViewMode;
45
34
  var mediaProvider = (0, _useMediaProvider.useMediaProvider)(pluginInjectionApi);
46
35
  return renderFn({
47
36
  editorDisabled: editorDisabled,
@@ -234,23 +234,6 @@ var selector = function selector(states) {
234
234
  mediaClientConfig: (_states$mediaState7 = states.mediaState) === null || _states$mediaState7 === void 0 ? void 0 : _states$mediaState7.mediaClientConfig
235
235
  };
236
236
  };
237
- var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
238
- return (0, _hooks.useSharedPluginStateWithSelector)(api, ['editorViewMode', 'media'], selector);
239
- }, function (api) {
240
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['editorViewMode', 'media']),
241
- editorViewModeState = _useSharedPluginState.editorViewModeState,
242
- mediaState = _useSharedPluginState.mediaState;
243
- return {
244
- viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
245
- mediaProvider: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider,
246
- handleMediaNodeMount: mediaState === null || mediaState === void 0 ? void 0 : mediaState.handleMediaNodeMount,
247
- handleMediaNodeUnmount: mediaState === null || mediaState === void 0 ? void 0 : mediaState.handleMediaNodeUnmount,
248
- allowInlineImages: mediaState === null || mediaState === void 0 ? void 0 : mediaState.allowInlineImages,
249
- addPendingTask: mediaState === null || mediaState === void 0 ? void 0 : mediaState.addPendingTask,
250
- selectedMediaContainerNode: mediaState === null || mediaState === void 0 ? void 0 : mediaState.selectedMediaContainerNode,
251
- mediaClientConfig: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaClientConfig
252
- };
253
- });
254
237
  var MediaInlineSharedState = function MediaInlineSharedState(_ref3) {
255
238
  var identifier = _ref3.identifier,
256
239
  node = _ref3.node,
@@ -259,15 +242,15 @@ var MediaInlineSharedState = function MediaInlineSharedState(_ref3) {
259
242
  contextIdentifierProvider = _ref3.contextIdentifierProvider,
260
243
  api = _ref3.api,
261
244
  view = _ref3.view;
262
- var _useSharedState = useSharedState(api),
263
- mediaProvider = _useSharedState.mediaProvider,
264
- allowInlineImages = _useSharedState.allowInlineImages,
265
- handleMediaNodeMount = _useSharedState.handleMediaNodeMount,
266
- handleMediaNodeUnmount = _useSharedState.handleMediaNodeUnmount,
267
- addPendingTask = _useSharedState.addPendingTask,
268
- selectedMediaContainerNode = _useSharedState.selectedMediaContainerNode,
269
- mediaClientConfig = _useSharedState.mediaClientConfig,
270
- viewMode = _useSharedState.viewMode;
245
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['editorViewMode', 'media'], selector),
246
+ mediaProvider = _useSharedPluginState.mediaProvider,
247
+ allowInlineImages = _useSharedPluginState.allowInlineImages,
248
+ handleMediaNodeMount = _useSharedPluginState.handleMediaNodeMount,
249
+ handleMediaNodeUnmount = _useSharedPluginState.handleMediaNodeUnmount,
250
+ addPendingTask = _useSharedPluginState.addPendingTask,
251
+ selectedMediaContainerNode = _useSharedPluginState.selectedMediaContainerNode,
252
+ mediaClientConfig = _useSharedPluginState.mediaClientConfig,
253
+ viewMode = _useSharedPluginState.viewMode;
271
254
  var newMediaProvider = (0, _react.useMemo)(function () {
272
255
  return mediaProvider ? Promise.resolve(mediaProvider) : undefined;
273
256
  }, [mediaProvider]);
@@ -33,31 +33,16 @@ function _superPropGet(t, o, e, r) { var p = (0, _get2.default)((0, _getPrototyp
33
33
  var selector = function selector(states) {
34
34
  var _states$mediaState;
35
35
  return {
36
- mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider,
37
- widthState: undefined
36
+ mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider
38
37
  };
39
38
  };
40
- var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
41
- return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['media'], selector);
42
- }, function (pluginInjectionApi) {
43
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['width', 'media']),
44
- widthState = _useSharedPluginState.widthState,
45
- mediaState = _useSharedPluginState.mediaState;
46
- return {
47
- mediaProvider: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider,
48
- widthState: widthState
49
- };
50
- });
51
39
  var MediaNodeWithProviders = function MediaNodeWithProviders(_ref) {
52
40
  var pluginInjectionApi = _ref.pluginInjectionApi,
53
41
  innerComponent = _ref.innerComponent;
54
- var _useSharedState = useSharedState(pluginInjectionApi),
55
- mediaProvider = _useSharedState.mediaProvider,
56
- widthState = _useSharedState.widthState;
42
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['media'], selector),
43
+ mediaProvider = _useSharedPluginState.mediaProvider;
57
44
  var interactionState = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'interaction.interactionState');
58
45
  return innerComponent({
59
- width: widthState,
60
- // Remove when platform_editor_usesharedpluginstatewithselector is cleaned up
61
46
  mediaProvider: mediaProvider ? Promise.resolve(mediaProvider) : undefined,
62
47
  interactionState: interactionState
63
48
  });
@@ -42,26 +42,6 @@ var selector = function selector(states) {
42
42
  viewMode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode
43
43
  };
44
44
  };
45
- var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
46
- return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['width', 'media', 'annotation', 'editorDisabled', 'editorViewMode'], selector);
47
- }, function (pluginInjectionApi) {
48
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['width', 'media', 'annotation', 'editorDisabled', 'editorViewMode']),
49
- widthState = _useSharedPluginState.widthState,
50
- mediaState = _useSharedPluginState.mediaState,
51
- annotationState = _useSharedPluginState.annotationState,
52
- editorDisabledState = _useSharedPluginState.editorDisabledState,
53
- editorViewModeState = _useSharedPluginState.editorViewModeState;
54
- return {
55
- mediaProviderPromise: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider,
56
- addPendingTask: mediaState === null || mediaState === void 0 ? void 0 : mediaState.addPendingTask,
57
- isDrafting: annotationState === null || annotationState === void 0 ? void 0 : annotationState.isDrafting,
58
- targetNodeId: annotationState === null || annotationState === void 0 ? void 0 : annotationState.targetNodeId,
59
- width: widthState === null || widthState === void 0 ? void 0 : widthState.width,
60
- lineLength: widthState === null || widthState === void 0 ? void 0 : widthState.lineLength,
61
- editorDisabled: editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled,
62
- viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode
63
- };
64
- });
65
45
  var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref) {
66
46
  var pluginInjectionApi = _ref.pluginInjectionApi,
67
47
  contextIdentifierProvider = _ref.contextIdentifierProvider,
@@ -75,15 +55,15 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref) {
75
55
  dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
76
56
  forwardRef = _ref.forwardRef,
77
57
  editorAppearance = _ref.editorAppearance;
78
- var _useSharedState = useSharedState(pluginInjectionApi),
79
- mediaProviderPromise = _useSharedState.mediaProviderPromise,
80
- addPendingTask = _useSharedState.addPendingTask,
81
- isDrafting = _useSharedState.isDrafting,
82
- targetNodeId = _useSharedState.targetNodeId,
83
- width = _useSharedState.width,
84
- lineLength = _useSharedState.lineLength,
85
- editorDisabled = _useSharedState.editorDisabled,
86
- viewMode = _useSharedState.viewMode;
58
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['width', 'media', 'annotation', 'editorDisabled', 'editorViewMode'], selector),
59
+ mediaProviderPromise = _useSharedPluginState.mediaProviderPromise,
60
+ addPendingTask = _useSharedPluginState.addPendingTask,
61
+ isDrafting = _useSharedPluginState.isDrafting,
62
+ targetNodeId = _useSharedPluginState.targetNodeId,
63
+ width = _useSharedPluginState.width,
64
+ lineLength = _useSharedPluginState.lineLength,
65
+ editorDisabled = _useSharedPluginState.editorDisabled,
66
+ viewMode = _useSharedPluginState.viewMode;
87
67
  var interactionState = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'interaction.interactionState');
88
68
  var mediaProvider = (0, _react.useMemo)(function () {
89
69
  return mediaProviderPromise ? Promise.resolve(mediaProviderPromise) : undefined;
@@ -21,17 +21,6 @@ var selector = function selector(states) {
21
21
  annotations: (_states$annotationSta3 = states.annotationState) === null || _states$annotationSta3 === void 0 ? void 0 : _states$annotationSta3.annotations
22
22
  };
23
23
  };
24
- var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
25
- return (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector);
26
- }, function (api) {
27
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['annotation']),
28
- annotationState = _useSharedPluginState.annotationState;
29
- return {
30
- selectedAnnotations: annotationState === null || annotationState === void 0 ? void 0 : annotationState.selectedAnnotations,
31
- isInlineCommentViewClosed: annotationState === null || annotationState === void 0 ? void 0 : annotationState.isInlineCommentViewClosed,
32
- annotations: annotationState === null || annotationState === void 0 ? void 0 : annotationState.annotations
33
- };
34
- });
35
24
  var CommentBadgeWrapper = function CommentBadgeWrapper(_ref) {
36
25
  var api = _ref.api,
37
26
  mediaNode = _ref.mediaNode,
@@ -40,10 +29,10 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref) {
40
29
  intl = _ref.intl,
41
30
  isDrafting = _ref.isDrafting,
42
31
  badgeOffsetRight = _ref.badgeOffsetRight;
43
- var _useSharedState = useSharedState(api),
44
- selectedAnnotations = _useSharedState.selectedAnnotations,
45
- isInlineCommentViewClosed = _useSharedState.isInlineCommentViewClosed,
46
- annotations = _useSharedState.annotations;
32
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector),
33
+ selectedAnnotations = _useSharedPluginState.selectedAnnotations,
34
+ isInlineCommentViewClosed = _useSharedPluginState.isInlineCommentViewClosed,
35
+ annotations = _useSharedPluginState.annotations;
47
36
  var _useState = (0, _react.useState)(false),
48
37
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
49
38
  entered = _useState2[0],
@@ -118,10 +107,10 @@ var CommentBadgeNextWrapper = exports.CommentBadgeNextWrapper = function Comment
118
107
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
119
108
  entered = _useState4[0],
120
109
  setEntered = _useState4[1];
121
- var _useSharedState2 = useSharedState(api),
122
- selectedAnnotations = _useSharedState2.selectedAnnotations,
123
- isInlineCommentViewClosed = _useSharedState2.isInlineCommentViewClosed,
124
- annotations = _useSharedState2.annotations;
110
+ var _useSharedPluginState2 = (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector),
111
+ selectedAnnotations = _useSharedPluginState2.selectedAnnotations,
112
+ isInlineCommentViewClosed = _useSharedPluginState2.isInlineCommentViewClosed,
113
+ annotations = _useSharedPluginState2.annotations;
125
114
  var _view$state$schema2 = view.state.schema,
126
115
  media = _view$state$schema2.nodes.media,
127
116
  annotation = _view$state$schema2.marks.annotation,
@@ -20,16 +20,6 @@ var selector = function selector(states) {
20
20
  handleDrag: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.handleDrag
21
21
  };
22
22
  };
23
- var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
24
- return (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector);
25
- }, function (api) {
26
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['media']),
27
- mediaState = _useSharedPluginState.mediaState;
28
- return {
29
- options: mediaState === null || mediaState === void 0 ? void 0 : mediaState.options,
30
- handleDrag: mediaState === null || mediaState === void 0 ? void 0 : mediaState.handleDrag
31
- };
32
- });
33
23
  var DropzoneWrapperInternal = function DropzoneWrapperInternal(_ref) {
34
24
  var api = _ref.api,
35
25
  isActive = _ref.isActive,
@@ -39,9 +29,9 @@ var DropzoneWrapperInternal = function DropzoneWrapperInternal(_ref) {
39
29
  mediaClientConfig = _ref.mediaClientConfig,
40
30
  config = _ref.config,
41
31
  pickerFacadeInstance = _ref.pickerFacadeInstance;
42
- var _useSharedState = useSharedState(api),
43
- options = _useSharedState.options,
44
- handleDrag = _useSharedState.handleDrag;
32
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector),
33
+ options = _useSharedPluginState.options,
34
+ handleDrag = _useSharedPluginState.handleDrag;
45
35
  var _ref2 = options || {},
46
36
  customDropzoneContainer = _ref2.customDropzoneContainer;
47
37
 
@@ -29,21 +29,6 @@ var selector = function selector(states) {
29
29
  options: (_states$mediaState4 = states.mediaState) === null || _states$mediaState4 === void 0 ? void 0 : _states$mediaState4.options
30
30
  };
31
31
  };
32
- var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
33
- return (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector);
34
- }, function (api) {
35
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['media']),
36
- mediaState = _useSharedPluginState.mediaState;
37
- var mediaProvider = (0, _react.useMemo)(function () {
38
- return mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider;
39
- }, [mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider]);
40
- return {
41
- mediaProvider: mediaProvider,
42
- mediaOptions: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaOptions,
43
- insertFile: mediaState === null || mediaState === void 0 ? void 0 : mediaState.insertFile,
44
- options: mediaState === null || mediaState === void 0 ? void 0 : mediaState.options
45
- };
46
- });
47
32
  function PickerFacadeProvider(_ref) {
48
33
  var api = _ref.api,
49
34
  analyticsName = _ref.analyticsName,
@@ -56,11 +41,11 @@ function PickerFacadeProvider(_ref) {
56
41
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
57
42
  state = _useState2[0],
58
43
  setState = _useState2[1];
59
- var _useSharedState = useSharedState(api),
60
- mediaProvider = _useSharedState.mediaProvider,
61
- mediaOptions = _useSharedState.mediaOptions,
62
- insertFile = _useSharedState.insertFile,
63
- options = _useSharedState.options;
44
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector),
45
+ mediaProvider = _useSharedPluginState.mediaProvider,
46
+ mediaOptions = _useSharedPluginState.mediaOptions,
47
+ insertFile = _useSharedPluginState.insertFile,
48
+ options = _useSharedPluginState.options;
64
49
  var handleMediaProvider = (0, _react.useCallback)( /*#__PURE__*/function () {
65
50
  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_name, provider) {
66
51
  var mediaProvider, resolvedMediaClientConfig, pickerFacadeConfig, pickerFacadeInstance, config;
@@ -26,19 +26,6 @@ var selector = function selector(states) {
26
26
  mediaOptions: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaOptions
27
27
  };
28
28
  };
29
- var useMediaPickerState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
30
- return (0, _hooks.useSharedPluginStateWithSelector)(api, ['focus', 'connectivity', 'media'], selector);
31
- }, function (api) {
32
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['focus', 'connectivity', 'media']),
33
- focusState = _useSharedPluginState.focusState,
34
- connectivityState = _useSharedPluginState.connectivityState,
35
- mediaState = _useSharedPluginState.mediaState;
36
- return {
37
- hasFocus: focusState === null || focusState === void 0 ? void 0 : focusState.hasFocus,
38
- connectivityMode: connectivityState === null || connectivityState === void 0 ? void 0 : connectivityState.mode,
39
- mediaOptions: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaOptions
40
- };
41
- });
42
29
  var MediaPicker = function MediaPicker(_ref) {
43
30
  var _editorDom$parentElem;
44
31
  var api = _ref.api,
@@ -46,10 +33,10 @@ var MediaPicker = function MediaPicker(_ref) {
46
33
  appearance = _ref.appearance,
47
34
  onBrowseFn = _ref.onBrowseFn,
48
35
  editorDomElement = _ref.editorDomElement;
49
- var _useMediaPickerState = useMediaPickerState(api),
50
- hasFocus = _useMediaPickerState.hasFocus,
51
- connectivityMode = _useMediaPickerState.connectivityMode,
52
- mediaOptions = _useMediaPickerState.mediaOptions;
36
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['focus', 'connectivity', 'media'], selector),
37
+ hasFocus = _useSharedPluginState.hasFocus,
38
+ connectivityMode = _useSharedPluginState.connectivityMode,
39
+ mediaOptions = _useSharedPluginState.mediaOptions;
53
40
  var featureFlags = mediaOptions && mediaOptions.featureFlags;
54
41
 
55
42
  // Ignored via go/ees005
@@ -24,24 +24,14 @@ var selector = function selector(states) {
24
24
  showMediaPicker: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.showMediaPicker
25
25
  };
26
26
  };
27
- var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
28
- return (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector);
29
- }, function (api) {
30
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['media']),
31
- mediaState = _useSharedPluginState.mediaState;
32
- return {
33
- allowsUploads: mediaState === null || mediaState === void 0 ? void 0 : mediaState.allowsUploads,
34
- showMediaPicker: mediaState === null || mediaState === void 0 ? void 0 : mediaState.showMediaPicker
35
- };
36
- });
37
27
  var ToolbarMedia = function ToolbarMedia(_ref) {
38
28
  var isDisabled = _ref.isDisabled,
39
29
  isReducedSpacing = _ref.isReducedSpacing,
40
30
  intl = _ref.intl,
41
31
  api = _ref.api;
42
- var _useSharedState = useSharedState(api),
43
- allowsUploads = _useSharedState.allowsUploads,
44
- showMediaPicker = _useSharedState.showMediaPicker;
32
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector),
33
+ allowsUploads = _useSharedPluginState.allowsUploads,
34
+ showMediaPicker = _useSharedPluginState.showMediaPicker;
45
35
  if (!allowsUploads || !showMediaPicker) {
46
36
  return null;
47
37
  }
@@ -12,18 +12,9 @@ var selector = function selector(states) {
12
12
  mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider
13
13
  };
14
14
  };
15
- var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
16
- return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['media'], selector);
17
- }, function (pluginInjectionApi) {
18
- var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['media']),
19
- mediaState = _useSharedPluginState.mediaState;
20
- return {
21
- mediaProvider: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider
22
- };
23
- });
24
15
  var useMediaProvider = exports.useMediaProvider = function useMediaProvider(pluginInjectionApi) {
25
- var _useSharedState = useSharedState(pluginInjectionApi),
26
- mediaProvider = _useSharedState.mediaProvider;
16
+ var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['media'], selector),
17
+ mediaProvider = _useSharedPluginState.mediaProvider;
27
18
  var provider = (0, _react.useMemo)(function () {
28
19
  return mediaProvider;
29
20
  }, [mediaProvider]);
@@ -1,6 +1,6 @@
1
1
  import React, { useMemo } from 'react';
2
2
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
3
- import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
3
+ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
4
4
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
5
5
  import { IconImages } from '@atlaskit/editor-common/quick-insert';
6
6
  import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
@@ -39,17 +39,6 @@ const selector = states => {
39
39
  setBrowseFn: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.setBrowseFn
40
40
  };
41
41
  };
42
- const useMediaPickerSharedState = sharedPluginStateHookMigratorFactory(api => {
43
- return useSharedPluginStateWithSelector(api, ['media'], selector);
44
- }, api => {
45
- const {
46
- mediaState
47
- } = useSharedPluginState(api, ['media']);
48
- return {
49
- onPopupToggle: mediaState === null || mediaState === void 0 ? void 0 : mediaState.onPopupToggle,
50
- setBrowseFn: mediaState === null || mediaState === void 0 ? void 0 : mediaState.setBrowseFn
51
- };
52
- });
53
42
  const MediaPickerFunctionalComponent = ({
54
43
  api,
55
44
  editorDomElement,
@@ -58,7 +47,7 @@ const MediaPickerFunctionalComponent = ({
58
47
  const {
59
48
  onPopupToggle,
60
49
  setBrowseFn
61
- } = useMediaPickerSharedState(api);
50
+ } = useSharedPluginStateWithSelector(api, ['media'], selector);
62
51
  if (!onPopupToggle || !setBrowseFn) {
63
52
  return null;
64
53
  }
@@ -78,18 +67,6 @@ const mediaViewerStateSelector = states => {
78
67
  mediaClientConfig: (_states$mediaState5 = states.mediaState) === null || _states$mediaState5 === void 0 ? void 0 : _states$mediaState5.mediaClientConfig
79
68
  };
80
69
  };
81
- const useMediaViewerSharedState = sharedPluginStateHookMigratorFactory(api => {
82
- return useSharedPluginStateWithSelector(api, ['media'], mediaViewerStateSelector);
83
- }, api => {
84
- const {
85
- mediaState
86
- } = useSharedPluginState(api, ['media']);
87
- return {
88
- isMediaViewerVisible: mediaState === null || mediaState === void 0 ? void 0 : mediaState.isMediaViewerVisible,
89
- mediaViewerSelectedMedia: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaViewerSelectedMedia,
90
- mediaClientConfig: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaClientConfig
91
- };
92
- });
93
70
  const MediaViewerFunctionalComponent = ({
94
71
  api,
95
72
  editorView
@@ -100,7 +77,7 @@ const MediaViewerFunctionalComponent = ({
100
77
  isMediaViewerVisible,
101
78
  mediaViewerSelectedMedia,
102
79
  mediaClientConfig
103
- } = useMediaViewerSharedState(api);
80
+ } = useSharedPluginStateWithSelector(api, ['media'], mediaViewerStateSelector);
104
81
  const mediaItems = useMemo(() => {
105
82
  if (isMediaViewerVisible) {
106
83
  const mediaNodes = extractMediaNodes(editorView.state.doc);
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
2
+ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
3
3
  import { WithProviders } from '@atlaskit/editor-common/provider-factory';
4
4
  import ReactNodeView from '@atlaskit/editor-common/react-node-view';
5
5
  import { useMediaProvider } from '../ui/hooks/useMediaProvider';
@@ -11,18 +11,6 @@ const selector = states => {
11
11
  editorViewMode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode
12
12
  };
13
13
  };
14
- const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
15
- return useSharedPluginStateWithSelector(pluginInjectionApi, ['editorDisabled', 'editorViewMode'], selector);
16
- }, pluginInjectionApi => {
17
- const {
18
- editorDisabledState: editorDisabledPlugin,
19
- editorViewModeState: editorViewModePlugin
20
- } = useSharedPluginState(pluginInjectionApi, ['editorDisabled', 'editorViewMode']);
21
- return {
22
- editorDisabled: editorDisabledPlugin === null || editorDisabledPlugin === void 0 ? void 0 : editorDisabledPlugin.editorDisabled,
23
- editorViewMode: editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode
24
- };
25
- });
26
14
  function MediaGroupNodeViewInternal({
27
15
  renderFn,
28
16
  pluginInjectionApi
@@ -30,7 +18,7 @@ function MediaGroupNodeViewInternal({
30
18
  const {
31
19
  editorDisabled,
32
20
  editorViewMode
33
- } = useSharedState(pluginInjectionApi);
21
+ } = useSharedPluginStateWithSelector(pluginInjectionApi, ['editorDisabled', 'editorViewMode'], selector);
34
22
  const mediaProvider = useMediaProvider(pluginInjectionApi);
35
23
  return renderFn({
36
24
  editorDisabled,
@@ -6,7 +6,7 @@ import { useEffect, useMemo, useState } from 'react';
6
6
 
7
7
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
8
8
  import { jsx } from '@emotion/react';
9
- import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
9
+ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
10
10
  import { MediaInlineImageCard } from '@atlaskit/editor-common/media-inline';
11
11
  import { WithProviders } from '@atlaskit/editor-common/provider-factory';
12
12
  import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
@@ -166,24 +166,6 @@ const selector = states => {
166
166
  mediaClientConfig: (_states$mediaState7 = states.mediaState) === null || _states$mediaState7 === void 0 ? void 0 : _states$mediaState7.mediaClientConfig
167
167
  };
168
168
  };
169
- const useSharedState = sharedPluginStateHookMigratorFactory(api => {
170
- return useSharedPluginStateWithSelector(api, ['editorViewMode', 'media'], selector);
171
- }, api => {
172
- const {
173
- editorViewModeState,
174
- mediaState
175
- } = useSharedPluginState(api, ['editorViewMode', 'media']);
176
- return {
177
- viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
178
- mediaProvider: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider,
179
- handleMediaNodeMount: mediaState === null || mediaState === void 0 ? void 0 : mediaState.handleMediaNodeMount,
180
- handleMediaNodeUnmount: mediaState === null || mediaState === void 0 ? void 0 : mediaState.handleMediaNodeUnmount,
181
- allowInlineImages: mediaState === null || mediaState === void 0 ? void 0 : mediaState.allowInlineImages,
182
- addPendingTask: mediaState === null || mediaState === void 0 ? void 0 : mediaState.addPendingTask,
183
- selectedMediaContainerNode: mediaState === null || mediaState === void 0 ? void 0 : mediaState.selectedMediaContainerNode,
184
- mediaClientConfig: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaClientConfig
185
- };
186
- });
187
169
  const MediaInlineSharedState = ({
188
170
  identifier,
189
171
  node,
@@ -202,7 +184,7 @@ const MediaInlineSharedState = ({
202
184
  selectedMediaContainerNode,
203
185
  mediaClientConfig,
204
186
  viewMode
205
- } = useSharedState(api);
187
+ } = useSharedPluginStateWithSelector(api, ['editorViewMode', 'media'], selector);
206
188
  const newMediaProvider = useMemo(() => mediaProvider ? Promise.resolve(mediaProvider) : undefined, [mediaProvider]);
207
189
  if (!handleMediaNodeMount || !handleMediaNodeUnmount || !addPendingTask || !selectedMediaContainerNode || !mediaClientConfig || !newMediaProvider) {
208
190
  return null;
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  import React from 'react';
3
- import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
3
+ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
4
4
  import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
5
5
  import { WithProviders } from '@atlaskit/editor-common/provider-factory';
6
6
  import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
@@ -14,34 +14,18 @@ import MediaNode from './media';
14
14
  const selector = states => {
15
15
  var _states$mediaState;
16
16
  return {
17
- mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider,
18
- widthState: undefined
17
+ mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider
19
18
  };
20
19
  };
21
- const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
22
- return useSharedPluginStateWithSelector(pluginInjectionApi, ['media'], selector);
23
- }, pluginInjectionApi => {
24
- const {
25
- widthState,
26
- mediaState
27
- } = useSharedPluginState(pluginInjectionApi, ['width', 'media']);
28
- return {
29
- mediaProvider: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider,
30
- widthState
31
- };
32
- });
33
20
  const MediaNodeWithProviders = ({
34
21
  pluginInjectionApi,
35
22
  innerComponent
36
23
  }) => {
37
24
  const {
38
- mediaProvider,
39
- widthState
40
- } = useSharedState(pluginInjectionApi);
25
+ mediaProvider
26
+ } = useSharedPluginStateWithSelector(pluginInjectionApi, ['media'], selector);
41
27
  const interactionState = useSharedPluginStateSelector(pluginInjectionApi, 'interaction.interactionState');
42
28
  return innerComponent({
43
- width: widthState,
44
- // Remove when platform_editor_usesharedpluginstatewithselector is cleaned up
45
29
  mediaProvider: mediaProvider ? Promise.resolve(mediaProvider) : undefined,
46
30
  interactionState
47
31
  });