@atlaskit/editor-plugin-card 1.6.1 → 1.7.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-card
 
+## 1.7.0
+
+### Minor Changes
+
+- [#89386](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89386) [`91d0fdc31828`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/91d0fdc31828) - Updates card plugin to leverage hyperlink plugins addToolbarItems action in order to inject link preferences button into the hyperlink floating toolbar. Also adds support to configure the link via card plugin options (smart links). Requires platform feature flag `platform.editor.card.inject-settings-button`.
+
+  Example usage:
+
+  ```tsx
+  <Editor
+    linking={{ smartLinks: { userPreferencesLink: 'https://example.com' } }}
+    {...restProps}
+  />
+  ```
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.6.2
+
+### Patch Changes
+
+- [#89921](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89921) [`411822b4d808`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/411822b4d808) - The changes here updates the datasource toolbar to display smart-link icons for config and non-config based datasources.
+
 ## 1.6.1
 
 ### Patch Changes

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

@@ -8,6 +8,8 @@ exports.mountHyperlinkPlugin = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _toolbar = require("../toolbar");
 var _HyperlinkToolbarAppearance = require("../ui/HyperlinkToolbarAppearance");
 var _ToolbarViewedEvent = require("../ui/ToolbarViewedEvent");
 var getToolbarViewedItem = function getToolbarViewedItem(link) {
@@ -56,6 +58,25 @@ var mountHyperlinkPlugin = exports.mountHyperlinkPlugin = function mountHyperlin
           view: editorView,
           skipAnalytics: true
         });
+        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.card.inject-settings-button')) {
+          /**
+           * Require either provider to be supplied (controls link preferences)
+           * Or explicit user preferences config in order to enable button
+           */
+          if (options.provider || options.userPreferencesLink) {
+            var _pluginInjectionApi$h2;
+            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$h2 = pluginInjectionApi.hyperlink) === null || _pluginInjectionApi$h2 === void 0 || _pluginInjectionApi$h2.actions.addToolbarItems({
+              items: function items(_, intl) {
+                var _pluginInjectionApi$a2;
+                return [{
+                  type: 'separator'
+                }, (0, _toolbar.getHyperlinkToolbarSettingsButton)(intl, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions, options.userPreferencesLink)];
+              },
+              placement: 'end',
+              view: editorView
+            });
+          }
+        }
       });
       return {};
     }

package/dist/cjs/toolbar.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.visitCardLink = exports.shouldRenderToolbarPulse = exports.removeCard = exports.openLinkSettings = exports.floatingToolbar = void 0;
+exports.visitCardLink = exports.shouldRenderToolbarPulse = exports.removeCard = exports.openLinkSettings = exports.getSettingsButtonGroup = exports.getSettingsButton = exports.getHyperlinkToolbarSettingsButton = exports.floatingToolbar = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
@@ -83,12 +83,12 @@ var visitCardLink = exports.visitCardLink = function visitCardLink(editorAnalyti
     return true;
   };
 };
-var openLinkSettings = exports.openLinkSettings = function openLinkSettings(editorAnalyticsApi) {
+var openLinkSettings = exports.openLinkSettings = function openLinkSettings(editorAnalyticsApi, userPreferencesLink) {
   return function (state, dispatch) {
     if (!(state.selection instanceof _state.NodeSelection)) {
       return false;
     }
-    window.open((0, _link.getLinkPreferencesURLFromENV)());
+    window.open(userPreferencesLink || (0, _link.getLinkPreferencesURLFromENV)());
     if (dispatch) {
       var tr = state.tr,
         type = state.selection.node.type;
@@ -255,7 +255,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         }, {
           type: 'separator'
         }]
-      }], (0, _toConsumableArray2.default)(getSettingsButtonGroup(intl, editorAnalyticsApi)), [{
+      }], (0, _toConsumableArray2.default)(getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions.userPreferencesLink)), [{
         id: 'editor.link.delete',
         focusEditoronEnter: true,
         type: 'button',
@@ -355,14 +355,28 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     type: 'separator'
   }] : [];
 };
