@atlaskit/editor-plugin-extension 5.3.7 → 5.3.8

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-extension
 
+## 5.3.8
+
+### Patch Changes
+
+- [#147357](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/147357)
+  [`1eab8cfeaf029`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1eab8cfeaf029) -
+  Migrate extensions and floating toolbar plugins to use useSharedPluginStateSelector hook
+- Updated dependencies
+
 ## 5.3.7
 
 ### Patch Changes

package/dist/cjs/ui/ConfigPanel/ConfigPanel.js

@@ -26,6 +26,7 @@ var _new = _interopRequireDefault(require("@atlaskit/button/new"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _extensions = require("@atlaskit/editor-common/extensions");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _form = _interopRequireWildcard(require("@atlaskit/form"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
@@ -488,6 +489,18 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
     }
   }]);
 }(_react.default.Component);
+var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  var contextIdentifierProvider = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'contextIdentifier.contextIdentifierProvider');
+  return {
+    contextIdentifierProvider: contextIdentifierProvider
+  };
+}, function (api) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['contextIdentifier']),
+    contextIdentifierState = _useSharedPluginState.contextIdentifierState;
+  return {
+    contextIdentifierProvider: contextIdentifierState === null || contextIdentifierState === void 0 ? void 0 : contextIdentifierState.contextIdentifierProvider
+  };
+});
 function ConfigFormIntlWithBoundary(_ref6) {
   var api = _ref6.api,
     fields = _ref6.fields,
@@ -503,10 +516,8 @@ function ConfigFormIntlWithBoundary(_ref6) {
     firstVisibleFieldName = _ref6.firstVisibleFieldName,
     errorMessage = _ref6.errorMessage,
     disableFields = _ref6.disableFields;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['contextIdentifier']),
-    contextIdentifierState = _useSharedPluginState.contextIdentifierState;
-  var _ref7 = contextIdentifierState !== null && contextIdentifierState !== void 0 ? contextIdentifierState : {},
-    contextIdentifierProvider = _ref7.contextIdentifierProvider;
+  var _useSharedState = useSharedState(api),
+    contextIdentifierProvider = _useSharedState.contextIdentifierProvider;
   return /*#__PURE__*/_react.default.createElement(_FormErrorBoundary.FormErrorBoundary, {
     contextIdentifierProvider: contextIdentifierProvider,
     extensionKey: extensionManifest.key,

package/dist/cjs/ui/useConfigPanelPluginHook.js

@@ -16,6 +16,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _extensions = require("@atlaskit/editor-common/extensions");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _commands = require("../editor-commands/commands");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
@@ -28,35 +29,50 @@ var _contextPanel = require("./context-panel");
 var _SaveIndicator = require("./SaveIndicator/SaveIndicator");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  var showContextPanel = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'extension.showContextPanel');
+  var extensionProvider = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'extension.extensionProvider');
+  var processParametersAfter = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'extension.processParametersAfter');
+  return {
+    showContextPanel: showContextPanel,
+    extensionProvider: extensionProvider,
+    processParametersAfter: processParametersAfter
+  };
+}, function (api) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['extension']),
+    extensionState = _useSharedPluginState.extensionState;
+  return {
+    showContextPanel: extensionState === null || extensionState === void 0 ? void 0 : extensionState.showContextPanel,
+    extensionProvider: extensionState === null || extensionState === void 0 ? void 0 : extensionState.extensionProvider,
+    processParametersAfter: extensionState === null || extensionState === void 0 ? void 0 : extensionState.processParametersAfter
+  };
+});
 function useConfigPanelPluginHook(_ref) {
   var editorView = _ref.editorView,
     api = _ref.api;
   var editorState = editorView.state;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['extension']),
