@atlaskit/editor-plugin-card 8.0.0 → 8.1.0

package/dist/esm/ui/HyperlinkToolbarAppearance.js

@@ -3,12 +3,13 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useRef, useState } from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { Flex } from '@atlaskit/primitives/compiled';
 import { DatasourceAppearanceButton } from './DatasourceAppearanceButton';
 import { LinkToolbarAppearance } from './LinkToolbarAppearance';
 export function HyperlinkToolbarAppearance(props) {
-  var _props$cardOptions3;
+  var _props$cardOptions3, _props$editorPluginAp2;
   var _useState = useState(new Map()),
     _useState2 = _slicedToArray(_useState, 2),
     supportedUrlsMap = _useState2[0],
@@ -127,6 +128,7 @@ export function HyperlinkToolbarAppearance(props) {
   if (!supportedUrlsMap.get(url)) {
     return null;
   }
+  var areAnyNewToolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean((_props$editorPluginAp2 = props.editorPluginApi) === null || _props$editorPluginAp2 === void 0 ? void 0 : _props$editorPluginAp2.toolbar));
   return /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(LinkToolbarAppearance, {
     key: "link-appearance",
     url: url,
@@ -135,13 +137,17 @@ export function HyperlinkToolbarAppearance(props) {
     editorState: editorState,
     allowEmbeds: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowEmbeds,
     allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
-    editorAnalyticsApi: editorAnalyticsApi
+    editorAnalyticsApi: editorAnalyticsApi,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
     intl: intl,
     url: url,
     editorState: editorState,
     editorView: editorView,
     editorAnalyticsApi: editorAnalyticsApi,
-    inputMethod: INPUT_METHOD.FLOATING_TB
-  }), /*#__PURE__*/React.createElement(Separator, null));
+    inputMethod: INPUT_METHOD.FLOATING_TB,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
+  }), /*#__PURE__*/React.createElement(Separator, {
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
+  }));
 }

package/dist/esm/ui/HyperlinkToolbarAppearanceDropdown.js

@@ -11,7 +11,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives/compiled';
 import { LinkAppearanceMenu } from './LinkToolbarAppearanceDropdown';
 var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
-  var _props$cardOptions3;
+  var _props$editorPluginAp, _props$cardOptions3, _props$editorPluginAp3, _props$editorPluginAp4;
   var _useState = useState(new Map()),
     _useState2 = _slicedToArray(_useState, 2),
     supportedUrlsMap = _useState2[0],
@@ -22,6 +22,7 @@ var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
     setIsOpen = _useState4[1];
   var cardProvider = useRef(undefined);
   var containerRef = useRef(undefined);
+  var areAnyNewToolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean((_props$editorPluginAp = props.editorPluginApi) === null || _props$editorPluginAp === void 0 ? void 0 : _props$editorPluginAp.toolbar));
   var url = props.url,
     intl = props.intl,
     editorView = props.editorView,