-var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyticsApi) {
-  return [{
+var getHyperlinkToolbarSettingsButton = exports.getHyperlinkToolbarSettingsButton = function getHyperlinkToolbarSettingsButton(intl, editorAnalyticsApi, userPreferencesLink) {
+  return {
     id: 'editor.link.settings',
     type: 'button',
     icon: _settings.default,
     title: intl.formatMessage(_messages.linkToolbarMessages.settingsLink),
-    onClick: openLinkSettings(editorAnalyticsApi)
-  }, {
+    onClick: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined),
+    href: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.card.inject-settings-button') ? userPreferencesLink || (0, _link.getLinkPreferencesURLFromENV)() : (0, _link.getLinkPreferencesURLFromENV)(),
+    target: '_blank'
+  };
+};
+var getSettingsButton = exports.getSettingsButton = function getSettingsButton(intl, editorAnalyticsApi, userPreferencesLink) {
+  return {
+    id: 'editor.link.settings',
+    type: 'button',
+    icon: _settings.default,
+    title: intl.formatMessage(_messages.linkToolbarMessages.settingsLink),
+    onClick: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined)
+  };
+};
+var getSettingsButtonGroup = exports.getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyticsApi, userPreferencesLink) {
+  return [getSettingsButton(intl, editorAnalyticsApi, userPreferencesLink), {
     type: 'separator'
   }];
 };
@@ -383,9 +397,17 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       type: 'separator'
     });
   }
+  var canShowMainToolbar = function canShowMainToolbar() {
+    if (
+    // FF that controls visibily of the additional toolbar buttons
+    !(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+      return false;
+    }
 
-  // Smart card view buttons only allowed for non-config datasources
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar') && !(0, _utils3.isDatasourceConfigEditable)(datasourceId) && cardOptions) {
+    // FF to enable additional toolbar buttons based on if the datasource is configurable or not
+    return (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources') ? true : !(0, _utils3.isDatasourceConfigEditable)(datasourceId);
+  };
+  if (canShowMainToolbar()) {
     var allowBlockCards = cardOptions.allowBlockCards,
       allowEmbeds = cardOptions.allowEmbeds,
       showUpgradeDiscoverability = cardOptions.showUpgradeDiscoverability;
@@ -450,7 +472,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     }, {
       type: 'separator'
     }]
-  }].concat((0, _toConsumableArray2.default)(getSettingsButtonGroup(intl, editorAnalyticsApi)), [{
+  }].concat((0, _toConsumableArray2.default)(getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink)), [{
     id: 'editor.link.delete',
     focusEditoronEnter: true,
     type: 'button',

package/dist/cjs/ui/EditDatasourceButton.js

@@ -10,6 +10,7 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _primitives = require("@atlaskit/primitives");
 var _actions = require("../pm-plugins/actions");
+var _utils2 = require("../utils");
 var _CardContextProvider = require("./CardContextProvider");
 var _useFetchDatasourceInfo = require("./useFetchDatasourceInfo");
 /** @jsx jsx */
@@ -33,7 +34,7 @@ var EditDatasourceButtonWithCardContext = function EditDatasourceButtonWithCardC
       cardContext: cardContext
     }),
     datasourceId = _useFetchDatasourceIn.datasourceId;
-  if (!datasourceId || !(0, _utils.canRenderDatasource)(datasourceId, false)) {
+  if (!datasourceId || !(0, _utils2.isDatasourceConfigEditable)(datasourceId)) {
     return null;
   }
   if (url) {

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

@@ -1,5 +1,7 @@
 import React from 'react';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { getHyperlinkToolbarSettingsButton } from '../toolbar';
 import { HyperlinkToolbarAppearance } from '../ui/HyperlinkToolbarAppearance';
 import { ToolbarViewedEvent } from '../ui/ToolbarViewedEvent';
 const getToolbarViewedItem = link => {
@@ -44,6 +46,25 @@ export const mountHyperlinkPlugin = (pluginInjectionApi, options) => {
           view: editorView,
           skipAnalytics: true
         });
+        if (getBooleanFF('platform.editor.card.inject-settings-button')) {
+          /**
+           * Require either provider to be supplied (controls link preferences)
+           * Or explicit user preferences config in order to enable button
+           */
+          if (options.provider || options.userPreferencesLink) {
+            var _pluginInjectionApi$h3;
+            pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$h3 = pluginInjectionApi.hyperlink) === null || _pluginInjectionApi$h3 === void 0 ? void 0 : _pluginInjectionApi$h3.actions.addToolbarItems({
+              items: (_, intl) => {
+                var _pluginInjectionApi$a2;
+                return [{
+                  type: 'separator'
+                }, getHyperlinkToolbarSettingsButton(intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions, options.userPreferencesLink)];
+              },
+              placement: 'end',
+              view: editorView
+            });
+          }
+        }
       });
       return {};
     }

