@atlaskit/editor-plugin-card 5.4.0 → 5.4.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-card
 
+## 5.4.2
+
+### Patch Changes
+
+- [#129138](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/129138)
+  [`9f003b1dbcdb5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9f003b1dbcdb5) -
+  Render ssred smartlink for editor under feature gate 'platform_ssr_smartlinks_editor'
+
+## 5.4.1
+
+### Patch Changes
+
+- [#130882](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130882)
+  [`df1c29f476539`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/df1c29f476539) -
+  [ux] Adds a new i18n message and updates icons and tooltips on links, media and extensions.
+- Updated dependencies
+
 ## 5.4.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/inlineCard.js

@@ -19,6 +19,7 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _smartCard = require("@atlaskit/smart-card");
+var _ssr = require("@atlaskit/smart-card/ssr");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = require("../pm-plugins/actions");
 var _utils = require("../pm-plugins/utils");
@@ -38,7 +39,8 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
     onRes = _ref.onResolve,
     isHovered = _ref.isHovered,
     showHoverPreview = _ref.showHoverPreview,
-    hoverPreviewOptions = _ref.hoverPreviewOptions;
+    hoverPreviewOptions = _ref.hoverPreviewOptions,
+    isPageSSRed = _ref.isPageSSRed;
   var _node$attrs = node.attrs,
     url = _node$attrs.url,
     data = _node$attrs.data;
@@ -97,6 +99,22 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
     });
   }, [onResolve]);
   var card = (0, _react.useMemo)(function () {
+    if (isPageSSRed && url && (0, _platformFeatureFlags.fg)('platform_ssr_smartlinks_editor')) {
+      return /*#__PURE__*/_react.default.createElement(_ssr.CardSSR, {
+        key: url,
+        url: url,
+        appearance: "inline",
+        onClick: onClick,
+        container: scrollContainer,
+        onResolve: onResolve,
+        onError: onError,
+        inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
+        actionOptions: actionOptions,
+        isHovered: isHovered,
+        showHoverPreview: showHoverPreview,
+        hoverPreviewOptions: hoverPreviewOptions
+      });
+    }
     return /*#__PURE__*/_react.default.createElement(_smartCard.Card, {
       key: url,
       url: url !== null && url !== void 0 ? url : data.url,
@@ -111,7 +129,7 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
       showHoverPreview: showHoverPreview,
       hoverPreviewOptions: hoverPreviewOptions
     });
-  }, [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, isHovered, showHoverPreview, hoverPreviewOptions]);
+  }, [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, isHovered, showHoverPreview, hoverPreviewOptions, isPageSSRed]);
 
   // [WS-2307]: we only render card wrapped into a Provider when the value is ready,
   // otherwise if we got data, we can render the card directly since it doesn't need the Provider
@@ -132,7 +150,8 @@ function InlineCardNodeView(props) {
     enableInlineUpgradeFeatures = props.enableInlineUpgradeFeatures,
     pluginInjectionApi = props.pluginInjectionApi,
     onClickCallback = props.onClickCallback,
-    __livePage = props.__livePage;
+    __livePage = props.__livePage,
+    isPageSSRed = props.isPageSSRed;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isOverlayHovered = _useState2[0],
@@ -155,7 +174,8 @@ function InlineCardNodeView(props) {
       showHoverPreview: showHoverPreview,
       hoverPreviewOptions: {
         fadeInDelay: livePagesHoverCardFadeInDelay
-      }
+      },
+      isPageSSRed: isPageSSRed
     });
     return (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view' ? inlineCard : /*#__PURE__*/_react.default.createElement(_ConfigureOverlay.default, {
       targetElementPos: getPos(),
@@ -179,7 +199,9 @@ function InlineCardNodeView(props) {
     actionOptions: actionOptions,
     useAlternativePreloader: useAlternativePreloader,
     pluginInjectionApi: pluginInjectionApi,
-    onClickCallback: onClickCallback
+    onClickCallback: onClickCallback,
+    isPageSSRed: isPageSSRed,
+    appearance: "inline"
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
   }, enableInlineUpgradeFeatures && (0, _utils.getAwarenessProps)(view.state, getPos, allowEmbeds, allowBlockCards, !(0, _experiments.editorExperiment)('live_pages_graceful_edit', 'control') ? true : (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view')));

package/dist/cjs/nodeviews/inlineCardWithAwareness.js

@@ -26,7 +26,9 @@ var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0,
     onClick = _ref.onClick,
     isPulseEnabled = _ref.isPulseEnabled,
     isOverlayEnabled = _ref.isOverlayEnabled,
-    isSelected = _ref.isSelected;
+    isSelected = _ref.isSelected,
+    isPageSSRed = _ref.isPageSSRed,
+    appearance = _ref.appearance;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isHovered = _useState2[0],
@@ -80,9 +82,10 @@ var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0,
       onResolve: onResolve,
       onClick: onClick,
       cardContext: cardContext,
-      isHovered: isHovered
+      isHovered: isHovered,
+      isPageSSRed: isPageSSRed
     });
-  }, [actionOptions, cardContext, getPos, isHovered, node, onClick, onResolve, useAlternativePreloader, view]);
+  }, [actionOptions, cardContext, getPos, isHovered, node, onClick, onResolve, useAlternativePreloader, view, isPageSSRed]);
   return isOverlayEnabled || isPulseEnabled ? /*#__PURE__*/_react.default.createElement(_AwarenessWrapper.AwarenessWrapper, {
     isOverlayEnabled: isOverlayEnabled,
     isPulseEnabled: isPulseEnabled,
@@ -95,7 +98,8 @@ var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0,
     isResolvedViewRendered: isResolvedViewRendered,
     markMostRecentlyInsertedLink: markMostRecentlyInsertedLink,
     pluginInjectionApi: pluginInjectionApi,
-    setOverlayHoveredStyles: setOverlayHoveredStyles
+    setOverlayHoveredStyles: setOverlayHoveredStyles,
+    appearance: appearance
   }, innerCard) :
   /*#__PURE__*/
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766

package/dist/cjs/nodeviews/lazy-inline-card.js

@@ -13,7 +13,8 @@ var _inlineCard = require("./inlineCard");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var lazyInlineCardView = exports.lazyInlineCardView = function lazyInlineCardView(props) {
-  if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false) || !(0, _platformFeatureFlags.fg)('platform_editor_ssr_fix_smartlinks')) {
+  var isPageSSRed = props.isPageSSRed || false;
+  if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false) || !(0, _platformFeatureFlags.fg)('platform_editor_ssr_fix_smartlinks') || isPageSSRed && (0, _platformFeatureFlags.fg)('platform_ssr_smartlinks_editor')) {
     return (0, _inlineCard.inlineCardNodeView)(props);
   }
   return (0, _lazyNodeView.withLazyLoading)({

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

@@ -67,7 +67,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
       allowEmbeds = options.allowEmbeds,
       allowBlockCards = options.allowBlockCards,
       onClickCallback = options.onClickCallback,
-      __livePage = options.__livePage;
+      __livePage = options.__livePage,
+      isPageSSRed = options.isPageSSRed;
     var enableInlineUpgradeFeatures = !!showUpgradeDiscoverability;
     var inlineCardViewProducer = (0, _reactNodeView.getInlineNodeViewProducer)(_objectSpread({
       pmPluginFactoryParams: pmPluginFactoryParams,
@@ -80,7 +81,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
         allowBlockCards: allowBlockCards,
         pluginInjectionApi: pluginInjectionApi,
         onClickCallback: onClickCallback,
-        __livePage: __livePage
+        __livePage: __livePage,
+        isPageSSRed: isPageSSRed
       }
     }, __livePage && (0, _platformFeatureFlags.fg)('linking_platform_smart_links_in_live_pages') && {
       extraNodeViewProps: {
@@ -254,7 +256,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
       props: _objectSpread({
         nodeViews: {
           inlineCard: (0, _lazyInlineCard.lazyInlineCardView)({
-            inlineCardViewProducer: inlineCardViewProducer
+            inlineCardViewProducer: inlineCardViewProducer,
+            isPageSSRed: isPageSSRed
           }),
           blockCard: (0, _lazyBlockCard.lazyBlockCardView)({
             pmPluginFactoryParams: pmPluginFactoryParams,

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

@@ -45,7 +45,8 @@ var AwarenessWrapper = exports.AwarenessWrapper = function AwarenessWrapper(_ref
     markMostRecentlyInsertedLink = _ref.markMostRecentlyInsertedLink,
     pluginInjectionApi = _ref.pluginInjectionApi,
     setOverlayHoveredStyles = _ref.setOverlayHoveredStyles,
-    url = _ref.url;
+    url = _ref.url,
+    appearance = _ref.appearance;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isHovered = _useState2[0],
@@ -112,6 +113,7 @@ var AwarenessWrapper = exports.AwarenessWrapper = function AwarenessWrapper(_ref
       url: url
     }, children);
   }, [children, isHovered, url, handleOverlayChange, isResolvedViewRendered]);
+  var isInline = appearance === 'inline';
   return (0, _react.useMemo)(function () {
     var _cardContext$value;
     return (
@@ -128,8 +130,9 @@ var AwarenessWrapper = exports.AwarenessWrapper = function AwarenessWrapper(_ref
         localStorageKeyExpirationInMs: _localStorage.ONE_DAY_IN_MILLISECONDS,
         discoveryMode: "start",
         shouldShowPulse: isResolvedViewRendered && shouldShowLinkPulse,
-        testId: "link-discovery-pulse"
+        testId: "link-discovery-pulse",
+        isInline: isInline
       }, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? cardWithOpenButtonOverlay : cardWithOverlay)))
     );
-  }, [shouldShowLinkPulse, url, cardContext === null || cardContext === void 0 || (_cardContext$value2 = cardContext.value) === null || _cardContext$value2 === void 0 ? void 0 : _cardContext$value2.store, isResolvedViewRendered, cardWithOverlay, cardWithOpenButtonOverlay]);
+  }, [shouldShowLinkPulse, url, cardContext === null || cardContext === void 0 || (_cardContext$value2 = cardContext.value) === null || _cardContext$value2 === void 0 ? void 0 : _cardContext$value2.store, isResolvedViewRendered, cardWithOverlay, cardWithOpenButtonOverlay, isInline]);
 };

package/dist/cjs/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -12,11 +12,13 @@ var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _edit = _interopRequireDefault(require("@atlaskit/icon/core/edit"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
 var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
 var _menu = require("@atlaskit/menu");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _utils = require("../../pm-plugins/utils");
 var _editDatasourceAction = require("../editDatasourceAction");
 /**
@@ -63,6 +65,9 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
       (0, _utils.focusEditorView)(editorView);
     }
   }, [currentAppearance, datasourceId, editorAnalyticsApi, editorView, extensionKey]);
+  var icon = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _react2.jsx)(_edit.default, {
+    label: ""
+  }) : undefined;
   switch (editVariant) {
     case 'edit-link':
       {
@@ -70,8 +75,9 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           gap: "space.050"
         }, (0, _react2.jsx)(_ui.FloatingToolbarButton, {
           testId: "edit-link",
-          onClick: onEditLink
-        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+          onClick: onEditLink,
+          icon: icon
+        }, (0, _experiments.editorExperiment)('platform_editor_controls', 'control') && (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.linkToolbarMessages.editLink)), (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));

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

@@ -25,10 +25,10 @@ var withHistoryMethod = function withHistoryMethod(fn) {
   };
 };
 var getMethod = exports.getMethod = withHistoryMethod(function (_ref) {
-  var _inputMethod, _payload;
+  var _payload;
   var inputMethod = _ref.inputMethod,
     sourceEvent = _ref.sourceEvent;
-  inputMethod = (_inputMethod = inputMethod) !== null && _inputMethod !== void 0 ? _inputMethod : sourceEvent === null || sourceEvent === void 0 || (_payload = sourceEvent.payload) === null || _payload === void 0 || (_payload = _payload.attributes) === null || _payload === void 0 ? void 0 : _payload.inputMethod;
+  inputMethod = inputMethod !== null && inputMethod !== void 0 ? inputMethod : sourceEvent === null || sourceEvent === void 0 || (_payload = sourceEvent.payload) === null || _payload === void 0 || (_payload = _payload.attributes) === null || _payload === void 0 ? void 0 : _payload.inputMethod;
   switch (inputMethod) {
     case _analytics.INPUT_METHOD.CLIPBOARD:
       return 'editor_paste';

package/dist/cjs/ui/LinkToolbarAppearanceDropdown.js

@@ -126,7 +126,7 @@ var LinkAppearanceMenu = exports.LinkAppearanceMenu = function LinkAppearanceMen
     }),
     href: 'href' in settingsConfig ? settingsConfig.href : undefined,
     target: 'target' in settingsConfig ? settingsConfig.target : undefined
-  }, "Link Preferences")));
+  }, intl.formatMessage(_messages.linkToolbarMessages.preferencesLink))));
 };
 var getLinkAppearanceDropdown = exports.getLinkAppearanceDropdown = function getLinkAppearanceDropdown(_ref2) {
   var url = _ref2.url,

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

@@ -18,7 +18,8 @@ var DiscoveryPulse = exports.DiscoveryPulse = function DiscoveryPulse(_ref) {
     _ref$discoveryMode = _ref.discoveryMode,
     discoveryMode = _ref$discoveryMode === void 0 ? 'iteration' : _ref$discoveryMode,
     shouldShowPulse = _ref.shouldShowPulse,
-    testId = _ref.testId;
+    testId = _ref.testId,
+    isInline = _ref.isInline;
   var discovered = (0, _localStorage.isLocalStorageKeyDiscovered)(localStorageKey);
   var showPulse = shouldShowPulse !== null && shouldShowPulse !== void 0 ? shouldShowPulse : !discovered;
   var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(),
@@ -44,6 +45,7 @@ var DiscoveryPulse = exports.DiscoveryPulse = function DiscoveryPulse(_ref) {
     onAnimationIteration: discoveryMode === 'iteration' ? onDiscovery : undefined,
     onAnimationStart: discoveryMode === 'start' ? onDiscovery : undefined,
     showPulse: showPulse,
-    testId: testId
+    testId: testId,
+    isInline: isInline
   }, children);
 };

package/dist/cjs/ui/toolbar.js

@@ -21,7 +21,7 @@ var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
 var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
 var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
-var _link2 = _interopRequireDefault(require("@atlaskit/icon/core/link"));
+var _edit = _interopRequireDefault(require("@atlaskit/icon/core/edit"));
 var _linkBroken = _interopRequireDefault(require("@atlaskit/icon/core/link-broken"));
 var _linkExternal = _interopRequireDefault(require("@atlaskit/icon/core/link-external"));
 var _settings = _interopRequireDefault(require("@atlaskit/icon/core/settings"));
@@ -340,7 +340,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         selected: false,
         metadata: metadata,
         title: intl.formatMessage(_messages.linkToolbarMessages.editLink),
-        icon: _link2.default,
+        icon: _edit.default,
         testId: 'link-toolbar-edit-link-button',
         onClick: (0, _EditLinkToolbar.getEditLinkCallback)(editorAnalyticsApi, true)
       }, {
@@ -667,8 +667,9 @@ var getStartingToolbarItems = exports.getStartingToolbarItems = function getStar
       type: 'button',
       onClick: onEditLink,
       title: intl.formatMessage(_messages.linkToolbarMessages.editLink),
-      showTitle: true,
-      metadata: metadata
+      showTitle: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? false : true,
+      metadata: metadata,
+      icon: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? _edit.default : undefined
     }, {
       type: 'separator'
     }];

package/dist/es2019/nodeviews/inlineCard.js

@@ -8,6 +8,7 @@ import { findOverflowScrollParent, UnsupportedInline } from '@atlaskit/editor-co
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
+import { CardSSR } from '@atlaskit/smart-card/ssr';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { registerCard, removeCard } from '../pm-plugins/actions';
 import { getAwarenessProps } from '../pm-plugins/utils';
@@ -25,7 +26,8 @@ export const InlineCard = /*#__PURE__*/memo(({
   onResolve: onRes,
   isHovered,
   showHoverPreview,
-  hoverPreviewOptions
+  hoverPreviewOptions,
+  isPageSSRed
 }) => {
   const {
     url,
@@ -89,20 +91,38 @@ export const InlineCard = /*#__PURE__*/memo(({
       url
     });
   }, [onResolve]);
-  const card = useMemo(() => /*#__PURE__*/React.createElement(SmartCard, {
-    key: url,
-    url: url !== null && url !== void 0 ? url : data.url,
-    appearance: "inline",
-    onClick: onClick,
-    container: scrollContainer,
-    onResolve: onResolve,
-    onError: onError,
-    inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
-    actionOptions: actionOptions,
-    isHovered: isHovered,
-    showHoverPreview: showHoverPreview,
-    hoverPreviewOptions: hoverPreviewOptions
-  }), [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, isHovered, showHoverPreview, hoverPreviewOptions]);
+  const card = useMemo(() => {
+    if (isPageSSRed && url && fg('platform_ssr_smartlinks_editor')) {
+      return /*#__PURE__*/React.createElement(CardSSR, {
+        key: url,
+        url: url,
+        appearance: "inline",
+        onClick: onClick,
+        container: scrollContainer,
+        onResolve: onResolve,
+        onError: onError,
+        inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
+        actionOptions: actionOptions,
+        isHovered: isHovered,
+        showHoverPreview: showHoverPreview,
+        hoverPreviewOptions: hoverPreviewOptions
+      });
+    }
+    return /*#__PURE__*/React.createElement(SmartCard, {
+      key: url,
+      url: url !== null && url !== void 0 ? url : data.url,
+      appearance: "inline",
+      onClick: onClick,
+      container: scrollContainer,
+      onResolve: onResolve,
+      onError: onError,
+      inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
+      actionOptions: actionOptions,
+      isHovered: isHovered,
+      showHoverPreview: showHoverPreview,
+      hoverPreviewOptions: hoverPreviewOptions
+    });
+  }, [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, isHovered, showHoverPreview, hoverPreviewOptions, isPageSSRed]);
 
   // [WS-2307]: we only render card wrapped into a Provider when the value is ready,
   // otherwise if we got data, we can render the card directly since it doesn't need the Provider
@@ -124,7 +144,8 @@ export function InlineCardNodeView(props) {
     enableInlineUpgradeFeatures,
     pluginInjectionApi,
     onClickCallback,
-    __livePage
+    __livePage,
+    isPageSSRed
   } = props;
   const [isOverlayHovered, setIsOverlayHovered] = useState(false);
   const {
@@ -146,7 +167,8 @@ export function InlineCardNodeView(props) {
       showHoverPreview: showHoverPreview,
       hoverPreviewOptions: {
         fadeInDelay: livePagesHoverCardFadeInDelay
-      }
+      },
+      isPageSSRed: isPageSSRed
     });
     return (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view' ? inlineCard : /*#__PURE__*/React.createElement(OverlayWrapper, {
       targetElementPos: getPos(),
@@ -170,7 +192,9 @@ export function InlineCardNodeView(props) {
     actionOptions: actionOptions,
     useAlternativePreloader: useAlternativePreloader,
     pluginInjectionApi: pluginInjectionApi,
-    onClickCallback: onClickCallback
+    onClickCallback: onClickCallback,
+    isPageSSRed: isPageSSRed,
+    appearance: "inline"
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
   }, enableInlineUpgradeFeatures && getAwarenessProps(view.state, getPos, allowEmbeds, allowBlockCards, !editorExperiment('live_pages_graceful_edit', 'control') ? true : (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view')));

package/dist/es2019/nodeviews/inlineCardWithAwareness.js

@@ -15,7 +15,9 @@ export const InlineCardWithAwareness = /*#__PURE__*/memo(({
   onClick,
   isPulseEnabled,
   isOverlayEnabled,
-  isSelected
+  isSelected,
+  isPageSSRed,
+  appearance
 }) => {
   const [isHovered, setIsHovered] = useState(false);
   const [isInserted, setIsInserted] = useState(false);
@@ -54,8 +56,9 @@ export const InlineCardWithAwareness = /*#__PURE__*/memo(({
     onResolve: onResolve,
     onClick: onClick,
     cardContext: cardContext,
-    isHovered: isHovered
-  }), [actionOptions, cardContext, getPos, isHovered, node, onClick, onResolve, useAlternativePreloader, view]);
+    isHovered: isHovered,
+    isPageSSRed: isPageSSRed
+  }), [actionOptions, cardContext, getPos, isHovered, node, onClick, onResolve, useAlternativePreloader, view, isPageSSRed]);
   return isOverlayEnabled || isPulseEnabled ? /*#__PURE__*/React.createElement(AwarenessWrapper, {
     isOverlayEnabled: isOverlayEnabled,
     isPulseEnabled: isPulseEnabled,
@@ -68,7 +71,8 @@ export const InlineCardWithAwareness = /*#__PURE__*/memo(({
     isResolvedViewRendered: isResolvedViewRendered,
     markMostRecentlyInsertedLink: markMostRecentlyInsertedLink,
     pluginInjectionApi: pluginInjectionApi,
-    setOverlayHoveredStyles: setOverlayHoveredStyles
+    setOverlayHoveredStyles: setOverlayHoveredStyles,
+    appearance: appearance
   }, innerCard) :
   /*#__PURE__*/
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766

package/dist/es2019/nodeviews/lazy-inline-card.js

@@ -3,7 +3,8 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { inlineCardNodeView } from './inlineCard';
 export const lazyInlineCardView = props => {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || !fg('platform_editor_ssr_fix_smartlinks')) {
+  const isPageSSRed = props.isPageSSRed || false;
+  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || !fg('platform_editor_ssr_fix_smartlinks') || isPageSSRed && fg('platform_ssr_smartlinks_editor')) {
     return inlineCardNodeView(props);
   }
   return withLazyLoading({

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

@@ -57,7 +57,8 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
     allowBlockCards,
     onClickCallback,
     // @ts-ignore Temporary solution to check for Live Page editor.
-    __livePage
+    __livePage,
+    isPageSSRed
   } = options;
   const enableInlineUpgradeFeatures = !!showUpgradeDiscoverability;
   const inlineCardViewProducer = getInlineNodeViewProducer({
@@ -71,7 +72,8 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
       allowBlockCards,
       pluginInjectionApi,
       onClickCallback,
-      __livePage
+      __livePage,
+      isPageSSRed
     },
     ...(__livePage && fg('linking_platform_smart_links_in_live_pages') && {
       extraNodeViewProps: {
@@ -253,7 +255,8 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
     props: {
       nodeViews: {
         inlineCard: lazyInlineCardView({
-          inlineCardViewProducer
+          inlineCardViewProducer,
+          isPageSSRed
         }),
         blockCard: lazyBlockCardView({
           pmPluginFactoryParams,

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

@@ -35,7 +35,8 @@ export const AwarenessWrapper = ({
   markMostRecentlyInsertedLink,
   pluginInjectionApi,
   setOverlayHoveredStyles,
-  url
+  url,
+  appearance
 }) => {
   var _cardContext$value2;
   const [isHovered, setIsHovered] = useState(false);
@@ -94,6 +95,7 @@ export const AwarenessWrapper = ({
       url: url
     }, children);
   }, [children, isHovered, url, handleOverlayChange, isResolvedViewRendered]);
+  const isInline = appearance === 'inline';
   return useMemo(() => {
     var _cardContext$value;
     return (
@@ -110,8 +112,9 @@ export const AwarenessWrapper = ({
         localStorageKeyExpirationInMs: ONE_DAY_IN_MILLISECONDS,
         discoveryMode: "start",
         shouldShowPulse: isResolvedViewRendered && shouldShowLinkPulse,
-        testId: "link-discovery-pulse"
+        testId: "link-discovery-pulse",
+        isInline: isInline
       }, editorExperiment('platform_editor_controls', 'variant1') ? cardWithOpenButtonOverlay : cardWithOverlay)))
     );
-  }, [shouldShowLinkPulse, url, cardContext === null || cardContext === void 0 ? void 0 : (_cardContext$value2 = cardContext.value) === null || _cardContext$value2 === void 0 ? void 0 : _cardContext$value2.store, isResolvedViewRendered, cardWithOverlay, cardWithOpenButtonOverlay]);
+  }, [shouldShowLinkPulse, url, cardContext === null || cardContext === void 0 ? void 0 : (_cardContext$value2 = cardContext.value) === null || _cardContext$value2 === void 0 ? void 0 : _cardContext$value2.store, isResolvedViewRendered, cardWithOverlay, cardWithOpenButtonOverlay, isInline]);
 };

package/dist/es2019/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -10,11 +10,13 @@ import { FormattedMessage } from 'react-intl-next';
 import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
+import EditIcon from '@atlaskit/icon/core/edit';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { focusEditorView } from '../../pm-plugins/utils';
 import { editDatasource } from '../editDatasourceAction';
 const dropdownExpandContainer = css({
@@ -46,6 +48,9 @@ const EditToolbarButtonPresentation = ({
       focusEditorView(editorView);
     }
   }, [currentAppearance, datasourceId, editorAnalyticsApi, editorView, extensionKey]);
+  const icon = editorExperiment('platform_editor_controls', 'variant1') ? jsx(EditIcon, {
+    label: ""
+  }) : undefined;
   switch (editVariant) {
     case 'edit-link':
       {
@@ -53,8 +58,9 @@ const EditToolbarButtonPresentation = ({
           gap: "space.050"
         }, jsx(Button, {
           testId: "edit-link",
-          onClick: onEditLink
-        }, jsx(FormattedMessage
+          onClick: onEditLink,
+          icon: icon
+        }, editorExperiment('platform_editor_controls', 'control') && jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , linkToolbarMessages.editLink)), jsx(Separator, null));

package/dist/es2019/ui/LinkToolbarAppearanceDropdown.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { appearancePropsMap, commandWithMetadata, getDropdownOption } from '@atlaskit/editor-common/card';
-import { cardMessages as messages } from '@atlaskit/editor-common/messages';
+import { cardMessages as messages, linkToolbarMessages } from '@atlaskit/editor-common/messages';
 import { isSupportedInParent } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { useSmartCardContext } from '@atlaskit/link-provider';
@@ -110,7 +110,7 @@ export const LinkAppearanceMenu = ({
     }),
     href: 'href' in settingsConfig ? settingsConfig.href : undefined,
     target: 'target' in settingsConfig ? settingsConfig.target : undefined
-  }, "Link Preferences")));
+  }, intl.formatMessage(linkToolbarMessages.preferencesLink))));
 };
 export const getLinkAppearanceDropdown = ({
   url,

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

@@ -8,7 +8,8 @@ export const DiscoveryPulse = ({
   localStorageKeyExpirationInMs,
   discoveryMode = 'iteration',
   shouldShowPulse,
-  testId
+  testId,
+  isInline
 }) => {
   const discovered = isLocalStorageKeyDiscovered(localStorageKey);
   const showPulse = shouldShowPulse !== null && shouldShowPulse !== void 0 ? shouldShowPulse : !discovered;
@@ -36,6 +37,7 @@ export const DiscoveryPulse = ({
     onAnimationIteration: discoveryMode === 'iteration' ? onDiscovery : undefined,
     onAnimationStart: discoveryMode === 'start' ? onDiscovery : undefined,
     showPulse: showPulse,
-    testId: testId
+    testId: testId,
+    isInline: isInline
   }, children);
 };

package/dist/es2019/ui/toolbar.js

@@ -11,7 +11,7 @@ import { findDomRefAtPos, removeSelectedNode } from '@atlaskit/editor-prosemirro
 import CommentIcon from '@atlaskit/icon/core/comment';
 import CopyIcon from '@atlaskit/icon/core/copy';
 import DeleteIcon from '@atlaskit/icon/core/delete';
-import LinkIcon from '@atlaskit/icon/core/link';
+import EditIcon from '@atlaskit/icon/core/edit';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import SettingsIcon from '@atlaskit/icon/core/settings';
@@ -332,7 +332,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       selected: false,
       metadata: metadata,
       title: intl.formatMessage(linkToolbarMessages.editLink),
-      icon: LinkIcon,
+      icon: EditIcon,
       testId: 'link-toolbar-edit-link-button',
       onClick: getEditLinkCallback(editorAnalyticsApi, true)
     }, {
@@ -656,8 +656,9 @@ export const getStartingToolbarItems = (options, api) => {
       type: 'button',
       onClick: onEditLink,
       title: intl.formatMessage(linkToolbarMessages.editLink),
-      showTitle: true,
-      metadata: metadata
+      showTitle: editorExperiment('platform_editor_controls', 'variant1') ? false : true,
+      metadata: metadata,
+      icon: editorExperiment('platform_editor_controls', 'variant1') ? EditIcon : undefined
     }, {
       type: 'separator'
     }];

package/dist/esm/nodeviews/inlineCard.js

@@ -9,6 +9,7 @@ import { findOverflowScrollParent, UnsupportedInline } from '@atlaskit/editor-co
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
+import { CardSSR } from '@atlaskit/smart-card/ssr';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { registerCard, removeCard } from '../pm-plugins/actions';
 import { getAwarenessProps } from '../pm-plugins/utils';
@@ -26,7 +27,8 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
     onRes = _ref.onResolve,
     isHovered = _ref.isHovered,
     showHoverPreview = _ref.showHoverPreview,
-    hoverPreviewOptions = _ref.hoverPreviewOptions;
+    hoverPreviewOptions = _ref.hoverPreviewOptions,
+    isPageSSRed = _ref.isPageSSRed;
   var _node$attrs = node.attrs,
     url = _node$attrs.url,
     data = _node$attrs.data;
@@ -85,6 +87,22 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
     });
   }, [onResolve]);
   var card = useMemo(function () {
+    if (isPageSSRed && url && fg('platform_ssr_smartlinks_editor')) {
+      return /*#__PURE__*/React.createElement(CardSSR, {
+        key: url,
+        url: url,
+        appearance: "inline",
+        onClick: onClick,
+        container: scrollContainer,
+        onResolve: onResolve,
+        onError: onError,
+        inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
+        actionOptions: actionOptions,
+        isHovered: isHovered,
+        showHoverPreview: showHoverPreview,
+        hoverPreviewOptions: hoverPreviewOptions
+      });
+    }
     return /*#__PURE__*/React.createElement(SmartCard, {
       key: url,
       url: url !== null && url !== void 0 ? url : data.url,
@@ -99,7 +117,7 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
       showHoverPreview: showHoverPreview,
       hoverPreviewOptions: hoverPreviewOptions
     });
-  }, [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, isHovered, showHoverPreview, hoverPreviewOptions]);
+  }, [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, isHovered, showHoverPreview, hoverPreviewOptions, isPageSSRed]);
 
   // [WS-2307]: we only render card wrapped into a Provider when the value is ready,
   // otherwise if we got data, we can render the card directly since it doesn't need the Provider
@@ -120,7 +138,8 @@ export function InlineCardNodeView(props) {
     enableInlineUpgradeFeatures = props.enableInlineUpgradeFeatures,
     pluginInjectionApi = props.pluginInjectionApi,
     onClickCallback = props.onClickCallback,
-    __livePage = props.__livePage;
+    __livePage = props.__livePage,
+    isPageSSRed = props.isPageSSRed;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isOverlayHovered = _useState2[0],
@@ -143,7 +162,8 @@ export function InlineCardNodeView(props) {
       showHoverPreview: showHoverPreview,
       hoverPreviewOptions: {
         fadeInDelay: livePagesHoverCardFadeInDelay
-      }
+      },
+      isPageSSRed: isPageSSRed
     });
     return (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view' ? inlineCard : /*#__PURE__*/React.createElement(OverlayWrapper, {
       targetElementPos: getPos(),
@@ -167,7 +187,9 @@ export function InlineCardNodeView(props) {
     actionOptions: actionOptions,
     useAlternativePreloader: useAlternativePreloader,
     pluginInjectionApi: pluginInjectionApi,
-    onClickCallback: onClickCallback
+    onClickCallback: onClickCallback,
+    isPageSSRed: isPageSSRed,
+    appearance: "inline"
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
   }, enableInlineUpgradeFeatures && getAwarenessProps(view.state, getPos, allowEmbeds, allowBlockCards, !editorExperiment('live_pages_graceful_edit', 'control') ? true : (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view')));

package/dist/esm/nodeviews/inlineCardWithAwareness.js

@@ -16,7 +16,9 @@ export var InlineCardWithAwareness = /*#__PURE__*/memo(function (_ref) {
     onClick = _ref.onClick,
     isPulseEnabled = _ref.isPulseEnabled,
     isOverlayEnabled = _ref.isOverlayEnabled,
-    isSelected = _ref.isSelected;
+    isSelected = _ref.isSelected,
+    isPageSSRed = _ref.isPageSSRed,
+    appearance = _ref.appearance;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isHovered = _useState2[0],
@@ -70,9 +72,10 @@ export var InlineCardWithAwareness = /*#__PURE__*/memo(function (_ref) {
       onResolve: onResolve,
       onClick: onClick,
       cardContext: cardContext,
-      isHovered: isHovered
+      isHovered: isHovered,
+      isPageSSRed: isPageSSRed
     });
-  }, [actionOptions, cardContext, getPos, isHovered, node, onClick, onResolve, useAlternativePreloader, view]);
+  }, [actionOptions, cardContext, getPos, isHovered, node, onClick, onResolve, useAlternativePreloader, view, isPageSSRed]);
   return isOverlayEnabled || isPulseEnabled ? /*#__PURE__*/React.createElement(AwarenessWrapper, {
     isOverlayEnabled: isOverlayEnabled,
     isPulseEnabled: isPulseEnabled,
@@ -85,7 +88,8 @@ export var InlineCardWithAwareness = /*#__PURE__*/memo(function (_ref) {
     isResolvedViewRendered: isResolvedViewRendered,
     markMostRecentlyInsertedLink: markMostRecentlyInsertedLink,
     pluginInjectionApi: pluginInjectionApi,
-    setOverlayHoveredStyles: setOverlayHoveredStyles
+    setOverlayHoveredStyles: setOverlayHoveredStyles,
+    appearance: appearance
   }, innerCard) :
   /*#__PURE__*/
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766

package/dist/esm/nodeviews/lazy-inline-card.js

@@ -3,7 +3,8 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { inlineCardNodeView } from './inlineCard';
 export var lazyInlineCardView = function lazyInlineCardView(props) {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || !fg('platform_editor_ssr_fix_smartlinks')) {
+  var isPageSSRed = props.isPageSSRed || false;
+  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || !fg('platform_editor_ssr_fix_smartlinks') || isPageSSRed && fg('platform_ssr_smartlinks_editor')) {
     return inlineCardNodeView(props);
   }
   return withLazyLoading({

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

@@ -60,7 +60,8 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
       allowEmbeds = options.allowEmbeds,
       allowBlockCards = options.allowBlockCards,
       onClickCallback = options.onClickCallback,
-      __livePage = options.__livePage;
+      __livePage = options.__livePage,
+      isPageSSRed = options.isPageSSRed;
     var enableInlineUpgradeFeatures = !!showUpgradeDiscoverability;
     var inlineCardViewProducer = getInlineNodeViewProducer(_objectSpread({
       pmPluginFactoryParams: pmPluginFactoryParams,
@@ -73,7 +74,8 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
         allowBlockCards: allowBlockCards,
         pluginInjectionApi: pluginInjectionApi,
         onClickCallback: onClickCallback,
-        __livePage: __livePage
+        __livePage: __livePage,
+        isPageSSRed: isPageSSRed
       }
     }, __livePage && fg('linking_platform_smart_links_in_live_pages') && {
       extraNodeViewProps: {
@@ -247,7 +249,8 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
       props: _objectSpread({
         nodeViews: {
           inlineCard: lazyInlineCardView({
-            inlineCardViewProducer: inlineCardViewProducer
+            inlineCardViewProducer: inlineCardViewProducer,
+            isPageSSRed: isPageSSRed
           }),
           blockCard: lazyBlockCardView({
             pmPluginFactoryParams: pmPluginFactoryParams,

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

@@ -37,7 +37,8 @@ export var AwarenessWrapper = function AwarenessWrapper(_ref) {
     markMostRecentlyInsertedLink = _ref.markMostRecentlyInsertedLink,
     pluginInjectionApi = _ref.pluginInjectionApi,
     setOverlayHoveredStyles = _ref.setOverlayHoveredStyles,
-    url = _ref.url;
+    url = _ref.url,
+    appearance = _ref.appearance;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isHovered = _useState2[0],
@@ -104,6 +105,7 @@ export var AwarenessWrapper = function AwarenessWrapper(_ref) {
       url: url
     }, children);
   }, [children, isHovered, url, handleOverlayChange, isResolvedViewRendered]);
+  var isInline = appearance === 'inline';
   return useMemo(function () {
     var _cardContext$value;
     return (
@@ -120,8 +122,9 @@ export var AwarenessWrapper = function AwarenessWrapper(_ref) {
         localStorageKeyExpirationInMs: ONE_DAY_IN_MILLISECONDS,
         discoveryMode: "start",
         shouldShowPulse: isResolvedViewRendered && shouldShowLinkPulse,
-        testId: "link-discovery-pulse"
+        testId: "link-discovery-pulse",
+        isInline: isInline
       }, editorExperiment('platform_editor_controls', 'variant1') ? cardWithOpenButtonOverlay : cardWithOverlay)))
     );
-  }, [shouldShowLinkPulse, url, cardContext === null || cardContext === void 0 || (_cardContext$value2 = cardContext.value) === null || _cardContext$value2 === void 0 ? void 0 : _cardContext$value2.store, isResolvedViewRendered, cardWithOverlay, cardWithOpenButtonOverlay]);
+  }, [shouldShowLinkPulse, url, cardContext === null || cardContext === void 0 || (_cardContext$value2 = cardContext.value) === null || _cardContext$value2 === void 0 ? void 0 : _cardContext$value2.store, isResolvedViewRendered, cardWithOverlay, cardWithOpenButtonOverlay, isInline]);
 };

package/dist/esm/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -11,11 +11,13 @@ import { FormattedMessage } from 'react-intl-next';
 import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
+import EditIcon from '@atlaskit/icon/core/edit';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { focusEditorView } from '../../pm-plugins/utils';
 import { editDatasource } from '../editDatasourceAction';
 var dropdownExpandContainer = css({
@@ -55,6 +57,9 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
       focusEditorView(editorView);
     }
   }, [currentAppearance, datasourceId, editorAnalyticsApi, editorView, extensionKey]);
+  var icon = editorExperiment('platform_editor_controls', 'variant1') ? jsx(EditIcon, {
+    label: ""
+  }) : undefined;
   switch (editVariant) {
     case 'edit-link':
       {
@@ -62,8 +67,9 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           gap: "space.050"
         }, jsx(Button, {
           testId: "edit-link",
-          onClick: onEditLink
-        }, jsx(FormattedMessage
+          onClick: onEditLink,
+          icon: icon
+        }, editorExperiment('platform_editor_controls', 'control') && jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , linkToolbarMessages.editLink)), jsx(Separator, null));

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

@@ -19,10 +19,10 @@ var withHistoryMethod = function withHistoryMethod(fn) {
   };
 };
 export var getMethod = withHistoryMethod(function (_ref) {
-  var _inputMethod, _payload;
+  var _payload;
   var inputMethod = _ref.inputMethod,
     sourceEvent = _ref.sourceEvent;
-  inputMethod = (_inputMethod = inputMethod) !== null && _inputMethod !== void 0 ? _inputMethod : sourceEvent === null || sourceEvent === void 0 || (_payload = sourceEvent.payload) === null || _payload === void 0 || (_payload = _payload.attributes) === null || _payload === void 0 ? void 0 : _payload.inputMethod;
+  inputMethod = inputMethod !== null && inputMethod !== void 0 ? inputMethod : sourceEvent === null || sourceEvent === void 0 || (_payload = sourceEvent.payload) === null || _payload === void 0 || (_payload = _payload.attributes) === null || _payload === void 0 ? void 0 : _payload.inputMethod;
   switch (inputMethod) {
     case INPUT_METHOD.CLIPBOARD:
       return 'editor_paste';

package/dist/esm/ui/LinkToolbarAppearanceDropdown.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { appearancePropsMap, commandWithMetadata, getDropdownOption } from '@atlaskit/editor-common/card';
-import { cardMessages as messages } from '@atlaskit/editor-common/messages';
+import { cardMessages as messages, linkToolbarMessages } from '@atlaskit/editor-common/messages';
 import { isSupportedInParent } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { useSmartCardContext } from '@atlaskit/link-provider';
@@ -119,7 +119,7 @@ export var LinkAppearanceMenu = function LinkAppearanceMenu(_ref) {
     }),
     href: 'href' in settingsConfig ? settingsConfig.href : undefined,
     target: 'target' in settingsConfig ? settingsConfig.target : undefined
-  }, "Link Preferences")));
+  }, intl.formatMessage(linkToolbarMessages.preferencesLink))));
 };
 export var getLinkAppearanceDropdown = function getLinkAppearanceDropdown(_ref2) {
   var url = _ref2.url,

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

@@ -9,7 +9,8 @@ export var DiscoveryPulse = function DiscoveryPulse(_ref) {
     _ref$discoveryMode = _ref.discoveryMode,
     discoveryMode = _ref$discoveryMode === void 0 ? 'iteration' : _ref$discoveryMode,
     shouldShowPulse = _ref.shouldShowPulse,
-    testId = _ref.testId;
+    testId = _ref.testId,
+    isInline = _ref.isInline;
   var discovered = isLocalStorageKeyDiscovered(localStorageKey);
   var showPulse = shouldShowPulse !== null && shouldShowPulse !== void 0 ? shouldShowPulse : !discovered;
   var _useAnalyticsEvents = useAnalyticsEvents(),
@@ -35,6 +36,7 @@ export var DiscoveryPulse = function DiscoveryPulse(_ref) {
     onAnimationIteration: discoveryMode === 'iteration' ? onDiscovery : undefined,
     onAnimationStart: discoveryMode === 'start' ? onDiscovery : undefined,
     showPulse: showPulse,
-    testId: testId
+    testId: testId,
+    isInline: isInline
   }, children);
 };

package/dist/esm/ui/toolbar.js

@@ -15,7 +15,7 @@ import { findDomRefAtPos, removeSelectedNode } from '@atlaskit/editor-prosemirro
 import CommentIcon from '@atlaskit/icon/core/comment';
 import CopyIcon from '@atlaskit/icon/core/copy';
 import DeleteIcon from '@atlaskit/icon/core/delete';
-import LinkIcon from '@atlaskit/icon/core/link';
+import EditIcon from '@atlaskit/icon/core/edit';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import SettingsIcon from '@atlaskit/icon/core/settings';
@@ -330,7 +330,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         selected: false,
         metadata: metadata,
         title: intl.formatMessage(linkToolbarMessages.editLink),
-        icon: LinkIcon,
+        icon: EditIcon,
         testId: 'link-toolbar-edit-link-button',
         onClick: getEditLinkCallback(editorAnalyticsApi, true)
       }, {
@@ -657,8 +657,9 @@ export var getStartingToolbarItems = function getStartingToolbarItems(options, a
       type: 'button',
       onClick: onEditLink,
       title: intl.formatMessage(linkToolbarMessages.editLink),
-      showTitle: true,
-      metadata: metadata
+      showTitle: editorExperiment('platform_editor_controls', 'variant1') ? false : true,
+      metadata: metadata,
+      icon: editorExperiment('platform_editor_controls', 'variant1') ? EditIcon : undefined
     }, {
       type: 'separator'
     }];

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

@@ -45,6 +45,7 @@ export interface SmartCardProps extends CardProps {
     allowEmbeds?: boolean;
     allowBlockCards?: boolean;
     enableInlineUpgradeFeatures?: boolean;
+    isPageSSRed?: boolean;
 }
 export declare function Card(SmartCardComponent: React.ComponentType<React.PropsWithChildren<SmartCardProps & {
     id?: string;

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

@@ -4,10 +4,11 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Decoration, EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { SmartCardProps } from './genericCard';
 import { type InlineCardWithAwarenessProps } from './inlineCardWithAwareness';
-export declare const InlineCard: React.MemoExoticComponent<({ node, cardContext, actionOptions, useAlternativePreloader, view, getPos, onClick, onResolve: onRes, isHovered, showHoverPreview, hoverPreviewOptions, }: SmartCardProps) => React.JSX.Element | null>;
-export type InlineCardNodeViewProps = Pick<SmartCardProps, 'useAlternativePreloader' | 'actionOptions' | 'allowEmbeds' | 'allowBlockCards' | 'enableInlineUpgradeFeatures' | 'pluginInjectionApi' | 'onClickCallback' | '__livePage'>;
+export declare const InlineCard: React.MemoExoticComponent<({ node, cardContext, actionOptions, useAlternativePreloader, view, getPos, onClick, onResolve: onRes, isHovered, showHoverPreview, hoverPreviewOptions, isPageSSRed, }: SmartCardProps) => React.JSX.Element | null>;
+export type InlineCardNodeViewProps = Pick<SmartCardProps, 'useAlternativePreloader' | 'actionOptions' | 'allowEmbeds' | 'allowBlockCards' | 'enableInlineUpgradeFeatures' | 'pluginInjectionApi' | 'onClickCallback' | '__livePage' | 'isPageSSRed'>;
 export declare function InlineCardNodeView(props: InlineNodeViewComponentProps & InlineCardNodeViewProps & InlineCardWithAwarenessProps): React.JSX.Element;
 export interface InlineCardNodeViewProperties {
     inlineCardViewProducer: ReturnType<typeof getInlineNodeViewProducer>;
+    isPageSSRed?: boolean;
 }
 export declare const inlineCardNodeView: ({ inlineCardViewProducer }: InlineCardNodeViewProperties) => (node: PMNode, view: EditorView, getPos: () => number | undefined, decorations: readonly Decoration[]) => import("prosemirror-view").NodeView;

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

@@ -5,4 +5,4 @@ export type InlineCardWithAwarenessProps = {
     isOverlayEnabled?: boolean;
     isSelected?: boolean;
 };
-export declare const InlineCardWithAwareness: React.MemoExoticComponent<({ node, cardContext, actionOptions, useAlternativePreloader, view, getPos, pluginInjectionApi, onClick, isPulseEnabled, isOverlayEnabled, isSelected, }: SmartCardProps & InlineCardWithAwarenessProps) => React.JSX.Element>;
+export declare const InlineCardWithAwareness: React.MemoExoticComponent<({ node, cardContext, actionOptions, useAlternativePreloader, view, getPos, pluginInjectionApi, onClick, isPulseEnabled, isOverlayEnabled, isSelected, isPageSSRed, appearance, }: SmartCardProps & InlineCardWithAwarenessProps) => React.JSX.Element>;

package/dist/types/types/index.d.ts

@@ -107,6 +107,7 @@ export type CardPluginOptions = CardOptions & {
     lpLinkPicker?: boolean;
     disableFloatingToolbar?: boolean;
     onClickCallback?: OnClickCallback;
+    isPageSSRed?: boolean;
 };
 export type SetProvider = {
     type: 'SET_PROVIDER';

package/dist/types/ui/AwarenessWrapper/index.d.ts

@@ -12,5 +12,5 @@ type AwarenessWrapperProps = {
     isPulseEnabled?: boolean;
     isSelected?: boolean;
 } & Partial<SmartCardProps>;
-export declare const AwarenessWrapper: ({ cardContext, children, getPos, isInserted, isOverlayEnabled, isSelected, isResolvedViewRendered, isPulseEnabled, markMostRecentlyInsertedLink, pluginInjectionApi, setOverlayHoveredStyles, url, }: AwarenessWrapperProps) => jsx.JSX.Element;
+export declare const AwarenessWrapper: ({ cardContext, children, getPos, isInserted, isOverlayEnabled, isSelected, isResolvedViewRendered, isPulseEnabled, markMostRecentlyInsertedLink, pluginInjectionApi, setOverlayHoveredStyles, url, appearance, }: AwarenessWrapperProps) => jsx.JSX.Element;
 export {};

package/dist/types/ui/Pulse/index.d.ts

@@ -20,5 +20,6 @@ export interface PulseProps {
     discoveryMode?: PulseDiscoveryMode;
     shouldShowPulse?: boolean;
     testId?: string;
+    isInline?: boolean;
 }
-export declare const DiscoveryPulse: ({ children, localStorageKey, localStorageKeyExpirationInMs, discoveryMode, shouldShowPulse, testId, }: PulseProps) => React.JSX.Element;
+export declare const DiscoveryPulse: ({ children, localStorageKey, localStorageKeyExpirationInMs, discoveryMode, shouldShowPulse, testId, isInline, }: PulseProps) => React.JSX.Element;

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

@@ -45,6 +45,7 @@ export interface SmartCardProps extends CardProps {
     allowEmbeds?: boolean;
     allowBlockCards?: boolean;
     enableInlineUpgradeFeatures?: boolean;
+    isPageSSRed?: boolean;
 }
 export declare function Card(SmartCardComponent: React.ComponentType<React.PropsWithChildren<SmartCardProps & {
     id?: string;

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

@@ -4,10 +4,11 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Decoration, EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { SmartCardProps } from './genericCard';
 import { type InlineCardWithAwarenessProps } from './inlineCardWithAwareness';
-export declare const InlineCard: React.MemoExoticComponent<({ node, cardContext, actionOptions, useAlternativePreloader, view, getPos, onClick, onResolve: onRes, isHovered, showHoverPreview, hoverPreviewOptions, }: SmartCardProps) => React.JSX.Element | null>;
-export type InlineCardNodeViewProps = Pick<SmartCardProps, 'useAlternativePreloader' | 'actionOptions' | 'allowEmbeds' | 'allowBlockCards' | 'enableInlineUpgradeFeatures' | 'pluginInjectionApi' | 'onClickCallback' | '__livePage'>;
+export declare const InlineCard: React.MemoExoticComponent<({ node, cardContext, actionOptions, useAlternativePreloader, view, getPos, onClick, onResolve: onRes, isHovered, showHoverPreview, hoverPreviewOptions, isPageSSRed, }: SmartCardProps) => React.JSX.Element | null>;
+export type InlineCardNodeViewProps = Pick<SmartCardProps, 'useAlternativePreloader' | 'actionOptions' | 'allowEmbeds' | 'allowBlockCards' | 'enableInlineUpgradeFeatures' | 'pluginInjectionApi' | 'onClickCallback' | '__livePage' | 'isPageSSRed'>;
 export declare function InlineCardNodeView(props: InlineNodeViewComponentProps & InlineCardNodeViewProps & InlineCardWithAwarenessProps): React.JSX.Element;
 export interface InlineCardNodeViewProperties {
     inlineCardViewProducer: ReturnType<typeof getInlineNodeViewProducer>;
+    isPageSSRed?: boolean;
 }
 export declare const inlineCardNodeView: ({ inlineCardViewProducer }: InlineCardNodeViewProperties) => (node: PMNode, view: EditorView, getPos: () => number | undefined, decorations: readonly Decoration[]) => import("prosemirror-view").NodeView;

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

@@ -5,4 +5,4 @@ export type InlineCardWithAwarenessProps = {
     isOverlayEnabled?: boolean;
     isSelected?: boolean;
 };
-export declare const InlineCardWithAwareness: React.MemoExoticComponent<({ node, cardContext, actionOptions, useAlternativePreloader, view, getPos, pluginInjectionApi, onClick, isPulseEnabled, isOverlayEnabled, isSelected, }: SmartCardProps & InlineCardWithAwarenessProps) => React.JSX.Element>;
+export declare const InlineCardWithAwareness: React.MemoExoticComponent<({ node, cardContext, actionOptions, useAlternativePreloader, view, getPos, pluginInjectionApi, onClick, isPulseEnabled, isOverlayEnabled, isSelected, isPageSSRed, appearance, }: SmartCardProps & InlineCardWithAwarenessProps) => React.JSX.Element>;

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

@@ -107,6 +107,7 @@ export type CardPluginOptions = CardOptions & {
     lpLinkPicker?: boolean;
     disableFloatingToolbar?: boolean;
     onClickCallback?: OnClickCallback;
+    isPageSSRed?: boolean;
 };
 export type SetProvider = {
     type: 'SET_PROVIDER';

package/dist/types-ts4.5/ui/AwarenessWrapper/index.d.ts

@@ -12,5 +12,5 @@ type AwarenessWrapperProps = {
     isPulseEnabled?: boolean;
     isSelected?: boolean;
 } & Partial<SmartCardProps>;
-export declare const AwarenessWrapper: ({ cardContext, children, getPos, isInserted, isOverlayEnabled, isSelected, isResolvedViewRendered, isPulseEnabled, markMostRecentlyInsertedLink, pluginInjectionApi, setOverlayHoveredStyles, url, }: AwarenessWrapperProps) => jsx.JSX.Element;
+export declare const AwarenessWrapper: ({ cardContext, children, getPos, isInserted, isOverlayEnabled, isSelected, isResolvedViewRendered, isPulseEnabled, markMostRecentlyInsertedLink, pluginInjectionApi, setOverlayHoveredStyles, url, appearance, }: AwarenessWrapperProps) => jsx.JSX.Element;
 export {};

package/dist/types-ts4.5/ui/Pulse/index.d.ts

@@ -20,5 +20,6 @@ export interface PulseProps {
     discoveryMode?: PulseDiscoveryMode;
     shouldShowPulse?: boolean;
     testId?: string;
+    isInline?: boolean;
 }
-export declare const DiscoveryPulse: ({ children, localStorageKey, localStorageKeyExpirationInMs, discoveryMode, shouldShowPulse, testId, }: PulseProps) => React.JSX.Element;
+export declare const DiscoveryPulse: ({ children, localStorageKey, localStorageKeyExpirationInMs, discoveryMode, shouldShowPulse, testId, isInline, }: PulseProps) => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "5.4.0",
+	"version": "5.4.2",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^21.1.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^102.12.0",
+		"@atlaskit/editor-common": "^102.13.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-base": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -62,7 +62,7 @@
 		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/smart-card": "^36.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.1.0",
+		"@atlaskit/tmp-editor-statsig": "^4.4.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -145,6 +145,9 @@
 		},
 		"confluence-issue-terminology-refresh": {
 			"type": "boolean"
+		},
+		"platform_ssr_smartlinks_editor": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {