@atlaskit/editor-plugin-media 5.1.1 → 5.1.3

package/dist/es2019/ui/CommentBadge/index.js

@@ -1,18 +1,18 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import { injectIntl } from 'react-intl-next';
 import { VIEW_METHOD } from '@atlaskit/editor-common/analytics';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { CommentBadge as CommentBadgeComponent, CommentBadgeNext } from '@atlaskit/editor-common/media-single';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-const useSharedState = sharedPluginStateHookMigratorFactory(api => {
-  const selectedAnnotations = useSharedPluginStateSelector(api, 'annotation.selectedAnnotations');
-  const isInlineCommentViewClosed = useSharedPluginStateSelector(api, 'annotation.isInlineCommentViewClosed');
-  const annotations = useSharedPluginStateSelector(api, 'annotation.annotations');
+const selector = states => {
+  var _states$annotationSta, _states$annotationSta2, _states$annotationSta3;
   return {
-    selectedAnnotations,
-    isInlineCommentViewClosed,
-    annotations
+    selectedAnnotations: (_states$annotationSta = states.annotationState) === null || _states$annotationSta === void 0 ? void 0 : _states$annotationSta.selectedAnnotations,
+    isInlineCommentViewClosed: (_states$annotationSta2 = states.annotationState) === null || _states$annotationSta2 === void 0 ? void 0 : _states$annotationSta2.isInlineCommentViewClosed,
+    annotations: (_states$annotationSta3 = states.annotationState) === null || _states$annotationSta3 === void 0 ? void 0 : _states$annotationSta3.annotations
   };
+};
+const useSharedState = sharedPluginStateHookMigratorFactory(api => {
+  return useSharedPluginStateWithSelector(api, ['annotation'], selector);
 }, api => {
   const {
     annotationState

package/dist/es2019/ui/MediaPicker/DropzoneWrapper.js

@@ -1,16 +1,17 @@
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { Dropzone } from '@atlaskit/media-picker';
 import PickerFacadeProvider from './PickerFacadeProvider';
-const useSharedState = sharedPluginStateHookMigratorFactory(api => {
-  const options = useSharedPluginStateSelector(api, 'media.options');
-  const handleDrag = useSharedPluginStateSelector(api, 'media.handleDrag');
+const selector = states => {
+  var _states$mediaState, _states$mediaState2;
   return {
-    options,
-    handleDrag
+    options: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.options,
+    handleDrag: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.handleDrag
   };
+};
+const useSharedState = sharedPluginStateHookMigratorFactory(api => {
+  return useSharedPluginStateWithSelector(api, ['media'], selector);
 }, api => {
   const {
     mediaState

package/dist/es2019/ui/MediaPicker/PickerFacadeProvider.js

@@ -1,7 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { flushSync } from 'react-dom';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ErrorReporter } from '@atlaskit/editor-common/utils';
 import PickerFacade from '../../pm-plugins/picker-facade';
 const dummyMediaPickerObject = {
@@ -11,17 +10,17 @@ const dummyMediaPickerObject = {
   destroy: () => {},
   setUploadParams: () => {}
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(api => {
-  const mediaProvider = useSharedPluginStateSelector(api, 'media.mediaProvider');
-  const mediaOptions = useSharedPluginStateSelector(api, 'media.mediaOptions');
-  const insertFile = useSharedPluginStateSelector(api, 'media.insertFile');
-  const options = useSharedPluginStateSelector(api, 'media.options');
+const selector = states => {
+  var _states$mediaState, _states$mediaState2, _states$mediaState3, _states$mediaState4;
   return {
-    mediaProvider,
-    mediaOptions,
-    insertFile,
-    options
+    mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider,
+    mediaOptions: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.mediaOptions,
+    insertFile: (_states$mediaState3 = states.mediaState) === null || _states$mediaState3 === void 0 ? void 0 : _states$mediaState3.insertFile,
+    options: (_states$mediaState4 = states.mediaState) === null || _states$mediaState4 === void 0 ? void 0 : _states$mediaState4.options
   };
+};
+const useSharedState = sharedPluginStateHookMigratorFactory(api => {
+  return useSharedPluginStateWithSelector(api, ['media'], selector);
 }, api => {
   const {
     mediaState

package/dist/es2019/ui/MediaPicker/index.js

@@ -1,19 +1,19 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { BrowserWrapper } from './BrowserWrapper';
 import { ClipboardWrapper } from './ClipboardWrapper';
 import { DropzoneWrapper } from './DropzoneWrapper';
-const useMediaPickerState = sharedPluginStateHookMigratorFactory(api => {
-  const hasFocus = useSharedPluginStateSelector(api, 'focus.hasFocus');
-  const connectivityMode = useSharedPluginStateSelector(api, 'connectivity.mode');
-  const mediaOptions = useSharedPluginStateSelector(api, 'media.mediaOptions');
+const selector = states => {
+  var _states$focusState, _states$connectivityS, _states$mediaState;
   return {
-    hasFocus,
-    connectivityMode,
-    mediaOptions
+    hasFocus: (_states$focusState = states.focusState) === null || _states$focusState === void 0 ? void 0 : _states$focusState.hasFocus,
+    connectivityMode: (_states$connectivityS = states.connectivityState) === null || _states$connectivityS === void 0 ? void 0 : _states$connectivityS.mode,
+    mediaOptions: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaOptions
   };
+};
+const useMediaPickerState = sharedPluginStateHookMigratorFactory(api => {
+  return useSharedPluginStateWithSelector(api, ['focus', 'connectivity', 'media'], selector);
 }, api => {
   const {
     focusState,

package/dist/es2019/ui/ToolbarMedia/index.js

@@ -1,21 +1,22 @@
 import React from 'react';
 import { injectIntl } from 'react-intl-next';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { toolbarMediaMessages } from '@atlaskit/editor-common/media';
 import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import AttachmentIcon from '@atlaskit/icon/core/migration/attachment--editor-attachment';
 const onClickMediaButton = showMediaPicker => () => {
   showMediaPicker();
   return true;
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(api => {
-  const allowsUploads = useSharedPluginStateSelector(api, 'media.allowsUploads');
-  const showMediaPicker = useSharedPluginStateSelector(api, 'media.showMediaPicker');
+const selector = states => {
+  var _states$mediaState, _states$mediaState2;
   return {
-    allowsUploads,
-    showMediaPicker
+    allowsUploads: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.allowsUploads,
+    showMediaPicker: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.showMediaPicker
   };
+};
+const useSharedState = sharedPluginStateHookMigratorFactory(api => {
+  return useSharedPluginStateWithSelector(api, ['media'], selector);
 }, api => {
   const {
     mediaState

package/dist/es2019/ui/hooks/useMediaProvider.js

@@ -1,11 +1,13 @@
 import { useMemo } from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  const mediaProvider = useSharedPluginStateSelector(pluginInjectionApi, 'media.mediaProvider');
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+const selector = states => {
+  var _states$mediaState;
   return {
-    mediaProvider
+    mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider
   };
+};
+const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
+  return useSharedPluginStateWithSelector(pluginInjectionApi, ['media'], selector);
 }, pluginInjectionApi => {
   const {
     mediaState

package/dist/esm/mediaPlugin.js

@@ -1,10 +1,9 @@
 import React, { useMemo } from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconImages } from '@atlaskit/editor-common/quick-insert';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { NodeSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -33,13 +32,15 @@ import { MediaPickerComponents } from './ui/MediaPicker';
 import { RenderMediaViewer } from './ui/MediaViewer/PortalWrapper';
 import { floatingToolbar as _floatingToolbar } from './ui/toolbar';
 import ToolbarMedia from './ui/ToolbarMedia';
-var useMediaPickerSharedState = sharedPluginStateHookMigratorFactory(function (api) {
-  var onPopupToggle = useSharedPluginStateSelector(api, 'media.onPopupToggle');
-  var setBrowseFn = useSharedPluginStateSelector(api, 'media.setBrowseFn');
+var selector = function selector(states) {
+  var _states$mediaState, _states$mediaState2;
   return {
-    onPopupToggle: onPopupToggle,
-    setBrowseFn: setBrowseFn
+    onPopupToggle: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.onPopupToggle,
+    setBrowseFn: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.setBrowseFn
   };
+};
+var useMediaPickerSharedState = sharedPluginStateHookMigratorFactory(function (api) {
+  return useSharedPluginStateWithSelector(api, ['media'], selector);
 }, function (api) {
   var _useSharedPluginState = useSharedPluginState(api, ['media']),
     mediaState = _useSharedPluginState.mediaState;
@@ -66,15 +67,16 @@ var MediaPickerFunctionalComponent = function MediaPickerFunctionalComponent(_re
     api: api
   });
 };
-var useMediaViewerSharedState = sharedPluginStateHookMigratorFactory(function (api) {
-  var isMediaViewerVisible = useSharedPluginStateSelector(api, 'media.isMediaViewerVisible');
-  var mediaViewerSelectedMedia = useSharedPluginStateSelector(api, 'media.mediaViewerSelectedMedia');
-  var mediaClientConfig = useSharedPluginStateSelector(api, 'media.mediaClientConfig');
+var mediaViewerStateSelector = function mediaViewerStateSelector(states) {
+  var _states$mediaState3, _states$mediaState4, _states$mediaState5;
   return {
-    isMediaViewerVisible: isMediaViewerVisible,
-    mediaViewerSelectedMedia: mediaViewerSelectedMedia,
-    mediaClientConfig: mediaClientConfig
+    isMediaViewerVisible: (_states$mediaState3 = states.mediaState) === null || _states$mediaState3 === void 0 ? void 0 : _states$mediaState3.isMediaViewerVisible,
+    mediaViewerSelectedMedia: (_states$mediaState4 = states.mediaState) === null || _states$mediaState4 === void 0 ? void 0 : _states$mediaState4.mediaViewerSelectedMedia,
+    mediaClientConfig: (_states$mediaState5 = states.mediaState) === null || _states$mediaState5 === void 0 ? void 0 : _states$mediaState5.mediaClientConfig
   };
+};
+var useMediaViewerSharedState = sharedPluginStateHookMigratorFactory(function (api) {
+  return useSharedPluginStateWithSelector(api, ['media'], mediaViewerStateSelector);
 }, function (api) {
   var _useSharedPluginState2 = useSharedPluginState(api, ['media']),
     mediaState = _useSharedPluginState2.mediaState;

package/dist/esm/nodeviews/mediaGroup.js

@@ -6,19 +6,20 @@ import _inherits from "@babel/runtime/helpers/inherits";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { useMediaProvider } from '../ui/hooks/useMediaProvider';
 import { MediaGroupNext } from './mediaGroupNext';
-var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
-  var editorDisabled = useSharedPluginStateSelector(pluginInjectionApi, 'editorDisabled.editorDisabled');
-  var editorViewMode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
+var selector = function selector(states) {
+  var _states$editorDisable, _states$editorViewMod;
   return {
-    editorDisabled: editorDisabled,
-    editorViewMode: editorViewMode
+    editorDisabled: (_states$editorDisable = states.editorDisabledState) === null || _states$editorDisable === void 0 ? void 0 : _states$editorDisable.editorDisabled,
+    editorViewMode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode
   };
+};
+var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
+  return useSharedPluginStateWithSelector(pluginInjectionApi, ['editorDisabled', 'editorViewMode'], selector);
 }, function (pluginInjectionApi) {
   var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['editorDisabled', 'editorViewMode']),
     editorDisabledPlugin = _useSharedPluginState.editorDisabledState,

package/dist/esm/nodeviews/mediaInline.js

@@ -21,11 +21,10 @@ import { useEffect, useMemo, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { MediaInlineImageCard } from '@atlaskit/editor-common/media-inline';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { MediaInlineCard } from '@atlaskit/media-card';
 import { getMediaClient } from '@atlaskit/media-client-react';
 import { MediaInlineCardLoadingView } from '@atlaskit/media-ui';
@@ -218,25 +217,21 @@ export var MediaInline = function MediaInline(props) {
     mediaClientConfig: viewMediaClientConfig
   }));
 };
-var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
-  var viewMode = useSharedPluginStateSelector(api, 'editorViewMode.mode');
-  var mediaProvider = useSharedPluginStateSelector(api, 'media.mediaProvider');
-  var handleMediaNodeMount = useSharedPluginStateSelector(api, 'media.handleMediaNodeMount');
-  var handleMediaNodeUnmount = useSharedPluginStateSelector(api, 'media.handleMediaNodeUnmount');
-  var allowInlineImages = useSharedPluginStateSelector(api, 'media.allowInlineImages');
-  var addPendingTask = useSharedPluginStateSelector(api, 'media.addPendingTask');
-  var selectedMediaContainerNode = useSharedPluginStateSelector(api, 'media.selectedMediaContainerNode');
-  var mediaClientConfig = useSharedPluginStateSelector(api, 'media.mediaClientConfig');
+var selector = function selector(states) {
+  var _states$editorViewMod, _states$mediaState, _states$mediaState2, _states$mediaState3, _states$mediaState4, _states$mediaState5, _states$mediaState6, _states$mediaState7;
   return {
-    viewMode: viewMode,
-    mediaProvider: mediaProvider,
-    handleMediaNodeMount: handleMediaNodeMount,
-    handleMediaNodeUnmount: handleMediaNodeUnmount,
-    allowInlineImages: allowInlineImages,
-    addPendingTask: addPendingTask,
-    selectedMediaContainerNode: selectedMediaContainerNode,
-    mediaClientConfig: mediaClientConfig
+    viewMode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode,
+    mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider,
+    handleMediaNodeMount: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.handleMediaNodeMount,
+    handleMediaNodeUnmount: (_states$mediaState3 = states.mediaState) === null || _states$mediaState3 === void 0 ? void 0 : _states$mediaState3.handleMediaNodeUnmount,
+    allowInlineImages: (_states$mediaState4 = states.mediaState) === null || _states$mediaState4 === void 0 ? void 0 : _states$mediaState4.allowInlineImages,
+    addPendingTask: (_states$mediaState5 = states.mediaState) === null || _states$mediaState5 === void 0 ? void 0 : _states$mediaState5.addPendingTask,
+    selectedMediaContainerNode: (_states$mediaState6 = states.mediaState) === null || _states$mediaState6 === void 0 ? void 0 : _states$mediaState6.selectedMediaContainerNode,
+    mediaClientConfig: (_states$mediaState7 = states.mediaState) === null || _states$mediaState7 === void 0 ? void 0 : _states$mediaState7.mediaClientConfig
   };
+};
+var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
+  return useSharedPluginStateWithSelector(api, ['editorViewMode', 'media'], selector);
 }, function (api) {
   var _useSharedPluginState = useSharedPluginState(api, ['editorViewMode', 'media']),
     editorViewModeState = _useSharedPluginState.editorViewModeState,

package/dist/esm/nodeviews/mediaNodeView/index.js

@@ -13,7 +13,7 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
@@ -24,12 +24,15 @@ import { isMediaBlobUrlFromAttrs } from '../../pm-plugins/utils/media-common';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import MediaNode from './media';
-var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
-  var mediaProvider = useSharedPluginStateSelector(pluginInjectionApi, 'media.mediaProvider');
+var selector = function selector(states) {
+  var _states$mediaState;
   return {
-    mediaProvider: mediaProvider,
+    mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider,
     widthState: undefined
   };
+};
+var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
+  return useSharedPluginStateWithSelector(pluginInjectionApi, ['media'], selector);
 }, function (pluginInjectionApi) {
   var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['width', 'media']),
     widthState = _useSharedPluginState.widthState,

package/dist/esm/nodeviews/mediaSingle.js

@@ -17,7 +17,7 @@ import { useCallback, useMemo } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
@@ -25,25 +25,21 @@ import { isNodeSelectedOrInRange } from '@atlaskit/editor-common/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import { MediaSingleNodeNext } from './mediaSingleNext';
-var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
-  var mediaProviderPromise = useSharedPluginStateSelector(pluginInjectionApi, 'media.mediaProvider');
-  var addPendingTask = useSharedPluginStateSelector(pluginInjectionApi, 'media.addPendingTask');
-  var isDrafting = useSharedPluginStateSelector(pluginInjectionApi, 'annotation.isDrafting');
-  var targetNodeId = useSharedPluginStateSelector(pluginInjectionApi, 'annotation.targetNodeId');
-  var width = useSharedPluginStateSelector(pluginInjectionApi, 'width.width');
-  var lineLength = useSharedPluginStateSelector(pluginInjectionApi, 'width.lineLength');
-  var editorDisabled = useSharedPluginStateSelector(pluginInjectionApi, 'editorDisabled.editorDisabled');
-  var viewMode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
+var selector = function selector(states) {
+  var _states$mediaState, _states$mediaState2, _states$annotationSta, _states$annotationSta2, _states$widthState, _states$widthState2, _states$editorDisable, _states$editorViewMod;
   return {
-    mediaProviderPromise: mediaProviderPromise,
-    addPendingTask: addPendingTask,
-    isDrafting: isDrafting,
-    targetNodeId: targetNodeId,
-    width: width,
-    lineLength: lineLength,
-    editorDisabled: editorDisabled,
-    viewMode: viewMode
+    mediaProviderPromise: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider,
+    addPendingTask: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.addPendingTask,
+    isDrafting: (_states$annotationSta = states.annotationState) === null || _states$annotationSta === void 0 ? void 0 : _states$annotationSta.isDrafting,
+    targetNodeId: (_states$annotationSta2 = states.annotationState) === null || _states$annotationSta2 === void 0 ? void 0 : _states$annotationSta2.targetNodeId,
+    width: (_states$widthState = states.widthState) === null || _states$widthState === void 0 ? void 0 : _states$widthState.width,
+    lineLength: (_states$widthState2 = states.widthState) === null || _states$widthState2 === void 0 ? void 0 : _states$widthState2.lineLength,
+    editorDisabled: (_states$editorDisable = states.editorDisabledState) === null || _states$editorDisable === void 0 ? void 0 : _states$editorDisable.editorDisabled,
+    viewMode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode
   };
+};
+var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
+  return useSharedPluginStateWithSelector(pluginInjectionApi, ['width', 'media', 'annotation', 'editorDisabled', 'editorViewMode'], selector);
 }, function (pluginInjectionApi) {
   var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['width', 'media', 'annotation', 'editorDisabled', 'editorViewMode']),
     widthState = _useSharedPluginState.widthState,

package/dist/esm/ui/CommentBadge/index.js

@@ -2,18 +2,18 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useMemo, useState } from 'react';
 import { injectIntl } from 'react-intl-next';
 import { VIEW_METHOD } from '@atlaskit/editor-common/analytics';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { CommentBadge as CommentBadgeComponent, CommentBadgeNext } from '@atlaskit/editor-common/media-single';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
-  var selectedAnnotations = useSharedPluginStateSelector(api, 'annotation.selectedAnnotations');
-  var isInlineCommentViewClosed = useSharedPluginStateSelector(api, 'annotation.isInlineCommentViewClosed');
-  var annotations = useSharedPluginStateSelector(api, 'annotation.annotations');
+var selector = function selector(states) {
+  var _states$annotationSta, _states$annotationSta2, _states$annotationSta3;
   return {
-    selectedAnnotations: selectedAnnotations,
-    isInlineCommentViewClosed: isInlineCommentViewClosed,
-    annotations: annotations
+    selectedAnnotations: (_states$annotationSta = states.annotationState) === null || _states$annotationSta === void 0 ? void 0 : _states$annotationSta.selectedAnnotations,
+    isInlineCommentViewClosed: (_states$annotationSta2 = states.annotationState) === null || _states$annotationSta2 === void 0 ? void 0 : _states$annotationSta2.isInlineCommentViewClosed,
+    annotations: (_states$annotationSta3 = states.annotationState) === null || _states$annotationSta3 === void 0 ? void 0 : _states$annotationSta3.annotations
   };
+};
+var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
+  return useSharedPluginStateWithSelector(api, ['annotation'], selector);
 }, function (api) {
   var _useSharedPluginState = useSharedPluginState(api, ['annotation']),
     annotationState = _useSharedPluginState.annotationState;

package/dist/esm/ui/MediaPicker/DropzoneWrapper.js

@@ -2,18 +2,19 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { Dropzone } from '@atlaskit/media-picker';
 import PickerFacadeProvider from './PickerFacadeProvider';
-var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
-  var options = useSharedPluginStateSelector(api, 'media.options');
-  var handleDrag = useSharedPluginStateSelector(api, 'media.handleDrag');
+var selector = function selector(states) {
+  var _states$mediaState, _states$mediaState2;
   return {
-    options: options,
-    handleDrag: handleDrag
+    options: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.options,
+    handleDrag: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.handleDrag
   };
+};
+var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
+  return useSharedPluginStateWithSelector(api, ['media'], selector);
 }, function (api) {
   var _useSharedPluginState = useSharedPluginState(api, ['media']),
     mediaState = _useSharedPluginState.mediaState;

package/dist/esm/ui/MediaPicker/PickerFacadeProvider.js

@@ -3,8 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { flushSync } from 'react-dom';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ErrorReporter } from '@atlaskit/editor-common/utils';
 import PickerFacade from '../../pm-plugins/picker-facade';
 var dummyMediaPickerObject = {
@@ -14,17 +13,17 @@ var dummyMediaPickerObject = {
   destroy: function destroy() {},
   setUploadParams: function setUploadParams() {}
 };
-var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
-  var mediaProvider = useSharedPluginStateSelector(api, 'media.mediaProvider');
-  var mediaOptions = useSharedPluginStateSelector(api, 'media.mediaOptions');
-  var insertFile = useSharedPluginStateSelector(api, 'media.insertFile');
-  var options = useSharedPluginStateSelector(api, 'media.options');
+var selector = function selector(states) {
+  var _states$mediaState, _states$mediaState2, _states$mediaState3, _states$mediaState4;
   return {
-    mediaProvider: mediaProvider,
-    mediaOptions: mediaOptions,
-    insertFile: insertFile,
-    options: options
+    mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider,
+    mediaOptions: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.mediaOptions,
+    insertFile: (_states$mediaState3 = states.mediaState) === null || _states$mediaState3 === void 0 ? void 0 : _states$mediaState3.insertFile,
+    options: (_states$mediaState4 = states.mediaState) === null || _states$mediaState4 === void 0 ? void 0 : _states$mediaState4.options
   };
+};
+var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
+  return useSharedPluginStateWithSelector(api, ['media'], selector);
 }, function (api) {
   var _useSharedPluginState = useSharedPluginState(api, ['media']),
     mediaState = _useSharedPluginState.mediaState;

package/dist/esm/ui/MediaPicker/index.js

@@ -7,20 +7,20 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { BrowserWrapper } from './BrowserWrapper';
 import { ClipboardWrapper } from './ClipboardWrapper';
 import { DropzoneWrapper } from './DropzoneWrapper';
-var useMediaPickerState = sharedPluginStateHookMigratorFactory(function (api) {
-  var hasFocus = useSharedPluginStateSelector(api, 'focus.hasFocus');
-  var connectivityMode = useSharedPluginStateSelector(api, 'connectivity.mode');
-  var mediaOptions = useSharedPluginStateSelector(api, 'media.mediaOptions');
+var selector = function selector(states) {
+  var _states$focusState, _states$connectivityS, _states$mediaState;
   return {
-    hasFocus: hasFocus,
-    connectivityMode: connectivityMode,
-    mediaOptions: mediaOptions
+    hasFocus: (_states$focusState = states.focusState) === null || _states$focusState === void 0 ? void 0 : _states$focusState.hasFocus,
+    connectivityMode: (_states$connectivityS = states.connectivityState) === null || _states$connectivityS === void 0 ? void 0 : _states$connectivityS.mode,
+    mediaOptions: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaOptions
   };
+};
+var useMediaPickerState = sharedPluginStateHookMigratorFactory(function (api) {
+  return useSharedPluginStateWithSelector(api, ['focus', 'connectivity', 'media'], selector);
 }, function (api) {
   var _useSharedPluginState = useSharedPluginState(api, ['focus', 'connectivity', 'media']),
     focusState = _useSharedPluginState.focusState,

package/dist/esm/ui/ToolbarMedia/index.js

@@ -1,9 +1,8 @@
 import React from 'react';
 import { injectIntl } from 'react-intl-next';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { toolbarMediaMessages } from '@atlaskit/editor-common/media';
 import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import AttachmentIcon from '@atlaskit/icon/core/migration/attachment--editor-attachment';
 var onClickMediaButton = function onClickMediaButton(showMediaPicker) {
   return function () {
@@ -11,13 +10,15 @@ var onClickMediaButton = function onClickMediaButton(showMediaPicker) {
     return true;
   };
 };
-var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
-  var allowsUploads = useSharedPluginStateSelector(api, 'media.allowsUploads');
-  var showMediaPicker = useSharedPluginStateSelector(api, 'media.showMediaPicker');
+var selector = function selector(states) {
+  var _states$mediaState, _states$mediaState2;
   return {
-    allowsUploads: allowsUploads,
-    showMediaPicker: showMediaPicker
+    allowsUploads: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.allowsUploads,
+    showMediaPicker: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.showMediaPicker
   };
+};
+var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
+  return useSharedPluginStateWithSelector(api, ['media'], selector);
 }, function (api) {
   var _useSharedPluginState = useSharedPluginState(api, ['media']),
     mediaState = _useSharedPluginState.mediaState;

package/dist/esm/ui/hooks/useMediaProvider.js

@@ -1,11 +1,13 @@
 import { useMemo } from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
-  var mediaProvider = useSharedPluginStateSelector(pluginInjectionApi, 'media.mediaProvider');
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+var selector = function selector(states) {
+  var _states$mediaState;
   return {
-    mediaProvider: mediaProvider
+    mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider
   };
+};
+var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
+  return useSharedPluginStateWithSelector(pluginInjectionApi, ['media'], selector);
 }, function (pluginInjectionApi) {
   var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['media']),
     mediaState = _useSharedPluginState.mediaState;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "5.1.1",
+	"version": "5.1.3",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -57,7 +57,7 @@
 		"@atlaskit/form": "^12.0.0",
 		"@atlaskit/icon": "^27.3.0",
 		"@atlaskit/icon-lab": "^5.1.0",
-		"@atlaskit/media-card": "^79.3.0",
+		"@atlaskit/media-card": "^79.4.0",
 		"@atlaskit/media-client": "^35.0.0",
 		"@atlaskit/media-client-react": "^4.1.0",
 		"@atlaskit/media-common": "^12.3.0",
@@ -68,8 +68,8 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.10.0",
 		"@atlaskit/textfield": "^8.0.0",
-		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^9.0.0",
+		"@atlaskit/theme": "^19.0.0",
+		"@atlaskit/tmp-editor-statsig": "^9.1.0",
 		"@atlaskit/tokens": "^5.4.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",