package/dist/es2019/toolbar.js

@@ -72,11 +72,11 @@ export const visitCardLink = editorAnalyticsApi => (state, dispatch) => {
   }
   return true;
 };
-export const openLinkSettings = editorAnalyticsApi => (state, dispatch) => {
+export const openLinkSettings = (editorAnalyticsApi, userPreferencesLink) => (state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
   }
-  window.open(getLinkPreferencesURLFromENV());
+  window.open(userPreferencesLink || getLinkPreferencesURLFromENV());
   if (dispatch) {
     const {
       tr,
@@ -249,7 +249,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       }, {
         type: 'separator'
       }]
-    }, ...getSettingsButtonGroup(intl, editorAnalyticsApi), {
+    }, ...getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions.userPreferencesLink), {
       id: 'editor.link.delete',
       focusEditoronEnter: true,
       type: 'button',
@@ -346,14 +346,28 @@ const getUnlinkButtonGroup = (state, intl, node, inlineCard, editorAnalyticsApi)
     type: 'separator'
   }] : [];
 };
-const getSettingsButtonGroup = (intl, editorAnalyticsApi) => {
-  return [{
+export const getHyperlinkToolbarSettingsButton = (intl, editorAnalyticsApi, userPreferencesLink) => {
+  return {
     id: 'editor.link.settings',
     type: 'button',
     icon: CogIcon,
     title: intl.formatMessage(linkToolbarMessages.settingsLink),
-    onClick: openLinkSettings(editorAnalyticsApi)
-  }, {
+    onClick: getBooleanFF('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined),
+    href: getBooleanFF('platform.editor.card.inject-settings-button') ? userPreferencesLink || getLinkPreferencesURLFromENV() : getLinkPreferencesURLFromENV(),
+    target: '_blank'
+  };
+};
+export const getSettingsButton = (intl, editorAnalyticsApi, userPreferencesLink) => {
+  return {
+    id: 'editor.link.settings',
+    type: 'button',
+    icon: CogIcon,
+    title: intl.formatMessage(linkToolbarMessages.settingsLink),
+    onClick: getBooleanFF('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined)
+  };
+};
+export const getSettingsButtonGroup = (intl, editorAnalyticsApi, userPreferencesLink) => {
+  return [getSettingsButton(intl, editorAnalyticsApi, userPreferencesLink), {
     type: 'separator'
   }];
 };
@@ -374,9 +388,17 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       type: 'separator'
     });
   }
+  const canShowMainToolbar = () => {
+    if (
+    // FF that controls visibily of the additional toolbar buttons
+    !getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+      return false;
+    }
 
-  // Smart card view buttons only allowed for non-config datasources
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && !isDatasourceConfigEditable(datasourceId) && cardOptions) {
+    // FF to enable additional toolbar buttons based on if the datasource is configurable or not
+    return getBooleanFF('platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources') ? true : !isDatasourceConfigEditable(datasourceId);
+  };
+  if (canShowMainToolbar()) {
     const {
       allowBlockCards,
       allowEmbeds,
@@ -443,7 +465,7 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
     }, {
       type: 'separator'
     }]
-  }, ...getSettingsButtonGroup(intl, editorAnalyticsApi), {
+  }, ...getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink), {
     id: 'editor.link.delete',
     focusEditoronEnter: true,
     type: 'button',

package/dist/es2019/ui/EditDatasourceButton.js

@@ -2,9 +2,10 @@
 import { css, jsx } from '@emotion/react';
 import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator, SmallerEditIcon } from '@atlaskit/editor-common/ui';