-    extensionState = _useSharedPluginState.extensionState;
+  var _useSharedState = useSharedState(api),
+    showContextPanel = _useSharedState.showContextPanel,
+    extensionProvider = _useSharedState.extensionProvider,
+    processParametersAfter = _useSharedState.processParametersAfter;
   (0, _react.useEffect)(function () {
     var nodeWithPos = (0, _utils.getSelectedExtension)(editorState, true);
     // Adding checks to bail out early
-    if (!nodeWithPos || !extensionState) {
+    if (!nodeWithPos) {
       hideConfigPanel(api);
       return;
     }
-    if (extensionState) {
-      var showContextPanel = extensionState.showContextPanel,
-        extensionProvider = extensionState.extensionProvider,
-        processParametersAfter = extensionState.processParametersAfter;
-      if (showContextPanel && extensionProvider && processParametersAfter) {
-        showConfigPanel({
-          api: api,
-          editorView: editorView,
-          extensionProvider: extensionProvider,
-          nodeWithPos: nodeWithPos
-        });
-      } else {
-        hideConfigPanel(api);
-      }
+    if (showContextPanel && extensionProvider && processParametersAfter) {
+      showConfigPanel({
+        api: api,
+        editorView: editorView,
+        extensionProvider: extensionProvider,
+        nodeWithPos: nodeWithPos
+      });
+    } else {
+      hideConfigPanel(api);
     }
-  }, [api, editorState, editorView, extensionState]);
+  }, [api, editorState, editorView, showContextPanel, extensionProvider, processParametersAfter]);
   (0, _react.useEffect)(function () {
     return function () {
       hideConfigPanel(api);

package/dist/es2019/ui/ConfigPanel/ConfigPanel.js

@@ -10,7 +10,8 @@ import ButtonGroup from '@atlaskit/button/button-group';
 import Button from '@atlaskit/button/new';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { isTabGroup, configPanelMessages as messages } from '@atlaskit/editor-common/extensions';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import Form, { FormFooter } from '@atlaskit/form';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -425,6 +426,19 @@ class ConfigPanel extends React.Component {
     });
   }
 }
