@atlaskit/editor-plugin-card 7.7.2 → 7.7.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-card
 
+## 7.7.3
+
+### Patch Changes
+
+- [`05bf548de34be`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/05bf548de34be) -
+  PR to cleanup platform_editor_usesharedpluginstatewithselector for card
+- Updated dependencies
+
 ## 7.7.2
 
 ### Patch Changes

package/dist/cjs/nodeviews/embedCard.js

@@ -47,18 +47,6 @@ var selector = function selector(states) {
     editorDisabled: (_states$editorDisable = states.editorDisabledState) === null || _states$editorDisable === void 0 ? void 0 : _states$editorDisable.editorDisabled
   };
 };
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
-  return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['width', 'editorDisabled'], selector);
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['width', 'editorDisabled']),
-    widthState = _useSharedPluginState.widthState,
-    editorDisabledState = _useSharedPluginState.editorDisabledState;
-  return {
-    widthStateLineLength: (widthState === null || widthState === void 0 ? void 0 : widthState.lineLength) || 0,
-    widthStateWidth: (widthState === null || widthState === void 0 ? void 0 : widthState.width) || 0,
-    editorDisabled: editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled
-  };
-});
 var CardInner = function CardInner(_ref) {
   var pluginInjectionApi = _ref.pluginInjectionApi,
     getPosSafely = _ref.getPosSafely,
@@ -73,10 +61,10 @@ var CardInner = function CardInner(_ref) {
     heightAlone = _ref.heightAlone,
     cardProps = _ref.cardProps,
     dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
-  var _useSharedState = useSharedState(pluginInjectionApi),
-    widthStateLineLength = _useSharedState.widthStateLineLength,
-    widthStateWidth = _useSharedState.widthStateWidth,
-    editorDisabled = _useSharedState.editorDisabled;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['width', 'editorDisabled'], selector),
+    widthStateLineLength = _useSharedPluginState.widthStateLineLength,
+    widthStateWidth = _useSharedPluginState.widthStateWidth,
+    editorDisabled = _useSharedPluginState.editorDisabled;
   var pos = getPosSafely();
   if (pos === undefined) {
     return null;

package/dist/cjs/nodeviews/inlineCard.js

@@ -196,23 +196,11 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
 });
 var WrappedInlineCardWithAwareness = (0, _genericCard.Card)(_inlineCardWithAwareness.InlineCardWithAwareness, _ui.UnsupportedInline);
 var selector = function selector(states) {
-  var _states$editorViewMod, _states$selectionStat;
+  var _states$editorViewMod;
   return {
-    mode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode,
-    selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
+    mode: (_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, ['selection', 'editorViewMode'], selector);
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['selection', 'editorViewMode']),
-    selectionState = _useSharedPluginState.selectionState,
-    editorViewModeState = _useSharedPluginState.editorViewModeState;
-  return {
-    mode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
-    selection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection
-  };
-});
 
 /**
  *
@@ -233,8 +221,8 @@ function InlineCardNodeView(props) {
     isPageSSRed = props.isPageSSRed,
     provider = props.provider,
     CompetitorPrompt = props.CompetitorPrompt;
-  var _useSharedState = useSharedState(pluginInjectionApi),
-    mode = _useSharedState.mode;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['editorViewMode'], selector),
+    mode = _useSharedPluginState.mode;
   var url = node.attrs.url;
   var CompetitorPromptComponent = CompetitorPrompt && url ? /*#__PURE__*/_react.default.createElement(CompetitorPrompt, {
     sourceUrl: url,

package/dist/cjs/nodeviews/inlineCardWithAwareness.js

@@ -26,17 +26,6 @@ var selector = function selector(states) {
     selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
   };
 };
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
-  return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['selection', 'editorViewMode'], selector);
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['selection', 'editorViewMode']),
-    selectionState = _useSharedPluginState.selectionState,
-    editorViewModeState = _useSharedPluginState.editorViewModeState;
-  return {
-    mode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
-    selection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection
-  };
-});
 var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var _pluginInjectionApi$c;
   var node = _ref.node,
@@ -91,9 +80,9 @@ var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0,
       setIsHovered(isHovered);
     }
   }, [isOverlayEnabled]);