-import { canRenderDatasource, getDatasourceType } from '@atlaskit/editor-common/utils';
+import { getDatasourceType } from '@atlaskit/editor-common/utils';
 import { Flex } from '@atlaskit/primitives';
 import { showDatasourceModal } from '../pm-plugins/actions';
+import { isDatasourceConfigEditable } from '../utils';
 import { CardContextProvider } from './CardContextProvider';
 import { useFetchDatasourceInfo } from './useFetchDatasourceInfo';
 const buttonStyles = css({
@@ -28,7 +29,7 @@ const EditDatasourceButtonWithCardContext = ({
     url,
     cardContext
   });
-  if (!datasourceId || !canRenderDatasource(datasourceId, false)) {
+  if (!datasourceId || !isDatasourceConfigEditable(datasourceId)) {
     return null;
   }
   if (url) {

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

@@ -1,6 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import React from 'react';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { getHyperlinkToolbarSettingsButton } from '../toolbar';
 import { HyperlinkToolbarAppearance } from '../ui/HyperlinkToolbarAppearance';
 import { ToolbarViewedEvent } from '../ui/ToolbarViewedEvent';
 var getToolbarViewedItem = function getToolbarViewedItem(link) {
@@ -49,6 +51,25 @@ export var mountHyperlinkPlugin = function mountHyperlinkPlugin(pluginInjectionA
           view: editorView,
           skipAnalytics: true
         });
+        if (getBooleanFF('platform.editor.card.inject-settings-button')) {
+          /**
+           * Require either provider to be supplied (controls link preferences)
+           * Or explicit user preferences config in order to enable button
+           */
+          if (options.provider || options.userPreferencesLink) {
+            var _pluginInjectionApi$h2;
+            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$h2 = pluginInjectionApi.hyperlink) === null || _pluginInjectionApi$h2 === void 0 || _pluginInjectionApi$h2.actions.addToolbarItems({
+              items: function items(_, intl) {
+                var _pluginInjectionApi$a2;
+                return [{
+                  type: 'separator'
+                }, getHyperlinkToolbarSettingsButton(intl, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions, options.userPreferencesLink)];
+              },
+              placement: 'end',
+              view: editorView
+            });
+          }
+        }
       });
       return {};
     }

package/dist/esm/toolbar.js

@@ -73,12 +73,12 @@ export var visitCardLink = function visitCardLink(editorAnalyticsApi) {
     return true;
   };
 };
-export var openLinkSettings = function openLinkSettings(editorAnalyticsApi) {
+export var openLinkSettings = function openLinkSettings(editorAnalyticsApi, userPreferencesLink) {
   return function (state, dispatch) {
     if (!(state.selection instanceof NodeSelection)) {
       return false;
     }
-    window.open(getLinkPreferencesURLFromENV());
+    window.open(userPreferencesLink || getLinkPreferencesURLFromENV());
     if (dispatch) {
       var tr = state.tr,
         type = state.selection.node.type;
@@ -245,7 +245,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         }, {
           type: 'separator'
         }]
-      }], _toConsumableArray(getSettingsButtonGroup(intl, editorAnalyticsApi)), [{
+      }], _toConsumableArray(getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions.userPreferencesLink)), [{
         id: 'editor.link.delete',
         focusEditoronEnter: true,
         type: 'button',
@@ -345,14 +345,28 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     type: 'separator'
   }] : [];
 };
