@atlaskit/editor-plugin-card 35.0.2 → 35.1.2

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

@@ -5,6 +5,7 @@ import { getResolvedAttributes } from '@atlaskit/link-analytics/get-resolved-att
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource/assets-modal';
 import { CONFLUENCE_SEARCH_DATASOURCE_ID } from '@atlaskit/link-datasource/confluence-search-modal';
 import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource/jira-issues-modal';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { pluginKey } from './plugin-key';
 export var appearanceForNodeType = function appearanceForNodeType(spec) {
   if (spec.name === 'inlineCard') {
@@ -43,14 +44,25 @@ export var mergeCardInfo = function mergeCardInfo(titleUrlPair, info) {
 export var displayInfoForCard = function displayInfoForCard(node, info) {
   return mergeCardInfo(titleUrlPairFromNode(node), info);
 };
-export var findCardInfo = function findCardInfo(state) {
-  var pluginState = pluginKey.getState(state);
-  if (!pluginState) {
-    return undefined;
+export var findCardInfo = function findCardInfo(state, cardActions) {
+  if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+    var _cardActions$getCardR, _cardActions$getCardR2;
+    var registrations = (_cardActions$getCardR = cardActions === null || cardActions === void 0 || (_cardActions$getCardR2 = cardActions.getCardRegistrations) === null || _cardActions$getCardR2 === void 0 ? void 0 : _cardActions$getCardR2.call(cardActions)) !== null && _cardActions$getCardR !== void 0 ? _cardActions$getCardR : {};
+    var card = Object.values(registrations).find(function (registration) {
+      return registration.getPos() === state.selection.from;
+    });
+    return card ? {
+      id: card.id,
+      title: card.title,
+      url: card.url,
+      pos: state.selection.from
+    } : undefined;
+  } else {
+    var pluginState = pluginKey.getState(state);
+    return pluginState === null || pluginState === void 0 ? void 0 : pluginState.cards.find(function (cardInfo) {
+      return cardInfo.pos === state.selection.from;
+    });
   }
-  return pluginState.cards.find(function (cardInfo) {
-    return cardInfo.pos === state.selection.from;
-  });
 };
 var isAppearanceSupportedInParent = function isAppearanceSupportedInParent(currentNodePosition, editorState, fragment, currentAppearance) {
   var resolvedPosition = editorState.doc.resolve(currentNodePosition);

package/dist/esm/ui/EditLinkToolbar.js

@@ -13,6 +13,7 @@ import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDT
 import { HyperlinkAddToolbar as HyperlinkToolbar } from '@atlaskit/editor-common/link/HyperlinkAddToolbar';
 import { linkToolbarMessages } from '@atlaskit/editor-common/messages/link-toolbar';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { hideLinkToolbar as _hideLinkToolbar, showLinkToolbar } from '../pm-plugins/actions';
 import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { displayInfoForCard, findCardInfo } from '../pm-plugins/utils';
@@ -161,7 +162,7 @@ export var buildEditLinkToolbar = function buildEditLinkToolbar(_ref2) {
       if (!view || !providerFactory) {
         return null;
       }
-      var displayInfo = displayInfoForCard(node, findCardInfo(view.state));
+      var displayInfo = displayInfoForCard(node, findCardInfo(view.state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions));
       return /*#__PURE__*/React.createElement(EditLinkToolbar, {
         key: idx,
         view: view,
@@ -175,8 +176,9 @@ export var buildEditLinkToolbar = function buildEditLinkToolbar(_ref2) {
         // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
         ,
         onSubmit: function onSubmit(newHref, newText, inputMethod, analytic) {
-          var urlChanged = newHref !== displayInfo.url;
-          var titleChanged = newText !== displayInfo.title;
+          var currentDisplayInfo = isExperimentEnabled('platform_editor_reduce_forced_layout_2') ? displayInfoForCard(node, findCardInfo(view.state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions)) : displayInfo;
+          var urlChanged = newHref !== currentDisplayInfo.url;
+          var titleChanged = newText !== currentDisplayInfo.title;
 
           // If the title is changed in a smartlink, convert to standard blue hyperlink
           // (even if the url was also changed) - we don't want to lose the custom title.

package/dist/esm/ui/PasteDisplayAsMenu.js

@@ -22,10 +22,13 @@ import SmartLinkCardIcon from '@atlaskit/icon/core/smart-link-card';
 import SmartLinkEmbedIcon from '@atlaskit/icon/core/smart-link-embed';
 import SmartLinkInlineIcon from '@atlaskit/icon/core/smart-link-inline';
 import { useSmartCardContext } from '@atlaskit/link-provider/use-smart-card-context';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react/conditional-hooks-factory/conditional-hooks-factory';
 import { Box } from '@atlaskit/primitives/compiled/box';
 import { Flex } from '@atlaskit/primitives/compiled/flex';
 import { Pressable } from '@atlaskit/primitives/compiled/pressable';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { useCardRegistry } from '../actions/useCardRegistry';
 import { changeSelectedCardToLink, setSelectedCardAppearance } from '../pm-plugins/doc';
 import { getSingleSmartLinkUrlFromSlice } from './currentPastedSmartLink';
 import { changeNativeEmbedAppearance, getNativeEmbedUrl, isNativeEmbedAppearanceSupported } from './nativeEmbedNode';
@@ -195,6 +198,17 @@ export var normalizeSelectionToLinkRangeForUrlAppearance = function normalizeSel
   var linkRangeSelectionTr = editorView.state.tr.setSelection(TextSelection.create(editorView.state.doc, firstLinkRange.from, firstLinkRange.to));
   editorView.dispatch(linkRangeSelectionTr);
 };
+// Remove with platform_editor_reduce_forced_layout_2 cleanup; call useCardRegistry(api?.card?.actions) directly.
+var useCardStateWithRegistryExperiment = conditionalHooksFactory(function () {
+  return isExperimentEnabled('platform_editor_reduce_forced_layout_2');
+}, function useRegisteredCardState(api) {
+  var _api$card;
+  return useCardRegistry(api === null || api === void 0 || (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions);
+}, function useLegacyCardState(api) {
+  return useSharedPluginStateWithSelector(api, ['card'], function (states) {
+    return states.cardState;
+  });
+});
 var PasteDisplayAsMenuHorizontalView = function PasteDisplayAsMenuHorizontalView(_ref8) {
   var _smartCardContext$val, _cardAtPasteRange$app, _smartCardContext$val2;
   var api = _ref8.api,
@@ -215,10 +229,8 @@ var PasteDisplayAsMenuHorizontalView = function PasteDisplayAsMenuHorizontalView
       pasteStartPos: pluginState.pasteStartPos
     } : undefined;
   });
-  // Subscribe to card state so the menu re-renders when resolved card metadata updates.
-  useSharedPluginStateWithSelector(api, ['card'], function (states) {
-    return states.cardState;
-  });
+  // platform_editor_reduce_forced_layout_2 selects the registry when enabled and shared state otherwise.
+  useCardStateWithRegistryExperiment(api);
   var pastedLinkUrlFromSlice = getSingleSmartLinkUrlFromSlice(getCurrentPastedSlice(api));
   var pastedLinkUrlFromCard = editorView && pasteRange ? getCardUrlAtPasteRange({
     editorView: editorView,

package/dist/esm/ui/toolbar.js

@@ -29,6 +29,7 @@ import EditIcon from '@atlaskit/icon/core/edit';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import CogIcon from '@atlaskit/icon/core/settings';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { changeSelectedCardToText } from '../pm-plugins/doc';
 import { pluginKey } from '../pm-plugins/plugin-key';
@@ -122,6 +123,7 @@ export var openLinkSettings = function openLinkSettings(editorAnalyticsApi) {
 };
 export var floatingToolbar = function floatingToolbar(cardOptions, lpLinkPicker, linkPickerOptions, pluginInjectionApi, disableFloatingToolbar) {
   return function (state, intl, providerFactory) {
+    var _pluginInjectionApi$c;
     if (disableFloatingToolbar) {
       return;
     }
@@ -150,6 +152,10 @@ export var floatingToolbar = function floatingToolbar(cardOptions, lpLinkPicker,
     var isLinkPickerEnabled = !!lpLinkPicker;
     return _objectSpread(_objectSpread({
       title: intl.formatMessage(messages.card),
+      externalStore: isExperimentEnabled('platform_editor_reduce_forced_layout_2') ? (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions) && {
+        getSnapshot: pluginInjectionApi.card.actions.getCardRegistrations,
+        subscribe: pluginInjectionApi.card.actions.subscribeToCardRegistry
+      } : undefined,
       className: className,
       nodeType: nodeType,
       preventPopupOverflow: isLinkPickerEnabled
@@ -181,17 +187,27 @@ export var floatingToolbar = function floatingToolbar(cardOptions, lpLinkPicker,
     }, editLinkToolbarConfig(Boolean(pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLinkingToolbar), isLinkPickerEnabled, linkPickerOptions));
   };
 };
-var unlinkCard = function unlinkCard(node, state, editorAnalyticsApi) {
-  var displayInfo = displayInfoForCard(node, findCardInfo(state));
-  var text = displayInfo.title || displayInfo.url;
-  if (text) {
-    return commandWithMetadata(changeSelectedCardToText(text, editorAnalyticsApi), {
-      action: ACTION.UNLINK
-    });
+var unlinkCard = function unlinkCard(node, state, editorAnalyticsApi, pluginInjectionApi) {
+  if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+    return function (currentState, dispatch, view) {
+      var displayInfo = displayInfoForCard(node, findCardInfo(currentState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions));
+      var text = displayInfo.title || displayInfo.url;
+      return text ? commandWithMetadata(changeSelectedCardToText(text, editorAnalyticsApi), {
+        action: ACTION.UNLINK
+      })(currentState, dispatch, view) : false;
+    };
+  } else {
+    var displayInfo = displayInfoForCard(node, findCardInfo(state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions));
+    var text = displayInfo.title || displayInfo.url;
+    if (text) {
+      return commandWithMetadata(changeSelectedCardToText(text, editorAnalyticsApi), {
+        action: ACTION.UNLINK
+      });
+    }
+    return function () {
+      return false;
+    };
   }
-  return function () {
-    return false;
-  };
 };
 var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPluginDependencyApi, analyticsApi, cardOptions, areAnyNewToolbarFlagsEnabled) {
   if (areAnyNewToolbarFlagsEnabled) {
@@ -232,7 +248,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     if (url && !isSafeUrl(url)) {
       return [];
     } else {
-      var _displayInfoForCard = displayInfoForCard(node, findCardInfo(state)),
+      var _displayInfoForCard = displayInfoForCard(node, findCardInfo(state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions)),
         title = _displayInfoForCard.title;
       metadata = {
         url: url,
@@ -282,7 +298,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     } else if (shouldRenderDatasourceToolbar) {
       return getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, node.attrs.datasource.id, state, cardOptions, currentAppearance, pluginInjectionApi);
     } else {
-      var _pluginInjectionApi$c, _pluginState$resolved;
+      var _pluginInjectionApi$c2, _pluginState$resolved;
       var inlineCard = state.schema.nodes.inlineCard;
       var editItems = cardOptions.allowDatasource ? [{
         type: 'custom',
@@ -320,7 +336,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         title: intl.formatMessage(annotationMessages.createComment),
         showTitle: editorExperiment('platform_editor_controls', 'control') ? undefined : true,
         onClick: onCommentButtonClick,
-        disabled: isOfflineMode(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.sharedState) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.mode)
+        disabled: isOfflineMode(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c2 === void 0 || (_pluginInjectionApi$c2 = _pluginInjectionApi$c2.sharedState) === null || _pluginInjectionApi$c2 === void 0 || (_pluginInjectionApi$c2 = _pluginInjectionApi$c2.currentState()) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.mode)
       }, {
         type: 'separator'
       }] : [];
@@ -390,7 +406,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       };
       var toolbarItems = areAllNewToolbarFlagsDisabled ? [].concat(editItems, commentItems, openPreviewPanelItems, [openLinkToolbarItem, {
         type: 'separator'
-      }], _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled)), [{
+      }], _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled, pluginInjectionApi)), [{
         type: 'copy-button',
         items: [{
           state: state,
@@ -414,7 +430,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
         title: intl.formatMessage(commonMessages.remove),
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
-      }]) : [].concat(editButtonItems, _toConsumableArray([].concat(_toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled)), [{
+      }]) : [].concat(editButtonItems, _toConsumableArray([].concat(_toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled, pluginInjectionApi)), [{
         type: 'separator',
         fullHeight: true
       }])), openPreviewPanelItems, [openLinkToolbarItem], _toConsumableArray(commentItems.length > 1 ? [{
@@ -509,8 +525,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
           options: [_objectSpread({
             title: intl.formatMessage(commonMessages.copyToClipboard),
             onClick: function onClick() {
-              var _pluginInjectionApi$c2, _pluginInjectionApi$f;
-              pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.core) === null || _pluginInjectionApi$c2 === void 0 || _pluginInjectionApi$c2.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.commands.copyNode(node.type, INPUT_METHOD.FLOATING_TB));
+              var _pluginInjectionApi$c3, _pluginInjectionApi$f;
+              pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.core) === null || _pluginInjectionApi$c3 === void 0 || _pluginInjectionApi$c3.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.commands.copyNode(node.type, INPUT_METHOD.FLOATING_TB));
               return true;
             },
             icon: /*#__PURE__*/React.createElement(CopyIcon, {
@@ -530,7 +546,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     }
   };
 };
-var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, areAnyNewToolbarFlagsEnabled) {
+var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, areAnyNewToolbarFlagsEnabled, pluginInjectionApi) {
   return node.type === inlineCard ? [{
     id: 'editor.link.unlink',
     focusEditoronEnter: true,
@@ -538,7 +554,7 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     title: intl.formatMessage(linkToolbarMessages.unlink),
     icon: LinkBrokenIcon,
     iconFallback: LinkBrokenIcon,
-    onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi))
+    onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi, pluginInjectionApi))
   }].concat(_toConsumableArray(areAnyNewToolbarFlagsEnabled ? [] : [{
     type: 'separator'
   }])) : [];
@@ -738,8 +754,8 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       options: [{
         title: intl.formatMessage(commonMessages.copyToClipboard),
         onClick: function onClick() {
-          var _pluginInjectionApi$c3, _pluginInjectionApi$f2;
-          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.core) === null || _pluginInjectionApi$c3 === void 0 || _pluginInjectionApi$c3.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.commands.copyNode(node.type, INPUT_METHOD.FLOATING_TB));
+          var _pluginInjectionApi$c4, _pluginInjectionApi$f2;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.core) === null || _pluginInjectionApi$c4 === void 0 || _pluginInjectionApi$c4.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.commands.copyNode(node.type, INPUT_METHOD.FLOATING_TB));
           return true;
         },
         onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, true, akEditorSelectedNodeClassName),

package/dist/types/actions/cardRegistry.d.ts

@@ -0,0 +1,37 @@
+import type { CardRegistration, CardRegistrations } from '@atlaskit/editor-common/card/types';
+/**
+ * Creates a registry of resolved cards, for use with editor actions.
+ * Registration changes (insertion, deletion, and id/title/url updates) notify subscribers; live position changes do not.
+ *
+ * @returns A registry object with the following methods:
+ * - `getCardRegistrations`: Returns the current registrations, keyed by card ID.
+ * - `registerCard`: Adds or updates a card.
+ * - `removeCard`: Removes a card by ID.
+ * - `subscribe`: Registers a change listener and returns an unsubscribe function.
+ */
+export declare const createCardRegistry: () => {
+    /**
+     * Reads the current registrations without copying them.
+     * @returns An immutable object keyed by card ID. Its identity changes only when
+     * registrations change. Each entry's `getPos()` reads its live position, or
+     * undefined after node removal.
+     */
+    getCardRegistrations: () => CardRegistrations;
+    /**
+     * Adds or updates a card by ID and notifies subscribers when its registration changes.
+     * Ignores cards whose position is undefined.
+     * @param info - The card ID, metadata, and live position getter.
+     */
+    registerCard: (info: CardRegistration) => void;
+    /**
+     * Removes a card and notifies subscribers. Does nothing for an unknown ID.
+     * @param id - The registered card ID.
+     */
+    removeCard: (id: string) => void;
+    /**
+     * Registers a listener for registration changes, not position changes.
+     * @param listener - Called after the registration object is replaced.
+     * @returns A cleanup function to unsubscribe the listener.
+     */
+    subscribe: (listener: () => void) => () => void;
+};

package/dist/types/actions/useCardRegistry.d.ts

@@ -0,0 +1,3 @@
+import type { CardPluginActions, CardRegistrations } from '@atlaskit/editor-common/card/types';
+/** Subscribe to resolved card metadata without observing every editor transaction. */
+export declare const useCardRegistry: (actions: Pick<CardPluginActions, 'getCardRegistrations' | 'subscribeToCardRegistry'> | undefined) => CardRegistrations | undefined;

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

@@ -9,12 +9,12 @@ import type { CardContext } from '@atlaskit/link-provider/types';
 import { Datasource } from '../nodeviews/datasource';
 import type { SmartCardProps } from './genericCard';
 export declare class BlockCardComponent extends React.PureComponent<SmartCardProps & {
-    id?: string;
+    id: string;
 }, unknown> {
     private scrollContainer?;
     private pendingRegisterCard?;
     constructor(props: SmartCardProps & {
-        id?: string;
+        id: string;
     });
     onResolve: (data: {
         title?: string;

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

@@ -28,12 +28,12 @@ export type EmbedCardState = {
     liveHeight?: number;
 };
 export declare class EmbedCardComponent extends React.PureComponent<SmartCardProps & {
-    id?: string;
+    id: string;
 }, EmbedCardState> {
     private scrollContainer?;
     private embedIframeRef;
     constructor(props: SmartCardProps & {
-        id?: string;
+        id: string;
     });
     state: EmbedCardState;
     private getPosSafely;

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

@@ -52,7 +52,7 @@ export interface SmartCardProps extends CardProps {
     isHovered?: boolean;
     isPageSSRed?: boolean;
     onClick?: EventHandler<MouseEvent | KeyboardEvent> | undefined;
-    onResolve?: (tr: Transaction, title?: string) => void;
+    onResolve?: (tr: Transaction | undefined, title?: string) => void;
     pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>;
     provider?: Providers['cardProvider'];
     smartCardContext?: CardContext;
@@ -63,6 +63,4 @@ export interface SmartCardProps extends CardProps {
  * @param UnsupportedComponent
  * @example
  */
-export declare function Card(SmartCardComponent: React.ComponentType<React.PropsWithChildren<SmartCardProps & {
-    id?: string;
-}>>, UnsupportedComponent: React.ComponentType<React.PropsWithChildren<unknown>>): React.ComponentType<React.PropsWithChildren<CardProps>>;
+export declare function Card<Props extends SmartCardProps>(SmartCardComponent: React.ComponentType<React.PropsWithChildren<Props>>, UnsupportedComponent: React.ComponentType<React.PropsWithChildren<unknown>>): React.ComponentType<React.PropsWithChildren<Props>>;

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

@@ -4,6 +4,7 @@ import type { Node, NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { CardContext } from '@atlaskit/link-provider/types';
+import type { CardPlugin } from '../cardPluginType';
 import type { CardInfo, DatasourceNode, ToolbarResolvedAttributes } from '../types';
 export declare const appearanceForNodeType: (spec: NodeType) => CardAppearance | undefined;
 export declare const selectedCardAppearance: (state: EditorState) => CardAppearance | undefined;
@@ -19,7 +20,7 @@ export declare const titleUrlPairFromNode: (node: Node) => TitleUrlPair;
  */
 export declare const mergeCardInfo: (titleUrlPair: TitleUrlPair, info?: CardInfo) => TitleUrlPair;
 export declare const displayInfoForCard: (node: Node, info?: CardInfo) => TitleUrlPair;
-export declare const findCardInfo: (state: EditorState) => CardInfo | undefined;
+export declare const findCardInfo: (state: EditorState, cardActions?: Pick<ReturnType<CardPlugin>['actions'], 'getCardRegistrations'>) => CardInfo | undefined;
 export declare const isEmbedSupportedAtPosition: (currentNodePosition: number, editorState: EditorState, currentAppearance?: CardAppearance) => boolean;
 export declare const isBlockSupportedAtPosition: (currentNodePosition: number, editorState: EditorState, currentAppearance?: CardAppearance) => boolean;
 export declare const getResolvedAttributesFromStore: (url: string, display: string | null, store?: CardContext['store']) => Partial<ToolbarResolvedAttributes>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "35.0.2",
+	"version": "35.1.2",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -23,7 +23,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^57.7.0",
 		"@atlaskit/analytics-next": "^12.6.0",
-		"@atlaskit/button": "^25.5.0",
+		"@atlaskit/button": "^25.6.0",
 		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/custom-steps": "^1.1.0",
 		"@atlaskit/editor-card-provider": "^8.1.0",
@@ -43,7 +43,7 @@
 		"@atlaskit/editor-plugin-user-intent": "^27.0.0",
 		"@atlaskit/editor-plugin-width": "^30.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
-		"@atlaskit/editor-shared-styles": "^4.5.0",
+		"@atlaskit/editor-shared-styles": "^4.6.0",
 		"@atlaskit/editor-smart-link-draggable": "^1.2.0",
 		"@atlaskit/editor-toolbar": "^2.8.0",
 		"@atlaskit/editor-ui-control-model": "^2.10.0",
@@ -64,8 +64,8 @@
 		"@atlaskit/primitives": "^22.6.0",
 		"@atlaskit/prosemirror-history": "^1.3.0",
 		"@atlaskit/smart-card": "^46.7.0",
-		"@atlaskit/tmp-editor-statsig": "^244.0.0",
-		"@atlaskit/tokens": "^20.6.0",
+		"@atlaskit/tmp-editor-statsig": "^245.0.0",
+		"@atlaskit/tokens": "^20.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"lodash": "^4.17.21",
@@ -74,7 +74,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^133.1.0",
+		"@atlaskit/editor-common": "^133.5.0",
 		"@atlaskit/link-provider": "^6.0.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -90,6 +90,9 @@
 		"platform_native_embeds_rollout_non_maui_experience": {
 			"type": "boolean"
 		},
+		"platform_native_embeds_rollout_all_products": {
+			"type": "boolean"
+		},
 		"confluence-issue-terminology-refresh": {
 			"type": "boolean"
 		},