@atlaskit/editor-plugin-card 4.4.13 → 4.5.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-card
 
+## 4.5.1
+
+### Patch Changes
+
+- [#176132](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/176132)
+  [`738d9aeecf5e1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/738d9aeecf5e1) -
+  [ED-24119] Replace Legacy React Context with proper React Context
+
+## 4.5.0
+
+### Minor Changes
+
+- [#175540](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/175540)
+  [`fa908f67c5dba`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fa908f67c5dba) -
+  [ux] ED-25903 support comment on smart links floating toolbar
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.4.13
 
 ### Patch Changes

package/dist/cjs/nodeviews/blockCard.js

@@ -14,7 +14,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _ui = require("@atlaskit/editor-common/ui");
@@ -112,9 +111,6 @@ var BlockCardComponent = exports.BlockCardComponent = /*#__PURE__*/function (_Re
   }]);
   return BlockCardComponent;
 }(_react.default.PureComponent);
-(0, _defineProperty2.default)(BlockCardComponent, "contextTypes", {
-  contextAdapter: _propTypes.default.object
-});
 var WrappedBlockCard = (0, _genericCard.Card)(BlockCardComponent, _ui.UnsupportedBlock);
 var BlockCard = exports.BlockCard = /*#__PURE__*/function (_ReactNodeView) {
   (0, _inherits2.default)(BlockCard, _ReactNodeView);

package/dist/cjs/nodeviews/datasource.js

@@ -16,12 +16,12 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _linkDatasource = require("@atlaskit/link-datasource");
+var _linkProvider = require("@atlaskit/link-provider");
 var _linkingCommon = require("@atlaskit/linking-common");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _datasourceErrorBoundary = require("../datasourceErrorBoundary");
@@ -47,8 +47,6 @@ var getPosSafely = function getPosSafely(pos) {
 var DatasourceComponent = exports.DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
   (0, _inherits2.default)(DatasourceComponent, _React$PureComponent);
   var _super = _createSuper(DatasourceComponent);
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   function DatasourceComponent(props) {
     var _this;
     (0, _classCallCheck2.default)(this, DatasourceComponent);
@@ -184,7 +182,6 @@ var DatasourceComponent = exports.DatasourceComponent = /*#__PURE__*/function (_
   }, {
     key: "render",
     value: function render() {
-      var cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
       var datasource = this.getDatasource();
       var attrs = this.props.node.attrs;
       var tableView = this.getTableView();
@@ -193,34 +190,25 @@ var DatasourceComponent = exports.DatasourceComponent = /*#__PURE__*/function (_
           visibleColumnKeys = _this$getColumnsInfo10.visibleColumnKeys,
           columnCustomSizes = _this$getColumnsInfo10.columnCustomSizes,
           wrappedColumnKeys = _this$getColumnsInfo10.wrappedColumnKeys;
-
-        // [WS-2307]: we only render card wrapped into a Provider when the value is ready
-        if (cardContext && cardContext.value) {
-          return (0, _react2.jsx)(_EditorAnalyticsContext.EditorAnalyticsContext, {
-            editorView: this.props.view
-          }, (0, _react2.jsx)(cardContext.Provider, {
-            value: cardContext.value
-          }, (0, _react2.jsx)(_linkDatasource.DatasourceTableView, {
-            datasourceId: datasource.id,
-            parameters: datasource.parameters,
-            visibleColumnKeys: visibleColumnKeys,
-            onVisibleColumnKeysChange: this.handleColumnChange,
-            url: attrs === null || attrs === void 0 ? void 0 : attrs.url,
-            onColumnResize: this.handleColumnResize,
-            columnCustomSizes: columnCustomSizes,
-            onWrappedColumnChange: this.handleWrappedColumnChange,
-            wrappedColumnKeys: wrappedColumnKeys
-          })));
-        }
+        return (0, _react2.jsx)(_linkProvider.EditorSmartCardProviderValueGuard, null, (0, _react2.jsx)(_EditorAnalyticsContext.EditorAnalyticsContext, {
+          editorView: this.props.view
+        }, (0, _react2.jsx)(_linkProvider.EditorSmartCardProvider, null, (0, _react2.jsx)(_linkDatasource.DatasourceTableView, {
+          datasourceId: datasource.id,
+          parameters: datasource.parameters,
+          visibleColumnKeys: visibleColumnKeys,
+          onVisibleColumnKeysChange: this.handleColumnChange,
+          url: attrs === null || attrs === void 0 ? void 0 : attrs.url,
+          onColumnResize: this.handleColumnResize,
+          columnCustomSizes: columnCustomSizes,
+          onWrappedColumnChange: this.handleWrappedColumnChange,
+          wrappedColumnKeys: wrappedColumnKeys
+        }))));
       }
       return null;
     }
   }]);
   return DatasourceComponent;
 }(_react.default.PureComponent);
-(0, _defineProperty2.default)(DatasourceComponent, "contextTypes", {
-  contextAdapter: _propTypes.default.object
-});
 var Datasource = exports.Datasource = /*#__PURE__*/function (_ReactNodeView) {
   (0, _inherits2.default)(Datasource, _ReactNodeView);
   var _super2 = _createSuper(Datasource);

package/dist/cjs/nodeviews/embedCard.js

@@ -15,7 +15,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _hooks = require("@atlaskit/editor-common/hooks");
@@ -156,8 +155,9 @@ var EmbedCardComponent = exports.EmbedCardComponent = /*#__PURE__*/function (_Re
         })(view.state.tr));
       })();
       try {
-        var cardContext = _this.context.contextAdapter ? _this.context.contextAdapter.card : undefined;
-        var hasPreview = cardContext && cardContext.value.extractors.getPreview(url, 'web');
+        var _this$props$cardConte, _this$props$cardConte2;
+        var cardContext = (_this$props$cardConte = _this.props.cardContext) !== null && _this$props$cardConte !== void 0 && _this$props$cardConte.value ? (_this$props$cardConte2 = _this.props.cardContext) === null || _this$props$cardConte2 === void 0 ? void 0 : _this$props$cardConte2.value : undefined;
+        var hasPreview = url && cardContext && cardContext.extractors.getPreview(url, 'web');
         if (!hasPreview) {
           _this.setState({
             hasPreview: false
@@ -249,14 +249,11 @@ var EmbedCardComponent = exports.EmbedCardComponent = /*#__PURE__*/function (_Re
     _this.scrollContainer = (0, _ui.findOverflowScrollParent)(props.view.dom) || undefined;
     return _this;
   }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   (0, _createClass2.default)(EmbedCardComponent, [{
     key: "render",
     value: function render() {
       var _this$props = this.props,
         node = _this$props.node,
-        cardContext = _this$props.cardContext,
         allowResizing = _this$props.allowResizing,
         fullWidthMode = _this$props.fullWidthMode,
         view = _this$props.view,
@@ -305,7 +302,7 @@ var EmbedCardComponent = exports.EmbedCardComponent = /*#__PURE__*/function (_Re
         embedIframeRef: this.embedIframeRef,
         actionOptions: actionOptions
       });
-      var cardInner = /*#__PURE__*/_react.default.createElement(_smartCard.EmbedResizeMessageListener, {
+      return /*#__PURE__*/_react.default.createElement(_smartCard.EmbedResizeMessageListener, {
         embedIframeRef: this.embedIframeRef,
         onHeightUpdate: this.onHeightUpdate
       }, /*#__PURE__*/_react.default.createElement(CardInner, {
@@ -324,18 +321,10 @@ var EmbedCardComponent = exports.EmbedCardComponent = /*#__PURE__*/function (_Re
         cardProps: cardProps,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent
       }));
-
-      // [WS-2307]: we only render card wrapped into a Provider when the value is ready
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, cardContext && cardContext.value ? /*#__PURE__*/_react.default.createElement(cardContext.Provider, {
-        value: cardContext.value
-      }, cardInner) : null);
     }
   }]);
   return EmbedCardComponent;
 }(_react.default.PureComponent);
-(0, _defineProperty2.default)(EmbedCardComponent, "contextTypes", {
-  contextAdapter: _propTypes.default.object
-});
 var WrappedBlockCard = (0, _genericCard.Card)(EmbedCardComponent, _ui.UnsupportedBlock);
 var EmbedCard = exports.EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
   (0, _inherits2.default)(EmbedCard, _ReactNodeView);

package/dist/cjs/nodeviews/genericCard.js

@@ -15,7 +15,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
@@ -23,6 +22,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _doc = require("../pm-plugins/doc");
 var _state = require("../pm-plugins/util/state");
+var _WithCardContext = require("../ui/WithCardContext");
 var _utils2 = require("../utils");
 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; }
@@ -68,13 +68,12 @@ var WithClickHandler = function WithClickHandler(_ref) {
   }));
 };
 function Card(SmartCardComponent, UnsupportedComponent) {
-  var _class;
-  return _class = /*#__PURE__*/function (_React$Component) {
-    (0, _inherits2.default)(_class, _React$Component);
-    var _super = _createSuper(_class);
-    function _class() {
+  return /*#__PURE__*/function (_React$Component) {
+    (0, _inherits2.default)(_class2, _React$Component);
+    var _super = _createSuper(_class2);
+    function _class2() {
       var _this;
-      (0, _classCallCheck2.default)(this, _class);
+      (0, _classCallCheck2.default)(this, _class2);
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
@@ -84,7 +83,7 @@ function Card(SmartCardComponent, UnsupportedComponent) {
       });
       return _this;
     }
-    (0, _createClass2.default)(_class, [{
+    (0, _createClass2.default)(_class2, [{
       key: "render",
       value: function render() {
         var _getPluginState,
@@ -109,7 +108,6 @@ function Card(SmartCardComponent, UnsupportedComponent) {
             return /*#__PURE__*/_react.default.createElement(UnsupportedComponent, null);
           }
         }
-        var cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
         var editorAppearance = (_getPluginState = (0, _state.getPluginState)(this.props.view.state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.editorAppearance;
         var analyticsEditorAppearance = (0, _utils.getAnalyticsEditorAppearance)(editorAppearance);
         return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
@@ -127,12 +125,14 @@ function Card(SmartCardComponent, UnsupportedComponent) {
           __livePage: this.props.__livePage
         }, function (_ref2) {
           var onClick = _ref2.onClick;
-          return /*#__PURE__*/_react.default.createElement(SmartCardComponent, (0, _extends2.default)({
-            key: url,
-            cardContext: cardContext
-          }, _this2.props, {
-            onClick: onClick
-          }));
+          return /*#__PURE__*/_react.default.createElement(_WithCardContext.WithCardContext, null, function (cardContext) {
+            return /*#__PURE__*/_react.default.createElement(SmartCardComponent, (0, _extends2.default)({
+              key: url,
+              cardContext: cardContext
+            }, _this2.props, {
+              onClick: onClick
+            }));
+          });
         }));
       }
     }, {
@@ -169,8 +169,6 @@ function Card(SmartCardComponent, UnsupportedComponent) {
         }
       }
     }]);
-    return _class;
-  }(_react.default.Component), (0, _defineProperty2.default)(_class, "contextTypes", {
-    contextAdapter: _propTypes.default.object
-  }), _class;
+    return _class2;
+  }(_react.default.Component);
 }

package/dist/cjs/plugin.js

@@ -30,6 +30,10 @@ var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
 var _utils2 = require("./utils");
 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; }
+// Dummpy type of AnnotationPlugin
+// This is used to avoid editor universal preset's inferred type maximum length error
+// TODO: Remove this when the issue is fixed
+
 var cardPlugin = exports.cardPlugin = function cardPlugin(_ref) {
   var _options$lpLinkPicker;
   var _ref$config = _ref.config,

package/dist/cjs/toolbar.js

@@ -18,10 +18,12 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
 var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
 var _linkBroken = _interopRequireDefault(require("@atlaskit/icon/core/link-broken"));
 var _linkExternal = _interopRequireDefault(require("@atlaskit/icon/core/link-external"));
 var _settings = _interopRequireDefault(require("@atlaskit/icon/core/settings"));
+var _comment2 = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
 var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
 var _settings2 = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/settings"));
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
@@ -189,7 +191,7 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
 };
 var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs;
+    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$a2, _node$attrs;
     var _titleUrlPairFromNode2 = (0, _utils3.titleUrlPairFromNode)(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
@@ -210,6 +212,19 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       hoverDecoration = _ref2.hoverDecoration;
     var isDatasource = (0, _utils3.isDatasourceNode)(node);
     var pluginState = _main.pluginKey.getState(state);
+    var annotationApiState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.annotation) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.sharedState.currentState();
+    var activeCommentMark = node.marks.find(function (mark) {
+      return mark.type.name === 'annotation' && (annotationApiState === null || annotationApiState === void 0 ? void 0 : annotationApiState.annotations[mark.attrs.id]) === false;
+    });
+    var isCommentEnabled = annotationApiState && annotationApiState.isVisible && !annotationApiState.bookmark && !annotationApiState.mouseData.isSelecting && !activeCommentMark && node.type === state.schema.nodes.inlineCard && (0, _platformFeatureFlags.fg)('platform_inline_node_as_valid_annotation_selection');
+    var onCommentButtonClick = function onCommentButtonClick(state, dispatch) {
+      if (!(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.annotation) || !isCommentEnabled) {
+        return false;
+      }
+      var setInlineCommentDraftState = pluginInjectionApi.annotation.actions.setInlineCommentDraftState;
+      var command = setInlineCommentDraftState(true, _analytics.INPUT_METHOD.FLOATING_TB);
+      return command(state, dispatch);
+    };
     var shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && (0, _utils.canRenderDatasource)(node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.datasource) === null || _node$attrs === void 0 ? void 0 : _node$attrs.id);
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
       return [(0, _EditLinkToolbar.buildEditLinkToolbar)({
@@ -249,7 +264,18 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       }, {
         type: 'separator'
       }];
-      var toolbarItems = [].concat(editItems, [{
+      var commentItems = isCommentEnabled ? [{
+        id: 'editor.link.commentLink',
+        type: 'button',
+        icon: _comment.default,
+        testId: 'inline-card-toolbar-comment-button',
+        iconFallback: _comment2.default,
+        title: intl.formatMessage(_messages.annotationMessages.createComment),
+        onClick: onCommentButtonClick
+      }, {
+        type: 'separator'
+      }] : [];
+      var toolbarItems = [].concat(editItems, commentItems, [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: _linkExternal.default,
@@ -287,8 +313,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
       }]);
       if (currentAppearance === 'embed') {
-        var _pluginInjectionApi$a2;
-        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions, cardOptions);
+        var _pluginInjectionApi$a3;
+        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, cardOptions);
         if (alignmentOptions.length) {
           alignmentOptions.push({
             type: 'separator'

package/dist/cjs/ui/DatasourceAppearanceButton.js

@@ -11,10 +11,10 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _linkDatasource = require("@atlaskit/link-datasource");
+var _linkProvider = require("@atlaskit/link-provider");
 var _primitives = require("@atlaskit/primitives");
 var _doc = require("../pm-plugins/doc");
 var _pluginKey = require("../pm-plugins/plugin-key");
-var _CardContextProvider = require("./CardContextProvider");
 var _DatasourceIcon = require("./DatasourceIcon");
 var _useFetchDatasourceInfo = require("./useFetchDatasourceInfo");
 /**
@@ -112,17 +112,15 @@ var DatasourceAppearanceButton = exports.DatasourceAppearanceButton = function D
     editorState = _ref2.editorState,
     selected = _ref2.selected,
     inputMethod = _ref2.inputMethod;
-  return (0, _react2.jsx)(_CardContextProvider.CardContextProvider, null, function (_ref3) {
-    var cardContext = _ref3.cardContext;
-    return (0, _react2.jsx)(DatasourceAppearanceButtonWithCardContext, {
-      url: url,
-      intl: intl,
-      editorAnalyticsApi: editorAnalyticsApi,
-      editorView: editorView,
-      editorState: editorState,
-      cardContext: cardContext,
-      selected: selected,
-      inputMethod: inputMethod
-    });
+  var cardContext = (0, _linkProvider.useSmartLinkContext)();
+  return (0, _react2.jsx)(DatasourceAppearanceButtonWithCardContext, {
+    url: url,
+    intl: intl,
+    editorAnalyticsApi: editorAnalyticsApi,
+    editorView: editorView,
+    editorState: editorState,
+    cardContext: cardContext,
+    selected: selected,
+    inputMethod: inputMethod
   });
 };

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

@@ -8,12 +8,13 @@ exports.modalTypeToComponentMap = exports.default = void 0;
 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 _datasourceErrorBoundary = require("../../datasourceErrorBoundary");
-var _CardContextProvider = require("../CardContextProvider");
 var _index = require("./index");
 var ModalWithState = function ModalWithState(_ref) {
   var api = _ref.api,
     editorView = _ref.editorView;
+  var cardContext = (0, _linkProvider.useSmartLinkContext)();
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['card']),
     cardState = _useSharedPluginState.cardState;
   if (!cardState) {
@@ -30,16 +31,21 @@ var ModalWithState = function ModalWithState(_ref) {
   return /*#__PURE__*/_react.default.createElement(_datasourceErrorBoundary.DatasourceErrorBoundary, {
     view: editorView,
     datasourceModalType: datasourceModalType
-  }, /*#__PURE__*/_react.default.createElement(_CardContextProvider.CardContextProvider, null, function (_ref2) {
-    var cardContext = _ref2.cardContext;
-    return /*#__PURE__*/_react.default.createElement(_index.DatasourceModal, {
-      view: editorView,
-      cardContext: cardContext,
-      datasourceId: datasourceId,
-      componentType: componentType
-    });
+  }, /*#__PURE__*/_react.default.createElement(_index.DatasourceModal, {
+    view: editorView,
+    cardContext: cardContext,
+    datasourceId: datasourceId,
+    componentType: componentType
   }));
 };
+var SafeModalWithState = /*#__PURE__*/_react.default.memo(function (_ref2) {
+  var api = _ref2.api,
+    editorView = _ref2.editorView;
+  return /*#__PURE__*/_react.default.createElement(_linkProvider.EditorSmartCardProviderValueGuard, null, /*#__PURE__*/_react.default.createElement(ModalWithState, {
+    api: api,
+    editorView: editorView
+  }));
+});
 var modalTypeToComponentMap = exports.modalTypeToComponentMap = {
   jira: {
     componentType: _linkDatasource.JiraIssuesConfigModal,
@@ -54,4 +60,4 @@ var modalTypeToComponentMap = exports.modalTypeToComponentMap = {
     datasourceId: _linkDatasource.ASSETS_LIST_OF_LINKS_DATASOURCE_ID
   }
 };
-var _default = exports.default = ModalWithState;
+var _default = exports.default = SafeModalWithState;

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

@@ -14,10 +14,10 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
+var _linkProvider = require("@atlaskit/link-provider");
 var _menu = require("@atlaskit/menu");
 var _primitives = require("@atlaskit/primitives");
 var _utils = require("../../utils");
-var _CardContextProvider = require("../CardContextProvider");
 var _editDatasourceAction = require("../editDatasourceAction");
 var _useFetchDatasourceDataInfo = require("../useFetchDatasourceDataInfo");
 var _useFetchDatasourceInfo = require("../useFetchDatasourceInfo");
@@ -250,34 +250,11 @@ var EditToolbarButton = exports.EditToolbarButton = function EditToolbarButton(p
     intl = props.intl,
     onLinkEditClick = props.onLinkEditClick,
     url = props.url;
-  return (0, _react2.jsx)(_CardContextProvider.CardContextProvider, null, function (_ref) {
-    var cardContext = _ref.cardContext;
-    if (props.url) {
-      return (0, _react2.jsx)(EditToolbarButtonWithUrl, {
-        datasourceId: datasourceId,
-        url: props.url,
-        intl: intl,
-        editorAnalyticsApi: editorAnalyticsApi,
-        editorView: editorView,
-        cardContext: cardContext,
-        onLinkEditClick: onLinkEditClick,
-        currentAppearance: currentAppearance
-      });
-    }
-    if (props.datasourceId && props.node) {
-      return (0, _react2.jsx)(EditToolbarButtonWithDatasourceId, {
-        datasourceId: props.datasourceId,
-        node: props.node,
-        intl: intl,
-        editorAnalyticsApi: editorAnalyticsApi,
-        editorView: editorView,
-        onLinkEditClick: onLinkEditClick,
-        currentAppearance: currentAppearance
-      });
-    }
-    return (0, _react2.jsx)(EditToolbarButtonWithCardContext, {
+  var cardContext = (0, _linkProvider.useSmartLinkContext)();
+  if (props.url) {
+    return (0, _react2.jsx)(EditToolbarButtonWithUrl, {
       datasourceId: datasourceId,
-      url: url,
+      url: props.url,
       intl: intl,
       editorAnalyticsApi: editorAnalyticsApi,
       editorView: editorView,
@@ -285,5 +262,26 @@ var EditToolbarButton = exports.EditToolbarButton = function EditToolbarButton(p
       onLinkEditClick: onLinkEditClick,
       currentAppearance: currentAppearance
     });
+  }
+  if (props.datasourceId && props.node) {
+    return (0, _react2.jsx)(EditToolbarButtonWithDatasourceId, {
+      datasourceId: props.datasourceId,
+      node: props.node,
+      intl: intl,
+      editorAnalyticsApi: editorAnalyticsApi,
+      editorView: editorView,
+      onLinkEditClick: onLinkEditClick,
+      currentAppearance: currentAppearance
+    });
+  }
+  return (0, _react2.jsx)(EditToolbarButtonWithCardContext, {
+    datasourceId: datasourceId,
+    url: url,
+    intl: intl,
+    editorAnalyticsApi: editorAnalyticsApi,
+    editorView: editorView,
+    cardContext: cardContext,
+    onLinkEditClick: onLinkEditClick,
+    currentAppearance: currentAppearance
   });
 };

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

@@ -10,9 +10,8 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _linkProvider = require("@atlaskit/link-provider");
 var _EditorAnalyticsContext = require("../EditorAnalyticsContext");
 var _DatasourceEvents = require("./DatasourceEvents");
 var _LinkEvents = require("./LinkEvents");
@@ -28,30 +27,11 @@ var EditorLinkingPlatformAnalytics = exports.EditorLinkingPlatformAnalytics = /*
   }
   (0, _createClass2.default)(EditorLinkingPlatformAnalytics, [{
     key: "render",
-    value:
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-    function render() {
-      var _this$context;
-      var cardContext = (_this$context = this.context) === null || _this$context === void 0 || (_this$context = _this$context.contextAdapter) === null || _this$context === void 0 ? void 0 : _this$context.card;
-
-      /**
-       * The analytics hook needs to be able to communicate with the card context
-       * If we can't access it, don't mount the event bindings
-       * This effectively entirely disables all tracking behaviour
-       */
-      if (!(cardContext !== null && cardContext !== void 0 && cardContext.value)) {
-        return null;
-      }
-      return /*#__PURE__*/_react.default.createElement(cardContext.Provider, {
-        value: cardContext.value
-      }, /*#__PURE__*/_react.default.createElement(_EditorAnalyticsContext.EditorAnalyticsContext, {
+    value: function render() {
+      return /*#__PURE__*/_react.default.createElement(_linkProvider.EditorSmartCardProvider, null, /*#__PURE__*/_react.default.createElement(_linkProvider.EditorSmartCardProviderValueGuard, null, /*#__PURE__*/_react.default.createElement(_EditorAnalyticsContext.EditorAnalyticsContext, {
         editorView: this.props.editorView
-      }, /*#__PURE__*/_react.default.createElement(_LinkEvents.LinkEventsBinding, this.props), /*#__PURE__*/_react.default.createElement(_DatasourceEvents.DatasourceEventsBinding, this.props)));
+      }, /*#__PURE__*/_react.default.createElement(_LinkEvents.LinkEventsBinding, this.props), /*#__PURE__*/_react.default.createElement(_DatasourceEvents.DatasourceEventsBinding, this.props))));
     }
   }]);
   return EditorLinkingPlatformAnalytics;
-}(_react.default.PureComponent);
-(0, _defineProperty2.default)(EditorLinkingPlatformAnalytics, "contextTypes", {
-  contextAdapter: _propTypes.default.object
-});
+}(_react.default.PureComponent);

package/dist/cjs/ui/LinkToolbarAppearance.js

@@ -14,7 +14,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
@@ -26,6 +25,7 @@ var _doc = require("../pm-plugins/doc");
 var _toolbar = require("../toolbar");
 var _utils2 = require("../utils");
 var _Pulse = require("./Pulse");
+var _WithCardContext = require("./WithCardContext");
 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; }
 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; }
@@ -146,16 +146,15 @@ var LinkToolbarAppearance = exports.LinkToolbarAppearance = /*#__PURE__*/functio
   (0, _createClass2.default)(LinkToolbarAppearance, [{
     key: "render",
     value: function render() {
-      var cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
+      var _this2 = this;
       var editorView = this.props.editorView;
-      return this.renderDropdown(editorView, cardContext && cardContext.value);
+      return /*#__PURE__*/_react.default.createElement(_WithCardContext.WithCardContext, null, function (cardContext) {
+        return _this2.renderDropdown(editorView, cardContext && cardContext.value);
+      });
     }
   }]);
   return LinkToolbarAppearance;
 }(_react.default.Component);
-(0, _defineProperty2.default)(LinkToolbarAppearance, "contextTypes", {
-  contextAdapter: _propTypes.default.object
-});
 var getUnavailableMessage = function getUnavailableMessage(state, intl) {
   try {
     var parentNode = state.selection.$from.node(1);