@@ -52,8 +53,8 @@ var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
             return _context.abrupt("return", cardProvider.current);
           case 4:
             return _context.abrupt("return", new Promise(function (resolve) {
-              var _props$editorPluginAp;
-              var cardProvider = (_props$editorPluginAp = props.editorPluginApi) === null || _props$editorPluginAp === void 0 || (_props$editorPluginAp = _props$editorPluginAp.card) === null || _props$editorPluginAp === void 0 || (_props$editorPluginAp = _props$editorPluginAp.sharedState) === null || _props$editorPluginAp === void 0 || (_props$editorPluginAp = _props$editorPluginAp.currentState()) === null || _props$editorPluginAp === void 0 ? void 0 : _props$editorPluginAp.provider;
+              var _props$editorPluginAp2;
+              var cardProvider = (_props$editorPluginAp2 = props.editorPluginApi) === null || _props$editorPluginAp2 === void 0 || (_props$editorPluginAp2 = _props$editorPluginAp2.card) === null || _props$editorPluginAp2 === void 0 || (_props$editorPluginAp2 = _props$editorPluginAp2.sharedState) === null || _props$editorPluginAp2 === void 0 || (_props$editorPluginAp2 = _props$editorPluginAp2.currentState()) === null || _props$editorPluginAp2 === void 0 ? void 0 : _props$editorPluginAp2.provider;
               if (cardProvider) {
                 resolve(cardProvider);
               }
@@ -170,7 +171,8 @@ var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
       label: "",
       spacing: "compact",
       size: "small"
-    })
+    }),
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   }, title);
   return /*#__PURE__*/React.createElement(Flex, {
     ref: containerRef,
@@ -198,8 +200,11 @@ var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
     isDatasourceView: isDatasourceView,
     allowDatasource: allowDatasource,
     dispatchCommand: dispatchCommand,
-    settingsConfig: settingsConfig
-  })), !(areToolbarFlagsEnabled() && fg('platform_editor_controls_patch_15')) && /*#__PURE__*/React.createElement(Separator, null));
+    settingsConfig: settingsConfig,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
+  })), !(areToolbarFlagsEnabled(Boolean((_props$editorPluginAp3 = props.editorPluginApi) === null || _props$editorPluginAp3 === void 0 ? void 0 : _props$editorPluginAp3.toolbar)) && fg('platform_editor_controls_patch_15')) && /*#__PURE__*/React.createElement(Separator, {
+    areAnyNewToolbarFlagsEnabled: areToolbarFlagsEnabled(Boolean((_props$editorPluginAp4 = props.editorPluginApi) === null || _props$editorPluginAp4 === void 0 ? void 0 : _props$editorPluginAp4.toolbar))
+  }));
 };
 export var getCustomHyperlinkAppearanceDropdown = function getCustomHyperlinkAppearanceDropdown(_ref3) {
   var url = _ref3.url,

package/dist/esm/ui/LinkToolbarAppearance.js

@@ -43,7 +43,8 @@ export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         editorAnalyticsApi = _this$props.editorAnalyticsApi,
         _this$props$showUpgra = _this$props.showUpgradeDiscoverability,
         showUpgradeDiscoverability = _this$props$showUpgra === void 0 ? true : _this$props$showUpgra,
-        isDatasourceView = _this$props.isDatasourceView;
+        isDatasourceView = _this$props.isDatasourceView,
+        areAnyNewToolbarFlagsEnabled = _this$props.areAnyNewToolbarFlagsEnabled;
       var preview = allowEmbeds && cardContext && url && cardContext.extractors.getPreview(url, 'web');
       var defaultCommand = function defaultCommand() {
         return false;
@@ -106,7 +107,7 @@ export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
       var LinkToolbarButtons = /*#__PURE__*/React.createElement(LinkToolbarButtonGroup, {
         key: "link-toolbar-button-group",
         options: options.map(function (option) {
-          return getButtonGroupOption(intl, dispatchCommand, _objectSpread(_objectSpread({}, option), {}, {
+          return getButtonGroupOption(intl, areAnyNewToolbarFlagsEnabled, dispatchCommand, _objectSpread(_objectSpread({}, option), {}, {
             onClick: commandWithMetadata(option.onClick, {
               inputMethod: INPUT_METHOD.FLOATING_TB
             })

package/dist/esm/ui/LinkToolbarAppearanceDropdown.js

@@ -136,7 +136,8 @@ export var getLinkAppearanceDropdown = function getLinkAppearanceDropdown(_ref2)
     _ref2$showUpgradeDisc = _ref2.showUpgradeDiscoverability,
     showUpgradeDiscoverability = _ref2$showUpgradeDisc === void 0 ? true : _ref2$showUpgradeDisc,
     isDatasourceView = _ref2.isDatasourceView,
-    settingsConfig = _ref2.settingsConfig;
+    settingsConfig = _ref2.settingsConfig,
+    areAnyNewToolbarFlagsEnabled = _ref2.areAnyNewToolbarFlagsEnabled;
   var alignmentItemOptions = {
     render: function render(props) {
       return /*#__PURE__*/React.createElement(LinkAppearanceMenu, {
@@ -151,7 +152,8 @@ export var getLinkAppearanceDropdown = function getLinkAppearanceDropdown(_ref2)
         isDatasourceView: isDatasourceView,
         allowDatasource: allowDatasource,
         dispatchCommand: props.dispatchCommand,
-        settingsConfig: settingsConfig
+        settingsConfig: settingsConfig,
+        areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
       });
     },
     width: 200,

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import { linkMessages } from '@atlaskit/editor-common/messages';
-import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import PanelRightIcon from '@atlaskit/icon/core/panel-right';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
@@ -8,7 +7,8 @@ import { Inline, Box, Flex } from '@atlaskit/primitives/compiled';
 import { getObjectAri, getObjectIconUrl, getObjectName } from '@atlaskit/smart-card';
 export var OpenPreviewPanelToolbarButton = function OpenPreviewPanelToolbarButton(_ref) {
   var node = _ref.node,
-    intl = _ref.intl;
+    intl = _ref.intl,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   var _useSmartLinkContext = useSmartLinkContext(),
     store = _useSmartLinkContext.store,
     isPreviewPanelAvailable = _useSmartLinkContext.isPreviewPanelAvailable,
@@ -33,13 +33,13 @@ export var OpenPreviewPanelToolbarButton = function OpenPreviewPanelToolbarButto
       }
     };
     var title = intl.formatMessage(linkMessages.openPreviewPanel);
-    var icon = areToolbarFlagsEnabled() ? /*#__PURE__*/React.createElement(PanelRightIcon, {
+    var icon = areAnyNewToolbarFlagsEnabled ? /*#__PURE__*/React.createElement(PanelRightIcon, {
       label: "",
       spacing: "spacious"
     }) :
     /*#__PURE__*/
     // This is a hack required for Jira until areToolbarFlagsEnabled are enabled to ensure the icon has padding
-    // Padding is removed when areToolbarFlagsEnabed for a button with icon only in platform/packages/editor/editor-common/src/ui/FloatingToolbar/Button.tsx
+    // Padding is removed when areToolbarFlagsEnabled for a button with icon only in platform/packages/editor/editor-common/src/ui/FloatingToolbar/Button.tsx
     React.createElement(Inline, {
       as: "span",
       space: "space.050",
@@ -63,7 +63,8 @@ export var OpenPreviewPanelToolbarButton = function OpenPreviewPanelToolbarButto
         testId: "open-preview-panel-floating-toolbar-button",
         onClick: handleOpenGlancePanelClick,
         icon: icon,
-        title: title
+        title: title,
+        areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
       }));
     }
   }

package/dist/esm/ui/toolbar.js

@@ -167,8 +167,8 @@ var unlinkCard = function unlinkCard(node, state, editorAnalyticsApi) {
     return false;
   };
 };
-var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPluginDependencyApi, analyticsApi, cardOptions) {
-  if (areToolbarFlagsEnabled()) {
+var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPluginDependencyApi, analyticsApi, cardOptions, areAnyNewToolbarFlagsEnabled) {
+  if (areAnyNewToolbarFlagsEnabled) {
     return buildLayoutDropdown(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
   }
   return buildLayoutButtons(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
@@ -213,7 +213,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         title: title
       };
     }
-    var isNewEditorToolbarDisabled = !areToolbarFlagsEnabled();
+    var areAllNewToolbarFlagsDisabled = !areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar));
     var currentAppearance = appearanceForNodeType(node.type);
     var _ref2 = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
       hoverDecoration = _ref2.hoverDecoration;
@@ -269,7 +269,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
             editorAnalyticsApi: editorAnalyticsApi,
             editorView: editorView,
             onLinkEditClick: getEditLinkCallback(editorAnalyticsApi, true),
-            currentAppearance: currentAppearance
+            currentAppearance: currentAppearance,
+            areAnyNewToolbarFlagsEnabled: !areAllNewToolbarFlagsDisabled
           });
         }
       }] : [{
@@ -309,7 +310,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
             editorAnalyticsApi: editorAnalyticsApi,
             editorView: editorView,
             onLinkEditClick: getEditLinkCallback(editorAnalyticsApi, true),
-            currentAppearance: currentAppearance
+            currentAppearance: currentAppearance,
+            areAnyNewToolbarFlagsEnabled: !areAllNewToolbarFlagsDisabled
           });
         }
       }] : [{
@@ -331,11 +333,12 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
           return /*#__PURE__*/React.createElement(OpenPreviewPanelToolbarButton, {
             node: node,
             intl: intl,
-            editorAnalyticsApi: editorAnalyticsApi
+            editorAnalyticsApi: editorAnalyticsApi,
+            areAnyNewToolbarFlagsEnabled: !areAllNewToolbarFlagsDisabled
           });
         }
       }] : [];
