@atlaskit/editor-plugin-card 11.4.0 → 11.4.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-card
 
+## 11.4.2
+
+### Patch Changes
+
+- [`57a9de1ebc5db`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/57a9de1ebc5db) -
+  fix: remove unnecessary re-renders in smart card node views
+- Updated dependencies
+
+## 11.4.1
+
+### Patch Changes
+
+- [`3660feecde98f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3660feecde98f) -
+  upgrade use of browser util
+- Updated dependencies
+
 ## 11.4.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/blockCard.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.blockCardNodeView = exports.BlockCardComponent = exports.BlockCard = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -17,7 +15,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _v = _interopRequireDefault(require("uuid/v4"));
-var _editorCardProvider = require("@atlaskit/editor-card-provider");
+var _browser = require("@atlaskit/editor-common/browser");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -29,8 +27,6 @@ var _actions = require("../pm-plugins/actions");
 var _utils2 = require("../pm-plugins/utils");
 var _genericCard = require("./genericCard");
 function _superPropGet(t, o, e, r) { var p = (0, _get2.default)((0, _getPrototypeOf2.default)(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
-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; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -41,9 +37,6 @@ var BlockCardComponent = exports.BlockCardComponent = /*#__PURE__*/function (_Re
     _this = _callSuper(this, BlockCardComponent, [props]);
     // Ignored via go/ees005
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    (0, _defineProperty2.default)(_this, "state", {
-      isSSRDataAvailable: false
-    });
     (0, _defineProperty2.default)(_this, "onResolve", function (data) {
       var _this$props = _this.props,
         getPos = _this$props.getPos,
@@ -71,9 +64,10 @@ var BlockCardComponent = exports.BlockCardComponent = /*#__PURE__*/function (_Re
     });
     (0, _defineProperty2.default)(_this, "removeCardDispatched", false);
     (0, _defineProperty2.default)(_this, "gapCursorSpan", function () {
+      var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
       // Don't render in EdgeHTMl version <= 18 (Edge version 44)
       // as it forces the edit popup to render 24px lower than it should
-      if (_utils.browser.ie && _utils.browser.ie_version < 79) {
+      if (browser.ie && browser.ie_version < 79) {
         return;
       }
 
@@ -90,53 +84,10 @@ var BlockCardComponent = exports.BlockCardComponent = /*#__PURE__*/function (_Re
       }
     });
     _this.scrollContainer = (0, _ui.findOverflowScrollParent)(props.view.dom) || undefined;
-    _this.state = {
-      isSSRDataAvailable: (0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true) && props.isPageSSRed
-    };
     return _this;
   }
   (0, _inherits2.default)(BlockCardComponent, _React$PureComponent);
   return (0, _createClass2.default)(BlockCardComponent, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      var _this2 = this;
-      if (!(0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true)) {
-        return;
-      }
-      var provider = this.props.provider;
-      if (!provider) {
-        return;
-      }
-      var updateSSRDataAvailability = /*#__PURE__*/function () {
-        var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-          var resolvedProvider;
-          return _regenerator.default.wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return provider;
-              case 2:
-                resolvedProvider = _context.sent;
-                if (resolvedProvider instanceof _editorCardProvider.EditorCardProvider) {
-                  _this2.setState(function (state) {
-                    return _objectSpread(_objectSpread({}, state), {}, {
-                      isSSRDataAvailable: resolvedProvider.getCacheStatusForNode(_this2.props.node) === 'ssr'
-                    });
-                  });
-                }
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        return function updateSSRDataAvailability() {
-          return _ref2.apply(this, arguments);
-        };
-      }();
-      void updateSSRDataAvailability();
-    }
-  }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       this.removeCard();
@@ -167,7 +118,7 @@ var BlockCardComponent = exports.BlockCardComponent = /*#__PURE__*/function (_Re
       var _node$attrs = node.attrs,
         url = _node$attrs.url,
         data = _node$attrs.data;
-      var cardInner = (0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true) && this.state.isSSRDataAvailable && isPageSSRed ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ssr.CardSSR, {
+      var cardInner = (0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true) && isPageSSRed ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ssr.CardSSR, {
         key: url,
         url: url !== null && url !== void 0 ? url : data.url,
         container: this.scrollContainer,
@@ -202,31 +153,31 @@ var BlockCardComponent = exports.BlockCardComponent = /*#__PURE__*/function (_Re
 var WrappedBlockCard = (0, _genericCard.Card)(BlockCardComponent, _ui.UnsupportedBlock);
 var BlockCard = exports.BlockCard = /*#__PURE__*/function (_ReactNodeView) {
   function BlockCard() {
-    var _this3;
+    var _this2;
     (0, _classCallCheck2.default)(this, BlockCard);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this3 = _callSuper(this, BlockCard, [].concat(args));
-    (0, _defineProperty2.default)(_this3, "id", (0, _v.default)());
-    (0, _defineProperty2.default)(_this3, "updateContentEditable", function (editorViewModeState, divElement) {
+    _this2 = _callSuper(this, BlockCard, [].concat(args));
+    (0, _defineProperty2.default)(_this2, "id", (0, _v.default)());
+    (0, _defineProperty2.default)(_this2, "updateContentEditable", function (editorViewModeState, divElement) {
       divElement.contentEditable = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view' ? 'false' : 'true';
     });
-    return _this3;
+    return _this2;
   }
   (0, _inherits2.default)(BlockCard, _ReactNodeView);
   return (0, _createClass2.default)(BlockCard, [{
     key: "createDomRef",
     value: function createDomRef() {
       var _this$reactComponentP,
-        _this4 = this,
+        _this3 = this,
         _this$reactComponentP2;
       var domRef = document.createElement('div');
       // workaround Chrome bug in https://product-fabric.atlassian.net/browse/ED-5379
       // see also: https://github.com/ProseMirror/prosemirror/issues/884
-      this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref3) {
-        var nextSharedState = _ref3.nextSharedState;
-        return _this4.updateContentEditable(nextSharedState, domRef);
+      this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref2) {
+        var nextSharedState = _ref2.nextSharedState;
+        return _this3.updateContentEditable(nextSharedState, domRef);
       });
       this.updateContentEditable((_this$reactComponentP2 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP2 === void 0 || (_this$reactComponentP2 = _this$reactComponentP2.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.currentState(), domRef);
       domRef.setAttribute('spellcheck', 'false');
@@ -282,16 +233,16 @@ var BlockCard = exports.BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     }
   }]);
 }(_reactNodeView.default);
-var blockCardNodeView = exports.blockCardNodeView = function blockCardNodeView(_ref4) {
-  var pmPluginFactoryParams = _ref4.pmPluginFactoryParams,
-    actionOptions = _ref4.actionOptions,
-    pluginInjectionApi = _ref4.pluginInjectionApi,
-    onClickCallback = _ref4.onClickCallback,
-    allowDatasource = _ref4.allowDatasource,
-    inlineCardViewProducer = _ref4.inlineCardViewProducer,
-    CompetitorPrompt = _ref4.CompetitorPrompt,
-    isPageSSRed = _ref4.isPageSSRed,
-    provider = _ref4.provider;
+var blockCardNodeView = exports.blockCardNodeView = function blockCardNodeView(_ref3) {
+  var pmPluginFactoryParams = _ref3.pmPluginFactoryParams,
+    actionOptions = _ref3.actionOptions,
+    pluginInjectionApi = _ref3.pluginInjectionApi,
+    onClickCallback = _ref3.onClickCallback,
+    allowDatasource = _ref3.allowDatasource,
+    inlineCardViewProducer = _ref3.inlineCardViewProducer,
+    CompetitorPrompt = _ref3.CompetitorPrompt,
+    isPageSSRed = _ref3.isPageSSRed,
+    provider = _ref3.provider;
   return function (node, view, getPos, decorations) {
     var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
       eventDispatcher = pmPluginFactoryParams.eventDispatcher;

package/dist/cjs/nodeviews/embedCard.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.embedCardNodeView = exports.EmbedOrBlockCardComponent = exports.EmbedCardComponent = exports.EmbedCard = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -19,7 +17,6 @@ var _react = _interopRequireDefault(require("react"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _v = _interopRequireDefault(require("uuid/v4"));
 var _steps = require("@atlaskit/adf-schema/steps");
-var _editorCardProvider = require("@atlaskit/editor-card-provider");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _ui = require("@atlaskit/editor-common/ui");
@@ -268,53 +265,12 @@ var EmbedCardComponent = exports.EmbedCardComponent = /*#__PURE__*/function (_Re
     (0, _defineProperty2.default)(_this, "removeCardDispatched", false);
     _this.scrollContainer = (0, _ui.findOverflowScrollParent)(props.view.dom) || undefined;
     _this.state = {
-      hasPreview: true,
-      isSSRDataAvailable: (0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true) && props.isPageSSRed
+      hasPreview: true
     };
     return _this;
   }
   (0, _inherits2.default)(EmbedCardComponent, _React$PureComponent);
   return (0, _createClass2.default)(EmbedCardComponent, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      var _this2 = this;
-      if (!(0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true)) {
-        return;
-      }
-      var provider = this.props.provider;
-      if (!provider) {
-        return;
-      }
-      var updateSSRDataAvailability = /*#__PURE__*/function () {
-        var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-          var resolvedProvider;
-          return _regenerator.default.wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return provider;
-              case 2:
-                resolvedProvider = _context.sent;
-                if (resolvedProvider instanceof _editorCardProvider.EditorCardProvider) {
-                  _this2.setState(function (state) {
-                    return _objectSpread(_objectSpread({}, state), {}, {
-                      isSSRDataAvailable: resolvedProvider.getCacheStatusForNode(_this2.props.node) === 'ssr'
-                    });
-                  });
-                }
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        return function updateSSRDataAvailability() {
-          return _ref3.apply(this, arguments);
-        };
-      }();
-      void updateSSRDataAvailability();
-    }
-  }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       this.removeCard();
@@ -373,7 +329,7 @@ var EmbedCardComponent = exports.EmbedCardComponent = /*#__PURE__*/function (_Re
         pctWidth: pctWidth,
         fullWidthMode: fullWidthMode
       };
-      var smartCard = (0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true) && this.state.isSSRDataAvailable && isPageSSRed ? /*#__PURE__*/_react.default.createElement(_ssr.CardSSR, {
+      var smartCard = (0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true) && isPageSSRed ? /*#__PURE__*/_react.default.createElement(_ssr.CardSSR, {
         key: url,
         url: url,
         appearance: "embed",
@@ -478,17 +434,17 @@ var WrappedEmbedCardWithCondition = (0, _platformFeatureFlagsReact.componentWith
 var WrappedEmbedCard = (0, _genericCard.Card)(WrappedEmbedCardWithCondition, _ui.UnsupportedBlock);
 var EmbedCard = exports.EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
   function EmbedCard() {
-    var _this3;
+    var _this2;
     (0, _classCallCheck2.default)(this, EmbedCard);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this3 = _callSuper(this, EmbedCard, [].concat(args));
-    (0, _defineProperty2.default)(_this3, "id", (0, _v.default)());
-    (0, _defineProperty2.default)(_this3, "updateContentEditable", function (editorViewModeState, divElement) {
+    _this2 = _callSuper(this, EmbedCard, [].concat(args));
+    (0, _defineProperty2.default)(_this2, "id", (0, _v.default)());
+    (0, _defineProperty2.default)(_this2, "updateContentEditable", function (editorViewModeState, divElement) {
       divElement.contentEditable = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view' ? 'false' : 'true';
     });
-    return _this3;
+    return _this2;
   }
   (0, _inherits2.default)(EmbedCard, _ReactNodeView);
   return (0, _createClass2.default)(EmbedCard, [{
@@ -503,13 +459,13 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
     key: "createDomRef",
     value: function createDomRef() {
       var _this$reactComponentP,
-        _this4 = this,
+        _this3 = this,
         _this$reactComponentP2;
       var domRef = document.createElement('div');
       // It is a tradeoff for the bug mentioned that occurs in Chrome: https://product-fabric.atlassian.net/browse/ED-5379, https://github.com/ProseMirror/prosemirror/issues/884
-      this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref4) {
-        var nextSharedState = _ref4.nextSharedState;
-        return _this4.updateContentEditable(nextSharedState, domRef);
+      this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref3) {
+        var nextSharedState = _ref3.nextSharedState;
+        return _this3.updateContentEditable(nextSharedState, domRef);
       });
       this.updateContentEditable((_this$reactComponentP2 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP2 === void 0 || (_this$reactComponentP2 = _this$reactComponentP2.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.currentState(), domRef);
       domRef.setAttribute('spellcheck', 'false');
@@ -553,16 +509,16 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
     }
   }]);
 }(_reactNodeView.default);
-var embedCardNodeView = exports.embedCardNodeView = function embedCardNodeView(_ref5) {
-  var allowResizing = _ref5.allowResizing,
-    fullWidthMode = _ref5.fullWidthMode,
-    pmPluginFactoryParams = _ref5.pmPluginFactoryParams,
-    pluginInjectionApi = _ref5.pluginInjectionApi,
-    actionOptions = _ref5.actionOptions,
-    onClickCallback = _ref5.onClickCallback,
-    CompetitorPrompt = _ref5.CompetitorPrompt,
-    isPageSSRed = _ref5.isPageSSRed,
-    provider = _ref5.provider;
+var embedCardNodeView = exports.embedCardNodeView = function embedCardNodeView(_ref4) {
+  var allowResizing = _ref4.allowResizing,
+    fullWidthMode = _ref4.fullWidthMode,
+    pmPluginFactoryParams = _ref4.pmPluginFactoryParams,
+    pluginInjectionApi = _ref4.pluginInjectionApi,
+    actionOptions = _ref4.actionOptions,
+    onClickCallback = _ref4.onClickCallback,
+    CompetitorPrompt = _ref4.CompetitorPrompt,
+    isPageSSRed = _ref4.isPageSSRed,
+    provider = _ref4.provider;
   return function (node, view, getPos) {
     var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
       eventDispatcher = pmPluginFactoryParams.eventDispatcher,

package/dist/cjs/nodeviews/inlineCard.js

@@ -8,14 +8,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.InlineCard = void 0;
 exports.InlineCardNodeView = InlineCardNodeView;
 exports.inlineCardNodeView = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _v = _interopRequireDefault(require("uuid/v4"));
-var _editorCardProvider = require("@atlaskit/editor-card-provider");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _ui = require("@atlaskit/editor-common/ui");
@@ -60,42 +56,6 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
       view.dispatch(tr);
     };
   }, [getPos, view]);
-  var _useState = (0, _react.useState)((0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true) && isPageSSRed),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    isSSRDataAvailable = _useState2[0],
-    setIsSSRDataAvailable = _useState2[1];
-  (0, _react.useEffect)(function () {
-    if (!(0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true)) {
-      return;
-    }
-    if (!provider) {
-      return;
-    }
-    var updateSSRDataAvailability = /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var resolvedProvider;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return provider;
-            case 2:
-              resolvedProvider = _context.sent;
-              if (resolvedProvider instanceof _editorCardProvider.EditorCardProvider) {
-                setIsSSRDataAvailable(resolvedProvider.getCacheStatusForNode(node) === 'ssr');
-              }
-            case 4:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function updateSSRDataAvailability() {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-    void updateSSRDataAvailability();
-  }, [provider, node]);
   var scrollContainer = (0, _react.useMemo)(
   // Ignored via go/ees005
   // eslint-disable-next-line @atlaskit/editor/no-as-casting
@@ -140,8 +100,8 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
   var handleOnClick = (0, _react.useCallback)(function (event) {
     if (event.metaKey || event.ctrlKey) {
       var _pluginInjectionApi$a;
-      var _ref3 = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
-        editorAnalyticsApi = _ref3.actions;
+      var _ref2 = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
+        editorAnalyticsApi = _ref2.actions;
       (0, _toolbar.visitCardLinkAnalytics)(editorAnalyticsApi, _analytics.INPUT_METHOD.META_CLICK)(view.state, view.dispatch);
       window.open(url, '_blank');
     } else {
@@ -151,10 +111,7 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
   }, [propsOnClick, url, view, pluginInjectionApi]);
   var onClick = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? handleOnClick : propsOnClick;
   var card = (0, _react.useMemo)(function () {
-    if (
-    // The `isSSRDataAvailable` check is only required when the OTP experiment is on,
-    // because inline smart card SSR is already implemented without OTP.
-    ((0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true) ? isSSRDataAvailable : true) && isPageSSRed && url) {
+    if (isPageSSRed && url) {
       return /*#__PURE__*/_react.default.createElement(_ssr.CardSSR, {
         key: url,
         url: url,
@@ -170,9 +127,8 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
         hoverPreviewOptions: hoverPreviewOptions,
         disablePreviewPanel: disablePreviewPanel
         // Durin `platform_editor_smart_card_otp` cleaning up, replace this with `true`.
-        // Ths `isSSRDataAvailable` should be checked in the `if` condition above.
         ,
-        hideIconLoadingSkeleton: (0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true) && isSSRDataAvailable
+        hideIconLoadingSkeleton: (0, _expValEquals.expValEquals)('platform_editor_smart_card_otp', 'isEnabled', true)
       });
     }
     return /*#__PURE__*/_react.default.createElement(_smartCard.Card, {
@@ -190,7 +146,7 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
       hoverPreviewOptions: hoverPreviewOptions,
       disablePreviewPanel: disablePreviewPanel
     });
-  }, [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, isHovered, showHoverPreview, hoverPreviewOptions, isPageSSRed, disablePreviewPanel, isSSRDataAvailable]);
+  }, [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, isHovered, showHoverPreview, hoverPreviewOptions, isPageSSRed, disablePreviewPanel]);
 
   // [WS-2307]: we only render card wrapped into a Provider when the value is ready,
   // otherwise if we got data, we can render the card directly since it doesn't need the Provider
@@ -247,8 +203,8 @@ function InlineCardNodeView(props) {
     // eslint-disable-next-line react/jsx-props-no-spreading
   }, enableInlineUpgradeFeatures && (0, _utils.getAwarenessProps)(view.state, getPos, allowEmbeds, allowBlockCards, mode === 'view'))), (0, _platformFeatureFlags.fg)('prompt_whiteboard_competitor_link_gate') && CompetitorPromptComponent);
 }
-var inlineCardNodeView = exports.inlineCardNodeView = function inlineCardNodeView(_ref4) {
-  var inlineCardViewProducer = _ref4.inlineCardViewProducer;
+var inlineCardNodeView = exports.inlineCardNodeView = function inlineCardNodeView(_ref3) {
+  var inlineCardViewProducer = _ref3.inlineCardViewProducer;
   return function (node, view, getPos, decorations) {
     return inlineCardViewProducer(node, view, getPos, decorations);
   };

package/dist/cjs/pm-plugins/keymap.js

@@ -9,6 +9,7 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var lookupPixel = 10;
 var getClosestInlineCardPos = function getClosestInlineCardPos(state, editorView, direction) {
   var _editorView$posAtCoor;
@@ -54,9 +55,9 @@ var selectAboveBelowInlineCard = function selectAboveBelowInlineCard(direction)
 };
 function cardKeymap(featureFlags) {
   var list = {};
-
+  var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
   // https://bugs.chromium.org/p/chromium/issues/detail?id=1227468 introduced since Chrome 91
-  if (_browser.browser.chrome && _browser.browser.chrome_version > 90) {
+  if (browser.chrome && browser.chrome_version > 90) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveUp.common, selectAboveBelowInlineCard('up'), list);

package/dist/es2019/nodeviews/blockCard.js

@@ -2,10 +2,10 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import rafSchedule from 'raf-schd';
 import uuid from 'uuid/v4';
-import { EditorCardProvider } from '@atlaskit/editor-card-provider';
+import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, UnsupportedBlock } from '@atlaskit/editor-common/ui';
-import { browser, canRenderDatasource } from '@atlaskit/editor-common/utils';
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { Card as SmartCard } from '@atlaskit/smart-card';
 import { CardSSR } from '@atlaskit/smart-card/ssr';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -13,15 +13,13 @@ import { Datasource } from '../nodeviews/datasource';
 import { registerCard, removeCard } from '../pm-plugins/actions';
 import { isDatasourceNode } from '../pm-plugins/utils';
 import { Card } from './genericCard';
+
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class BlockCardComponent extends React.PureComponent {
   constructor(props) {
     super(props);
     // Ignored via go/ees005
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    _defineProperty(this, "state", {
-      isSSRDataAvailable: false
-    });
     _defineProperty(this, "onResolve", data => {
       const {
         getPos,
@@ -52,6 +50,7 @@ export class BlockCardComponent extends React.PureComponent {
     });
     _defineProperty(this, "removeCardDispatched", false);
     _defineProperty(this, "gapCursorSpan", () => {
+      const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
       // Don't render in EdgeHTMl version <= 18 (Edge version 44)
       // as it forces the edit popup to render 24px lower than it should
       if (browser.ie && browser.ie_version < 79) {
@@ -72,28 +71,6 @@ export class BlockCardComponent extends React.PureComponent {
       }
     });
     this.scrollContainer = findOverflowScrollParent(props.view.dom) || undefined;
-    this.state = {
-      isSSRDataAvailable: expValEquals('platform_editor_smart_card_otp', 'isEnabled', true) && props.isPageSSRed
-    };
-  }
-  componentDidMount() {
-    if (!expValEquals('platform_editor_smart_card_otp', 'isEnabled', true)) {
-      return;
-    }
-    const provider = this.props.provider;
-    if (!provider) {
-      return;
-    }
-    const updateSSRDataAvailability = async () => {
-      const resolvedProvider = await provider;
-      if (resolvedProvider instanceof EditorCardProvider) {
-        this.setState(state => ({
-          ...state,
-          isSSRDataAvailable: resolvedProvider.getCacheStatusForNode(this.props.node) === 'ssr'
-        }));
-      }
-    };
-    void updateSSRDataAvailability();
   }
   componentWillUnmount() {
     this.removeCard();
@@ -124,7 +101,7 @@ export class BlockCardComponent extends React.PureComponent {
       url,
       data
     } = node.attrs;
-    const cardInner = expValEquals('platform_editor_smart_card_otp', 'isEnabled', true) && this.state.isSSRDataAvailable && isPageSSRed ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardSSR, {
+    const cardInner = expValEquals('platform_editor_smart_card_otp', 'isEnabled', true) && isPageSSRed ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardSSR, {
       key: url,
       url: url !== null && url !== void 0 ? url : data.url,
       container: this.scrollContainer,

package/dist/es2019/nodeviews/embedCard.js

@@ -4,7 +4,6 @@ import React from 'react';
 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 { 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';
@@ -260,29 +259,9 @@ export class EmbedCardComponent extends React.PureComponent {
     _defineProperty(this, "removeCardDispatched", false);
     this.scrollContainer = findOverflowScrollParent(props.view.dom) || undefined;
     this.state = {
-      hasPreview: true,
-      isSSRDataAvailable: expValEquals('platform_editor_smart_card_otp', 'isEnabled', true) && props.isPageSSRed
+      hasPreview: true
     };
   }
-  componentDidMount() {
-    if (!expValEquals('platform_editor_smart_card_otp', 'isEnabled', true)) {
-      return;
-    }
-    const provider = this.props.provider;
-    if (!provider) {
-      return;
-    }
-    const updateSSRDataAvailability = async () => {
-      const resolvedProvider = await provider;
-      if (resolvedProvider instanceof EditorCardProvider) {
-        this.setState(state => ({
-          ...state,
-          isSSRDataAvailable: resolvedProvider.getCacheStatusForNode(this.props.node) === 'ssr'
-        }));
-      }
-    };
-    void updateSSRDataAvailability();
-  }
   componentWillUnmount() {
     this.removeCard();
   }
@@ -341,7 +320,7 @@ export class EmbedCardComponent extends React.PureComponent {
       pctWidth,
       fullWidthMode
     };
-    const smartCard = expValEquals('platform_editor_smart_card_otp', 'isEnabled', true) && this.state.isSSRDataAvailable && isPageSSRed ? /*#__PURE__*/React.createElement(CardSSR, {
+    const smartCard = expValEquals('platform_editor_smart_card_otp', 'isEnabled', true) && isPageSSRed ? /*#__PURE__*/React.createElement(CardSSR, {
       key: url,
       url: url,
       appearance: "embed",