@atlaskit/editor-plugin-media 5.1.1 → 5.1.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-media
 
+## 5.1.2
+
+### Patch Changes
+
+- [#182839](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/182839)
+  [`81f1c3383bdab`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/81f1c3383bdab) -
+  refactor: use useSharedPluginStateWithSelector instead of useSharedPluginStateSelector
+- Updated dependencies
+
 ## 5.1.1
 
 ### Patch Changes

package/dist/cjs/mediaPlugin.js

@@ -12,7 +12,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _mediaCommon = require("@atlaskit/media-common");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -42,13 +41,15 @@ var _PortalWrapper = require("./ui/MediaViewer/PortalWrapper");
 var _toolbar = require("./ui/toolbar");
 var _ToolbarMedia = _interopRequireDefault(require("./ui/ToolbarMedia"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-var useMediaPickerSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
-  var onPopupToggle = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.onPopupToggle');
-  var setBrowseFn = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector);
 }, function (api) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['media']),
     mediaState = _useSharedPluginState.mediaState;
@@ -75,15 +76,16 @@ var MediaPickerFunctionalComponent = function MediaPickerFunctionalComponent(_re
     api: api
   });
 };
-var useMediaViewerSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
-  var isMediaViewerVisible = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.isMediaViewerVisible');
-  var mediaViewerSelectedMedia = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.mediaViewerSelectedMedia');
-  var mediaClientConfig = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], mediaViewerStateSelector);
 }, function (api) {
   var _useSharedPluginState2 = (0, _hooks.useSharedPluginState)(api, ['media']),
     mediaState = _useSharedPluginState2.mediaState;

package/dist/cjs/nodeviews/mediaGroup.js

@@ -14,18 +14,19 @@ var _react = _interopRequireDefault(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _useMediaProvider = require("../ui/hooks/useMediaProvider");
 var _mediaGroupNext = require("./mediaGroupNext");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
-  var editorDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'editorDisabled.editorDisabled');
-  var editorViewMode = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['editorDisabled', 'editorViewMode'], selector);
 }, function (pluginInjectionApi) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['editorDisabled', 'editorViewMode']),
     editorDisabledPlugin = _useSharedPluginState.editorDisabledState,

package/dist/cjs/nodeviews/mediaInline.js

@@ -21,7 +21,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _mediaInline = require("@atlaskit/editor-common/media-inline");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _selectionBasedNodeView = require("@atlaskit/editor-common/selection-based-node-view");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _mediaCard = require("@atlaskit/media-card");
 var _mediaClientReact = require("@atlaskit/media-client-react");
 var _mediaUi = require("@atlaskit/media-ui");
@@ -222,25 +221,21 @@ var MediaInline = exports.MediaInline = function MediaInline(props) {
     mediaClientConfig: viewMediaClientConfig
   }));
 };
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
-  var viewMode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'editorViewMode.mode');
-  var mediaProvider = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.mediaProvider');
-  var handleMediaNodeMount = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.handleMediaNodeMount');
-  var handleMediaNodeUnmount = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.handleMediaNodeUnmount');
-  var allowInlineImages = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.allowInlineImages');
-  var addPendingTask = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.addPendingTask');
-  var selectedMediaContainerNode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.selectedMediaContainerNode');
-  var mediaClientConfig = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['editorViewMode', 'media'], selector);
 }, function (api) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['editorViewMode', 'media']),
     editorViewModeState = _useSharedPluginState.editorViewModeState,

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

@@ -30,12 +30,15 @@ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0,
 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 = (0, _get2.default)((0, _getPrototypeOf2.default)(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; } // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
-  var mediaProvider = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['media'], selector);
 }, function (pluginInjectionApi) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['width', 'media']),
     widthState = _useSharedPluginState.widthState,

package/dist/cjs/nodeviews/mediaSingle.js

@@ -29,25 +29,21 @@ function _superPropGet(t, o, e, r) { var p = (0, _get2.default)((0, _getPrototyp
  * @jsx jsx
  * @jsxFrag
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
-  var mediaProviderPromise = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'media.mediaProvider');
-  var addPendingTask = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'media.addPendingTask');
-  var isDrafting = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'annotation.isDrafting');
-  var targetNodeId = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'annotation.targetNodeId');
-  var width = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'width.width');
-  var lineLength = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'width.lineLength');
-  var editorDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'editorDisabled.editorDisabled');
-  var viewMode = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['width', 'media', 'annotation', 'editorDisabled', 'editorViewMode'], selector);
 }, function (pluginInjectionApi) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['width', 'media', 'annotation', 'editorDisabled', 'editorViewMode']),
     widthState = _useSharedPluginState.widthState,

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