-var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyticsApi) {
-  return [{
+export var getHyperlinkToolbarSettingsButton = function getHyperlinkToolbarSettingsButton(intl, editorAnalyticsApi, userPreferencesLink) {
+  return {
     id: 'editor.link.settings',
     type: 'button',
     icon: CogIcon,
     title: intl.formatMessage(linkToolbarMessages.settingsLink),
-    onClick: openLinkSettings(editorAnalyticsApi)
-  }, {
+    onClick: getBooleanFF('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined),
+    href: getBooleanFF('platform.editor.card.inject-settings-button') ? userPreferencesLink || getLinkPreferencesURLFromENV() : getLinkPreferencesURLFromENV(),
+    target: '_blank'
+  };
+};
+export var getSettingsButton = function getSettingsButton(intl, editorAnalyticsApi, userPreferencesLink) {
+  return {
+    id: 'editor.link.settings',
+    type: 'button',
+    icon: CogIcon,
+    title: intl.formatMessage(linkToolbarMessages.settingsLink),
+    onClick: getBooleanFF('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined)
+  };
+};
+export var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyticsApi, userPreferencesLink) {
+  return [getSettingsButton(intl, editorAnalyticsApi, userPreferencesLink), {
     type: 'separator'
   }];
 };
@@ -373,9 +387,17 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       type: 'separator'
     });
   }
+  var canShowMainToolbar = function canShowMainToolbar() {
+    if (
+    // FF that controls visibily of the additional toolbar buttons
+    !getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+      return false;
+    }
 
-  // Smart card view buttons only allowed for non-config datasources
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && !isDatasourceConfigEditable(datasourceId) && cardOptions) {
+    // FF to enable additional toolbar buttons based on if the datasource is configurable or not
+    return getBooleanFF('platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources') ? true : !isDatasourceConfigEditable(datasourceId);
+  };
+  if (canShowMainToolbar()) {
     var allowBlockCards = cardOptions.allowBlockCards,
       allowEmbeds = cardOptions.allowEmbeds,
       showUpgradeDiscoverability = cardOptions.showUpgradeDiscoverability;
@@ -440,7 +462,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     }, {
       type: 'separator'
     }]