-  var _useSharedState = useSharedState(pluginInjectionApi),
-    mode = _useSharedState.mode,
-    selection = _useSharedState.selection;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['selection', 'editorViewMode'], selector),
+    mode = _useSharedPluginState.mode,
+    selection = _useSharedPluginState.selection;
   var floatingToolbarNode = selection instanceof _state.NodeSelection && selection.node;
   // This is a prop to show Hover card, Hover card should be shown only in Live View and Classic Renderer (note when only Editor controls enabled we don't show in Live view)
   var showHoverPreview = floatingToolbarNode !== node && (0, _experiments.editorExperiment)('platform_editor_preview_panel_linking_exp', true, {

package/dist/cjs/ui/DatasourceModal/ModalWithState.js

@@ -9,39 +9,22 @@ var _react = _interopRequireDefault(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _linkDatasource = require("@atlaskit/link-datasource");
 var _linkProvider = require("@atlaskit/link-provider");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _datasourceErrorBoundary = require("../datasourceErrorBoundary");
 var _index = require("./index");
 var selector = function selector(states) {
   var _states$cardState, _states$cardState2;
   return {
-    cardState: undefined,
     showDatasourceModal: (_states$cardState = states.cardState) === null || _states$cardState === void 0 ? void 0 : _states$cardState.showDatasourceModal,
     datasourceModalType: (_states$cardState2 = states.cardState) === null || _states$cardState2 === void 0 ? void 0 : _states$cardState2.datasourceModalType
   };
 };
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
-  return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['card'], selector);
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['card']),
-    cardState = _useSharedPluginState.cardState;
-  return {
-    cardState: cardState,
-    showDatasourceModal: cardState === null || cardState === void 0 ? void 0 : cardState.showDatasourceModal,
-    datasourceModalType: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceModalType
-  };
-});
 var ModalWithState = function ModalWithState(_ref) {
   var api = _ref.api,
     editorView = _ref.editorView;
   var cardContext = (0, _linkProvider.useSmartLinkContext)();
-  var _useSharedState = useSharedState(api),
-    cardState = _useSharedState.cardState,
-    showDatasourceModal = _useSharedState.showDatasourceModal,
-    datasourceModalType = _useSharedState.datasourceModalType;
-  if (!cardState && (0, _expValEquals.expValEquals)('platform_editor_usesharedpluginstatewithselector', 'isEnabled', false)) {
-    return null;
-  }
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['card'], selector),
+    showDatasourceModal = _useSharedPluginState.showDatasourceModal,
+    datasourceModalType = _useSharedPluginState.datasourceModalType;
   if (!showDatasourceModal || !datasourceModalType) {
     return null;
   }

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

@@ -84,16 +84,6 @@ var selector = function selector(states) {
     datasourceTableRef: (_states$cardState2 = states.cardState) === null || _states$cardState2 === void 0 ? void 0 : _states$cardState2.datasourceTableRef
   };
 };
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
-  return (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['card'], selector);
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['card']),
-    cardState = _useSharedPluginState.cardState;
-  return {
-    layout: cardState === null || cardState === void 0 ? void 0 : cardState.layout,
-    datasourceTableRef: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceTableRef
-  };
-});
 var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
   var _node$attrs;
   var editorView = _ref2.editorView,
@@ -105,10 +95,10 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
   var _getDatasource = (0, _utils3.getDatasource)(editorView),
     node = _getDatasource.node,
     pos = _getDatasource.pos;