-      var toolbarItems = isNewEditorToolbarDisabled ? [].concat(editItems, commentItems, openPreviewPanelItems, [{
+      var toolbarItems = areAllNewToolbarFlagsDisabled ? [].concat(editItems, commentItems, openPreviewPanelItems, [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: LinkExternalIcon,
@@ -348,7 +351,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         target: '_blank'
       }, {
         type: 'separator'
-      }], _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
+      }], _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled)), [{
         type: 'copy-button',
         items: [{
           state: state,
@@ -372,10 +375,10 @@ 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(openPreviewPanelItems, editButtonItems, _toConsumableArray(fg('platform_editor_controls_patch_15') ? [].concat(_toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
+      }]) : [].concat(openPreviewPanelItems, editButtonItems, _toConsumableArray(fg('platform_editor_controls_patch_15') ? [].concat(_toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled)), [{
         type: 'separator',
         fullHeight: true
-      }]) : getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
+      }]) : getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled)), [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: LinkExternalIcon,
@@ -392,8 +395,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       }, commentItems[0]] : commentItems));
       if (currentAppearance === 'embed') {
         var _pluginInjectionApi$a4;
-        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions, cardOptions);
-        if (alignmentOptions.length && isNewEditorToolbarDisabled) {
+        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions, cardOptions, !areAllNewToolbarFlagsDisabled);
+        if (alignmentOptions.length && areAllNewToolbarFlagsDisabled) {
           alignmentOptions.push({
             type: 'separator'
           });
@@ -408,7 +411,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       // For url appearance, please see HyperlinkToolbarAppearanceProps
       if (currentAppearance) {
         var showDatasourceAppearance = allowDatasource && url;
-        toolbarItems.unshift.apply(toolbarItems, _toConsumableArray(getToolbarViewedItem(url, currentAppearance)).concat([isNewEditorToolbarDisabled ? {
+        toolbarItems.unshift.apply(toolbarItems, _toConsumableArray(getToolbarViewedItem(url, currentAppearance)).concat([areAllNewToolbarFlagsDisabled ? {
           type: 'custom',
           fallback: [],
           render: function render(editorView) {
@@ -422,7 +425,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
               allowEmbeds: allowEmbeds,
               allowBlockCards: allowBlockCards,
               editorAnalyticsApi: editorAnalyticsApi,
-              showUpgradeDiscoverability: showUpgradeDiscoverability
+              showUpgradeDiscoverability: showUpgradeDiscoverability,
+              areAnyNewToolbarFlagsEnabled: false
             });
           }
         } : getLinkAppearanceDropdown({
@@ -436,8 +440,9 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
           allowDatasource: cardOptions.allowDatasource,
           showUpgradeDiscoverability: showUpgradeDiscoverability,
           settingsConfig: getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink),
-          isDatasourceView: isDatasource
-        })], _toConsumableArray(showDatasourceAppearance && isNewEditorToolbarDisabled ? [{
+          isDatasourceView: isDatasource,
+          areAnyNewToolbarFlagsEnabled: !areAllNewToolbarFlagsDisabled
+        })], _toConsumableArray(showDatasourceAppearance && areAllNewToolbarFlagsDisabled ? [{
           type: 'custom',
           fallback: [],
           render: function render(editorView) {
@@ -447,14 +452,15 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
               url: url,
               editorView: editorView,
               editorState: state,
-              inputMethod: INPUT_METHOD.FLOATING_TB
+              inputMethod: INPUT_METHOD.FLOATING_TB,
+              areAnyNewToolbarFlagsEnabled: !areAllNewToolbarFlagsDisabled
             });
           }
-        }] : []), _toConsumableArray(!isNewEditorToolbarDisabled ? [] : [{
+        }] : []), _toConsumableArray(!areAllNewToolbarFlagsDisabled ? [] : [{
           type: 'separator'
         }])));
       }