-  }].concat(_toConsumableArray(getSettingsButtonGroup(intl, editorAnalyticsApi)), [{
+  }].concat(_toConsumableArray(getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink)), [{
     id: 'editor.link.delete',
     focusEditoronEnter: true,
     type: 'button',

package/dist/esm/ui/EditDatasourceButton.js

@@ -2,9 +2,10 @@
 import { css, jsx } from '@emotion/react';
 import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator, SmallerEditIcon } from '@atlaskit/editor-common/ui';
-import { canRenderDatasource, getDatasourceType } from '@atlaskit/editor-common/utils';
+import { getDatasourceType } from '@atlaskit/editor-common/utils';
 import { Flex } from '@atlaskit/primitives';
 import { showDatasourceModal } from '../pm-plugins/actions';
+import { isDatasourceConfigEditable } from '../utils';
 import { CardContextProvider } from './CardContextProvider';
 import { useFetchDatasourceInfo } from './useFetchDatasourceInfo';
 var buttonStyles = css({
@@ -26,7 +27,7 @@ var EditDatasourceButtonWithCardContext = function EditDatasourceButtonWithCardC
       cardContext: cardContext
     }),
     datasourceId = _useFetchDatasourceIn.datasourceId;
-  if (!datasourceId || !canRenderDatasource(datasourceId, false)) {
+  if (!datasourceId || !isDatasourceConfigEditable(datasourceId)) {
     return null;
   }
   if (url) {

package/dist/types/toolbar.d.ts

@@ -1,10 +1,14 @@
+import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';
-import type { Command, ExtractInjectionAPI, FloatingToolbarHandler, LinkPickerOptions } from '@atlaskit/editor-common/types';
+import type { Command, ExtractInjectionAPI, FloatingToolbarHandler, FloatingToolbarItem, LinkPickerOptions } from '@atlaskit/editor-common/types';
 import type { CardPlatform } from '@atlaskit/smart-card';
 import type { cardPlugin } from './index';
 export declare const removeCard: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
-export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
+export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink: string | undefined) => Command;
 export declare const floatingToolbar: (cardOptions: CardOptions, lpLinkPicker: boolean, platform?: CardPlatform, linkPickerOptions?: LinkPickerOptions, pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>, disableFloatingToolbar?: boolean) => FloatingToolbarHandler;
+export declare const getHyperlinkToolbarSettingsButton: (intl: IntlShape, editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink?: string) => FloatingToolbarItem<Command>;
+export declare const getSettingsButton: (intl: IntlShape, editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink: string | undefined) => FloatingToolbarItem<Command>;
+export declare const getSettingsButtonGroup: (intl: IntlShape, editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink: string | undefined) => FloatingToolbarItem<Command>[];
 export declare const shouldRenderToolbarPulse: (embedEnabled: boolean, appearance: string, status: string, isDiscoverabilityEnabled: boolean) => boolean;

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

@@ -1,10 +1,14 @@
+import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';
-import type { Command, ExtractInjectionAPI, FloatingToolbarHandler, LinkPickerOptions } from '@atlaskit/editor-common/types';
+import type { Command, ExtractInjectionAPI, FloatingToolbarHandler, FloatingToolbarItem, LinkPickerOptions } from '@atlaskit/editor-common/types';
 import type { CardPlatform } from '@atlaskit/smart-card';
 import type { cardPlugin } from './index';
 export declare const removeCard: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
-export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
+export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink: string | undefined) => Command;
 export declare const floatingToolbar: (cardOptions: CardOptions, lpLinkPicker: boolean, platform?: CardPlatform, linkPickerOptions?: LinkPickerOptions, pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>, disableFloatingToolbar?: boolean) => FloatingToolbarHandler;
+export declare const getHyperlinkToolbarSettingsButton: (intl: IntlShape, editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink?: string) => FloatingToolbarItem<Command>;
+export declare const getSettingsButton: (intl: IntlShape, editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink: string | undefined) => FloatingToolbarItem<Command>;
+export declare const getSettingsButtonGroup: (intl: IntlShape, editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink: string | undefined) => FloatingToolbarItem<Command>[];
 export declare const shouldRenderToolbarPulse: (embedEnabled: boolean, appearance: string, status: string, isDiscoverabilityEnabled: boolean) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -35,13 +35,13 @@
     "@atlaskit/adf-schema": "^35.8.0",
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/custom-steps": "^0.0.17",
-    "@atlaskit/editor-common": "^78.26.0",
+    "@atlaskit/editor-common": "^78.27.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-decorations": "^1.0.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-plugin-floating-toolbar": "^1.2.0",
     "@atlaskit/editor-plugin-grid": "^1.0.0",
-    "@atlaskit/editor-plugin-hyperlink": "^1.4.0",
+    "@atlaskit/editor-plugin-hyperlink": "^1.5.0",
     "@atlaskit/editor-plugin-width": "^1.0.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
@@ -54,7 +54,7 @@
     "@atlaskit/linking-types": "^8.8.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/primitives": "^5.5.0",
-    "@atlaskit/smart-card": "^26.54.0",
+    "@atlaskit/smart-card": "^26.55.0",
     "@atlaskit/theme": "^12.7.0",
     "@atlaskit/tokens": "^1.43.0",
     "@babel/runtime": "^7.0.0",
@@ -113,6 +113,9 @@
     "platform.linking-platform.enable-datasource-appearance-toolbar": {
       "type": "boolean"
     },
+    "platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources": {
+      "type": "boolean"
+    },
     "platform.editor.card.fix-embed-card-select-all": {
       "type": "boolean"
     },
@@ -121,6 +124,9 @@
     },
     "platform.linking-platform.datasource-assets_objects_remove_beta": {
       "type": "boolean"
+    },
+    "platform.editor.card.inject-settings-button": {
+      "type": "boolean"
     }
   },
   "stricter": {