@atlaskit/editor-plugin-card 8.0.1 → 8.1.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-card
 
+## 8.1.0
+
+### Minor Changes
+
+- [`c0113eeccb2df`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c0113eeccb2df) -
+  [ux] ED-29120 add a new config option for default editor preset
+  (`toolbar.enableNewToolbarExperience`) which allows the new toolbar to be disabled. This is needed
+  for editors that can't be excluded at the experiment level.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.0.1
 
 ### Patch Changes

package/dist/cjs/ui/DatasourceAppearanceButton.js

@@ -34,7 +34,8 @@ var DatasourceAppearanceButtonWithCardContext = function DatasourceAppearanceBut
     editorView = _ref.editorView,
     editorState = _ref.editorState,
     selected = _ref.selected,
-    inputMethod = _ref.inputMethod;
+    inputMethod = _ref.inputMethod,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   var _useFetchDatasourceIn = (0, _useFetchDatasourceInfo.useFetchDatasourceInfo)({
       isRegularCardNode: true,
       url: url,
@@ -101,7 +102,8 @@ var DatasourceAppearanceButtonWithCardContext = function DatasourceAppearanceBut
     }),
     selected: selected,
     onClick: onChangeAppearance,
-    testId: 'card-datasource-appearance-button'
+    testId: 'card-datasource-appearance-button',
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   }));
 };
 var DatasourceAppearanceButton = exports.DatasourceAppearanceButton = function DatasourceAppearanceButton(_ref2) {
@@ -111,7 +113,8 @@ var DatasourceAppearanceButton = exports.DatasourceAppearanceButton = function D
     editorView = _ref2.editorView,
     editorState = _ref2.editorState,
     selected = _ref2.selected,
-    inputMethod = _ref2.inputMethod;
+    inputMethod = _ref2.inputMethod,
+    areAnyNewToolbarFlagsEnabled = _ref2.areAnyNewToolbarFlagsEnabled;
   var cardContext = (0, _linkProvider.useSmartLinkContext)();
   return (0, _react2.jsx)(DatasourceAppearanceButtonWithCardContext, {
     url: url,
@@ -121,6 +124,7 @@ var DatasourceAppearanceButton = exports.DatasourceAppearanceButton = function D
     editorState: editorState,
     cardContext: cardContext,
     selected: selected,
-    inputMethod: inputMethod
+    inputMethod: inputMethod,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   });
 };

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

@@ -10,7 +10,6 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
-var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _edit = _interopRequireDefault(require("@atlaskit/icon/core/edit"));
@@ -37,7 +36,8 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
     editorView = _ref.editorView,
     extensionKey = _ref.extensionKey,
     onLinkEditClick = _ref.onLinkEditClick,
-    intl = _ref.intl;
+    intl = _ref.intl,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isOpen = _useState2[0],
@@ -63,11 +63,10 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
       (0, _utils.focusEditorView)(editorView);
     }
   }, [currentAppearance, datasourceId, editorAnalyticsApi, editorView, extensionKey]);