-      if (!isNewEditorToolbarDisabled) {
+      if (!areAllNewToolbarFlagsDisabled) {
         var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
           return {
             onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
@@ -497,7 +503,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     }
   };
 };
-var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi) {
+var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, areAnyNewToolbarFlagsEnabled) {
   return node.type === inlineCard ? [{
     id: 'editor.link.unlink',
     focusEditoronEnter: true,
@@ -506,7 +512,7 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     icon: LinkBrokenIcon,
     iconFallback: UnlinkIcon,
     onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi))
-  }].concat(_toConsumableArray(areToolbarFlagsEnabled() ? [] : [{
+  }].concat(_toConsumableArray(areAnyNewToolbarFlagsEnabled ? [] : [{
     type: 'separator'
   }])) : [];
 };
@@ -525,7 +531,7 @@ export var getSettingsButton = function getSettingsButton(intl, editorAnalyticsA
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance, pluginInjectionApi) {
   var _node$attrs2;
   var toolbarItems = [];
-  var isNewEditorToolbarDisabled = !areToolbarFlagsEnabled();
+  var areAllNewToolbarFlagsDisabled = !areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar));
   var canShowAppearanceSwitch = function canShowAppearanceSwitch() {
     // we do not show smart-link or the datasource icons when the node does not have a url to resolve
     if (!metadata.url) {
@@ -538,7 +544,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       allowEmbeds = cardOptions.allowEmbeds,
       showUpgradeDiscoverability = cardOptions.showUpgradeDiscoverability;
     var url = metadata.url;
-    if (isNewEditorToolbarDisabled) {
+    if (areAllNewToolbarFlagsDisabled) {
       toolbarItems.push({
         type: 'custom',
         fallback: [],
@@ -554,7 +560,8 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
             allowBlockCards: allowBlockCards,
             editorAnalyticsApi: editorAnalyticsApi,
             showUpgradeDiscoverability: showUpgradeDiscoverability,
-            isDatasourceView: true
+            isDatasourceView: true,
+            areAnyNewToolbarFlagsEnabled: false
           });
         }
       }, {
@@ -568,7 +575,8 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
             editorView: editorView,
             editorState: state,
             selected: true,
-            inputMethod: INPUT_METHOD.FLOATING_TB
+            inputMethod: INPUT_METHOD.FLOATING_TB,
+            areAnyNewToolbarFlagsEnabled: !areAllNewToolbarFlagsDisabled
           });
         }
       }, {
@@ -586,7 +594,8 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
         allowDatasource: cardOptions.allowDatasource,
         showUpgradeDiscoverability: showUpgradeDiscoverability,
         settingsConfig: getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink),
