@atlaskit/editor-plugin-card 1.14.2 → 1.14.4

package/dist/esm/nodeviews/blockCard.js

@@ -14,8 +14,10 @@ import rafSchedule from 'raf-schd';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { browser } from '@atlaskit/editor-common/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
 import { registerCard } from '../pm-plugins/actions';
+import { isDatasourceNode } from '../utils';
 import { Card } from './genericCard';
 
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -147,6 +149,13 @@ export var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     key: "validUpdate",
     value: function validUpdate(currentNode, newNode) {
       var _currentNode$attrs, _newNode$attrs;
+      if (getBooleanFF('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;
 

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

@@ -10,7 +10,7 @@ import { getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { appearanceForNodeType, isDatasourceConfigEditable, selectedCardAppearance } from '../utils';
+import { appearanceForNodeType, isDatasourceConfigEditable, isDatasourceNode, selectedCardAppearance } from '../utils';
 import { hideDatasourceModal, queueCards, removeDatasourceStash, resolveCard, setDatasourceStash } from './actions';
 import { pluginKey } from './plugin-key';
 import { shouldReplaceLink } from './shouldReplaceLink';
@@ -490,7 +490,9 @@ export var updateCardViaDatasource = function updateCardViaDatasource(args) {
     inputMethod: inputMethod
   });
   if (isDeletingConfig) {
-    removeDatasourceStash(tr, node.attrs.url);
+    if (typeof node.attrs.url === 'string') {
+      removeDatasourceStash(tr, node.attrs.url);
+    }
   } else {
     hideDatasourceModal(tr);
   }
@@ -524,19 +526,38 @@ export var getAttrsForAppearance = function getAttrsForAppearance(appearance, se
       layout: 'center'
     });
   }
-  if (selectedNode.attrs.datasource) {
-    return {
-      url: selectedNode.attrs.url
-    };
+  if (getBooleanFF('platform.linking-platform.editor-datasource-typeguards')) {
+    if (isDatasourceNode(selectedNode)) {
+      return {
+        url: selectedNode.attrs.url
+      };
+    }
+  } else {
+    if (selectedNode.attrs.datasource) {
+      return {
+        url: selectedNode.attrs.url
+      };
+    }
   }
   return selectedNode.attrs;
 };
 var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
-  var _selectedNode$attrs;
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && 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 (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+    if (getBooleanFF('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
+        });
+      }
+    }
   }
 };

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

@@ -17,7 +17,8 @@ import { BlockCard } from '../nodeviews/blockCard';
 import { Datasource } from '../nodeviews/datasource';
 import { EmbedCard } from '../nodeviews/embedCard';
 import { InlineCardNodeView } from '../nodeviews/inlineCard';
-import { isBlockSupportedAtPosition, isEmbedSupportedAtPosition } from '../utils';
+import { isDatasourceTableLayout } from '../ui/LayoutButton/utils';
+import { isBlockSupportedAtPosition, isDatasourceNode, isEmbedSupportedAtPosition } from '../utils';
 import { clearOverlayCandidate, setCardLayoutAndDatasourceTableRef, setDatasourceTableRef } from './actions';
 import { pluginKey } from './plugin-key';
 import reducer from './reducers';
