@atlaskit/editor-plugin-card 2.7.0 → 2.8.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-card
 
+## 2.8.0
+
+### Minor Changes
+
+- [#124209](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/124209)
+  [`8aa1792f12ed3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8aa1792f12ed3) -
+  bump @atlaskit/editor-prosemirror to 5.0.0, bump @atlaskit/adf-schema to 40.1.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.7.1
+
+### Patch Changes
+
+- [`338c00056aa27`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/338c00056aa27) -
+  Cleans up internal refactor (platform.linking-platform.editor-datasource-typeguards). No expected
+  functional changes.
+
 ## 2.7.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/blockCard.js

@@ -172,16 +172,8 @@ var BlockCard = exports.BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     // If so, we return false so we can get the node to re-render properly as a datasource node instead.
     // Otherwise, the node view will still consider the node as a blockCard and render a regular blockCard.
     function validUpdate(currentNode, newNode) {
-      var _currentNode$attrs, _newNode$attrs;
-      if ((0, _platformFeatureFlags.fg)('platform.linking-platform.editor-datasource-typeguards')) {
-        var _isCurrentNodeBlockCard = !(0, _utils2.isDatasourceNode)(currentNode);
-        var _isNewNodeDatasource = (0, _utils2.isDatasourceNode)(newNode);
-
-        // need to return falsy to update node
-        return !(_isCurrentNodeBlockCard && _isNewNodeDatasource);
-      }
-      var isCurrentNodeBlockCard = !((_currentNode$attrs = currentNode.attrs) !== null && _currentNode$attrs !== void 0 && _currentNode$attrs.datasource);
-      var isNewNodeDatasource = (_newNode$attrs = newNode.attrs) === null || _newNode$attrs === void 0 ? void 0 : _newNode$attrs.datasource;
+      var isCurrentNodeBlockCard = !(0, _utils2.isDatasourceNode)(currentNode);
+      var isNewNodeDatasource = (0, _utils2.isDatasourceNode)(newNode);
 
       // need to return falsy to update node
       return !(isCurrentNodeBlockCard && isNewNodeDatasource);

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

@@ -471,7 +471,9 @@ var updateCardViaDatasource = exports.updateCardViaDatasource = function updateC
       if (isColumnChange || isUrlChange) {
         tr.setNodeMarkup(from, schemaNodes.blockCard, _objectSpread(_objectSpread({}, oldAttrs), newAdf.attrs));
       }
-    } else if (node.type.isText && (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+    } else if (
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar') && node.type.isText) {
       // url to datasource
       var link;
       state.doc.nodesBetween(from, to, function (node, pos) {
@@ -543,38 +545,20 @@ var getAttrsForAppearance = exports.getAttrsForAppearance = function getAttrsFor
       layout: 'center'
     });
   }
-  if ((0, _platformFeatureFlags.fg)('platform.linking-platform.editor-datasource-typeguards')) {
-    if ((0, _utils2.isDatasourceNode)(selectedNode)) {
-      return {
-        url: selectedNode.attrs.url
-      };
-    }
-  } else {
-    if (selectedNode.attrs.datasource) {
-      return {
-        url: selectedNode.attrs.url
-      };
-    }
+  if ((0, _utils2.isDatasourceNode)(selectedNode)) {
+    return {
+      url: selectedNode.attrs.url
+    };
   }
   return selectedNode.attrs;
 };
 var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
   if ((0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    if ((0, _platformFeatureFlags.fg)('platform.linking-platform.editor-datasource-typeguards')) {
-      if ((0, _utils2.isDatasourceNode)(selectedNode) && !(0, _utils2.isDatasourceConfigEditable)(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
-        (0, _actions.setDatasourceStash)(tr, {
-          url: selectedNode.attrs.url,
-          views: selectedNode.attrs.datasource.views
-        });
-      }
-    } else {
-      var _selectedNode$attrs;
-      if (selectedNode !== null && selectedNode !== void 0 && (_selectedNode$attrs = selectedNode.attrs) !== null && _selectedNode$attrs !== void 0 && _selectedNode$attrs.datasource && !(0, _utils2.isDatasourceConfigEditable)(selectedNode.attrs.datasource.id)) {
-        (0, _actions.setDatasourceStash)(tr, {
-          url: selectedNode.attrs.url,
-          views: selectedNode.attrs.datasource.views
-        });
-      }
+    if ((0, _utils2.isDatasourceNode)(selectedNode) && !(0, _utils2.isDatasourceConfigEditable)(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
+      (0, _actions.setDatasourceStash)(tr, {
+        url: selectedNode.attrs.url,
+        views: selectedNode.attrs.datasource.views
+      });
     }
   }
 };

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

@@ -192,13 +192,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
               var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.datasource);
               var shouldUpdateTableRef = datasourceTableRef && (currentState === null || currentState === void 0 ? void 0 : currentState.datasourceTableRef) !== datasourceTableRef;
               if (isDatasource && shouldUpdateTableRef) {
-                var _node$attrs2;
-                var getLayout = function getLayout() {
-                  return (0, _utils3.isDatasourceTableLayout)(node.attrs.layout) ? node.attrs.layout : _linkingCommon.DATASOURCE_DEFAULT_LAYOUT;
-                };
-
                 // since we use the plugin state, which is a shared state, we need to update the datasourceTableRef, layout on each selection
-                var layout = (0, _platformFeatureFlags.fg)('platform.linking-platform.editor-datasource-typeguards') ? getLayout() : (node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || _linkingCommon.DATASOURCE_DEFAULT_LAYOUT;
+                var layout = (0, _utils3.isDatasourceTableLayout)(node.attrs.layout) ? node.attrs.layout : _linkingCommon.DATASOURCE_DEFAULT_LAYOUT;
                 var isNested = selection.$anchor.depth > 0;
 
                 // we want to disable resize button when datasource table is nested by not setting then datasourceTableRef on selection
@@ -261,7 +256,6 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
         nodeViews: {
           inlineCard: inlineCardViewProducer,
           blockCard: function blockCard(node, view, getPos, decorations) {
-            var _node$attrs3;
             var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
               eventDispatcher = pmPluginFactoryParams.eventDispatcher;
             var reactComponentProps = {
@@ -271,10 +265,10 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
               pluginInjectionApi: pluginInjectionApi,
               onClickCallback: options.onClickCallback
             };
-            var isDatasource = (0, _platformFeatureFlags.fg)('platform.linking-platform.editor-datasource-typeguards') ? (0, _utils4.isDatasourceNode)(node) : !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
+            var isDatasource = (0, _utils4.isDatasourceNode)(node);
             if (isDatasource) {
-              var _node$attrs4;
-              if (options.allowDatasource && platform !== 'mobile' && (0, _utils.canRenderDatasource)(node === null || node === void 0 || (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 || (_node$attrs4 = _node$attrs4.datasource) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.id)) {
+              var _node$attrs2;
+              if (options.allowDatasource && platform !== 'mobile' && (0, _utils.canRenderDatasource)(node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.datasource) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.id)) {
                 var datasourcePosition = typeof getPos === 'function' && getPos();
                 var datasourceResolvedPosition = datasourcePosition && view.state.doc.resolve(datasourcePosition);
                 var isNodeNested = !!(datasourceResolvedPosition && datasourceResolvedPosition.depth > 0);

package/dist/cjs/toolbar.js

@@ -188,7 +188,7 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
 };
 var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, platform, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs2;
+    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs;
     var _titleUrlPairFromNode2 = (0, _utils3.titleUrlPairFromNode)(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
@@ -208,10 +208,10 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     var currentAppearance = (0, _utils3.appearanceForNodeType)(node.type);
     var _ref2 = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
       hoverDecoration = _ref2.hoverDecoration;
-    var isDatasource = (0, _platformFeatureFlags.fg)('platform.linking-platform.editor-datasource-typeguards') ? (0, _utils3.isDatasourceNode)(node) : currentAppearance === 'block' && (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
+    var isDatasource = (0, _utils3.isDatasourceNode)(node);
     var shouldRenderDatasourceToolbar = isDatasource &&
     // not showing toolbar in mobile for now since not sure what our plans are for it
-    platform !== 'mobile' && cardOptions.allowDatasource && (0, _utils.canRenderDatasource)(node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.datasource) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.id);
+    platform !== 'mobile' && cardOptions.allowDatasource && (0, _utils.canRenderDatasource)(node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.datasource) === null || _node$attrs === void 0 ? void 0 : _node$attrs.id);
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -397,7 +397,7 @@ var getSettingsButtonGroup = exports.getSettingsButtonGroup = function getSettin
   }];
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance, platform) {
-  var _node$attrs3;
+  var _node$attrs2;
   var toolbarItems = [];
   if ((0, _utils3.isDatasourceConfigEditable)(datasourceId) && !(0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-edit-dropdown-toolbar')) {
     toolbarItems.push({
@@ -488,7 +488,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       }
     });
   }
-  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
+  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
     toolbarItems.push({
       id: 'editor.link.openLink',
       type: 'button',

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

@@ -16,7 +16,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _collapse = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/collapse"));
 var _expand = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/expand"));
 var _linkingCommon = require("@atlaskit/linking-common");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
 var _actions = require("../../pm-plugins/actions");
 var _utils2 = require("../../utils");
@@ -79,7 +78,7 @@ var LayoutButton = exports.LayoutButton = function LayoutButton(_ref) {
   }));
 };
 var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
-  var _node$attrs, _node$attrs2;
+  var _node$attrs;
   var editorView = _ref2.editorView,
     mountPoint = _ref2.mountPoint,
     scrollableElement = _ref2.scrollableElement,
@@ -91,7 +90,7 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
   var _getDatasource = (0, _utils3.getDatasource)(editorView),
     node = _getDatasource.node,
     pos = _getDatasource.pos;
-  var isDatasource = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.editor-datasource-typeguards') ? (0, _utils2.isDatasourceNode)(node) : !!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.datasource);
+  var isDatasource = (0, _utils2.isDatasourceNode)(node);
   if (!isDatasource) {
     return null;
   }
@@ -101,7 +100,7 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
   var _ref3 = cardState !== null && cardState !== void 0 ? cardState : {},
     datasourceTableRef = _ref3.datasourceTableRef,
     _ref3$layout = _ref3.layout,
-    layout = _ref3$layout === void 0 ? (node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || undefined : _ref3$layout;
+    layout = _ref3$layout === void 0 ? (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || undefined : _ref3$layout;
   var onLayoutChange = function onLayoutChange(layout) {
     var _getDatasource$node;
     if (pos === undefined) {

package/dist/cjs/ui/LayoutButton/utils.js

@@ -7,30 +7,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.isDatasourceTableLayout = exports.getDatasource = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils2 = require("../../utils");
 var _types = require("./types");
 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; }
 var getDatasource = exports.getDatasource = function getDatasource(editorView) {
-  var _findSelectedNodeOfTy;
   var _editorView$state = editorView.state,
     selection = _editorView$state.selection,
     schema = _editorView$state.schema;
   var blockCard = schema.nodes.blockCard;
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.editor-datasource-typeguards')) {
-    var findResult = (0, _utils.findSelectedNodeOfType)([blockCard])(selection);
-    if (findResult && (0, _utils2.isDatasourceNode)(findResult.node)) {
-      return _objectSpread(_objectSpread({}, findResult), {}, {
-        node: findResult.node
-      });
-    }
-    return {
-      node: undefined,
-      pos: undefined
-    };
+  var findResult = (0, _utils.findSelectedNodeOfType)([blockCard])(selection);
+  if (findResult && (0, _utils2.isDatasourceNode)(findResult.node)) {
+    return _objectSpread(_objectSpread({}, findResult), {}, {
+      node: findResult.node
+    });
   }
-  return (_findSelectedNodeOfTy = (0, _utils.findSelectedNodeOfType)([blockCard])(selection)) !== null && _findSelectedNodeOfTy !== void 0 ? _findSelectedNodeOfTy : {
+  return {
     node: undefined,
     pos: undefined
   };

package/dist/es2019/nodeviews/blockCard.js

@@ -136,16 +136,8 @@ export class BlockCard extends ReactNodeView {
   // If so, we return false so we can get the node to re-render properly as a datasource node instead.
   // Otherwise, the node view will still consider the node as a blockCard and render a regular blockCard.
   validUpdate(currentNode, newNode) {
-    var _currentNode$attrs, _newNode$attrs;
-    if (fg('platform.linking-platform.editor-datasource-typeguards')) {
-      const isCurrentNodeBlockCard = !isDatasourceNode(currentNode);
-      const isNewNodeDatasource = isDatasourceNode(newNode);
-
-      // need to return falsy to update node
-      return !(isCurrentNodeBlockCard && isNewNodeDatasource);
-    }
-    const isCurrentNodeBlockCard = !((_currentNode$attrs = currentNode.attrs) !== null && _currentNode$attrs !== void 0 && _currentNode$attrs.datasource);
-    const isNewNodeDatasource = (_newNode$attrs = newNode.attrs) === null || _newNode$attrs === void 0 ? void 0 : _newNode$attrs.datasource;
+    const isCurrentNodeBlockCard = !isDatasourceNode(currentNode);
+    const isNewNodeDatasource = isDatasourceNode(newNode);
 
     // need to return falsy to update node
     return !(isCurrentNodeBlockCard && isNewNodeDatasource);

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

@@ -452,7 +452,9 @@ export const updateCardViaDatasource = args => {
           ...newAdf.attrs
         });
       }
-    } else if (node.type.isText && fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+    } else if (
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    fg('platform.linking-platform.enable-datasource-appearance-toolbar') && node.type.isText) {
       // url to datasource
       let link;
       state.doc.nodesBetween(from, to, (node, pos) => {
@@ -531,38 +533,20 @@ export const getAttrsForAppearance = (appearance, selectedNode) => {
       layout: 'center'
     };
   }
-  if (fg('platform.linking-platform.editor-datasource-typeguards')) {
-    if (isDatasourceNode(selectedNode)) {
-      return {
-        url: selectedNode.attrs.url
-      };
-    }
-  } else {
-    if (selectedNode.attrs.datasource) {
-      return {
-        url: selectedNode.attrs.url
-      };
-    }
+  if (isDatasourceNode(selectedNode)) {
+    return {
+      url: selectedNode.attrs.url
+    };
   }
   return selectedNode.attrs;
 };
 const updateDatasourceStash = (tr, selectedNode) => {
   if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    if (fg('platform.linking-platform.editor-datasource-typeguards')) {
-      if (isDatasourceNode(selectedNode) && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
-        setDatasourceStash(tr, {
-          url: selectedNode.attrs.url,
-          views: selectedNode.attrs.datasource.views
-        });
-      }
-    } else {
-      var _selectedNode$attrs;
-      if (selectedNode !== null && selectedNode !== void 0 && (_selectedNode$attrs = selectedNode.attrs) !== null && _selectedNode$attrs !== void 0 && _selectedNode$attrs.datasource && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id)) {
-        setDatasourceStash(tr, {
-          url: selectedNode.attrs.url,
-          views: selectedNode.attrs.datasource.views
-        });
-      }
+    if (isDatasourceNode(selectedNode) && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
+      setDatasourceStash(tr, {
+        url: selectedNode.attrs.url,
+        views: selectedNode.attrs.datasource.views
+      });
     }
   }
 };

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

@@ -183,13 +183,8 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
             const isDatasource = !!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.datasource);
             const shouldUpdateTableRef = datasourceTableRef && (currentState === null || currentState === void 0 ? void 0 : currentState.datasourceTableRef) !== datasourceTableRef;
             if (isDatasource && shouldUpdateTableRef) {
-              var _node$attrs2;
-              const getLayout = () => {
-                return isDatasourceTableLayout(node.attrs.layout) ? node.attrs.layout : DATASOURCE_DEFAULT_LAYOUT;
-              };
-
               // since we use the plugin state, which is a shared state, we need to update the datasourceTableRef, layout on each selection
-              const layout = fg('platform.linking-platform.editor-datasource-typeguards') ? getLayout() : (node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || DATASOURCE_DEFAULT_LAYOUT;
+              const layout = isDatasourceTableLayout(node.attrs.layout) ? node.attrs.layout : DATASOURCE_DEFAULT_LAYOUT;
               const isNested = selection.$anchor.depth > 0;
 
               // we want to disable resize button when datasource table is nested by not setting then datasourceTableRef on selection
@@ -252,7 +247,6 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
       nodeViews: {
         inlineCard: inlineCardViewProducer,
         blockCard: (node, view, getPos, decorations) => {
-          var _node$attrs3;
           const {
             portalProviderAPI,
             eventDispatcher
@@ -264,10 +258,10 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
             pluginInjectionApi,
             onClickCallback: options.onClickCallback
           };
-          const isDatasource = fg('platform.linking-platform.editor-datasource-typeguards') ? isDatasourceNode(node) : !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
+          const isDatasource = isDatasourceNode(node);
           if (isDatasource) {
-            var _node$attrs4, _node$attrs4$datasour;
-            if (options.allowDatasource && platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : (_node$attrs4$datasour = _node$attrs4.datasource) === null || _node$attrs4$datasour === void 0 ? void 0 : _node$attrs4$datasour.id)) {
+            var _node$attrs2, _node$attrs2$datasour;
+            if (options.allowDatasource && platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : (_node$attrs2$datasour = _node$attrs2.datasource) === null || _node$attrs2$datasour === void 0 ? void 0 : _node$attrs2$datasour.id)) {
               const datasourcePosition = typeof getPos === 'function' && getPos();
               const datasourceResolvedPosition = datasourcePosition && view.state.doc.resolve(datasourcePosition);
               const isNodeNested = !!(datasourceResolvedPosition && datasourceResolvedPosition.depth > 0);

package/dist/es2019/toolbar.js

@@ -176,7 +176,7 @@ const getToolbarViewedItem = (url, display) => {
   }];
 };
 const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkPicker, platform, linkPicker, pluginInjectionApi) => node => {
-  var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs2, _node$attrs2$datasour;
+  var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs$datasourc;
   const {
     url
   } = titleUrlPairFromNode(node);
@@ -200,10 +200,10 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
   const {
     hoverDecoration
   } = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {};
-  const isDatasource = fg('platform.linking-platform.editor-datasource-typeguards') ? isDatasourceNode(node) : currentAppearance === 'block' && (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
+  const isDatasource = isDatasourceNode(node);
   const shouldRenderDatasourceToolbar = isDatasource &&
   // not showing toolbar in mobile for now since not sure what our plans are for it
-  platform !== 'mobile' && cardOptions.allowDatasource && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : (_node$attrs2$datasour = _node$attrs2.datasource) === null || _node$attrs2$datasour === void 0 ? void 0 : _node$attrs2$datasour.id);
+  platform !== 'mobile' && cardOptions.allowDatasource && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : (_node$attrs$datasourc = _node$attrs.datasource) === null || _node$attrs$datasourc === void 0 ? void 0 : _node$attrs$datasourc.id);
 
   /* mobile builds toolbar natively using toolbarItems */
   if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -384,7 +384,7 @@ export const getSettingsButtonGroup = (intl, editorAnalyticsApi, userPreferences
   }];
 };
 const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance, platform) => {
-  var _node$attrs3;
+  var _node$attrs2;
   const toolbarItems = [];
   if (isDatasourceConfigEditable(datasourceId) && !fg('platform.linking-platform.enable-datasource-edit-dropdown-toolbar')) {
     toolbarItems.push({
@@ -475,7 +475,7 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       })
     });
   }
-  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
+  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
     toolbarItems.push({
       id: 'editor.link.openLink',
       type: 'button',

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

@@ -14,7 +14,6 @@ import { getNextBreakoutMode, getTitle } from '@atlaskit/editor-common/utils';
 import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
 import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B300, N20A, N300 } from '@atlaskit/theme/colors';
 import { setCardLayout } from '../../pm-plugins/actions';
 import { isDatasourceNode } from '../../utils';
@@ -80,7 +79,7 @@ const LayoutButtonWrapper = ({
   intl,
   api
 }) => {
-  var _node$attrs, _node$attrs2;
+  var _node$attrs;
   const {
     cardState
   } = useSharedPluginState(api, ['card']);
@@ -88,7 +87,7 @@ const LayoutButtonWrapper = ({
     node,
     pos
   } = getDatasource(editorView);
-  const isDatasource = getBooleanFF('platform.linking-platform.editor-datasource-typeguards') ? isDatasourceNode(node) : !!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.datasource);
+  const isDatasource = isDatasourceNode(node);
   if (!isDatasource) {
     return null;
   }
@@ -97,7 +96,7 @@ const LayoutButtonWrapper = ({
   //  which results in default parameter value being used in LayoutButton.
   const {
     datasourceTableRef,
-    layout = (node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || undefined
+    layout = (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || undefined
   } = cardState !== null && cardState !== void 0 ? cardState : {};
   const onLayoutChange = layout => {
     var _getDatasource$node;

package/dist/es2019/ui/LayoutButton/utils.js

@@ -1,9 +1,7 @@
 import { findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { isDatasourceNode } from '../../utils';
 import { DATASOURCE_TABLE_LAYOUTS } from './types';
 export const getDatasource = editorView => {
-  var _findSelectedNodeOfTy;
   const {
     selection,
     schema
@@ -11,20 +9,14 @@ export const getDatasource = editorView => {
   const {
     blockCard
   } = schema.nodes;
-  if (getBooleanFF('platform.linking-platform.editor-datasource-typeguards')) {
-    const findResult = findSelectedNodeOfType([blockCard])(selection);
-    if (findResult && isDatasourceNode(findResult.node)) {
-      return {
-        ...findResult,
-        node: findResult.node
-      };
-    }
+  const findResult = findSelectedNodeOfType([blockCard])(selection);
+  if (findResult && isDatasourceNode(findResult.node)) {
     return {
-      node: undefined,
-      pos: undefined
+      ...findResult,
+      node: findResult.node
     };
   }
-  return (_findSelectedNodeOfTy = findSelectedNodeOfType([blockCard])(selection)) !== null && _findSelectedNodeOfTy !== void 0 ? _findSelectedNodeOfTy : {
+  return {
     node: undefined,
     pos: undefined
   };

package/dist/esm/nodeviews/blockCard.js

@@ -166,16 +166,8 @@ export var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     // If so, we return false so we can get the node to re-render properly as a datasource node instead.
     // Otherwise, the node view will still consider the node as a blockCard and render a regular blockCard.
     function validUpdate(currentNode, newNode) {
-      var _currentNode$attrs, _newNode$attrs;
-      if (fg('platform.linking-platform.editor-datasource-typeguards')) {
-        var _isCurrentNodeBlockCard = !isDatasourceNode(currentNode);
-        var _isNewNodeDatasource = isDatasourceNode(newNode);
-
-        // need to return falsy to update node
-        return !(_isCurrentNodeBlockCard && _isNewNodeDatasource);
-      }
-      var isCurrentNodeBlockCard = !((_currentNode$attrs = currentNode.attrs) !== null && _currentNode$attrs !== void 0 && _currentNode$attrs.datasource);
-      var isNewNodeDatasource = (_newNode$attrs = newNode.attrs) === null || _newNode$attrs === void 0 ? void 0 : _newNode$attrs.datasource;
+      var isCurrentNodeBlockCard = !isDatasourceNode(currentNode);
+      var isNewNodeDatasource = isDatasourceNode(newNode);
 
       // need to return falsy to update node
       return !(isCurrentNodeBlockCard && isNewNodeDatasource);

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

@@ -465,7 +465,9 @@ export var updateCardViaDatasource = function updateCardViaDatasource(args) {
       if (isColumnChange || isUrlChange) {
         tr.setNodeMarkup(from, schemaNodes.blockCard, _objectSpread(_objectSpread({}, oldAttrs), newAdf.attrs));
       }
-    } else if (node.type.isText && fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+    } else if (
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    fg('platform.linking-platform.enable-datasource-appearance-toolbar') && node.type.isText) {
       // url to datasource
       var link;
       state.doc.nodesBetween(from, to, function (node, pos) {
@@ -537,38 +539,20 @@ export var getAttrsForAppearance = function getAttrsForAppearance(appearance, se
       layout: 'center'
     });
   }
-  if (fg('platform.linking-platform.editor-datasource-typeguards')) {
-    if (isDatasourceNode(selectedNode)) {
-      return {
-        url: selectedNode.attrs.url
-      };
-    }
-  } else {
-    if (selectedNode.attrs.datasource) {
-      return {
-        url: selectedNode.attrs.url
-      };
-    }
+  if (isDatasourceNode(selectedNode)) {
+    return {
+      url: selectedNode.attrs.url
+    };
   }
   return selectedNode.attrs;
 };
 var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
   if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    if (fg('platform.linking-platform.editor-datasource-typeguards')) {
-      if (isDatasourceNode(selectedNode) && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
-        setDatasourceStash(tr, {
-          url: selectedNode.attrs.url,
-          views: selectedNode.attrs.datasource.views
-        });
-      }
-    } else {
-      var _selectedNode$attrs;
-      if (selectedNode !== null && selectedNode !== void 0 && (_selectedNode$attrs = selectedNode.attrs) !== null && _selectedNode$attrs !== void 0 && _selectedNode$attrs.datasource && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id)) {
-        setDatasourceStash(tr, {
-          url: selectedNode.attrs.url,
-          views: selectedNode.attrs.datasource.views
-        });
-      }
+    if (isDatasourceNode(selectedNode) && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
+      setDatasourceStash(tr, {
+        url: selectedNode.attrs.url,
+        views: selectedNode.attrs.datasource.views
+      });
     }
   }
 };

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

@@ -179,13 +179,8 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
               var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.datasource);
               var shouldUpdateTableRef = datasourceTableRef && (currentState === null || currentState === void 0 ? void 0 : currentState.datasourceTableRef) !== datasourceTableRef;
               if (isDatasource && shouldUpdateTableRef) {
-                var _node$attrs2;
-                var getLayout = function getLayout() {
-                  return isDatasourceTableLayout(node.attrs.layout) ? node.attrs.layout : DATASOURCE_DEFAULT_LAYOUT;
-                };
-
                 // since we use the plugin state, which is a shared state, we need to update the datasourceTableRef, layout on each selection
-                var layout = fg('platform.linking-platform.editor-datasource-typeguards') ? getLayout() : (node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || DATASOURCE_DEFAULT_LAYOUT;
+                var layout = isDatasourceTableLayout(node.attrs.layout) ? node.attrs.layout : DATASOURCE_DEFAULT_LAYOUT;
                 var isNested = selection.$anchor.depth > 0;
 
                 // we want to disable resize button when datasource table is nested by not setting then datasourceTableRef on selection
@@ -248,7 +243,6 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
         nodeViews: {
           inlineCard: inlineCardViewProducer,
           blockCard: function blockCard(node, view, getPos, decorations) {
-            var _node$attrs3;
             var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
               eventDispatcher = pmPluginFactoryParams.eventDispatcher;
             var reactComponentProps = {
@@ -258,10 +252,10 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
               pluginInjectionApi: pluginInjectionApi,
               onClickCallback: options.onClickCallback
             };
-            var isDatasource = fg('platform.linking-platform.editor-datasource-typeguards') ? isDatasourceNode(node) : !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
+            var isDatasource = isDatasourceNode(node);
             if (isDatasource) {
-              var _node$attrs4;
-              if (options.allowDatasource && platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 || (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 || (_node$attrs4 = _node$attrs4.datasource) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.id)) {
+              var _node$attrs2;
+              if (options.allowDatasource && platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.datasource) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.id)) {
                 var datasourcePosition = typeof getPos === 'function' && getPos();
                 var datasourceResolvedPosition = datasourcePosition && view.state.doc.resolve(datasourcePosition);
                 var isNodeNested = !!(datasourceResolvedPosition && datasourceResolvedPosition.depth > 0);

package/dist/esm/toolbar.js

@@ -178,7 +178,7 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
 };
 var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, platform, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs2;
+    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs;
     var _titleUrlPairFromNode2 = titleUrlPairFromNode(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
@@ -198,10 +198,10 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     var currentAppearance = appearanceForNodeType(node.type);
     var _ref2 = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
       hoverDecoration = _ref2.hoverDecoration;
-    var isDatasource = fg('platform.linking-platform.editor-datasource-typeguards') ? isDatasourceNode(node) : currentAppearance === 'block' && (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
+    var isDatasource = isDatasourceNode(node);
     var shouldRenderDatasourceToolbar = isDatasource &&
     // not showing toolbar in mobile for now since not sure what our plans are for it
-    platform !== 'mobile' && cardOptions.allowDatasource && canRenderDatasource(node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.datasource) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.id);
+    platform !== 'mobile' && cardOptions.allowDatasource && canRenderDatasource(node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.datasource) === null || _node$attrs === void 0 ? void 0 : _node$attrs.id);
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -387,7 +387,7 @@ export var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editor
   }];
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance, platform) {
-  var _node$attrs3;
+  var _node$attrs2;
   var toolbarItems = [];
   if (isDatasourceConfigEditable(datasourceId) && !fg('platform.linking-platform.enable-datasource-edit-dropdown-toolbar')) {
     toolbarItems.push({
@@ -478,7 +478,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       }
     });
   }
-  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
+  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
     toolbarItems.push({
       id: 'editor.link.openLink',
       type: 'button',

package/dist/esm/ui/LayoutButton/index.js

@@ -17,7 +17,6 @@ import { getNextBreakoutMode, getTitle } from '@atlaskit/editor-common/utils';
 import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
 import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B300, N20A, N300 } from '@atlaskit/theme/colors';
 import { setCardLayout } from '../../pm-plugins/actions';
 import { isDatasourceNode } from '../../utils';
@@ -75,7 +74,7 @@ export var LayoutButton = function LayoutButton(_ref) {
   }));
 };
 var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
-  var _node$attrs, _node$attrs2;
+  var _node$attrs;
   var editorView = _ref2.editorView,
     mountPoint = _ref2.mountPoint,
     scrollableElement = _ref2.scrollableElement,
@@ -87,7 +86,7 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
   var _getDatasource = getDatasource(editorView),
     node = _getDatasource.node,
     pos = _getDatasource.pos;
-  var isDatasource = getBooleanFF('platform.linking-platform.editor-datasource-typeguards') ? isDatasourceNode(node) : !!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.datasource);
+  var isDatasource = isDatasourceNode(node);
   if (!isDatasource) {
     return null;
   }
@@ -97,7 +96,7 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
   var _ref3 = cardState !== null && cardState !== void 0 ? cardState : {},
     datasourceTableRef = _ref3.datasourceTableRef,
     _ref3$layout = _ref3.layout,
-    layout = _ref3$layout === void 0 ? (node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || undefined : _ref3$layout;
+    layout = _ref3$layout === void 0 ? (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || undefined : _ref3$layout;
   var onLayoutChange = function onLayoutChange(layout) {
     var _getDatasource$node;
     if (pos === undefined) {

package/dist/esm/ui/LayoutButton/utils.js

@@ -2,28 +2,20 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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 { findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { isDatasourceNode } from '../../utils';
 import { DATASOURCE_TABLE_LAYOUTS } from './types';
 export var getDatasource = function getDatasource(editorView) {
-  var _findSelectedNodeOfTy;
   var _editorView$state = editorView.state,
     selection = _editorView$state.selection,
     schema = _editorView$state.schema;
   var blockCard = schema.nodes.blockCard;
-  if (getBooleanFF('platform.linking-platform.editor-datasource-typeguards')) {
-    var findResult = findSelectedNodeOfType([blockCard])(selection);
-    if (findResult && isDatasourceNode(findResult.node)) {
-      return _objectSpread(_objectSpread({}, findResult), {}, {
-        node: findResult.node
-      });
-    }
-    return {
-      node: undefined,
-      pos: undefined
-    };
+  var findResult = findSelectedNodeOfType([blockCard])(selection);
+  if (findResult && isDatasourceNode(findResult.node)) {
+    return _objectSpread(_objectSpread({}, findResult), {}, {
+      node: findResult.node
+    });
   }
-  return (_findSelectedNodeOfTy = findSelectedNodeOfType([blockCard])(selection)) !== null && _findSelectedNodeOfTy !== void 0 ? _findSelectedNodeOfTy : {
+  return {
     node: undefined,
     pos: undefined
   };

package/dist/types/ui/LayoutButton/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-export declare const getDatasource: (editorView: EditorView) => import("prosemirror-utils/dist/types").ContentNodeWithPos | {
+export declare const getDatasource: (editorView: EditorView) => {
     node: import("../../types").DatasourceNode;
     start: number;
     depth: number;

package/dist/types-ts4.5/ui/LayoutButton/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-export declare const getDatasource: (editorView: EditorView) => import("prosemirror-utils/dist/types").ContentNodeWithPos | {
+export declare const getDatasource: (editorView: EditorView) => {
     node: import("../../types").DatasourceNode;
     start: number;
     depth: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "2.7.0",
+	"version": "2.8.0",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,29 +34,29 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.3.0",
 		"@atlaskit/analytics-next": "^9.3.0",
-		"@atlaskit/custom-steps": "^0.5.0",
-		"@atlaskit/editor-common": "^86.7.0",
-		"@atlaskit/editor-plugin-analytics": "^1.5.0",
-		"@atlaskit/editor-plugin-decorations": "^1.1.0",
-		"@atlaskit/editor-plugin-editor-disabled": "^1.1.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^2.0.0",
-		"@atlaskit/editor-plugin-feature-flags": "^1.1.0",
-		"@atlaskit/editor-plugin-floating-toolbar": "^1.8.0",
-		"@atlaskit/editor-plugin-grid": "^1.1.0",
-		"@atlaskit/editor-plugin-width": "^1.1.0",
-		"@atlaskit/editor-prosemirror": "4.0.1",
+		"@atlaskit/custom-steps": "^0.6.0",
+		"@atlaskit/editor-common": "^86.8.0",
+		"@atlaskit/editor-plugin-analytics": "^1.6.0",
+		"@atlaskit/editor-plugin-decorations": "^1.2.0",
+		"@atlaskit/editor-plugin-editor-disabled": "^1.2.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
+		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
+		"@atlaskit/editor-plugin-floating-toolbar": "^1.9.0",
+		"@atlaskit/editor-plugin-grid": "^1.2.0",
+		"@atlaskit/editor-plugin-width": "^1.2.0",
+		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/frontend-utilities": "^2.7.0",
 		"@atlaskit/icon": "^22.7.0",
 		"@atlaskit/link-analytics": "^8.3.0",
 		"@atlaskit/link-client-extension": "^1.10.0",
-		"@atlaskit/link-datasource": "^2.6.0",
+		"@atlaskit/link-datasource": "^2.8.0",
 		"@atlaskit/linking-common": "^5.7.0",
 		"@atlaskit/linking-types": "^8.12.0",
 		"@atlaskit/menu": "2.8.1",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/primitives": "^11.0.0",
-		"@atlaskit/smart-card": "^27.10.0",
+		"@atlaskit/primitives": "^11.1.0",
+		"@atlaskit/smart-card": "^27.11.0",
 		"@atlaskit/theme": "^12.11.0",
 		"@atlaskit/tokens": "^1.56.0",
 		"@babel/runtime": "^7.0.0",
@@ -131,9 +131,6 @@
 		"platform.editor.card.inject-settings-button": {
 			"type": "boolean"
 		},
-		"platform.linking-platform.editor-datasource-typeguards": {
-			"type": "boolean"
-		},
 		"platform_editor_get_card_provider_from_config": {
 			"type": "boolean"
 		},