-  var isNewEditorToolbarEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)();
-  var icon = isNewEditorToolbarEnabled ? (0, _react2.jsx)(_edit.default, {
+  var icon = areAnyNewToolbarFlagsEnabled ? (0, _react2.jsx)(_edit.default, {
     label: ""
   }) : undefined;
-  var tooltipContent = isNewEditorToolbarEnabled ? intl.formatMessage(_messages.linkToolbarMessages.editLink) : undefined;
+  var tooltipContent = areAnyNewToolbarFlagsEnabled ? intl.formatMessage(_messages.linkToolbarMessages.editLink) : undefined;
   switch (editVariant) {
     case 'edit-link':
       {
@@ -77,11 +76,14 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           testId: "edit-link",
           onClick: onEditLink,
           icon: icon,
-          tooltipContent: tooltipContent
-        }, !isNewEditorToolbarEnabled && (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+          tooltipContent: tooltipContent,
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
+        }, !areAnyNewToolbarFlagsEnabled && (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , _messages.linkToolbarMessages.editLink)), !isNewEditorToolbarEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.linkToolbarMessages.editLink)), !areAnyNewToolbarFlagsEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
+          areAnyNewToolbarFlagsEnabled: false
+        }));
       }
     case 'edit-datasource':
       {
@@ -90,11 +92,14 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
         }, (0, _react2.jsx)(_ui.FloatingToolbarButton, {
           testId: "edit-datasource",
           tooltipContent: intl.formatMessage(_messages.linkToolbarMessages.editDatasourceStandaloneTooltip),
-          onClick: onEditDatasource
+          onClick: onEditDatasource,
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , _messages.linkToolbarMessages.editDatasourceStandalone)), !isNewEditorToolbarEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.linkToolbarMessages.editDatasourceStandalone)), !areAnyNewToolbarFlagsEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
+          areAnyNewToolbarFlagsEnabled: false
+        }));
       }
     case 'edit-dropdown':
       {
@@ -111,11 +116,14 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           onClick: toggleOpen,
           selected: isOpen,
           disabled: false,
-          ariaHasPopup: true
+          ariaHasPopup: true,
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , _messages.cardMessages.editDropdownTriggerTitle)), !isNewEditorToolbarEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.cardMessages.editDropdownTriggerTitle)), !areAnyNewToolbarFlagsEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
+          areAnyNewToolbarFlagsEnabled: false
+        }));
         return (0, _react2.jsx)(_compiled.Flex, {
           ref: containerRef
         }, (0, _react2.jsx)(_uiMenu.DropdownContainer, {

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

@@ -40,7 +40,8 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
     editorView = props.editorView,
     intl = props.intl,
     onLinkEditClick = props.onLinkEditClick,
-    url = props.url;
+    url = props.url,
+    areAnyNewToolbarFlagsEnabled = props.areAnyNewToolbarFlagsEnabled;
   var _useFetchDatasourceIn = (0, _useFetchDatasourceInfo.useFetchDatasourceInfo)({
       isRegularCardNode: true,
       url: url,
@@ -100,11 +101,14 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
           gap: "space.050"
         }, (0, _react2.jsx)(_ui.FloatingToolbarButton, {
           testId: "edit-link",
-          onClick: onEditLink
+          onClick: onEditLink,
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , _messages.linkToolbarMessages.editLink)), !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.linkToolbarMessages.editLink)), !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
+          areAnyNewToolbarFlagsEnabled: false
+        }));
       }
     case 'edit-datasource':
       {
@@ -113,11 +117,14 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
         }, (0, _react2.jsx)(_ui.FloatingToolbarButton, {
           testId: "edit-datasource",
           tooltipContent: intl.formatMessage(_messages.linkToolbarMessages.editDatasourceStandaloneTooltip),
-          onClick: onEditDatasource
+          onClick: onEditDatasource,
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , _messages.linkToolbarMessages.editDatasourceStandalone)), !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.linkToolbarMessages.editDatasourceStandalone)), !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
+          areAnyNewToolbarFlagsEnabled: false
+        }));
       }
     case 'edit-dropdown':
       {
@@ -134,11 +141,14 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
           onClick: toggleOpen,
           selected: isOpen,
           disabled: false,
-          ariaHasPopup: true
+          ariaHasPopup: true,
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , _messages.cardMessages.editDropdownTriggerTitle)), !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.cardMessages.editDropdownTriggerTitle)), !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
+          areAnyNewToolbarFlagsEnabled: false
+        }));
         return (0, _react2.jsx)(_compiled.Flex, {
           ref: containerRef
         }, (0, _react2.jsx)(_uiMenu.DropdownContainer, {
@@ -180,7 +190,8 @@ var EditToolbarButtonWithUrl = function EditToolbarButtonWithUrl(props) {
     editorView = props.editorView,
     intl = props.intl,
     onLinkEditClick = props.onLinkEditClick,
-    url = props.url;
+    url = props.url,
+    areAnyNewToolbarFlagsEnabled = props.areAnyNewToolbarFlagsEnabled;
   var _useFetchDatasourceIn2 = (0, _useFetchDatasourceInfo.useFetchDatasourceInfo)({
       isRegularCardNode: true,
       url: url,
@@ -208,7 +219,8 @@ var EditToolbarButtonWithUrl = function EditToolbarButtonWithUrl(props) {
     editorView: editorView,
     extensionKey: extensionKey,
     onLinkEditClick: onLinkEditClick,
-    intl: intl
+    intl: intl,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   });
 };
 var EditToolbarButtonWithDatasourceId = function EditToolbarButtonWithDatasourceId(props) {
@@ -218,7 +230,8 @@ var EditToolbarButtonWithDatasourceId = function EditToolbarButtonWithDatasource
     intl = props.intl,
     onLinkEditClick = props.onLinkEditClick,
     datasourceId = props.datasourceId,
-    node = props.node;
+    node = props.node,
+    areAnyNewToolbarFlagsEnabled = props.areAnyNewToolbarFlagsEnabled;
   var fetchData = (0, _react.useMemo)(function () {
     try {
       var _attrs$datasource$vie;
@@ -256,7 +269,8 @@ var EditToolbarButtonWithDatasourceId = function EditToolbarButtonWithDatasource
     editorView: editorView,
     extensionKey: extensionKey,
     onLinkEditClick: onLinkEditClick,
-    intl: intl
+    intl: intl,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   });
 };
 var EditToolbarButton = exports.EditToolbarButton = function EditToolbarButton(props) {
@@ -266,7 +280,8 @@ var EditToolbarButton = exports.EditToolbarButton = function EditToolbarButton(p
     editorView = props.editorView,
     intl = props.intl,
     onLinkEditClick = props.onLinkEditClick,
-    url = props.url;
+    url = props.url,
+    areAnyNewToolbarFlagsEnabled = props.areAnyNewToolbarFlagsEnabled;
   var cardContext = (0, _linkProvider.useSmartLinkContext)();
   if (props.url) {
     return (0, _react2.jsx)(EditToolbarButtonWithUrl, {
@@ -277,7 +292,8 @@ var EditToolbarButton = exports.EditToolbarButton = function EditToolbarButton(p
       editorView: editorView,
       cardContext: cardContext,
       onLinkEditClick: onLinkEditClick,
-      currentAppearance: currentAppearance
+      currentAppearance: currentAppearance,
+      areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
     });
   }
   if (props.datasourceId && props.node) {
@@ -288,7 +304,8 @@ var EditToolbarButton = exports.EditToolbarButton = function EditToolbarButton(p
       editorAnalyticsApi: editorAnalyticsApi,
       editorView: editorView,
       onLinkEditClick: onLinkEditClick,
-      currentAppearance: currentAppearance
+      currentAppearance: currentAppearance,
+      areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
     });
   }
   return (0, _react2.jsx)(EditToolbarButtonWithCardContext, {
@@ -299,6 +316,7 @@ var EditToolbarButton = exports.EditToolbarButton = function EditToolbarButton(p
     editorView: editorView,
     cardContext: cardContext,
     onLinkEditClick: onLinkEditClick,
-    currentAppearance: currentAppearance
+    currentAppearance: currentAppearance,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   });
 };

package/dist/cjs/ui/HyperlinkToolbarAppearance.js

@@ -11,13 +11,14 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _ui = require("@atlaskit/editor-common/ui");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _DatasourceAppearanceButton = require("./DatasourceAppearanceButton");
 var _LinkToolbarAppearance = require("./LinkToolbarAppearance");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function HyperlinkToolbarAppearance(props) {
-  var _props$cardOptions3;
+  var _props$cardOptions3, _props$editorPluginAp2;
   var _useState = (0, _react.useState)(new Map()),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     supportedUrlsMap = _useState2[0],
@@ -136,6 +137,7 @@ function HyperlinkToolbarAppearance(props) {
   if (!supportedUrlsMap.get(url)) {
     return null;
   }
+  var areAnyNewToolbarFlagsEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean((_props$editorPluginAp2 = props.editorPluginApi) === null || _props$editorPluginAp2 === void 0 ? void 0 : _props$editorPluginAp2.toolbar));
   return /*#__PURE__*/_react.default.createElement(_compiled.Flex, null, /*#__PURE__*/_react.default.createElement(_LinkToolbarAppearance.LinkToolbarAppearance, {
     key: "link-appearance",
     url: url,
@@ -144,13 +146,17 @@ 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.default.createElement(_DatasourceAppearanceButton.DatasourceAppearanceButton, {
     intl: intl,
     url: url,
     editorState: editorState,
     editorView: editorView,
     editorAnalyticsApi: editorAnalyticsApi,
-    inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
-  }), /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarSeparator, null));
+    inputMethod: _analytics.INPUT_METHOD.FLOATING_TB,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
+  }), /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarSeparator, {
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
+  }));
 }

package/dist/cjs/ui/HyperlinkToolbarAppearanceDropdown.js

@@ -20,7 +20,7 @@ var _compiled = require("@atlaskit/primitives/compiled");
 var _LinkToolbarAppearanceDropdown = require("./LinkToolbarAppearanceDropdown");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
-  var _props$cardOptions3;
+  var _props$editorPluginAp, _props$cardOptions3, _props$editorPluginAp3, _props$editorPluginAp4;
   var _useState = (0, _react.useState)(new Map()),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     supportedUrlsMap = _useState2[0],
@@ -31,6 +31,7 @@ var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
     setIsOpen = _useState4[1];
   var cardProvider = (0, _react.useRef)(undefined);
   var containerRef = (0, _react.useRef)(undefined);
+  var areAnyNewToolbarFlagsEnabled = (0, _toolbarFlagCheck.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,
@@ -61,8 +62,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);
               }
@@ -179,7 +180,8 @@ var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
       label: "",
       spacing: "compact",
       size: "small"
-    })
+    }),
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   }, title);
   return /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
     ref: containerRef,