@@ -172,8 +173,12 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
               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 = (node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || DATASOURCE_DEFAULT_LAYOUT;
+                var layout = getBooleanFF('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 isNested = selection.$anchor.depth > 0;
 
                 // we want to disable resize button when datasource table is nested by not setting then datasourceTableRef on selection
@@ -245,7 +250,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
               onClickCallback: options.onClickCallback
             };
             var hasIntlContext = true;
-            var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
+            var isDatasource = getBooleanFF('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);
             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)) {

package/dist/esm/toolbar.js

@@ -25,7 +25,7 @@ import { editDatasource, EditDatasourceButton } from './ui/EditDatasourceButton'
 import { buildEditLinkToolbar, editLink, editLinkToolbarConfig } from './ui/EditLinkToolbar';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
 import { ToolbarViewedEvent } from './ui/ToolbarViewedEvent';
-import { appearanceForNodeType, displayInfoForCard, findCardInfo, isDatasourceConfigEditable, titleUrlPairFromNode } from './utils';
+import { appearanceForNodeType, displayInfoForCard, findCardInfo, isDatasourceConfigEditable, isDatasourceNode, titleUrlPairFromNode } from './utils';
 export var removeCard = function removeCard(editorAnalyticsApi) {
   return commandWithMetadata(function (state, dispatch) {
     if (!(state.selection instanceof NodeSelection)) {
@@ -196,7 +196,7 @@ 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 = currentAppearance === 'block' && (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
+    var isDatasource = getBooleanFF('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 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);

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

@@ -12,9 +12,11 @@ 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 { getDatasource } from './utils';
+import { isDatasourceNode } from '../../utils';
+import { getDatasource, isDatasourceTableLayout } from './utils';
 var toolbarButtonWrapperStyles = css({
   background: "".concat("var(--ds-background-neutral, ".concat(N20A, ")")),
   color: "".concat("var(--ds-icon, ".concat(N300, ")")),
@@ -78,14 +80,17 @@ 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);
+  if (!isDatasource) {
+    return null;
+  }
 
   //  If layout doesn't exist in ADF it returns null, we want to change to undefined
   //  which results in default parameter value being used in LayoutButton.
   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$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || undefined : _ref3$layout;
-  var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.datasource);
+    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;
   var onLayoutChange = function onLayoutChange(layout) {
     var _getDatasource$node;
     if (pos === undefined) {
@@ -101,15 +106,12 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
     tr.setMeta('scrollIntoView', false);
     dispatch(setCardLayout(layout)(tr));
   };
-  if (!isDatasource) {
-    return null;
-  }
   return jsx(LayoutButton, {
     mountPoint: mountPoint,
     scrollableElement: scrollableElement,
     boundariesElement: boundariesElement,
     targetElement: datasourceTableRef,
-    layout: layout,
+    layout: isDatasourceTableLayout(layout) ? layout : undefined,
     onLayoutChange: onLayoutChange,
     intl: intl
   });

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

@@ -1 +1 @@
-export {};
+export var DATASOURCE_TABLE_LAYOUTS = ['full-width', 'center', 'wide'];

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

@@ -1,12 +1,35 @@
+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
+    };
+  }
   return (_findSelectedNodeOfTy = findSelectedNodeOfType([blockCard])(selection)) !== null && _findSelectedNodeOfTy !== void 0 ? _findSelectedNodeOfTy : {
     node: undefined,
     pos: undefined
   };
+};
+export var isDatasourceTableLayout = function isDatasourceTableLayout(layout) {
+  return DATASOURCE_TABLE_LAYOUTS.some(function (l) {
+    return l === layout;
+  });
 };

package/dist/esm/utils.js

@@ -1,3 +1,4 @@
+import _typeof from "@babel/runtime/helpers/typeof";
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { getResolvedAttributes } from '@atlaskit/link-analytics/resolved-attributes';
@@ -78,4 +79,40 @@ export var isDatasourceConfigEditable = function isDatasourceConfigEditable(data
     datasourcesWithConfigModal.push(CONFLUENCE_SEARCH_DATASOURCE_ID);
   }
   return datasourcesWithConfigModal.includes(datasourceId);
+};
+
+/**
+ * Typeguard that checks node attributes are datasource node attributes
+ * ** WARNING ** Typeguards are not a guarantee, if the asserted type changes
+ * this function will not be updated automatically
+ */
+export var isDatasourceAdfAttributes = function isDatasourceAdfAttributes(attrs) {
+  // Check is attributes object
+  if (!(_typeof(attrs) === 'object' && attrs !== null)) {
+    return false;
+  }
+
+  // Check datasource attribute is an object
+  if (!('datasource' in attrs)) {
+    return false;
+  }
+  if (_typeof(attrs.datasource) !== 'object' || attrs.datasource === null) {
+    return false;
+  }
+  var hasId = 'id' in attrs.datasource && typeof attrs.datasource.id === 'string';
+  var hasParameters = 'parameters' in attrs.datasource && _typeof(attrs.datasource.parameters) === 'object' && attrs.datasource.parameters !== null && !Array.isArray(attrs.datasource.parameters);
+  var hasViews = 'views' in attrs.datasource && Array.isArray(attrs.datasource.views);
+  return hasId && hasParameters && hasViews;
+};
+
+/**
+ * Typeguard that checks a node is a datasource node (blockCard and has datasource attributes)
+ * ** WARNING ** Typeguards are not a guarantee, if the asserted type changes
+ * this function will not be updated automatically
+ */
+export var isDatasourceNode = function isDatasourceNode(node) {
+  if (!node) {
+    return false;
+  }
+  return node.type.name === 'blockCard' && isDatasourceAdfAttributes(node.attrs);
 };

package/dist/types/analytics/utils.d.ts

@@ -1,6 +1,6 @@
-import { Node } from '@atlaskit/editor-prosemirror/model';
-import { ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
-import { Entity, EVENT_SUBJECT } from './types';
+import { type Node } from '@atlaskit/editor-prosemirror/model';
+import { type ReadonlyTransaction, type Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type Entity, EVENT_SUBJECT } from './types';
 export declare function isDatasourceNode(node: Node): boolean;
 /**
  * Determine if a node is considered to be a link

package/dist/types/pm-plugins/plugin-key.d.ts

@@ -1,3 +1,3 @@
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { CardPluginState } from '../types';
+import { type CardPluginState } from '../types';
 export declare const pluginKey: PluginKey<CardPluginState>;

package/dist/types/pm-plugins/shouldReplaceLink.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '@atlaskit/editor-prosemirror/model';
+import type { Node } from '@atlaskit/editor-prosemirror/model';
 export declare function shouldReplaceLink(node: Node, compareLinkText?: boolean, compareToUrl?: string): boolean;

package/dist/types/pm-plugins/util/resolve.d.ts

@@ -4,5 +4,5 @@ import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { CardProvider, DatasourceAdf } from '@atlaskit/editor-common/provider-factory';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { Request } from '../../types';
-export declare const resolveWithProvider: (view: EditorView, provider: CardProvider, request: Request, options: CardOptions, editorAnalyticsApi: EditorAnalyticsAPI | undefined, createAnalyticsEvent: CreateUIAnalyticsEvent | undefined) => Promise<void | import("@atlaskit/linking-common").InlineCardAdf | import("@atlaskit/linking-common").BlockCardAdf | import("@atlaskit/linking-common").EmbedCardAdf | DatasourceAdf<Record<string, unknown>>>;
+export declare const resolveWithProvider: (view: EditorView, provider: CardProvider, request: Request, options: CardOptions, editorAnalyticsApi: EditorAnalyticsAPI | undefined, createAnalyticsEvent: CreateUIAnalyticsEvent | undefined) => Promise<void | DatasourceAdf<Record<string, unknown>> | import("@atlaskit/linking-common").InlineCardAdf | import("@atlaskit/linking-common").BlockCardAdf | import("@atlaskit/linking-common").EmbedCardAdf>;
 export declare const handleProvider: (_: 'cardProvider', provider: Promise<CardProvider> | undefined, view: EditorView) => void;

package/dist/types/pm-plugins/util/state.d.ts

@@ -1,5 +1,5 @@
-import { EditorState, ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
-import { CardPluginState, Request } from '../../types';
+import { type EditorState, type ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
+import { type CardPluginState, type Request } from '../../types';
 export declare const getPluginState: (editorState: EditorState) => CardPluginState | undefined;
 export declare const getPluginStateWithUpdatedPos: (pluginState: CardPluginState, tr: ReadonlyTransaction) => {
     requests: {
@@ -30,7 +30,7 @@ export declare const getPluginStateWithUpdatedPos: (pluginState: CardPluginState
     showDatasourceModal: boolean;
     datasourceModalType?: import("@atlaskit/editor-common/types").DatasourceModalType | undefined;
     datasourceTableRef?: HTMLElement | undefined;
-    layout?: import("../../ui/LayoutButton/types").DatasourceTableLayout | undefined;
+    layout?: "full-width" | "center" | "wide" | undefined;
     inlineCardAwarenessCandidatePosition?: number | undefined;
     overlayCandidatePosition?: number | undefined;
     removeOverlay?: (() => void) | undefined;

package/dist/types/types.d.ts

@@ -1,13 +1,18 @@
+import type { RichMediaAttributes } from '@atlaskit/adf-schema';
 import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import type { ACTION } from '@atlaskit/editor-common/analytics';
 import type { CardOptions, CardReplacementInputMethod, OnClickCallback } from '@atlaskit/editor-common/card';
 import type { CardAppearance, CardProvider } from '@atlaskit/editor-common/provider-factory';
 import type { DatasourceModalType, EditorAppearance, LinkPickerOptions } from '@atlaskit/editor-common/types';
-import type { DatasourceAdfView } from '@atlaskit/linking-common';
+import type { Node } from '@atlaskit/editor-prosemirror/model';
+import type { DatasourceAdf, DatasourceAdfView } from '@atlaskit/linking-common';
 import type { SmartLinkEvents } from '@atlaskit/smart-card';
 import type { EditorCardPluginEvents } from './analytics/create-events-queue';
 import type { CardPluginEvent } from './analytics/types';
 import type { DatasourceTableLayout } from './ui/LayoutButton/types';
+export type DatasourceNode = Omit<Node, 'attrs'> & {
+    readonly attrs: DatasourceAdf['attrs'] & Partial<RichMediaAttributes>;
+};
 export type CardInfo = {
     title?: string;
     url?: string;

package/dist/types/ui/EditorAnalyticsContext.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import { type EditorView } from '@atlaskit/editor-prosemirror/view';
 export type EditorAnalyticsContextProps = {
     editorView?: EditorView;
     children: React.ReactNode;

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

@@ -1,14 +1,15 @@
-import { IntlShape } from 'react-intl-next';
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { IntlShape } from 'react-intl-next';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { cardPlugin } from '../../index';
-export type DatasourceTableLayout = 'full-width' | 'center' | 'wide';
+export declare const DATASOURCE_TABLE_LAYOUTS: readonly ["full-width", "center", "wide"];
+export type DatasourceTableLayout = (typeof DATASOURCE_TABLE_LAYOUTS)[number];
 export type LayoutButtonProps = {
     mountPoint?: HTMLElement;
     boundariesElement?: HTMLElement;
     scrollableElement?: HTMLElement;
     targetElement?: HTMLElement;
-    layout: DatasourceTableLayout;
+    layout?: DatasourceTableLayout;
     onLayoutChange?: (layout: DatasourceTableLayout) => void;
     testId?: string;
     intl: IntlShape;

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

@@ -1,5 +1,11 @@
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const getDatasource: (editorView: EditorView) => import("prosemirror-utils/dist/types").ContentNodeWithPos | {
+    node: import("../../types").DatasourceNode;
+    start: number;
+    depth: number;
+    pos: number;
+} | {
     node: undefined;
     pos: undefined;
 };
+export declare const isDatasourceTableLayout: (layout: unknown) => layout is "full-width" | "center" | "wide";

package/dist/types/utils.d.ts

@@ -2,7 +2,7 @@ import type { CardAppearance } from '@atlaskit/editor-common/provider-factory';
 import type { Node, NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { CardContext } from '@atlaskit/link-provider';
-import type { CardInfo } from './types';
+import type { CardInfo, DatasourceNode } from './types';
 export declare const appearanceForNodeType: (spec: NodeType) => CardAppearance | undefined;
 export declare const selectedCardAppearance: (state: EditorState) => CardAppearance | undefined;
 export type TitleUrlPair = {
@@ -22,3 +22,18 @@ export declare const isEmbedSupportedAtPosition: (currentNodePosition: number, e
 export declare const isBlockSupportedAtPosition: (currentNodePosition: number, editorState: EditorState, currentAppearance?: CardAppearance) => boolean;
 export declare const getResolvedAttributesFromStore: (url: string, display: string | null, store?: CardContext['store']) => {};
 export declare const isDatasourceConfigEditable: (datasourceId: string) => boolean;
+/**
+ * Typeguard that checks node attributes are datasource node attributes
+ * ** WARNING ** Typeguards are not a guarantee, if the asserted type changes
+ * this function will not be updated automatically
+ */
+export declare const isDatasourceAdfAttributes: (attrs: Record<string, unknown> | undefined) => attrs is {
+    url?: string | undefined;
+    datasource: import("@atlaskit/linking-common").Datasource<Record<string, unknown>>;
+} & Partial<import("@atlaskit/adf-schema").RichMediaAttributes>;
+/**
+ * Typeguard that checks a node is a datasource node (blockCard and has datasource attributes)
+ * ** WARNING ** Typeguards are not a guarantee, if the asserted type changes
+ * this function will not be updated automatically
+ */
+export declare const isDatasourceNode: (node?: Node) => node is DatasourceNode;

package/dist/types-ts4.5/analytics/utils.d.ts

@@ -1,6 +1,6 @@
-import { Node } from '@atlaskit/editor-prosemirror/model';
-import { ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
-import { Entity, EVENT_SUBJECT } from './types';
+import { type Node } from '@atlaskit/editor-prosemirror/model';
+import { type ReadonlyTransaction, type Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type Entity, EVENT_SUBJECT } from './types';
 export declare function isDatasourceNode(node: Node): boolean;
 /**
  * Determine if a node is considered to be a link

package/dist/types-ts4.5/pm-plugins/plugin-key.d.ts

@@ -1,3 +1,3 @@
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { CardPluginState } from '../types';
+import { type CardPluginState } from '../types';
 export declare const pluginKey: PluginKey<CardPluginState>;

package/dist/types-ts4.5/pm-plugins/shouldReplaceLink.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '@atlaskit/editor-prosemirror/model';
+import type { Node } from '@atlaskit/editor-prosemirror/model';
 export declare function shouldReplaceLink(node: Node, compareLinkText?: boolean, compareToUrl?: string): boolean;

package/dist/types-ts4.5/pm-plugins/util/resolve.d.ts

@@ -4,5 +4,5 @@ import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { CardProvider, DatasourceAdf } from '@atlaskit/editor-common/provider-factory';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { Request } from '../../types';
-export declare const resolveWithProvider: (view: EditorView, provider: CardProvider, request: Request, options: CardOptions, editorAnalyticsApi: EditorAnalyticsAPI | undefined, createAnalyticsEvent: CreateUIAnalyticsEvent | undefined) => Promise<void | import("@atlaskit/linking-common").InlineCardAdf | import("@atlaskit/linking-common").BlockCardAdf | import("@atlaskit/linking-common").EmbedCardAdf | DatasourceAdf<Record<string, unknown>>>;
+export declare const resolveWithProvider: (view: EditorView, provider: CardProvider, request: Request, options: CardOptions, editorAnalyticsApi: EditorAnalyticsAPI | undefined, createAnalyticsEvent: CreateUIAnalyticsEvent | undefined) => Promise<void | DatasourceAdf<Record<string, unknown>> | import("@atlaskit/linking-common").InlineCardAdf | import("@atlaskit/linking-common").BlockCardAdf | import("@atlaskit/linking-common").EmbedCardAdf>;
 export declare const handleProvider: (_: 'cardProvider', provider: Promise<CardProvider> | undefined, view: EditorView) => void;

package/dist/types-ts4.5/pm-plugins/util/state.d.ts

@@ -1,5 +1,5 @@
-import { EditorState, ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
-import { CardPluginState, Request } from '../../types';
+import { type EditorState, type ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
+import { type CardPluginState, type Request } from '../../types';
 export declare const getPluginState: (editorState: EditorState) => CardPluginState | undefined;
 export declare const getPluginStateWithUpdatedPos: (pluginState: CardPluginState, tr: ReadonlyTransaction) => {
     requests: {
@@ -30,7 +30,7 @@ export declare const getPluginStateWithUpdatedPos: (pluginState: CardPluginState
     showDatasourceModal: boolean;
     datasourceModalType?: import("@atlaskit/editor-common/types").DatasourceModalType | undefined;
     datasourceTableRef?: HTMLElement | undefined;
-    layout?: import("../../ui/LayoutButton/types").DatasourceTableLayout | undefined;
+    layout?: "full-width" | "center" | "wide" | undefined;
     inlineCardAwarenessCandidatePosition?: number | undefined;
     overlayCandidatePosition?: number | undefined;
     removeOverlay?: (() => void) | undefined;

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

@@ -1,13 +1,18 @@
+import type { RichMediaAttributes } from '@atlaskit/adf-schema';
 import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import type { ACTION } from '@atlaskit/editor-common/analytics';
 import type { CardOptions, CardReplacementInputMethod, OnClickCallback } from '@atlaskit/editor-common/card';
 import type { CardAppearance, CardProvider } from '@atlaskit/editor-common/provider-factory';
 import type { DatasourceModalType, EditorAppearance, LinkPickerOptions } from '@atlaskit/editor-common/types';
-import type { DatasourceAdfView } from '@atlaskit/linking-common';
+import type { Node } from '@atlaskit/editor-prosemirror/model';
+import type { DatasourceAdf, DatasourceAdfView } from '@atlaskit/linking-common';
 import type { SmartLinkEvents } from '@atlaskit/smart-card';
 import type { EditorCardPluginEvents } from './analytics/create-events-queue';
 import type { CardPluginEvent } from './analytics/types';
 import type { DatasourceTableLayout } from './ui/LayoutButton/types';
+export type DatasourceNode = Omit<Node, 'attrs'> & {
+    readonly attrs: DatasourceAdf['attrs'] & Partial<RichMediaAttributes>;
+};
 export type CardInfo = {
     title?: string;
     url?: string;

package/dist/types-ts4.5/ui/EditorAnalyticsContext.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import { type EditorView } from '@atlaskit/editor-prosemirror/view';
 export type EditorAnalyticsContextProps = {
     editorView?: EditorView;
     children: React.ReactNode;

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

@@ -1,14 +1,19 @@
-import { IntlShape } from 'react-intl-next';
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { IntlShape } from 'react-intl-next';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { cardPlugin } from '../../index';
-export type DatasourceTableLayout = 'full-width' | 'center' | 'wide';
+export declare const DATASOURCE_TABLE_LAYOUTS: readonly [
+    "full-width",
+    "center",
+    "wide"
+];
+export type DatasourceTableLayout = (typeof DATASOURCE_TABLE_LAYOUTS)[number];
 export type LayoutButtonProps = {
     mountPoint?: HTMLElement;
     boundariesElement?: HTMLElement;
     scrollableElement?: HTMLElement;
     targetElement?: HTMLElement;
-    layout: DatasourceTableLayout;
+    layout?: DatasourceTableLayout;
     onLayoutChange?: (layout: DatasourceTableLayout) => void;
     testId?: string;
     intl: IntlShape;

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

@@ -1,5 +1,11 @@
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const getDatasource: (editorView: EditorView) => import("prosemirror-utils/dist/types").ContentNodeWithPos | {
+    node: import("../../types").DatasourceNode;
+    start: number;
+    depth: number;
+    pos: number;
+} | {
     node: undefined;
     pos: undefined;
 };
+export declare const isDatasourceTableLayout: (layout: unknown) => layout is "full-width" | "center" | "wide";

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

@@ -2,7 +2,7 @@ import type { CardAppearance } from '@atlaskit/editor-common/provider-factory';
 import type { Node, NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { CardContext } from '@atlaskit/link-provider';
-import type { CardInfo } from './types';
+import type { CardInfo, DatasourceNode } from './types';
 export declare const appearanceForNodeType: (spec: NodeType) => CardAppearance | undefined;
 export declare const selectedCardAppearance: (state: EditorState) => CardAppearance | undefined;
 export type TitleUrlPair = {
@@ -22,3 +22,18 @@ export declare const isEmbedSupportedAtPosition: (currentNodePosition: number, e
 export declare const isBlockSupportedAtPosition: (currentNodePosition: number, editorState: EditorState, currentAppearance?: CardAppearance) => boolean;
 export declare const getResolvedAttributesFromStore: (url: string, display: string | null, store?: CardContext['store']) => {};
 export declare const isDatasourceConfigEditable: (datasourceId: string) => boolean;
+/**
+ * Typeguard that checks node attributes are datasource node attributes
+ * ** WARNING ** Typeguards are not a guarantee, if the asserted type changes
+ * this function will not be updated automatically
+ */
+export declare const isDatasourceAdfAttributes: (attrs: Record<string, unknown> | undefined) => attrs is {
+    url?: string | undefined;
+    datasource: import("@atlaskit/linking-common").Datasource<Record<string, unknown>>;
+} & Partial<import("@atlaskit/adf-schema").RichMediaAttributes>;
+/**
+ * Typeguard that checks a node is a datasource node (blockCard and has datasource attributes)
+ * ** WARNING ** Typeguards are not a guarantee, if the asserted type changes
+ * this function will not be updated automatically
+ */
+export declare const isDatasourceNode: (node?: Node) => node is DatasourceNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "1.14.2",
+  "version": "1.14.4",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -32,10 +32,10 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^36.8.0",
+    "@atlaskit/adf-schema": "^36.10.7",
     "@atlaskit/analytics-next": "^9.3.0",
     "@atlaskit/custom-steps": "^0.2.0",
-    "@atlaskit/editor-common": "^80.5.0",
+    "@atlaskit/editor-common": "^81.0.0",
     "@atlaskit/editor-plugin-analytics": "^1.2.0",
     "@atlaskit/editor-plugin-decorations": "^1.1.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.1.0",
@@ -55,7 +55,7 @@
     "@atlaskit/linking-types": "^8.9.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/primitives": "^6.3.0",
-    "@atlaskit/smart-card": "^26.69.0",
+    "@atlaskit/smart-card": "^27.0.0",
     "@atlaskit/theme": "^12.8.0",
     "@atlaskit/tokens": "^1.49.0",
     "@babel/runtime": "^7.0.0",
@@ -131,6 +131,9 @@
     },
     "platform.linking-platform.smart-card.on-click-callback": {
       "type": "boolean"
+    },
+    "platform.linking-platform.editor-datasource-typeguards": {
+      "type": "boolean"
     }
   },
   "stricter": {