@atlaskit/editor-plugin-card 4.5.0 → 4.5.1

package/dist/es2019/nodeviews/datasource.js

@@ -7,12 +7,12 @@ import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import PropTypes from 'prop-types';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { DATASOURCE_INNER_CONTAINER_CLASSNAME, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { calcBreakoutWidth } from '@atlaskit/editor-common/utils';
 import { DatasourceTableView } from '@atlaskit/link-datasource';
+import { EditorSmartCardProvider, EditorSmartCardProviderValueGuard } from '@atlaskit/link-provider';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { DatasourceErrorBoundary } from '../datasourceErrorBoundary';
@@ -29,8 +29,6 @@ const getPosSafely = pos => {
 };
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class DatasourceComponent extends React.PureComponent {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   constructor(props) {
     super(props);
     _defineProperty(this, "getDatasource", () => this.props.node.attrs.datasource);
@@ -148,7 +146,6 @@ export class DatasourceComponent extends React.PureComponent {
     };
   }
   render() {
-    const cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
     const datasource = this.getDatasource();
     const attrs = this.props.node.attrs;
     const tableView = this.getTableView();
@@ -158,32 +155,23 @@ export class DatasourceComponent extends React.PureComponent {
         columnCustomSizes,
         wrappedColumnKeys
       } = this.getColumnsInfo();
-
-      // [WS-2307]: we only render card wrapped into a Provider when the value is ready
-      if (cardContext && cardContext.value) {
-        return jsx(EditorAnalyticsContext, {
-          editorView: this.props.view
-        }, jsx(cardContext.Provider, {
-          value: cardContext.value
-        }, jsx(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 jsx(EditorSmartCardProviderValueGuard, null, jsx(EditorAnalyticsContext, {
+        editorView: this.props.view
+      }, jsx(EditorSmartCardProvider, null, jsx(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;
   }
 }
-_defineProperty(DatasourceComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 export class Datasource extends ReactNodeView {
   constructor(props) {
     var _props$pluginInjectio, _props$pluginInjectio2, _sharedState$currentS;

package/dist/es2019/nodeviews/embedCard.js

@@ -1,7 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
@@ -143,8 +142,9 @@ export class EmbedCardComponent extends React.PureComponent {
         })(view.state.tr));
       })();
       try {
-        const cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
-        const hasPreview = cardContext && cardContext.value.extractors.getPreview(url, 'web');
+        var _this$props$cardConte, _this$props$cardConte2;
+        const 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;
+        const hasPreview = url && cardContext && cardContext.extractors.getPreview(url, 'web');
         if (!hasPreview) {
           this.setState({
             hasPreview: false
@@ -240,13 +240,9 @@ export class EmbedCardComponent extends React.PureComponent {
     });
     this.scrollContainer = findOverflowScrollParent(props.view.dom) || undefined;
   }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   render() {
     const {
       node,
-      cardContext,
       allowResizing,
       fullWidthMode,
       view,
@@ -298,7 +294,7 @@ export class EmbedCardComponent extends React.PureComponent {
       embedIframeRef: this.embedIframeRef,
       actionOptions: actionOptions
     });
-    const cardInner = /*#__PURE__*/React.createElement(EmbedResizeMessageListener, {
+    return /*#__PURE__*/React.createElement(EmbedResizeMessageListener, {
       embedIframeRef: this.embedIframeRef,
       onHeightUpdate: this.onHeightUpdate
     }, /*#__PURE__*/React.createElement(CardInner, {
@@ -317,16 +313,8 @@ export class EmbedCardComponent extends React.PureComponent {
       cardProps: cardProps,
       dispatchAnalyticsEvent: dispatchAnalyticsEvent
     }));
-
-    // [WS-2307]: we only render card wrapped into a Provider when the value is ready
-    return /*#__PURE__*/React.createElement(React.Fragment, null, cardContext && cardContext.value ? /*#__PURE__*/React.createElement(cardContext.Provider, {
-      value: cardContext.value
-    }, cardInner) : null);
   }
 }
-_defineProperty(EmbedCardComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 const WrappedBlockCard = Card(EmbedCardComponent, UnsupportedBlock);
 export class EmbedCard extends ReactNodeView {
   constructor(...args) {

package/dist/es2019/nodeviews/genericCard.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { useCallback } from 'react';
-import PropTypes from 'prop-types';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
@@ -9,6 +8,7 @@ import { getAnalyticsEditorAppearance } from '@atlaskit/editor-common/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { changeSelectedCardToLinkFallback } from '../pm-plugins/doc';
 import { getPluginState } from '../pm-plugins/util/state';
+import { WithCardContext } from '../ui/WithCardContext';
 import { titleUrlPairFromNode } from '../utils';
 const WithClickHandler = ({
   pluginInjectionApi,
@@ -52,8 +52,7 @@ const WithClickHandler = ({
   }));
 };
 export function Card(SmartCardComponent, UnsupportedComponent) {
-  var _class;
-  return _class = class extends React.Component {
+  return class extends React.Component {
     constructor(...args) {
       super(...args);
       _defineProperty(this, "state", {
@@ -84,7 +83,6 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
           return /*#__PURE__*/React.createElement(UnsupportedComponent, null);
         }
       }
-      const cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
       const editorAppearance = (_getPluginState = getPluginState(this.props.view.state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.editorAppearance;
       const analyticsEditorAppearance = getAnalyticsEditorAppearance(editorAppearance);
       return /*#__PURE__*/React.createElement(AnalyticsContext, {
@@ -102,12 +100,12 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
         __livePage: this.props.__livePage
       }, ({
         onClick
-      }) => /*#__PURE__*/React.createElement(SmartCardComponent, _extends({
+      }) => /*#__PURE__*/React.createElement(WithCardContext, null, cardContext => /*#__PURE__*/React.createElement(SmartCardComponent, _extends({
         key: url,
         cardContext: cardContext
       }, this.props, {
         onClick: onClick
-      }))));
+      })))));
     }
     componentDidCatch(error) {
       const maybeAPIError = error;
@@ -142,7 +140,5 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
         });
       }
     }
-  }, _defineProperty(_class, "contextTypes", {
-    contextAdapter: PropTypes.object
-  }), _class;
+  };
 }

package/dist/es2019/ui/DatasourceAppearanceButton.js

@@ -11,10 +11,10 @@ import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { buildDatasourceAdf } from '@atlaskit/link-datasource';
+import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { Flex } from '@atlaskit/primitives';
 import { updateCardViaDatasource } from '../pm-plugins/doc';
 import { pluginKey } from '../pm-plugins/plugin-key';
-import { CardContextProvider } from './CardContextProvider';
 import { DatasourceIcon } from './DatasourceIcon';
 import { useFetchDatasourceInfo } from './useFetchDatasourceInfo';
 const buttonStyles = css({
@@ -108,9 +108,8 @@ export const DatasourceAppearanceButton = ({
   selected,
   inputMethod
 }) => {
-  return jsx(CardContextProvider, null, ({
-    cardContext
-  }) => jsx(DatasourceAppearanceButtonWithCardContext, {
+  const cardContext = useSmartLinkContext();
+  return jsx(DatasourceAppearanceButtonWithCardContext, {
     url: url,
     intl: intl,
     editorAnalyticsApi: editorAnalyticsApi,
@@ -119,5 +118,5 @@ export const DatasourceAppearanceButton = ({
     cardContext: cardContext,
     selected: selected,
     inputMethod: inputMethod
-  }));
+  });
 };

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

@@ -1,13 +1,14 @@
 import React from 'react';
 import { useSharedPluginState } 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 { DatasourceErrorBoundary } from '../../datasourceErrorBoundary';
-import { CardContextProvider } from '../CardContextProvider';
 import { DatasourceModal } from './index';
 const ModalWithState = ({
   api,
   editorView
 }) => {
+  const cardContext = useSmartLinkContext();
   const {
     cardState
   } = useSharedPluginState(api, ['card']);
@@ -28,15 +29,22 @@ const ModalWithState = ({
   return /*#__PURE__*/React.createElement(DatasourceErrorBoundary, {
     view: editorView,
     datasourceModalType: datasourceModalType
-  }, /*#__PURE__*/React.createElement(CardContextProvider, null, ({
-    cardContext
-  }) => /*#__PURE__*/React.createElement(DatasourceModal, {
+  }, /*#__PURE__*/React.createElement(DatasourceModal, {
     view: editorView,
     cardContext: cardContext,
     datasourceId: datasourceId,
     componentType: componentType
-  })));
+  }));
 };
+const SafeModalWithState = /*#__PURE__*/React.memo(({
+  api,
+  editorView
+}) => {
+  return /*#__PURE__*/React.createElement(EditorSmartCardProviderValueGuard, null, /*#__PURE__*/React.createElement(ModalWithState, {
+    api: api,
+    editorView: editorView
+  }));
+});
 export const modalTypeToComponentMap = {
   jira: {
     componentType: JiraIssuesConfigModal,
@@ -51,4 +59,4 @@ export const modalTypeToComponentMap = {
     datasourceId: ASSETS_LIST_OF_LINKS_DATASOURCE_ID
   }
 };
-export default ModalWithState;
+export default SafeModalWithState;

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

@@ -11,10 +11,10 @@ import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
+import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { ButtonItem } from '@atlaskit/menu';
 import { Flex } from '@atlaskit/primitives';
 import { focusEditorView, isDatasourceConfigEditable } from '../../utils';
-import { CardContextProvider } from '../CardContextProvider';
 import { editDatasource } from '../editDatasourceAction';
 import { useFetchDatasourceDataInfo } from '../useFetchDatasourceDataInfo';
 import { useFetchDatasourceInfo } from '../useFetchDatasourceInfo';
@@ -241,35 +241,11 @@ export const EditToolbarButton = props => {
     onLinkEditClick,
     url
   } = props;
-  return jsx(CardContextProvider, null, ({
-    cardContext
-  }) => {
-    if (props.url) {
-      return 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 jsx(EditToolbarButtonWithDatasourceId, {
-        datasourceId: props.datasourceId,
-        node: props.node,
-        intl: intl,
-        editorAnalyticsApi: editorAnalyticsApi,
-        editorView: editorView,
-        onLinkEditClick: onLinkEditClick,
-        currentAppearance: currentAppearance
-      });
-    }
-    return jsx(EditToolbarButtonWithCardContext, {
+  const cardContext = useSmartLinkContext();
+  if (props.url) {
+    return jsx(EditToolbarButtonWithUrl, {
       datasourceId: datasourceId,
-      url: url,
+      url: props.url,
       intl: intl,
       editorAnalyticsApi: editorAnalyticsApi,
       editorView: editorView,
@@ -277,5 +253,26 @@ export const EditToolbarButton = props => {
       onLinkEditClick: onLinkEditClick,
       currentAppearance: currentAppearance
     });
+  }
+  if (props.datasourceId && props.node) {
+    return jsx(EditToolbarButtonWithDatasourceId, {
+      datasourceId: props.datasourceId,
+      node: props.node,
+      intl: intl,
+      editorAnalyticsApi: editorAnalyticsApi,
+      editorView: editorView,
+      onLinkEditClick: onLinkEditClick,
+      currentAppearance: currentAppearance
+    });
+  }
+  return jsx(EditToolbarButtonWithCardContext, {
+    datasourceId: datasourceId,
+    url: url,
+    intl: intl,
+    editorAnalyticsApi: editorAnalyticsApi,
+    editorView: editorView,
+    cardContext: cardContext,
+    onLinkEditClick: onLinkEditClick,
+    currentAppearance: currentAppearance
   });
 };

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

@@ -1,33 +1,14 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import PropTypes from 'prop-types';
+import { EditorSmartCardProvider, EditorSmartCardProviderValueGuard } from '@atlaskit/link-provider';
 import { EditorAnalyticsContext } from '../EditorAnalyticsContext';
 import { DatasourceEventsBinding } from './DatasourceEvents';
 import { LinkEventsBinding } from './LinkEvents';
 
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class EditorLinkingPlatformAnalytics extends React.PureComponent {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   render() {
-    var _this$context, _this$context$context;
-    const cardContext = (_this$context = this.context) === null || _this$context === void 0 ? void 0 : (_this$context$context = _this$context.contextAdapter) === null || _this$context$context === void 0 ? void 0 : _this$context$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.createElement(cardContext.Provider, {
-      value: cardContext.value
-    }, /*#__PURE__*/React.createElement(EditorAnalyticsContext, {
+    return /*#__PURE__*/React.createElement(EditorSmartCardProvider, null, /*#__PURE__*/React.createElement(EditorSmartCardProviderValueGuard, null, /*#__PURE__*/React.createElement(EditorAnalyticsContext, {
       editorView: this.props.editorView
-    }, /*#__PURE__*/React.createElement(LinkEventsBinding, this.props), /*#__PURE__*/React.createElement(DatasourceEventsBinding, this.props)));
+    }, /*#__PURE__*/React.createElement(LinkEventsBinding, this.props), /*#__PURE__*/React.createElement(DatasourceEventsBinding, this.props))));
   }
-}
-_defineProperty(EditorLinkingPlatformAnalytics, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
+}

package/dist/es2019/ui/LinkToolbarAppearance.js

@@ -1,6 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import PropTypes from 'prop-types';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { commandWithMetadata, getButtonGroupOption, LinkToolbarButtonGroup } from '@atlaskit/editor-common/card';
@@ -12,7 +11,9 @@ import { changeSelectedCardToLink, setSelectedCardAppearance } from '../pm-plugi
 import { shouldRenderToolbarPulse } from '../toolbar';
 import { getResolvedAttributesFromStore } from '../utils';
 import { DiscoveryPulse } from './Pulse';
+import { WithCardContext } from './WithCardContext';
 // eslint-disable-next-line @repo/internal/react/no-class-components
+
 export class LinkToolbarAppearance extends React.Component {
   constructor(...args) {
     super(...args);
@@ -114,16 +115,12 @@ export class LinkToolbarAppearance extends React.Component {
     });
   }
   render() {
-    const cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
     const {
       editorView
     } = this.props;
-    return this.renderDropdown(editorView, cardContext && cardContext.value);
+    return /*#__PURE__*/React.createElement(WithCardContext, null, cardContext => this.renderDropdown(editorView, cardContext && cardContext.value));
   }
 }
-_defineProperty(LinkToolbarAppearance, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 const getUnavailableMessage = (state, intl) => {
   try {
     const parentNode = state.selection.$from.node(1);

package/dist/es2019/ui/ToolbarViewedEvent.js

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
+import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { getResolvedAttributesFromStore } from '../utils';
-import { CardContextProvider } from './CardContextProvider';
 import { EditorAnalyticsContext } from './EditorAnalyticsContext';
 /**
  * Handles firing the toolbar viewed event
@@ -38,13 +38,12 @@ export const ToolbarViewedEvent = ({
   display,
   editorView
 }) => {
+  const cardContext = useSmartLinkContext();
   return /*#__PURE__*/React.createElement(EditorAnalyticsContext, {
     editorView: editorView
-  }, /*#__PURE__*/React.createElement(CardContextProvider, null, ({
-    cardContext
-  }) => url ? /*#__PURE__*/React.createElement(ToolbarViewedEventBase, {
+  }, url ? /*#__PURE__*/React.createElement(ToolbarViewedEventBase, {
     url: url,
     display: display,
     cardContext: cardContext
-  }) : null));
+  }) : null);
 };

package/dist/es2019/ui/WithCardContext.js

@@ -0,0 +1,8 @@
+import React from 'react';
+import { useSmartCardContext } from '@atlaskit/link-provider';
+export const WithCardContext = ({
+  children
+}) => {
+  const cardContext = useSmartCardContext();
+  return /*#__PURE__*/React.createElement(React.Fragment, null, children(cardContext));
+};

package/dist/esm/nodeviews/blockCard.js

@@ -9,7 +9,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
-import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, UnsupportedBlock } from '@atlaskit/editor-common/ui';
@@ -106,9 +105,6 @@ export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
   }]);
   return BlockCardComponent;
 }(React.PureComponent);
-_defineProperty(BlockCardComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 var WrappedBlockCard = Card(BlockCardComponent, UnsupportedBlock);
 export var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(BlockCard, _ReactNodeView);

package/dist/esm/nodeviews/datasource.js

@@ -19,12 +19,12 @@ import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import PropTypes from 'prop-types';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { DATASOURCE_INNER_CONTAINER_CLASSNAME, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { calcBreakoutWidth } from '@atlaskit/editor-common/utils';
 import { DatasourceTableView } from '@atlaskit/link-datasource';
+import { EditorSmartCardProvider, EditorSmartCardProviderValueGuard } from '@atlaskit/link-provider';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { DatasourceErrorBoundary } from '../datasourceErrorBoundary';
@@ -43,8 +43,6 @@ var getPosSafely = function getPosSafely(pos) {
 export var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(DatasourceComponent, _React$PureComponent);
   var _super = _createSuper(DatasourceComponent);
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   function DatasourceComponent(props) {
     var _this;
     _classCallCheck(this, DatasourceComponent);
@@ -180,7 +178,6 @@ export var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
   }, {
     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();
@@ -189,34 +186,25 @@ export var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
           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 jsx(EditorAnalyticsContext, {
-            editorView: this.props.view
-          }, jsx(cardContext.Provider, {
-            value: cardContext.value
-          }, jsx(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 jsx(EditorSmartCardProviderValueGuard, null, jsx(EditorAnalyticsContext, {
+          editorView: this.props.view
+        }, jsx(EditorSmartCardProvider, null, jsx(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.PureComponent);
-_defineProperty(DatasourceComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 export var Datasource = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(Datasource, _ReactNodeView);
   var _super2 = _createSuper(Datasource);

package/dist/esm/nodeviews/embedCard.js

@@ -12,7 +12,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
-import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
@@ -149,8 +148,9 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         })(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
@@ -242,14 +242,11 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
     _this.scrollContainer = findOverflowScrollParent(props.view.dom) || undefined;
     return _this;
   }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   _createClass(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,
@@ -298,7 +295,7 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         embedIframeRef: this.embedIframeRef,
         actionOptions: actionOptions
       });
-      var cardInner = /*#__PURE__*/React.createElement(EmbedResizeMessageListener, {
+      return /*#__PURE__*/React.createElement(EmbedResizeMessageListener, {
         embedIframeRef: this.embedIframeRef,
         onHeightUpdate: this.onHeightUpdate
       }, /*#__PURE__*/React.createElement(CardInner, {
@@ -317,18 +314,10 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         cardProps: cardProps,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent
       }));
-
-      // [WS-2307]: we only render card wrapped into a Provider when the value is ready
-      return /*#__PURE__*/React.createElement(React.Fragment, null, cardContext && cardContext.value ? /*#__PURE__*/React.createElement(cardContext.Provider, {
-        value: cardContext.value
-      }, cardInner) : null);
     }
   }]);
   return EmbedCardComponent;
 }(React.PureComponent);
-_defineProperty(EmbedCardComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 var WrappedBlockCard = Card(EmbedCardComponent, UnsupportedBlock);
 export var EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(EmbedCard, _ReactNodeView);