@@ -207,8 +209,11 @@ var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
     isDatasourceView: isDatasourceView,
     allowDatasource: allowDatasource,
     dispatchCommand: dispatchCommand,
-    settingsConfig: settingsConfig
-  })), !((0, _toolbarFlagCheck.areToolbarFlagsEnabled)() && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_15')) && /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarSeparator, null));
+    settingsConfig: settingsConfig,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
+  })), !((0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean((_props$editorPluginAp3 = props.editorPluginApi) === null || _props$editorPluginAp3 === void 0 ? void 0 : _props$editorPluginAp3.toolbar)) && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_15')) && /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarSeparator, {
+    areAnyNewToolbarFlagsEnabled: (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean((_props$editorPluginAp4 = props.editorPluginApi) === null || _props$editorPluginAp4 === void 0 ? void 0 : _props$editorPluginAp4.toolbar))
+  }));
 };
 var getCustomHyperlinkAppearanceDropdown = exports.getCustomHyperlinkAppearanceDropdown = function getCustomHyperlinkAppearanceDropdown(_ref3) {
   var url = _ref3.url,

package/dist/cjs/ui/LinkToolbarAppearance.js

@@ -52,7 +52,8 @@ var LinkToolbarAppearance = exports.LinkToolbarAppearance = /*#__PURE__*/functio
         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;
@@ -115,7 +116,7 @@ var LinkToolbarAppearance = exports.LinkToolbarAppearance = /*#__PURE__*/functio
       var LinkToolbarButtons = /*#__PURE__*/_react.default.createElement(_card.LinkToolbarButtonGroup, {
         key: "link-toolbar-button-group",
         options: options.map(function (option) {
-          return (0, _card.getButtonGroupOption)(intl, dispatchCommand, _objectSpread(_objectSpread({}, option), {}, {
+          return (0, _card.getButtonGroupOption)(intl, areAnyNewToolbarFlagsEnabled, dispatchCommand, _objectSpread(_objectSpread({}, option), {}, {
             onClick: (0, _card.commandWithMetadata)(option.onClick, {
               inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
             })

package/dist/cjs/ui/LinkToolbarAppearanceDropdown.js

@@ -143,7 +143,8 @@ var getLinkAppearanceDropdown = exports.getLinkAppearanceDropdown = function get
     _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.default.createElement(LinkAppearanceMenu, {
@@ -158,7 +159,8 @@ var getLinkAppearanceDropdown = exports.getLinkAppearanceDropdown = function get
         isDatasourceView: isDatasourceView,
         allowDatasource: allowDatasource,
         dispatchCommand: props.dispatchCommand,
-        settingsConfig: settingsConfig
+        settingsConfig: settingsConfig,
+        areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
       });
     },
     width: 200,

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.OpenPreviewPanelToolbarButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _messages = require("@atlaskit/editor-common/messages");
-var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _ui = require("@atlaskit/editor-common/ui");
 var _panelRight = _interopRequireDefault(require("@atlaskit/icon/core/panel-right"));
 var _linkProvider = require("@atlaskit/link-provider");
@@ -15,7 +14,8 @@ var _compiled = require("@atlaskit/primitives/compiled");
 var _smartCard = require("@atlaskit/smart-card");
 var OpenPreviewPanelToolbarButton = exports.OpenPreviewPanelToolbarButton = function OpenPreviewPanelToolbarButton(_ref) {
   var node = _ref.node,
-    intl = _ref.intl;
+    intl = _ref.intl,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   var _useSmartLinkContext = (0, _linkProvider.useSmartLinkContext)(),
     store = _useSmartLinkContext.store,
     isPreviewPanelAvailable = _useSmartLinkContext.isPreviewPanelAvailable,
@@ -40,13 +40,13 @@ var OpenPreviewPanelToolbarButton = exports.OpenPreviewPanelToolbarButton = func
       }
     };
     var title = intl.formatMessage(_messages.linkMessages.openPreviewPanel);
-    var icon = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ? /*#__PURE__*/_react.default.createElement(_panelRight.default, {
+    var icon = areAnyNewToolbarFlagsEnabled ? /*#__PURE__*/_react.default.createElement(_panelRight.default, {
       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.default.createElement(_compiled.Inline, {
       as: "span",
       space: "space.050",
@@ -70,7 +70,8 @@ var OpenPreviewPanelToolbarButton = exports.OpenPreviewPanelToolbarButton = func
         testId: "open-preview-panel-floating-toolbar-button",
         onClick: handleOpenGlancePanelClick,
         icon: icon,
-        title: title
+        title: title,
+        areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
       }));
     }
   }