@@ -12,17 +12,17 @@ var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
-  var selectedAnnotations = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'annotation.selectedAnnotations');
-  var isInlineCommentViewClosed = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'annotation.isInlineCommentViewClosed');
-  var annotations = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector);
 }, function (api) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['annotation']),
     annotationState = _useSharedPluginState.annotationState;

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

@@ -9,18 +9,19 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _ui = require("@atlaskit/editor-common/ui");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _mediaPicker = require("@atlaskit/media-picker");
 var _PickerFacadeProvider = _interopRequireDefault(require("./PickerFacadeProvider"));
 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) { (0, _defineProperty2.default)(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; }
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
-  var options = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.options');
-  var handleDrag = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector);
 }, function (api) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['media']),
     mediaState = _useSharedPluginState.mediaState;

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

@@ -11,7 +11,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _reactDom = require("react-dom");
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _utils = require("@atlaskit/editor-common/utils");
 var _pickerFacade = _interopRequireDefault(require("../../pm-plugins/picker-facade"));
 var dummyMediaPickerObject = {
@@ -21,17 +20,17 @@ var dummyMediaPickerObject = {
   destroy: function destroy() {},
   setUploadParams: function setUploadParams() {}
 };
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
-  var mediaProvider = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.mediaProvider');
-  var mediaOptions = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.mediaOptions');
-  var insertFile = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.insertFile');
-  var options = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector);
 }, function (api) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['media']),
     mediaState = _useSharedPluginState.mediaState;

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

@@ -13,21 +13,21 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _BrowserWrapper = require("./BrowserWrapper");
 var _ClipboardWrapper = require("./ClipboardWrapper");
 var _DropzoneWrapper = require("./DropzoneWrapper");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
-var useMediaPickerState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
-  var hasFocus = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'focus.hasFocus');
-  var connectivityMode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'connectivity.mode');
-  var mediaOptions = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['focus', 'connectivity', 'media'], selector);
 }, function (api) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['focus', 'connectivity', 'media']),
     focusState = _useSharedPluginState.focusState,

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

@@ -10,7 +10,6 @@ var _reactIntlNext = require("react-intl-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _media = require("@atlaskit/editor-common/media");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _attachmentEditorAttachment = _interopRequireDefault(require("@atlaskit/icon/core/migration/attachment--editor-attachment"));
 var onClickMediaButton = function onClickMediaButton(showMediaPicker) {
   return function () {
@@ -18,13 +17,15 @@ var onClickMediaButton = function onClickMediaButton(showMediaPicker) {
     return true;
   };
 };
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
-  var allowsUploads = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'media.allowsUploads');
-  var showMediaPicker = (0, _useSharedPluginStateSelector.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 = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['media'], selector);
 }, function (api) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['media']),
     mediaState = _useSharedPluginState.mediaState;

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

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.useMediaProvider = void 0;
 var _react = require("react");
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
-  var mediaProvider = (0, _useSharedPluginStateSelector.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
   };
+};
+var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['media'], selector);
 }, function (pluginInjectionApi) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['media']),
     mediaState = _useSharedPluginState.mediaState;

package/dist/es2019/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 } from './ui/toolbar';
 import ToolbarMedia from './ui/ToolbarMedia';