+const useSharedState = sharedPluginStateHookMigratorFactory(api => {
+  const contextIdentifierProvider = useSharedPluginStateSelector(api, 'contextIdentifier.contextIdentifierProvider');
+  return {
+    contextIdentifierProvider
+  };
+}, api => {
+  const {
+    contextIdentifierState
+  } = useSharedPluginState(api, ['contextIdentifier']);
+  return {
+    contextIdentifierProvider: contextIdentifierState === null || contextIdentifierState === void 0 ? void 0 : contextIdentifierState.contextIdentifierProvider
+  };
+});
 function ConfigFormIntlWithBoundary({
   api,
   fields,
@@ -441,12 +455,9 @@ function ConfigFormIntlWithBoundary({
   errorMessage,
   disableFields
 }) {
-  const {
-    contextIdentifierState
-  } = useSharedPluginState(api, ['contextIdentifier']);
   const {
     contextIdentifierProvider
-  } = contextIdentifierState !== null && contextIdentifierState !== void 0 ? contextIdentifierState : {};
+  } = useSharedState(api);
   return /*#__PURE__*/React.createElement(FormErrorBoundary, {
     contextIdentifierProvider: contextIdentifierProvider,
     extensionKey: extensionManifest.key,

package/dist/es2019/ui/useConfigPanelPluginHook.js

@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react';
 import { getExtensionKeyAndNodeKey } from '@atlaskit/editor-common/extensions';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { Box } from '@atlaskit/primitives/compiled';
 import { clearEditingContext, forceAutoSave } from '../editor-commands/commands';
 import { getPluginState } from '../pm-plugins/plugin-factory';
@@ -11,39 +12,53 @@ import HeaderAfterIconElement from './ConfigPanel/Header/HeaderAfterIconElement'
 import HeaderIcon from './ConfigPanel/Header/HeaderIcon';
 import { onChangeAction } from './context-panel';
 import { SaveIndicator } from './SaveIndicator/SaveIndicator';
+const useSharedState = sharedPluginStateHookMigratorFactory(api => {
+  const showContextPanel = useSharedPluginStateSelector(api, 'extension.showContextPanel');
+  const extensionProvider = useSharedPluginStateSelector(api, 'extension.extensionProvider');
+  const processParametersAfter = useSharedPluginStateSelector(api, 'extension.processParametersAfter');
+  return {
+    showContextPanel,
+    extensionProvider,
+    processParametersAfter
+  };
+}, api => {
+  const {
+    extensionState
+  } = useSharedPluginState(api, ['extension']);
+  return {
+    showContextPanel: extensionState === null || extensionState === void 0 ? void 0 : extensionState.showContextPanel,
+    extensionProvider: extensionState === null || extensionState === void 0 ? void 0 : extensionState.extensionProvider,
+    processParametersAfter: extensionState === null || extensionState === void 0 ? void 0 : extensionState.processParametersAfter
+  };
+});
 export function useConfigPanelPluginHook({
   editorView,
   api
 }) {
   const editorState = editorView.state;
   const {
-    extensionState
-  } = useSharedPluginState(api, ['extension']);
+    showContextPanel,
+    extensionProvider,
+    processParametersAfter
+  } = useSharedState(api);
   useEffect(() => {
     const nodeWithPos = getSelectedExtension(editorState, true);
     // Adding checks to bail out early
-    if (!nodeWithPos || !extensionState) {
+    if (!nodeWithPos) {
       hideConfigPanel(api);
       return;
     }
-    if (extensionState) {
-      const {
-        showContextPanel,
+    if (showContextPanel && extensionProvider && processParametersAfter) {
+      showConfigPanel({
+        api,
+        editorView,
         extensionProvider,
-        processParametersAfter
-      } = extensionState;
-      if (showContextPanel && extensionProvider && processParametersAfter) {
-        showConfigPanel({
-          api,
-          editorView,
-          extensionProvider,
-          nodeWithPos
-        });
-      } else {
-        hideConfigPanel(api);
-      }
+        nodeWithPos
+      });
+    } else {
+      hideConfigPanel(api);
     }
-  }, [api, editorState, editorView, extensionState]);
+  }, [api, editorState, editorView, showContextPanel, extensionProvider, processParametersAfter]);
   useEffect(() => {
     return () => {
       hideConfigPanel(api);

package/dist/esm/ui/ConfigPanel/ConfigPanel.js

@@ -21,7 +21,8 @@ import ButtonGroup from '@atlaskit/button/button-group';
 import Button from '@atlaskit/button/new';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { isTabGroup, configPanelMessages as messages } from '@atlaskit/editor-common/extensions';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import Form, { FormFooter } from '@atlaskit/form';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -478,6 +479,18 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
     }
   }]);
 }(React.Component);
+var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
+  var contextIdentifierProvider = useSharedPluginStateSelector(api, 'contextIdentifier.contextIdentifierProvider');
+  return {
+    contextIdentifierProvider: contextIdentifierProvider
+  };
+}, function (api) {
+  var _useSharedPluginState = useSharedPluginState(api, ['contextIdentifier']),
+    contextIdentifierState = _useSharedPluginState.contextIdentifierState;
+  return {
+    contextIdentifierProvider: contextIdentifierState === null || contextIdentifierState === void 0 ? void 0 : contextIdentifierState.contextIdentifierProvider
+  };
+});
 function ConfigFormIntlWithBoundary(_ref6) {
   var api = _ref6.api,
     fields = _ref6.fields,
@@ -493,10 +506,8 @@ function ConfigFormIntlWithBoundary(_ref6) {
     firstVisibleFieldName = _ref6.firstVisibleFieldName,
     errorMessage = _ref6.errorMessage,
     disableFields = _ref6.disableFields;
-  var _useSharedPluginState = useSharedPluginState(api, ['contextIdentifier']),
-    contextIdentifierState = _useSharedPluginState.contextIdentifierState;
-  var _ref7 = contextIdentifierState !== null && contextIdentifierState !== void 0 ? contextIdentifierState : {},
-    contextIdentifierProvider = _ref7.contextIdentifierProvider;
+  var _useSharedState = useSharedState(api),
+    contextIdentifierProvider = _useSharedState.contextIdentifierProvider;
   return /*#__PURE__*/React.createElement(FormErrorBoundary, {
     contextIdentifierProvider: contextIdentifierProvider,
     extensionKey: extensionManifest.key,

package/dist/esm/ui/useConfigPanelPluginHook.js

@@ -3,7 +3,8 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect } from 'react';
 import { getExtensionKeyAndNodeKey } from '@atlaskit/editor-common/extensions';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { Box } from '@atlaskit/primitives/compiled';
 import { clearEditingContext, forceAutoSave } from '../editor-commands/commands';
 import { getPluginState } from '../pm-plugins/plugin-factory';
@@ -14,35 +15,50 @@ import HeaderAfterIconElement from './ConfigPanel/Header/HeaderAfterIconElement'
 import HeaderIcon from './ConfigPanel/Header/HeaderIcon';
 import { onChangeAction } from './context-panel';
 import { SaveIndicator } from './SaveIndicator/SaveIndicator';
+var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
+  var showContextPanel = useSharedPluginStateSelector(api, 'extension.showContextPanel');
+  var extensionProvider = useSharedPluginStateSelector(api, 'extension.extensionProvider');
+  var processParametersAfter = useSharedPluginStateSelector(api, 'extension.processParametersAfter');
+  return {
+    showContextPanel: showContextPanel,
+    extensionProvider: extensionProvider,
+    processParametersAfter: processParametersAfter
+  };
+}, function (api) {
+  var _useSharedPluginState = useSharedPluginState(api, ['extension']),
+    extensionState = _useSharedPluginState.extensionState;
+  return {
+    showContextPanel: extensionState === null || extensionState === void 0 ? void 0 : extensionState.showContextPanel,
+    extensionProvider: extensionState === null || extensionState === void 0 ? void 0 : extensionState.extensionProvider,
+    processParametersAfter: extensionState === null || extensionState === void 0 ? void 0 : extensionState.processParametersAfter
+  };
+});
 export function useConfigPanelPluginHook(_ref) {
   var editorView = _ref.editorView,
     api = _ref.api;
   var editorState = editorView.state;
-  var _useSharedPluginState = useSharedPluginState(api, ['extension']),
-    extensionState = _useSharedPluginState.extensionState;
+  var _useSharedState = useSharedState(api),
+    showContextPanel = _useSharedState.showContextPanel,
+    extensionProvider = _useSharedState.extensionProvider,
+    processParametersAfter = _useSharedState.processParametersAfter;
   useEffect(function () {
     var nodeWithPos = getSelectedExtension(editorState, true);
     // Adding checks to bail out early
-    if (!nodeWithPos || !extensionState) {
+    if (!nodeWithPos) {
       hideConfigPanel(api);
       return;
     }
-    if (extensionState) {
-      var showContextPanel = extensionState.showContextPanel,
-        extensionProvider = extensionState.extensionProvider,
-        processParametersAfter = extensionState.processParametersAfter;
-      if (showContextPanel && extensionProvider && processParametersAfter) {
-        showConfigPanel({
-          api: api,
-          editorView: editorView,
-          extensionProvider: extensionProvider,
-          nodeWithPos: nodeWithPos
-        });
-      } else {
-        hideConfigPanel(api);
-      }
+    if (showContextPanel && extensionProvider && processParametersAfter) {
+      showConfigPanel({
+        api: api,
+        editorView: editorView,
+        extensionProvider: extensionProvider,
+        nodeWithPos: nodeWithPos
+      });
+    } else {
+      hideConfigPanel(api);
     }
-  }, [api, editorState, editorView, extensionState]);
+  }, [api, editorState, editorView, showContextPanel, extensionProvider, processParametersAfter]);
   useEffect(function () {
     return function () {
       hideConfigPanel(api);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-extension",
-	"version": "5.3.7",
+	"version": "5.3.8",
 	"description": "editor-plugin-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,13 +28,13 @@
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/adf-utils": "^19.19.0",
 		"@atlaskit/analytics-next": "^11.0.0",
-		"@atlaskit/avatar": "^25.0.0",
+		"@atlaskit/avatar": "^25.1.0",
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/checkbox": "^17.1.0",
 		"@atlaskit/datetime-picker": "^17.0.0",
-		"@atlaskit/editor-common": "^105.0.0",
+		"@atlaskit/editor-common": "^105.2.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
-		"@atlaskit/editor-plugin-analytics": "^2.2.0",
+		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
 		"@atlaskit/editor-plugin-context-identifier": "^2.1.0",
 		"@atlaskit/editor-plugin-context-panel": "^4.1.0",
@@ -59,7 +59,7 @@
 		"@atlaskit/textarea": "^8.0.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.19.0",
+		"@atlaskit/tmp-editor-statsig": "^4.21.0",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",