@atlaskit/editor-plugin-card 1.12.0 → 1.13.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-card
 
+## 1.13.0
+
+### Minor Changes
+
+-   [#98528](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98528)
+    [`12181f0bfaed`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/12181f0bfaed) -
+    EDM-9252 Removal of platform.linking-platform.smart-card.inline-switcher
+
+## 1.12.1
+
+### Patch Changes
+
+-   [#99590](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/99590)
+    [`b0670c3f10e6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b0670c3f10e6) -
+    Remove the displayedColumnCount key-value pair from attributes object entirely if it doesn't
+    exist for analytics
+-   Updated dependencies
+
 ## 1.12.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/inlineCard.js

@@ -4,126 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.InlineCardComponent = void 0;
 exports.InlineCardNodeView = InlineCardNodeView;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-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 _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _ui = require("@atlaskit/editor-common/ui");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _smartCard = require("@atlaskit/smart-card");
-var _actions = require("../pm-plugins/actions");
 var _utils = require("../utils");
 var _genericCard = require("./genericCard");
 var _inlineCardWithAwareness = require("./inlineCardWithAwareness");
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-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
-var InlineCardComponent = exports.InlineCardComponent = /*#__PURE__*/function (_React$PureComponent) {
-  (0, _inherits2.default)(InlineCardComponent, _React$PureComponent);
-  var _super = _createSuper(InlineCardComponent);
-  function InlineCardComponent() {
-    var _this;
-    (0, _classCallCheck2.default)(this, InlineCardComponent);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onResolve", function (data) {
-      var _this$props = _this.props,
-        getPos = _this$props.getPos,
-        view = _this$props.view;
-      if (!getPos || typeof getPos === 'boolean') {
-        return;
-      }
-      var title = data.title,
-        url = data.url;
-      // don't dispatch immediately since we might be in the middle of
-      // rendering a nodeview
-      (0, _rafSchd.default)(function () {
-        // prosemirror-bump-fix
-        var pos = getPos();
-        if (typeof pos !== 'number') {
-          return;
-        }
-        var tr = view.state.tr;
-        (0, _actions.registerCard)({
-          title: title,
-          url: url,
-          pos: pos
-        })(tr);
-        view.dispatch(tr);
-      })();
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onError", function (data) {
-      var url = data.url,
-        err = data.err;
-      if (err) {
-        throw err;
-      }
-      _this.onResolve({
-        url: url
-      });
-    });
-    return _this;
-  }
-  (0, _createClass2.default)(InlineCardComponent, [{
-    key: "UNSAFE_componentWillMount",
-    value: function UNSAFE_componentWillMount() {
-      var view = this.props.view;
-      var scrollContainer = (0, _ui.findOverflowScrollParent)(view.dom);
-      this.scrollContainer = scrollContainer || undefined;
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props2 = this.props,
-        node = _this$props2.node,
-        cardContext = _this$props2.cardContext,
-        actionOptions = _this$props2.actionOptions,
-        showServerActions = _this$props2.showServerActions,
-        useAlternativePreloader = _this$props2.useAlternativePreloader,
-        onClick = _this$props2.onClick;
-      var _node$attrs = node.attrs,
-        url = _node$attrs.url,
-        data = _node$attrs.data;
-      var card = /*#__PURE__*/_react.default.createElement("span", {
-        className: "card"
-      }, /*#__PURE__*/_react.default.createElement(_smartCard.Card, {
-        key: url,
-        url: url,
-        data: data,
-        appearance: "inline",
-        onClick: onClick,
-        container: this.scrollContainer,
-        onResolve: this.onResolve,
-        onError: this.onError,
-        inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
-        actionOptions: actionOptions,
-        showServerActions: showServerActions
-      }));
-      // [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
-      return cardContext && cardContext.value ? /*#__PURE__*/_react.default.createElement(cardContext.Provider, {
-        value: cardContext.value
-      }, card) : data ? card : null;
-    }
-  }]);
-  return InlineCardComponent;
-}(_react.default.PureComponent);
-(0, _defineProperty2.default)(InlineCardComponent, "contextTypes", {
-  contextAdapter: _propTypes.default.object
-});
-var WrappedInlineCard = (0, _genericCard.Card)(InlineCardComponent, _ui.UnsupportedInline);
 var WrappedInlineCardWithAwareness = (0, _genericCard.Card)(_inlineCardWithAwareness.InlineCardWithAwareness, _ui.UnsupportedInline);
 function InlineCardNodeView(props) {
   var useAlternativePreloader = props.useAlternativePreloader,
@@ -137,18 +25,6 @@ function InlineCardNodeView(props) {
     enableInlineUpgradeFeatures = props.enableInlineUpgradeFeatures,
     pluginInjectionApi = props.pluginInjectionApi,
     onClickCallback = props.onClickCallback;
-  if (!(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.inline-switcher')) {
-    return /*#__PURE__*/_react.default.createElement(WrappedInlineCard, {
-      node: node,
-      view: view,
-      getPos: getPos,
-      actionOptions: actionOptions,
-      showServerActions: showServerActions,
-      useAlternativePreloader: useAlternativePreloader,
-      pluginInjectionApi: pluginInjectionApi,
-      onClickCallback: onClickCallback
-    });
-  }
   return /*#__PURE__*/_react.default.createElement(WrappedInlineCardWithAwareness, (0, _extends2.default)({
     node: node,
     view: view,

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

@@ -62,7 +62,6 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
       allowBlockCards = options.allowBlockCards,
       onClickCallback = options.onClickCallback;
     var enableInlineUpgradeFeatures = !!showUpgradeDiscoverability && platform !== 'mobile';
-    var shouldUseUpgradeFeatures = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.inline-switcher') && enableInlineUpgradeFeatures;
     var inlineCardViewProducer = (0, _reactNodeView.getInlineNodeViewProducer)({
       pmPluginFactoryParams: pmPluginFactoryParams,
       Component: _inlineCard.InlineCardNodeView,
@@ -119,7 +118,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
           if (!meta) {
             return pluginStateWithUpdatedPos;
           }
-          if (!shouldUseUpgradeFeatures) {
+          if (!enableInlineUpgradeFeatures) {
             return (0, _reducers.default)(pluginStateWithUpdatedPos, meta);
           }
           var newState = (0, _reducers.default)(pluginStateWithUpdatedPos, meta);
@@ -283,7 +282,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
             return new _embedCard.EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
           }
         }
-      }, shouldUseUpgradeFeatures && {
+      }, enableInlineUpgradeFeatures && {
         handleKeyDown: function handleKeyDown(view) {
           handleAwarenessOverlay(view);
           return false;

package/dist/cjs/toolbar.js

@@ -494,5 +494,5 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
   return toolbarItems;
 };
 var shouldRenderToolbarPulse = exports.shouldRenderToolbarPulse = function shouldRenderToolbarPulse(embedEnabled, appearance, status, isDiscoverabilityEnabled) {
-  return embedEnabled && appearance === 'inline' && status === 'resolved' && isDiscoverabilityEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.inline-switcher');
+  return embedEnabled && appearance === 'inline' && status === 'resolved' && isDiscoverabilityEnabled;
 };

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

@@ -15,13 +15,15 @@ var _common = require("./common");
 var _excluded = ["node", "nodeContext"],
   _excluded2 = ["node", "nodeContext"],
   _excluded3 = ["node", "nodeContext"];
+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 getDatasourceDisplay(datasourceAttrs) {
   var _datasourceAttrs$data;
   return (_datasourceAttrs$data = datasourceAttrs.datasource.views[0]) === null || _datasourceAttrs$data === void 0 ? void 0 : _datasourceAttrs$data.type;
 }
 function getDisplayedColumnCount(datasourceAttrs) {
   var _datasourceAttrs$data2, _datasourceAttrs$data3;
-  return (_datasourceAttrs$data2 = (_datasourceAttrs$data3 = datasourceAttrs.datasource.views[0]) === null || _datasourceAttrs$data3 === void 0 || (_datasourceAttrs$data3 = _datasourceAttrs$data3.properties) === null || _datasourceAttrs$data3 === void 0 || (_datasourceAttrs$data3 = _datasourceAttrs$data3.columns) === null || _datasourceAttrs$data3 === void 0 ? void 0 : _datasourceAttrs$data3.length) !== null && _datasourceAttrs$data2 !== void 0 ? _datasourceAttrs$data2 : null;
+  return (_datasourceAttrs$data2 = (_datasourceAttrs$data3 = datasourceAttrs.datasource.views[0]) === null || _datasourceAttrs$data3 === void 0 || (_datasourceAttrs$data3 = _datasourceAttrs$data3.properties) === null || _datasourceAttrs$data3 === void 0 || (_datasourceAttrs$data3 = _datasourceAttrs$data3.columns) === null || _datasourceAttrs$data3 === void 0 ? void 0 : _datasourceAttrs$data3.length) !== null && _datasourceAttrs$data2 !== void 0 ? _datasourceAttrs$data2 : undefined;
 }
 function getSearchMethod(creationMethod, metadata) {
   if (creationMethod === 'editor_paste' || creationMethod === 'editor_type') {
@@ -94,14 +96,16 @@ var DatasourceEventsBinding = exports.DatasourceEventsBinding = function Datasou
         datasourceId: datasourceId,
         parameters: parameters,
         url: url
-      }, null, {
+      }, null, _objectSpread(_objectSpread({
         actions: actions,
         creationMethod: inputMethod,
-        display: display,
-        displayedColumnCount: displayedColumnCount,
+        display: display
+      }, typeof displayedColumnCount === 'number' ? {
+        displayedColumnCount: displayedColumnCount
+      } : {}), {}, {
         nodeContext: nodeContext,
         searchMethod: searchMethod
-      });
+      }));
     }), (0, _defineProperty2.default)(_ref5, _types.EVENT.UPDATED, function (_ref3) {
       var node = _ref3.node,
         nodeContext = _ref3.nodeContext,

package/dist/es2019/nodeviews/inlineCard.js

@@ -1,109 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import PropTypes from 'prop-types';
-import rafSchedule from 'raf-schd';
-import { findOverflowScrollParent, UnsupportedInline } from '@atlaskit/editor-common/ui';
+import { UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { Card as SmartCard } from '@atlaskit/smart-card';
-import { registerCard } from '../pm-plugins/actions';
 import { isBlockSupportedAtPosition, isEmbedSupportedAtPosition } from '../utils';
 import { Card } from './genericCard';
 import { InlineCardWithAwareness } from './inlineCardWithAwareness';
-
-// eslint-disable-next-line @repo/internal/react/no-class-components
-export class InlineCardComponent extends React.PureComponent {
-  constructor(...args) {
-    super(...args);
-    _defineProperty(this, "onResolve", data => {
-      const {
-        getPos,
-        view
-      } = this.props;
-      if (!getPos || typeof getPos === 'boolean') {
-        return;
-      }
-      const {
-        title,
-        url
-      } = data;
-      // don't dispatch immediately since we might be in the middle of
-      // rendering a nodeview
-      rafSchedule(() => {
-        // prosemirror-bump-fix
-        const pos = getPos();
-        if (typeof pos !== 'number') {
-          return;
-        }
-        const tr = view.state.tr;
-        registerCard({
-          title,
-          url,
-          pos
-        })(tr);
-        view.dispatch(tr);
-      })();
-    });
-    _defineProperty(this, "onError", data => {
-      const {
-        url,
-        err
-      } = data;
-      if (err) {
-        throw err;
-      }
-      this.onResolve({
-        url
-      });
-    });
-  }
-  UNSAFE_componentWillMount() {
-    const {
-      view
-    } = this.props;
-    const scrollContainer = findOverflowScrollParent(view.dom);
-    this.scrollContainer = scrollContainer || undefined;
-  }
-  render() {
-    const {
-      node,
-      cardContext,
-      actionOptions,
-      showServerActions,
-      useAlternativePreloader,
-      onClick
-    } = this.props;
-    const {
-      url,
-      data
-    } = node.attrs;
-    const card = /*#__PURE__*/React.createElement("span", {
-      className: "card"
-    }, /*#__PURE__*/React.createElement(SmartCard, {
-      key: url,
-      url: url,
-      data: data,
-      appearance: "inline",
-      onClick: onClick,
-      container: this.scrollContainer,
-      onResolve: this.onResolve,
-      onError: this.onError,
-      inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
-      actionOptions: actionOptions,
-      showServerActions: showServerActions
-    }));
-    // [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
-    return cardContext && cardContext.value ? /*#__PURE__*/React.createElement(cardContext.Provider, {
-      value: cardContext.value
-    }, card) : data ? card : null;
-  }
-}
-_defineProperty(InlineCardComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
-const WrappedInlineCard = Card(InlineCardComponent, UnsupportedInline);
 const WrappedInlineCardWithAwareness = Card(InlineCardWithAwareness, UnsupportedInline);
 export function InlineCardNodeView(props) {
   const {
@@ -119,18 +20,6 @@ export function InlineCardNodeView(props) {
     pluginInjectionApi,
     onClickCallback
   } = props;
-  if (!getBooleanFF('platform.linking-platform.smart-card.inline-switcher')) {
-    return /*#__PURE__*/React.createElement(WrappedInlineCard, {
-      node: node,
-      view: view,
-      getPos: getPos,
-      actionOptions: actionOptions,
-      showServerActions: showServerActions,
-      useAlternativePreloader: useAlternativePreloader,
-      pluginInjectionApi: pluginInjectionApi,
-      onClickCallback: onClickCallback
-    });
-  }
   return /*#__PURE__*/React.createElement(WrappedInlineCardWithAwareness, _extends({
     node: node,
     view: view,

package/dist/es2019/pm-plugins/main.js

@@ -47,7 +47,6 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
     onClickCallback
   } = options;
   const enableInlineUpgradeFeatures = !!showUpgradeDiscoverability && platform !== 'mobile';
-  const shouldUseUpgradeFeatures = getBooleanFF('platform.linking-platform.smart-card.inline-switcher') && enableInlineUpgradeFeatures;
   const inlineCardViewProducer = getInlineNodeViewProducer({
     pmPluginFactoryParams,
     Component: InlineCardNodeView,
@@ -105,7 +104,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
         if (!meta) {
           return pluginStateWithUpdatedPos;
         }
-        if (!shouldUseUpgradeFeatures) {
+        if (!enableInlineUpgradeFeatures) {
           return reducer(pluginStateWithUpdatedPos, meta);
         }
         const newState = reducer(pluginStateWithUpdatedPos, meta);
@@ -277,7 +276,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
           return new EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
         }
       },
-      ...(shouldUseUpgradeFeatures && {
+      ...(enableInlineUpgradeFeatures && {
         handleKeyDown: view => {
           handleAwarenessOverlay(view);
           return false;

package/dist/es2019/toolbar.js

@@ -487,5 +487,5 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
   return toolbarItems;
 };
 export const shouldRenderToolbarPulse = (embedEnabled, appearance, status, isDiscoverabilityEnabled) => {
-  return embedEnabled && appearance === 'inline' && status === 'resolved' && isDiscoverabilityEnabled && getBooleanFF('platform.linking-platform.smart-card.inline-switcher');
+  return embedEnabled && appearance === 'inline' && status === 'resolved' && isDiscoverabilityEnabled;
 };

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

@@ -9,7 +9,7 @@ function getDatasourceDisplay(datasourceAttrs) {
 }
 function getDisplayedColumnCount(datasourceAttrs) {
   var _datasourceAttrs$data2, _datasourceAttrs$data3, _datasourceAttrs$data4, _datasourceAttrs$data5;
-  return (_datasourceAttrs$data2 = (_datasourceAttrs$data3 = datasourceAttrs.datasource.views[0]) === null || _datasourceAttrs$data3 === void 0 ? void 0 : (_datasourceAttrs$data4 = _datasourceAttrs$data3.properties) === null || _datasourceAttrs$data4 === void 0 ? void 0 : (_datasourceAttrs$data5 = _datasourceAttrs$data4.columns) === null || _datasourceAttrs$data5 === void 0 ? void 0 : _datasourceAttrs$data5.length) !== null && _datasourceAttrs$data2 !== void 0 ? _datasourceAttrs$data2 : null;
+  return (_datasourceAttrs$data2 = (_datasourceAttrs$data3 = datasourceAttrs.datasource.views[0]) === null || _datasourceAttrs$data3 === void 0 ? void 0 : (_datasourceAttrs$data4 = _datasourceAttrs$data3.properties) === null || _datasourceAttrs$data4 === void 0 ? void 0 : (_datasourceAttrs$data5 = _datasourceAttrs$data4.columns) === null || _datasourceAttrs$data5 === void 0 ? void 0 : _datasourceAttrs$data5.length) !== null && _datasourceAttrs$data2 !== void 0 ? _datasourceAttrs$data2 : undefined;
 }
 function getSearchMethod(creationMethod, metadata) {
   if (creationMethod === 'editor_paste' || creationMethod === 'editor_type') {
@@ -96,8 +96,10 @@ export const DatasourceEventsBinding = ({
           actions,
           creationMethod: inputMethod,
           display,
-          displayedColumnCount,
-          nodeContext: nodeContext,
+          ...(typeof displayedColumnCount === 'number' ? {
+            displayedColumnCount
+          } : {}),
+          nodeContext,
           searchMethod
         });
       },
@@ -125,7 +127,7 @@ export const DatasourceEventsBinding = ({
           actions,
           display,
           displayedColumnCount,
-          nodeContext: nodeContext,
+          nodeContext,
           searchMethod,
           updateMethod: inputMethod
         });
@@ -153,7 +155,7 @@ export const DatasourceEventsBinding = ({
           deleteMethod: inputMethod,
           display,
           displayedColumnCount,
-          nodeContext: nodeContext,
+          nodeContext,
           searchMethod
         });
       }

package/dist/esm/nodeviews/inlineCard.js

@@ -1,122 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-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 { findOverflowScrollParent, UnsupportedInline } from '@atlaskit/editor-common/ui';
+import { UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { Card as SmartCard } from '@atlaskit/smart-card';
-import { registerCard } from '../pm-plugins/actions';
 import { isBlockSupportedAtPosition, isEmbedSupportedAtPosition } from '../utils';
 import { Card } from './genericCard';
 import { InlineCardWithAwareness } from './inlineCardWithAwareness';
-
-// eslint-disable-next-line @repo/internal/react/no-class-components
-export var InlineCardComponent = /*#__PURE__*/function (_React$PureComponent) {
-  _inherits(InlineCardComponent, _React$PureComponent);
-  var _super = _createSuper(InlineCardComponent);
-  function InlineCardComponent() {
-    var _this;
-    _classCallCheck(this, InlineCardComponent);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "onResolve", function (data) {
-      var _this$props = _this.props,
-        getPos = _this$props.getPos,
-        view = _this$props.view;
-      if (!getPos || typeof getPos === 'boolean') {
-        return;
-      }
-      var title = data.title,
-        url = data.url;
-      // don't dispatch immediately since we might be in the middle of
-      // rendering a nodeview
-      rafSchedule(function () {
-        // prosemirror-bump-fix
-        var pos = getPos();
-        if (typeof pos !== 'number') {
-          return;
-        }
-        var tr = view.state.tr;
-        registerCard({
-          title: title,
-          url: url,
-          pos: pos
-        })(tr);
-        view.dispatch(tr);
-      })();
-    });
-    _defineProperty(_assertThisInitialized(_this), "onError", function (data) {
-      var url = data.url,
-        err = data.err;
-      if (err) {
-        throw err;
-      }
-      _this.onResolve({
-        url: url
-      });
-    });
-    return _this;
-  }
-  _createClass(InlineCardComponent, [{
-    key: "UNSAFE_componentWillMount",
-    value: function UNSAFE_componentWillMount() {
-      var view = this.props.view;
-      var scrollContainer = findOverflowScrollParent(view.dom);
-      this.scrollContainer = scrollContainer || undefined;
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props2 = this.props,
-        node = _this$props2.node,
-        cardContext = _this$props2.cardContext,
-        actionOptions = _this$props2.actionOptions,
-        showServerActions = _this$props2.showServerActions,
-        useAlternativePreloader = _this$props2.useAlternativePreloader,
-        onClick = _this$props2.onClick;
-      var _node$attrs = node.attrs,
-        url = _node$attrs.url,
-        data = _node$attrs.data;
-      var card = /*#__PURE__*/React.createElement("span", {
-        className: "card"
-      }, /*#__PURE__*/React.createElement(SmartCard, {
-        key: url,
-        url: url,
-        data: data,
-        appearance: "inline",
-        onClick: onClick,
-        container: this.scrollContainer,
-        onResolve: this.onResolve,
-        onError: this.onError,
-        inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
-        actionOptions: actionOptions,
-        showServerActions: showServerActions
-      }));
-      // [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
-      return cardContext && cardContext.value ? /*#__PURE__*/React.createElement(cardContext.Provider, {
-        value: cardContext.value
-      }, card) : data ? card : null;
-    }
-  }]);
-  return InlineCardComponent;
-}(React.PureComponent);
-_defineProperty(InlineCardComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
-var WrappedInlineCard = Card(InlineCardComponent, UnsupportedInline);
 var WrappedInlineCardWithAwareness = Card(InlineCardWithAwareness, UnsupportedInline);
 export function InlineCardNodeView(props) {
   var useAlternativePreloader = props.useAlternativePreloader,
@@ -130,18 +18,6 @@ export function InlineCardNodeView(props) {
     enableInlineUpgradeFeatures = props.enableInlineUpgradeFeatures,
     pluginInjectionApi = props.pluginInjectionApi,
     onClickCallback = props.onClickCallback;
-  if (!getBooleanFF('platform.linking-platform.smart-card.inline-switcher')) {
-    return /*#__PURE__*/React.createElement(WrappedInlineCard, {
-      node: node,
-      view: view,
-      getPos: getPos,
-      actionOptions: actionOptions,
-      showServerActions: showServerActions,
-      useAlternativePreloader: useAlternativePreloader,
-      pluginInjectionApi: pluginInjectionApi,
-      onClickCallback: onClickCallback
-    });
-  }
   return /*#__PURE__*/React.createElement(WrappedInlineCardWithAwareness, _extends({
     node: node,
     view: view,

package/dist/esm/pm-plugins/main.js

@@ -50,7 +50,6 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
       allowBlockCards = options.allowBlockCards,
       onClickCallback = options.onClickCallback;
     var enableInlineUpgradeFeatures = !!showUpgradeDiscoverability && platform !== 'mobile';
-    var shouldUseUpgradeFeatures = getBooleanFF('platform.linking-platform.smart-card.inline-switcher') && enableInlineUpgradeFeatures;
     var inlineCardViewProducer = getInlineNodeViewProducer({
       pmPluginFactoryParams: pmPluginFactoryParams,
       Component: InlineCardNodeView,
@@ -107,7 +106,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
           if (!meta) {
             return pluginStateWithUpdatedPos;
           }
-          if (!shouldUseUpgradeFeatures) {
+          if (!enableInlineUpgradeFeatures) {
             return reducer(pluginStateWithUpdatedPos, meta);
           }
           var newState = reducer(pluginStateWithUpdatedPos, meta);
@@ -271,7 +270,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             return new EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
           }
         }
-      }, shouldUseUpgradeFeatures && {
+      }, enableInlineUpgradeFeatures && {
         handleKeyDown: function handleKeyDown(view) {
           handleAwarenessOverlay(view);
           return false;

package/dist/esm/toolbar.js

@@ -484,5 +484,5 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
   return toolbarItems;
 };
 export var shouldRenderToolbarPulse = function shouldRenderToolbarPulse(embedEnabled, appearance, status, isDiscoverabilityEnabled) {
-  return embedEnabled && appearance === 'inline' && status === 'resolved' && isDiscoverabilityEnabled && getBooleanFF('platform.linking-platform.smart-card.inline-switcher');
+  return embedEnabled && appearance === 'inline' && status === 'resolved' && isDiscoverabilityEnabled;
 };

package/dist/esm/ui/EditorLinkingPlatformAnalytics/DatasourceEvents.js

@@ -3,6 +3,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["node", "nodeContext"],
   _excluded2 = ["node", "nodeContext"],
   _excluded3 = ["node", "nodeContext"];
+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) { _defineProperty(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; }
 import { useEffect, useMemo } from 'react';
 import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { useDatasourceLifecycleAnalytics } from '@atlaskit/link-analytics';
@@ -14,7 +16,7 @@ function getDatasourceDisplay(datasourceAttrs) {
 }
 function getDisplayedColumnCount(datasourceAttrs) {
   var _datasourceAttrs$data2, _datasourceAttrs$data3;
-  return (_datasourceAttrs$data2 = (_datasourceAttrs$data3 = datasourceAttrs.datasource.views[0]) === null || _datasourceAttrs$data3 === void 0 || (_datasourceAttrs$data3 = _datasourceAttrs$data3.properties) === null || _datasourceAttrs$data3 === void 0 || (_datasourceAttrs$data3 = _datasourceAttrs$data3.columns) === null || _datasourceAttrs$data3 === void 0 ? void 0 : _datasourceAttrs$data3.length) !== null && _datasourceAttrs$data2 !== void 0 ? _datasourceAttrs$data2 : null;
+  return (_datasourceAttrs$data2 = (_datasourceAttrs$data3 = datasourceAttrs.datasource.views[0]) === null || _datasourceAttrs$data3 === void 0 || (_datasourceAttrs$data3 = _datasourceAttrs$data3.properties) === null || _datasourceAttrs$data3 === void 0 || (_datasourceAttrs$data3 = _datasourceAttrs$data3.columns) === null || _datasourceAttrs$data3 === void 0 ? void 0 : _datasourceAttrs$data3.length) !== null && _datasourceAttrs$data2 !== void 0 ? _datasourceAttrs$data2 : undefined;
 }
 function getSearchMethod(creationMethod, metadata) {
   if (creationMethod === 'editor_paste' || creationMethod === 'editor_type') {
@@ -87,14 +89,16 @@ export var DatasourceEventsBinding = function DatasourceEventsBinding(_ref) {
         datasourceId: datasourceId,
         parameters: parameters,
         url: url
-      }, null, {
+      }, null, _objectSpread(_objectSpread({
         actions: actions,
         creationMethod: inputMethod,
-        display: display,
-        displayedColumnCount: displayedColumnCount,
+        display: display
+      }, typeof displayedColumnCount === 'number' ? {
+        displayedColumnCount: displayedColumnCount
+      } : {}), {}, {
         nodeContext: nodeContext,
         searchMethod: searchMethod
-      });
+      }));
     }), _defineProperty(_ref5, EVENT.UPDATED, function (_ref3) {
       var node = _ref3.node,
         nodeContext = _ref3.nodeContext,

package/dist/types/nodeviews/inlineCard.d.ts

@@ -1,23 +1,6 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+/// <reference types="react" />
 import type { InlineNodeViewComponentProps } from '@atlaskit/editor-common/react-node-view';
 import type { SmartCardProps } from './genericCard';
-export declare class InlineCardComponent extends React.PureComponent<SmartCardProps> {
-    private scrollContainer?;
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
-    UNSAFE_componentWillMount(): void;
-    onResolve: (data: {
-        url?: string | undefined;
-        title?: string | undefined;
-    }) => void;
-    onError: (data: {
-        url?: string | undefined;
-        err?: Error | undefined;
-    }) => void;
-    render(): JSX.Element | null;
-}
 export type InlineCardNodeViewProps = Pick<SmartCardProps, 'useAlternativePreloader' | 'actionOptions' | 'showServerActions' | 'allowEmbeds' | 'allowBlockCards' | 'enableInlineUpgradeFeatures' | 'pluginInjectionApi' | 'onClickCallback'>;
 type InlineCardWithAwarenessProps = {
     allowEmbeds?: boolean;

package/dist/types-ts4.5/nodeviews/inlineCard.d.ts

@@ -1,23 +1,6 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+/// <reference types="react" />
 import type { InlineNodeViewComponentProps } from '@atlaskit/editor-common/react-node-view';
 import type { SmartCardProps } from './genericCard';
-export declare class InlineCardComponent extends React.PureComponent<SmartCardProps> {
-    private scrollContainer?;
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
-    UNSAFE_componentWillMount(): void;
-    onResolve: (data: {
-        url?: string | undefined;
-        title?: string | undefined;
-    }) => void;
-    onError: (data: {
-        url?: string | undefined;
-        err?: Error | undefined;
-    }) => void;
-    render(): JSX.Element | null;
-}
 export type InlineCardNodeViewProps = Pick<SmartCardProps, 'useAlternativePreloader' | 'actionOptions' | 'showServerActions' | 'allowEmbeds' | 'allowBlockCards' | 'enableInlineUpgradeFeatures' | 'pluginInjectionApi' | 'onClickCallback'>;
 type InlineCardWithAwarenessProps = {
     allowEmbeds?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     "@atlaskit/adf-schema": "^36.3.0",
     "@atlaskit/analytics-next": "^9.3.0",
     "@atlaskit/custom-steps": "^0.2.0",
-    "@atlaskit/editor-common": "^80.1.0",
+    "@atlaskit/editor-common": "^80.3.0",
     "@atlaskit/editor-plugin-analytics": "^1.2.0",
     "@atlaskit/editor-plugin-decorations": "^1.1.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.1.0",
@@ -54,8 +54,8 @@
     "@atlaskit/linking-common": "^5.6.0",
     "@atlaskit/linking-types": "^8.8.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/primitives": "^6.1.0",
-    "@atlaskit/smart-card": "^26.67.0",
+    "@atlaskit/primitives": "^6.2.0",
+    "@atlaskit/smart-card": "^26.68.0",
     "@atlaskit/theme": "^12.8.0",
     "@atlaskit/tokens": "^1.48.0",
     "@babel/runtime": "^7.0.0",
@@ -105,9 +105,6 @@
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
   "platform-feature-flags": {
-    "platform.linking-platform.smart-card.inline-switcher": {
-      "type": "boolean"
-    },
     "platform.linking-platform.datasource-word_wrap": {
       "type": "boolean"
     },