-const useMediaPickerSharedState = sharedPluginStateHookMigratorFactory(api => {
-  const onPopupToggle = useSharedPluginStateSelector(api, 'media.onPopupToggle');
-  const setBrowseFn = useSharedPluginStateSelector(api, 'media.setBrowseFn');
+const selector = states => {
+  var _states$mediaState, _states$mediaState2;
   return {
-    onPopupToggle,
-    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
   };
+};
+const useMediaPickerSharedState = sharedPluginStateHookMigratorFactory(api => {
+  return useSharedPluginStateWithSelector(api, ['media'], selector);
 }, api => {
   const {
     mediaState
@@ -69,15 +70,16 @@ const MediaPickerFunctionalComponent = ({
     api: api
   });
 };
-const useMediaViewerSharedState = sharedPluginStateHookMigratorFactory(api => {
-  const isMediaViewerVisible = useSharedPluginStateSelector(api, 'media.isMediaViewerVisible');
-  const mediaViewerSelectedMedia = useSharedPluginStateSelector(api, 'media.mediaViewerSelectedMedia');
-  const mediaClientConfig = useSharedPluginStateSelector(api, 'media.mediaClientConfig');
+const mediaViewerStateSelector = states => {
+  var _states$mediaState3, _states$mediaState4, _states$mediaState5;
   return {
-    isMediaViewerVisible,
-    mediaViewerSelectedMedia,
-    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
   };
+};
+const useMediaViewerSharedState = sharedPluginStateHookMigratorFactory(api => {
+  return useSharedPluginStateWithSelector(api, ['media'], mediaViewerStateSelector);
 }, api => {
   const {
     mediaState

package/dist/es2019/nodeviews/mediaGroup.js

@@ -1,17 +1,18 @@
 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';
-const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  const editorDisabled = useSharedPluginStateSelector(pluginInjectionApi, 'editorDisabled.editorDisabled');
-  const editorViewMode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
+const selector = states => {
+  var _states$editorDisable, _states$editorViewMod;
   return {
-    editorDisabled,
-    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
   };
+};
+const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
+  return useSharedPluginStateWithSelector(pluginInjectionApi, ['editorDisabled', 'editorViewMode'], selector);
 }, pluginInjectionApi => {
   const {
     editorDisabledState: editorDisabledPlugin,

package/dist/es2019/nodeviews/mediaInline.js

@@ -6,11 +6,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';
@@ -154,25 +153,21 @@ export const MediaInline = props => {
     mediaClientConfig: viewMediaClientConfig
   }));
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(api => {
-  const viewMode = useSharedPluginStateSelector(api, 'editorViewMode.mode');
-  const mediaProvider = useSharedPluginStateSelector(api, 'media.mediaProvider');
-  const handleMediaNodeMount = useSharedPluginStateSelector(api, 'media.handleMediaNodeMount');
-  const handleMediaNodeUnmount = useSharedPluginStateSelector(api, 'media.handleMediaNodeUnmount');
-  const allowInlineImages = useSharedPluginStateSelector(api, 'media.allowInlineImages');
-  const addPendingTask = useSharedPluginStateSelector(api, 'media.addPendingTask');
-  const selectedMediaContainerNode = useSharedPluginStateSelector(api, 'media.selectedMediaContainerNode');
-  const mediaClientConfig = useSharedPluginStateSelector(api, 'media.mediaClientConfig');
+const selector = states => {
+  var _states$editorViewMod, _states$mediaState, _states$mediaState2, _states$mediaState3, _states$mediaState4, _states$mediaState5, _states$mediaState6, _states$mediaState7;
   return {
-    viewMode,
-    mediaProvider,
-    handleMediaNodeMount,
-    handleMediaNodeUnmount,
-    allowInlineImages,
-    addPendingTask,
-    selectedMediaContainerNode,
-    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
   };
+};
+const useSharedState = sharedPluginStateHookMigratorFactory(api => {
+  return useSharedPluginStateWithSelector(api, ['editorViewMode', 'media'], selector);
 }, api => {
   const {
     editorViewModeState,

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

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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';
@@ -11,12 +11,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';
-const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  const mediaProvider = useSharedPluginStateSelector(pluginInjectionApi, 'media.mediaProvider');
+const selector = states => {
+  var _states$mediaState;
   return {
-    mediaProvider,
+    mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider,
     widthState: undefined
   };
+};
+const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
+  return useSharedPluginStateWithSelector(pluginInjectionApi, ['media'], selector);
 }, pluginInjectionApi => {
   const {
     widthState,

package/dist/es2019/nodeviews/mediaSingle.js

@@ -8,7 +8,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';
@@ -16,25 +16,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';
-const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  const mediaProviderPromise = useSharedPluginStateSelector(pluginInjectionApi, 'media.mediaProvider');
-  const addPendingTask = useSharedPluginStateSelector(pluginInjectionApi, 'media.addPendingTask');
-  const isDrafting = useSharedPluginStateSelector(pluginInjectionApi, 'annotation.isDrafting');
-  const targetNodeId = useSharedPluginStateSelector(pluginInjectionApi, 'annotation.targetNodeId');
-  const width = useSharedPluginStateSelector(pluginInjectionApi, 'width.width');
-  const lineLength = useSharedPluginStateSelector(pluginInjectionApi, 'width.lineLength');
-  const editorDisabled = useSharedPluginStateSelector(pluginInjectionApi, 'editorDisabled.editorDisabled');
-  const viewMode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
+const selector = states => {
+  var _states$mediaState, _states$mediaState2, _states$annotationSta, _states$annotationSta2, _states$widthState, _states$widthState2, _states$editorDisable, _states$editorViewMod;
   return {
-    mediaProviderPromise,
-    addPendingTask,
-    isDrafting,
-    targetNodeId,
-    width,
-    lineLength,
-    editorDisabled,
-    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
   };
+};
+const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
+  return useSharedPluginStateWithSelector(pluginInjectionApi, ['width', 'media', 'annotation', 'editorDisabled', 'editorViewMode'], selector);
 }, pluginInjectionApi => {
   const {
     widthState,