-  var _useSharedState = useSharedState(api),
-    _useSharedState$layou = _useSharedState.layout,
-    layout = _useSharedState$layou === void 0 ? (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || undefined : _useSharedState$layou,
-    datasourceTableRef = _useSharedState.datasourceTableRef;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['card'], selector),
+    _useSharedPluginState2 = _useSharedPluginState.layout,
+    layout = _useSharedPluginState2 === void 0 ? (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || undefined : _useSharedPluginState2,
+    datasourceTableRef = _useSharedPluginState.datasourceTableRef;
   var isDatasource = (0, _utils2.isDatasourceNode)(node);
   if (!isDatasource) {
     return null;

package/dist/es2019/nodeviews/embedCard.js

@@ -5,7 +5,7 @@ import rafSchedule from 'raf-schd';
 import uuid from 'uuid/v4';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { EditorCardProvider } from '@atlaskit/editor-card-provider';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, MediaSingle as RichMediaWrapper, UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
@@ -27,19 +27,6 @@ const selector = states => {
     editorDisabled: (_states$editorDisable = states.editorDisabledState) === null || _states$editorDisable === void 0 ? void 0 : _states$editorDisable.editorDisabled
   };
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  return useSharedPluginStateWithSelector(pluginInjectionApi, ['width', 'editorDisabled'], selector);
-}, pluginInjectionApi => {
-  const {
-    widthState,
-    editorDisabledState
-  } = useSharedPluginState(pluginInjectionApi, ['width', 'editorDisabled']);
-  return {
-    widthStateLineLength: (widthState === null || widthState === void 0 ? void 0 : widthState.lineLength) || 0,
-    widthStateWidth: (widthState === null || widthState === void 0 ? void 0 : widthState.width) || 0,
-    editorDisabled: editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled
-  };
-});
 const CardInner = ({
   pluginInjectionApi,
   getPosSafely,
@@ -59,7 +46,7 @@ const CardInner = ({
     widthStateLineLength,
     widthStateWidth,
     editorDisabled
-  } = useSharedState(pluginInjectionApi);
+  } = useSharedPluginStateWithSelector(pluginInjectionApi, ['width', 'editorDisabled'], selector);
   const pos = getPosSafely();
   if (pos === undefined) {
     return null;

package/dist/es2019/nodeviews/inlineCard.js

@@ -4,7 +4,7 @@ import rafSchedule from 'raf-schd';
 import uuid from 'uuid/v4';
 import { EditorCardProvider } from '@atlaskit/editor-card-provider';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { UnsupportedInline, findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
@@ -169,24 +169,11 @@ export const InlineCard = /*#__PURE__*/memo(({
 });
 const WrappedInlineCardWithAwareness = Card(InlineCardWithAwareness, UnsupportedInline);
 const selector = states => {
-  var _states$editorViewMod, _states$selectionStat;
+  var _states$editorViewMod;
   return {
-    mode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode,
-    selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
+    mode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode
   };
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  return useSharedPluginStateWithSelector(pluginInjectionApi, ['selection', 'editorViewMode'], selector);
-}, pluginInjectionApi => {
-  const {
-    selectionState,
-    editorViewModeState
-  } = useSharedPluginState(pluginInjectionApi, ['selection', 'editorViewMode']);
-  return {
-    mode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
-    selection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection
-  };
-});
 
 /**
  *
@@ -211,7 +198,7 @@ export function InlineCardNodeView(props) {
   } = props;
   const {
     mode
-  } = useSharedState(pluginInjectionApi);
+  } = useSharedPluginStateWithSelector(pluginInjectionApi, ['editorViewMode'], selector);
   const url = node.attrs.url;
   const CompetitorPromptComponent = CompetitorPrompt && url ? /*#__PURE__*/React.createElement(CompetitorPrompt, {
     sourceUrl: url,

package/dist/es2019/nodeviews/inlineCardWithAwareness.js

@@ -1,5 +1,5 @@
 import React, { memo, useCallback, useMemo, useState } from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { HoverLinkOverlay } from '@atlaskit/editor-common/ui';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { getObjectAri, getObjectName, getObjectIconUrl } from '@atlaskit/smart-card';
@@ -16,18 +16,6 @@ const selector = states => {
     selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
   };
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  return useSharedPluginStateWithSelector(pluginInjectionApi, ['selection', 'editorViewMode'], selector);
-}, pluginInjectionApi => {
-  const {
-    selectionState,
-    editorViewModeState
-  } = useSharedPluginState(pluginInjectionApi, ['selection', 'editorViewMode']);
-  return {
-    mode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
-    selection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection
-  };
-});
 export const InlineCardWithAwareness = /*#__PURE__*/memo(({
   node,
   cardContext,
@@ -73,7 +61,7 @@ export const InlineCardWithAwareness = /*#__PURE__*/memo(({
   const {
     mode,
     selection
-  } = useSharedState(pluginInjectionApi);
+  } = useSharedPluginStateWithSelector(pluginInjectionApi, ['selection', 'editorViewMode'], selector);
   const floatingToolbarNode = selection instanceof NodeSelection && selection.node;
   // This is a prop to show Hover card, Hover card should be shown only in Live View and Classic Renderer (note when only Editor controls enabled we don't show in Live view)
   const showHoverPreview = floatingToolbarNode !== node && editorExperiment('platform_editor_preview_panel_linking_exp', true, {

package/dist/es2019/ui/DatasourceModal/ModalWithState.js

@@ -1,43 +1,25 @@
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, AssetsConfigModal, CONFLUENCE_SEARCH_DATASOURCE_ID, ConfluenceSearchConfigModal, JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
 import { EditorSmartCardProviderValueGuard, useSmartLinkContext } from '@atlaskit/link-provider';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { DatasourceErrorBoundary } from '../datasourceErrorBoundary';
 import { DatasourceModal } from './index';
 const selector = states => {
   var _states$cardState, _states$cardState2;
   return {
-    cardState: undefined,
     showDatasourceModal: (_states$cardState = states.cardState) === null || _states$cardState === void 0 ? void 0 : _states$cardState.showDatasourceModal,
     datasourceModalType: (_states$cardState2 = states.cardState) === null || _states$cardState2 === void 0 ? void 0 : _states$cardState2.datasourceModalType
   };
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  return useSharedPluginStateWithSelector(pluginInjectionApi, ['card'], selector);
-}, pluginInjectionApi => {
-  const {
-    cardState
-  } = useSharedPluginState(pluginInjectionApi, ['card']);
-  return {
-    cardState,
-    showDatasourceModal: cardState === null || cardState === void 0 ? void 0 : cardState.showDatasourceModal,
-    datasourceModalType: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceModalType
-  };
-});
 const ModalWithState = ({
   api,
   editorView
 }) => {
   const cardContext = useSmartLinkContext();
   const {
-    cardState,
     showDatasourceModal,
     datasourceModalType
-  } = useSharedState(api);
-  if (!cardState && expValEquals('platform_editor_usesharedpluginstatewithselector', 'isEnabled', false)) {
-    return null;
-  }
+  } = useSharedPluginStateWithSelector(api, ['card'], selector);
   if (!showDatasourceModal || !datasourceModalType) {
     return null;
   }

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

@@ -7,7 +7,7 @@ import { useCallback, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { getNextBreakoutMode, getTitle } from '@atlaskit/editor-common/utils';
@@ -78,17 +78,6 @@ const selector = states => {
     datasourceTableRef: (_states$cardState2 = states.cardState) === null || _states$cardState2 === void 0 ? void 0 : _states$cardState2.datasourceTableRef
   };
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  return useSharedPluginStateWithSelector(pluginInjectionApi, ['card'], selector);
-}, pluginInjectionApi => {
-  const {
-    cardState
-  } = useSharedPluginState(pluginInjectionApi, ['card']);
-  return {
-    layout: cardState === null || cardState === void 0 ? void 0 : cardState.layout,
-    datasourceTableRef: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceTableRef
-  };
-});
 const LayoutButtonWrapper = ({
   editorView,
   mountPoint,
@@ -105,7 +94,7 @@ const LayoutButtonWrapper = ({
   const {
     layout = (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || undefined,
     datasourceTableRef
-  } = useSharedState(api);
+  } = useSharedPluginStateWithSelector(api, ['card'], selector);
   const isDatasource = isDatasourceNode(node);
   if (!isDatasource) {
     return null;

package/dist/esm/nodeviews/embedCard.js

@@ -18,7 +18,7 @@ import rafSchedule from 'raf-schd';
 import uuid from 'uuid/v4';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { EditorCardProvider } from '@atlaskit/editor-card-provider';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, MediaSingle as RichMediaWrapper, UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
@@ -40,18 +40,6 @@ var selector = function selector(states) {
     editorDisabled: (_states$editorDisable = states.editorDisabledState) === null || _states$editorDisable === void 0 ? void 0 : _states$editorDisable.editorDisabled
   };
 };
-var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
-  return useSharedPluginStateWithSelector(pluginInjectionApi, ['width', 'editorDisabled'], selector);
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['width', 'editorDisabled']),
-    widthState = _useSharedPluginState.widthState,
-    editorDisabledState = _useSharedPluginState.editorDisabledState;
-  return {
-    widthStateLineLength: (widthState === null || widthState === void 0 ? void 0 : widthState.lineLength) || 0,
-    widthStateWidth: (widthState === null || widthState === void 0 ? void 0 : widthState.width) || 0,
-    editorDisabled: editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled
-  };
-});
 var CardInner = function CardInner(_ref) {
   var pluginInjectionApi = _ref.pluginInjectionApi,
     getPosSafely = _ref.getPosSafely,
@@ -66,10 +54,10 @@ var CardInner = function CardInner(_ref) {
     heightAlone = _ref.heightAlone,
     cardProps = _ref.cardProps,
     dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
-  var _useSharedState = useSharedState(pluginInjectionApi),
-    widthStateLineLength = _useSharedState.widthStateLineLength,
-    widthStateWidth = _useSharedState.widthStateWidth,
-    editorDisabled = _useSharedState.editorDisabled;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(pluginInjectionApi, ['width', 'editorDisabled'], selector),
+    widthStateLineLength = _useSharedPluginState.widthStateLineLength,
+    widthStateWidth = _useSharedPluginState.widthStateWidth,
+    editorDisabled = _useSharedPluginState.editorDisabled;
   var pos = getPosSafely();
   if (pos === undefined) {
     return null;

package/dist/esm/nodeviews/inlineCard.js

@@ -7,7 +7,7 @@ import rafSchedule from 'raf-schd';
 import uuid from 'uuid/v4';
 import { EditorCardProvider } from '@atlaskit/editor-card-provider';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { UnsupportedInline, findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
@@ -185,23 +185,11 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
 });
 var WrappedInlineCardWithAwareness = Card(InlineCardWithAwareness, UnsupportedInline);
 var selector = function selector(states) {
-  var _states$editorViewMod, _states$selectionStat;
+  var _states$editorViewMod;
   return {
-    mode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode,
-    selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
+    mode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode
   };
 };
-var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
-  return useSharedPluginStateWithSelector(pluginInjectionApi, ['selection', 'editorViewMode'], selector);
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['selection', 'editorViewMode']),
-    selectionState = _useSharedPluginState.selectionState,
-    editorViewModeState = _useSharedPluginState.editorViewModeState;
-  return {
-    mode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
-    selection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection
-  };
-});
 
 /**
  *
@@ -222,8 +210,8 @@ export function InlineCardNodeView(props) {
     isPageSSRed = props.isPageSSRed,
     provider = props.provider,
     CompetitorPrompt = props.CompetitorPrompt;
-  var _useSharedState = useSharedState(pluginInjectionApi),
-    mode = _useSharedState.mode;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(pluginInjectionApi, ['editorViewMode'], selector),
+    mode = _useSharedPluginState.mode;
   var url = node.attrs.url;
   var CompetitorPromptComponent = CompetitorPrompt && url ? /*#__PURE__*/React.createElement(CompetitorPrompt, {
     sourceUrl: url,

package/dist/esm/nodeviews/inlineCardWithAwareness.js

@@ -1,6 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { memo, useCallback, useMemo, useState } from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { HoverLinkOverlay } from '@atlaskit/editor-common/ui';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { getObjectAri, getObjectName, getObjectIconUrl } from '@atlaskit/smart-card';
@@ -17,17 +17,6 @@ var selector = function selector(states) {
     selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
   };
 };
-var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
-  return useSharedPluginStateWithSelector(pluginInjectionApi, ['selection', 'editorViewMode'], selector);
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['selection', 'editorViewMode']),
-    selectionState = _useSharedPluginState.selectionState,
-    editorViewModeState = _useSharedPluginState.editorViewModeState;
-  return {
-    mode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
-    selection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection
-  };
-});
 export var InlineCardWithAwareness = /*#__PURE__*/memo(function (_ref) {
   var _pluginInjectionApi$c;
   var node = _ref.node,
@@ -82,9 +71,9 @@ export var InlineCardWithAwareness = /*#__PURE__*/memo(function (_ref) {
       setIsHovered(isHovered);
     }
   }, [isOverlayEnabled]);
-  var _useSharedState = useSharedState(pluginInjectionApi),
-    mode = _useSharedState.mode,
-    selection = _useSharedState.selection;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(pluginInjectionApi, ['selection', 'editorViewMode'], selector),
+    mode = _useSharedPluginState.mode,
+    selection = _useSharedPluginState.selection;
   var floatingToolbarNode = selection instanceof NodeSelection && selection.node;
   // This is a prop to show Hover card, Hover card should be shown only in Live View and Classic Renderer (note when only Editor controls enabled we don't show in Live view)
   var showHoverPreview = floatingToolbarNode !== node && editorExperiment('platform_editor_preview_panel_linking_exp', true, {

package/dist/esm/ui/DatasourceModal/ModalWithState.js

@@ -1,40 +1,23 @@
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, AssetsConfigModal, CONFLUENCE_SEARCH_DATASOURCE_ID, ConfluenceSearchConfigModal, JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
 import { EditorSmartCardProviderValueGuard, useSmartLinkContext } from '@atlaskit/link-provider';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { DatasourceErrorBoundary } from '../datasourceErrorBoundary';
 import { DatasourceModal } from './index';
 var selector = function selector(states) {
   var _states$cardState, _states$cardState2;
   return {
-    cardState: undefined,
     showDatasourceModal: (_states$cardState = states.cardState) === null || _states$cardState === void 0 ? void 0 : _states$cardState.showDatasourceModal,
     datasourceModalType: (_states$cardState2 = states.cardState) === null || _states$cardState2 === void 0 ? void 0 : _states$cardState2.datasourceModalType
   };
 };
-var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
-  return useSharedPluginStateWithSelector(pluginInjectionApi, ['card'], selector);
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['card']),
-    cardState = _useSharedPluginState.cardState;
-  return {
-    cardState: cardState,
-    showDatasourceModal: cardState === null || cardState === void 0 ? void 0 : cardState.showDatasourceModal,
-    datasourceModalType: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceModalType
-  };
-});
 var ModalWithState = function ModalWithState(_ref) {
   var api = _ref.api,
     editorView = _ref.editorView;
   var cardContext = useSmartLinkContext();
-  var _useSharedState = useSharedState(api),
-    cardState = _useSharedState.cardState,
-    showDatasourceModal = _useSharedState.showDatasourceModal,
-    datasourceModalType = _useSharedState.datasourceModalType;
-  if (!cardState && expValEquals('platform_editor_usesharedpluginstatewithselector', 'isEnabled', false)) {
-    return null;
-  }
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['card'], selector),
+    showDatasourceModal = _useSharedPluginState.showDatasourceModal,
+    datasourceModalType = _useSharedPluginState.datasourceModalType;
   if (!showDatasourceModal || !datasourceModalType) {
     return null;
   }

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

@@ -10,7 +10,7 @@ import { useCallback, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { getNextBreakoutMode, getTitle } from '@atlaskit/editor-common/utils';
@@ -80,16 +80,6 @@ var selector = function selector(states) {
     datasourceTableRef: (_states$cardState2 = states.cardState) === null || _states$cardState2 === void 0 ? void 0 : _states$cardState2.datasourceTableRef
   };
 };
-var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
-  return useSharedPluginStateWithSelector(pluginInjectionApi, ['card'], selector);
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['card']),
-    cardState = _useSharedPluginState.cardState;
-  return {
-    layout: cardState === null || cardState === void 0 ? void 0 : cardState.layout,
-    datasourceTableRef: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceTableRef
-  };
-});
 var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
   var _node$attrs;
   var editorView = _ref2.editorView,
@@ -101,10 +91,10 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
   var _getDatasource = getDatasource(editorView),
     node = _getDatasource.node,
     pos = _getDatasource.pos;
-  var _useSharedState = useSharedState(api),
-    _useSharedState$layou = _useSharedState.layout,
-    layout = _useSharedState$layou === void 0 ? (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || undefined : _useSharedState$layou,
-    datasourceTableRef = _useSharedState.datasourceTableRef;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['card'], selector),
+    _useSharedPluginState2 = _useSharedPluginState.layout,
+    layout = _useSharedPluginState2 === void 0 ? (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || undefined : _useSharedPluginState2,
+    datasourceTableRef = _useSharedPluginState.datasourceTableRef;
   var isDatasource = isDatasourceNode(node);
   if (!isDatasource) {
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "7.7.2",
+	"version": "7.7.3",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -58,9 +58,9 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
 		"@atlaskit/primitives": "^14.12.0",
-		"@atlaskit/smart-card": "^40.15.0",
+		"@atlaskit/smart-card": "^40.16.0",
 		"@atlaskit/theme": "^20.0.0",
-		"@atlaskit/tmp-editor-statsig": "^11.11.0",
+		"@atlaskit/tmp-editor-statsig": "^11.12.0",
 		"@atlaskit/tokens": "^6.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -70,7 +70,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.34.0",
+		"@atlaskit/editor-common": "^107.35.0",
 		"@atlaskit/link-provider": "^3.7.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"