-        isDatasourceView: true
+        isDatasourceView: true,
+        areAnyNewToolbarFlagsEnabled: !areAllNewToolbarFlagsDisabled
       }), {
         type: 'separator'
       });
@@ -606,7 +615,8 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
         editorAnalyticsApi: editorAnalyticsApi,
         editorView: editorView,
         onLinkEditClick: getEditLinkCallback(editorAnalyticsApi, false),
-        currentAppearance: "datasource"
+        currentAppearance: "datasource",
+        areAnyNewToolbarFlagsEnabled: !areAllNewToolbarFlagsDisabled
       });
     }
   });
@@ -623,13 +633,13 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       href: node.attrs.url,
       target: '_blank'
     });
-    if (isNewEditorToolbarDisabled) {
+    if (areAllNewToolbarFlagsDisabled) {
       toolbarItems.push({
         type: 'separator'
       });
     }
   }
-  if (isNewEditorToolbarDisabled) {
+  if (areAllNewToolbarFlagsDisabled) {
     toolbarItems.push({
       type: 'copy-button',
       supportsViewMode: true,
@@ -717,6 +727,7 @@ export var shouldRenderToolbarPulse = function shouldRenderToolbarPulse(embedEna
 };
 export var getStartingToolbarItems = function getStartingToolbarItems(options, api) {
   return function (intl, link, onEditLink, metadata, state) {
+    var areAllNewToolbarFlagsDisabled = !areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
     var editLinkItem = options.allowDatasource ? [{
       type: 'custom',
       fallback: [],
@@ -732,7 +743,8 @@ export var getStartingToolbarItems = function getStartingToolbarItems(options, a
           url: link,
           editorView: editorView,
           onLinkEditClick: onEditLink,
-          currentAppearance: "url"
+          currentAppearance: "url",
+          areAnyNewToolbarFlagsEnabled: !areAllNewToolbarFlagsDisabled
         });
       }
     }] : [{
@@ -747,7 +759,7 @@ export var getStartingToolbarItems = function getStartingToolbarItems(options, a
     }, {
       type: 'separator'
     }];
-    if (areToolbarFlagsEnabled()) {
+    if (!areAllNewToolbarFlagsDisabled) {
       var _api$analytics2, _api$analytics3;
       var hyperlinkAppearance = [getCustomHyperlinkAppearanceDropdown({
         url: link,
@@ -811,7 +823,7 @@ export var getEndingToolbarItems = function getEndingToolbarItems(options, api)
      * Require either provider to be supplied (controls link preferences)
      * Or explicit user preferences config in order to enable button
      */
-    if ((options.provider || options.userPreferencesLink) && !areToolbarFlagsEnabled()) {
+    if ((options.provider || options.userPreferencesLink) && !areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
       var _api$analytics5;
       return [{
         type: 'separator'

package/dist/types/cardPluginType.d.ts

@@ -12,6 +12,7 @@ import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 import type { GridPlugin } from '@atlaskit/editor-plugin-grid';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { CardPluginOptions, CardPluginState } from './types';
 type DummyAnnotationPlugin = NextEditorPlugin<'annotation', {
@@ -32,7 +33,8 @@ export type CardPluginDependencies = [
     OptionalPlugin<SelectionPlugin>,
     OptionalPlugin<DummyAnnotationPlugin>,
     OptionalPlugin<ConnectivityPlugin>,
-    OptionalPlugin<BasePlugin>
+    OptionalPlugin<BasePlugin>,
+    OptionalPlugin<ToolbarPlugin>
 ];
 export type CardPlugin = NextEditorPlugin<'card', {
     actions: CardPluginActions;

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

@@ -5,6 +5,7 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { type CardContext } from '@atlaskit/link-provider';
 export interface DatasourceAppearanceButtonProps {
+    areAnyNewToolbarFlagsEnabled: boolean;
     cardContext?: CardContext;
     editorAnalyticsApi?: EditorAnalyticsAPI;
     editorState: EditorState;
@@ -14,4 +15,4 @@ export interface DatasourceAppearanceButtonProps {
     selected?: boolean;
     url: string;
 }
-export declare const DatasourceAppearanceButton: ({ intl, editorAnalyticsApi, url, editorView, editorState, selected, inputMethod, }: DatasourceAppearanceButtonProps) => jsx.JSX.Element;
+export declare const DatasourceAppearanceButton: ({ intl, editorAnalyticsApi, url, editorView, editorState, selected, inputMethod, areAnyNewToolbarFlagsEnabled, }: DatasourceAppearanceButtonProps) => jsx.JSX.Element;

package/dist/types/ui/EditToolbarButton/EditToolbarButtonPresentation.d.ts

@@ -5,5 +5,5 @@ interface EditToolbarPresentationProps extends EditDatasourceToolbarButtonWithCo
     editVariant: EditVariant;
     extensionKey?: string;
 }
-declare const EditToolbarButtonPresentation: ({ datasourceId, currentAppearance, editorAnalyticsApi, editVariant, editorView, extensionKey, onLinkEditClick, intl, }: EditToolbarPresentationProps) => jsx.JSX.Element | null;
+declare const EditToolbarButtonPresentation: ({ datasourceId, currentAppearance, editorAnalyticsApi, editVariant, editorView, extensionKey, onLinkEditClick, intl, areAnyNewToolbarFlagsEnabled, }: EditToolbarPresentationProps) => jsx.JSX.Element | null;
 export default EditToolbarButtonPresentation;

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

@@ -7,6 +7,7 @@ import type { CardContext } from '@atlaskit/link-provider';
 import { type CardType } from '../../types';
 export type EditVariant = 'none' | 'edit-link' | 'edit-datasource' | 'edit-dropdown';
 export interface EditDatasourceToolbarButtonWithCommonProps {
+    areAnyNewToolbarFlagsEnabled: boolean;
     currentAppearance?: CardType;
     editorAnalyticsApi?: EditorAnalyticsAPI;
     editorView?: EditorView;

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

@@ -8,6 +8,7 @@ import type { CardContext } from '@atlaskit/link-provider';
 export interface LinkToolbarAppearanceProps {
     allowBlockCards?: boolean;
     allowEmbeds?: boolean;
+    areAnyNewToolbarFlagsEnabled: boolean;
     currentAppearance?: CardAppearance;
     editorAnalyticsApi: EditorAnalyticsAPI | undefined;
     editorState: EditorState;

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

@@ -7,7 +7,7 @@ type Props = LinkToolbarAppearanceProps & {
     settingsConfig: FloatingToolbarItem<Command>;
 };
 export declare const LinkAppearanceMenu: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, allowDatasource, editorAnalyticsApi, isDatasourceView, dispatchCommand, settingsConfig, }: Props) => React.JSX.Element | null;
-export declare const getLinkAppearanceDropdown: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, allowDatasource, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, settingsConfig, }: LinkToolbarAppearanceProps & {
+export declare const getLinkAppearanceDropdown: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, allowDatasource, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, settingsConfig, areAnyNewToolbarFlagsEnabled, }: LinkToolbarAppearanceProps & {
     allowDatasource?: boolean;
     settingsConfig: FloatingToolbarItem<Command>;
 }) => FloatingToolbarDropdown<Command>;

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

@@ -3,9 +3,10 @@ import { type IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 type OpenPreviewPanelToolbarButtonProps = {
+    areAnyNewToolbarFlagsEnabled: boolean;
     editorAnalyticsApi?: EditorAnalyticsAPI;
     intl: IntlShape;
     node: PMNode;
 };
-export declare const OpenPreviewPanelToolbarButton: ({ node, intl, }: OpenPreviewPanelToolbarButtonProps) => React.JSX.Element | null;
+export declare const OpenPreviewPanelToolbarButton: ({ node, intl, areAnyNewToolbarFlagsEnabled, }: OpenPreviewPanelToolbarButtonProps) => React.JSX.Element | null;
 export {};

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

@@ -12,6 +12,7 @@ import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 import type { GridPlugin } from '@atlaskit/editor-plugin-grid';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { CardPluginOptions, CardPluginState } from './types';
 type DummyAnnotationPlugin = NextEditorPlugin<'annotation', {
@@ -32,7 +33,8 @@ export type CardPluginDependencies = [
     OptionalPlugin<SelectionPlugin>,
     OptionalPlugin<DummyAnnotationPlugin>,
     OptionalPlugin<ConnectivityPlugin>,
-    OptionalPlugin<BasePlugin>
+    OptionalPlugin<BasePlugin>,
+    OptionalPlugin<ToolbarPlugin>
 ];
 export type CardPlugin = NextEditorPlugin<'card', {
     actions: CardPluginActions;

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

@@ -5,6 +5,7 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { type CardContext } from '@atlaskit/link-provider';
 export interface DatasourceAppearanceButtonProps {
+    areAnyNewToolbarFlagsEnabled: boolean;
     cardContext?: CardContext;
     editorAnalyticsApi?: EditorAnalyticsAPI;
     editorState: EditorState;
@@ -14,4 +15,4 @@ export interface DatasourceAppearanceButtonProps {
     selected?: boolean;
     url: string;
 }
-export declare const DatasourceAppearanceButton: ({ intl, editorAnalyticsApi, url, editorView, editorState, selected, inputMethod, }: DatasourceAppearanceButtonProps) => jsx.JSX.Element;
+export declare const DatasourceAppearanceButton: ({ intl, editorAnalyticsApi, url, editorView, editorState, selected, inputMethod, areAnyNewToolbarFlagsEnabled, }: DatasourceAppearanceButtonProps) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/EditToolbarButton/EditToolbarButtonPresentation.d.ts

@@ -5,5 +5,5 @@ interface EditToolbarPresentationProps extends EditDatasourceToolbarButtonWithCo
     editVariant: EditVariant;
     extensionKey?: string;
 }
-declare const EditToolbarButtonPresentation: ({ datasourceId, currentAppearance, editorAnalyticsApi, editVariant, editorView, extensionKey, onLinkEditClick, intl, }: EditToolbarPresentationProps) => jsx.JSX.Element | null;
+declare const EditToolbarButtonPresentation: ({ datasourceId, currentAppearance, editorAnalyticsApi, editVariant, editorView, extensionKey, onLinkEditClick, intl, areAnyNewToolbarFlagsEnabled, }: EditToolbarPresentationProps) => jsx.JSX.Element | null;
 export default EditToolbarButtonPresentation;

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

@@ -7,6 +7,7 @@ import type { CardContext } from '@atlaskit/link-provider';
 import { type CardType } from '../../types';
 export type EditVariant = 'none' | 'edit-link' | 'edit-datasource' | 'edit-dropdown';
 export interface EditDatasourceToolbarButtonWithCommonProps {
+    areAnyNewToolbarFlagsEnabled: boolean;
     currentAppearance?: CardType;
     editorAnalyticsApi?: EditorAnalyticsAPI;
     editorView?: EditorView;

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

@@ -8,6 +8,7 @@ import type { CardContext } from '@atlaskit/link-provider';
 export interface LinkToolbarAppearanceProps {
     allowBlockCards?: boolean;
     allowEmbeds?: boolean;
+    areAnyNewToolbarFlagsEnabled: boolean;
     currentAppearance?: CardAppearance;
     editorAnalyticsApi: EditorAnalyticsAPI | undefined;
     editorState: EditorState;

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

@@ -7,7 +7,7 @@ type Props = LinkToolbarAppearanceProps & {
     settingsConfig: FloatingToolbarItem<Command>;
 };
 export declare const LinkAppearanceMenu: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, allowDatasource, editorAnalyticsApi, isDatasourceView, dispatchCommand, settingsConfig, }: Props) => React.JSX.Element | null;
-export declare const getLinkAppearanceDropdown: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, allowDatasource, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, settingsConfig, }: LinkToolbarAppearanceProps & {
+export declare const getLinkAppearanceDropdown: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, allowDatasource, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, settingsConfig, areAnyNewToolbarFlagsEnabled, }: LinkToolbarAppearanceProps & {
     allowDatasource?: boolean;
     settingsConfig: FloatingToolbarItem<Command>;
 }) => FloatingToolbarDropdown<Command>;

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

@@ -3,9 +3,10 @@ import { type IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 type OpenPreviewPanelToolbarButtonProps = {
+    areAnyNewToolbarFlagsEnabled: boolean;
     editorAnalyticsApi?: EditorAnalyticsAPI;
     intl: IntlShape;
     node: PMNode;
 };
-export declare const OpenPreviewPanelToolbarButton: ({ node, intl, }: OpenPreviewPanelToolbarButtonProps) => React.JSX.Element | null;
+export declare const OpenPreviewPanelToolbarButton: ({ node, intl, areAnyNewToolbarFlagsEnabled, }: OpenPreviewPanelToolbarButtonProps) => React.JSX.Element | null;
 export {};