@atlaskit/editor-plugin-card 3.4.5 → 4.0.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-card
 
+## 4.0.0
+
+### Major Changes
+
+- [#149599](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/149599)
+  [`9c110fa4b038c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9c110fa4b038c) -
+  The hyperlink floating toolbar no longer includes a settings button by default, now requires card
+  plugin to be provided to include the settings button in the hyperlink floating toolbar (via ff
+  cleanup platform.editor.card.inject-settings-button).
+
+  Upgrade requires only checking compatible versions of `@atlaskit/editor-plugin-card` and
+  `@atlaskit/editor-plugin-hyperlink` as both packages are affected by feature flag change.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.4.5
 
 ### Patch Changes

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.getStartingToolbarItems = exports.getSettingsButtonGroup = exports.getSettingsButton = exports.getHyperlinkToolbarSettingsButton = exports.getEndingToolbarItems = exports.floatingToolbar = void 0;
+exports.visitCardLink = exports.shouldRenderToolbarPulse = exports.removeCard = exports.openLinkSettings = exports.getStartingToolbarItems = exports.getSettingsButton = exports.getEndingToolbarItems = 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"));
@@ -270,7 +270,9 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         }]
       }, {
         type: 'separator'
-      }], (0, _toConsumableArray2.default)(getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions.userPreferencesLink)), [{
+      }, getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink), {
+        type: 'separator'
+      }, {
         id: 'editor.link.delete',
         focusEditoronEnter: true,
         type: 'button',
@@ -368,31 +370,17 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     type: 'separator'
   }] : [];
 };
-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: (0, _platformFeatureFlags.fg)('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined),
-    href: (0, _platformFeatureFlags.fg)('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.fg)('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined)
+    onClick: openLinkSettings(editorAnalyticsApi, userPreferencesLink),
+    href: userPreferencesLink || (0, _link.getLinkPreferencesURLFromENV)(),
+    target: '_blank'
   };
 };
-var getSettingsButtonGroup = exports.getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyticsApi, userPreferencesLink) {
-  return [getSettingsButton(intl, editorAnalyticsApi, userPreferencesLink), {
-    type: 'separator'
-  }];
-};
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance) {
   var _node$attrs3;
   var toolbarItems = [];
@@ -490,7 +478,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       type: 'separator'
     });
   }
-  toolbarItems.push.apply(toolbarItems, [{
+  toolbarItems.push({
     type: 'copy-button',
     supportsViewMode: true,
     items: [{
@@ -500,7 +488,9 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     }]
   }, {
     type: 'separator'
-  }].concat((0, _toConsumableArray2.default)(getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink)), [{
+  }, getSettingsButton(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink), {
+    type: 'separator'
+  }, {
     id: 'editor.link.delete',
     focusEditoronEnter: true,
     type: 'button',
@@ -512,7 +502,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
     title: intl.formatMessage(_messages.default.remove),
     onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
-  }]));
+  });
   return toolbarItems;
 };
 var shouldRenderToolbarPulse = exports.shouldRenderToolbarPulse = function shouldRenderToolbarPulse(embedEnabled, appearance, status, isDiscoverabilityEnabled) {
@@ -585,17 +575,15 @@ var getStartingToolbarItems = exports.getStartingToolbarItems = function getStar
 };
 var getEndingToolbarItems = exports.getEndingToolbarItems = function getEndingToolbarItems(options, api) {
   return function (intl, link) {
-    if ((0, _platformFeatureFlags.fg)('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 _api$analytics3;
-        return [{
-          type: 'separator'
-        }, getHyperlinkToolbarSettingsButton(intl, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, options.userPreferencesLink)];
-      }
+    /**
+     * 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 _api$analytics3;
+      return [{
+        type: 'separator'
+      }, getSettingsButton(intl, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, options.userPreferencesLink)];
     }
     return [];
   };

package/dist/es2019/toolbar.js

@@ -262,7 +262,9 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       }]
     }, {
       type: 'separator'
-    }, ...getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions.userPreferencesLink), {
+    }, getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink), {
+      type: 'separator'
+    }, {
       id: 'editor.link.delete',
       focusEditoronEnter: true,
       type: 'button',
@@ -355,31 +357,17 @@ const getUnlinkButtonGroup = (state, intl, node, inlineCard, editorAnalyticsApi)
     type: 'separator'
   }] : [];
 };
-export const getHyperlinkToolbarSettingsButton = (intl, editorAnalyticsApi, userPreferencesLink) => {
-  return {
-    id: 'editor.link.settings',
-    type: 'button',
-    icon: CogIcon,
-    title: intl.formatMessage(linkToolbarMessages.settingsLink),
-    onClick: fg('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined),
-    href: fg('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: fg('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined)
+    onClick: openLinkSettings(editorAnalyticsApi, userPreferencesLink),
+    href: userPreferencesLink || getLinkPreferencesURLFromENV(),
+    target: '_blank'
   };
 };
-export const getSettingsButtonGroup = (intl, editorAnalyticsApi, userPreferencesLink) => {
-  return [getSettingsButton(intl, editorAnalyticsApi, userPreferencesLink), {
-    type: 'separator'
-  }];
-};
 const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance) => {
   var _node$attrs3;
   const toolbarItems = [];
@@ -487,7 +475,9 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
     }]
   }, {
     type: 'separator'
-  }, ...getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink), {
+  }, getSettingsButton(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink), {
+    type: 'separator'
+  }, {
     id: 'editor.link.delete',
     focusEditoronEnter: true,
     type: 'button',
@@ -569,17 +559,15 @@ export const getStartingToolbarItems = (options, api) => {
   };
 };
 export const getEndingToolbarItems = (options, api) => (intl, link) => {
-  if (fg('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 _api$analytics3;
-      return [{
-        type: 'separator'
-      }, getHyperlinkToolbarSettingsButton(intl, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, options.userPreferencesLink)];
-    }
+  /**
+   * 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 _api$analytics3;
+    return [{
+      type: 'separator'
+    }, getSettingsButton(intl, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, options.userPreferencesLink)];
   }
   return [];
 };

package/dist/esm/toolbar.js

@@ -260,7 +260,9 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         }]
       }, {
         type: 'separator'
-      }], _toConsumableArray(getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions.userPreferencesLink)), [{
+      }, getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink), {
+        type: 'separator'
+      }, {
         id: 'editor.link.delete',
         focusEditoronEnter: true,
         type: 'button',
@@ -358,31 +360,17 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     type: 'separator'
   }] : [];
 };
-export var getHyperlinkToolbarSettingsButton = function getHyperlinkToolbarSettingsButton(intl, editorAnalyticsApi, userPreferencesLink) {
-  return {
-    id: 'editor.link.settings',
-    type: 'button',
-    icon: CogIcon,
-    title: intl.formatMessage(linkToolbarMessages.settingsLink),
-    onClick: fg('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined),
-    href: fg('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: fg('platform.editor.card.inject-settings-button') ? openLinkSettings(editorAnalyticsApi, userPreferencesLink) : openLinkSettings(editorAnalyticsApi, undefined)
+    onClick: openLinkSettings(editorAnalyticsApi, userPreferencesLink),
+    href: userPreferencesLink || getLinkPreferencesURLFromENV(),
+    target: '_blank'
   };
 };
-export var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyticsApi, userPreferencesLink) {
-  return [getSettingsButton(intl, editorAnalyticsApi, userPreferencesLink), {
-    type: 'separator'
-  }];
-};
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance) {
   var _node$attrs3;
   var toolbarItems = [];
@@ -480,7 +468,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       type: 'separator'
     });
   }
-  toolbarItems.push.apply(toolbarItems, [{
+  toolbarItems.push({
     type: 'copy-button',
     supportsViewMode: true,
     items: [{
@@ -490,7 +478,9 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     }]
   }, {
     type: 'separator'
-  }].concat(_toConsumableArray(getSettingsButtonGroup(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink)), [{
+  }, getSettingsButton(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink), {
+    type: 'separator'
+  }, {
     id: 'editor.link.delete',
     focusEditoronEnter: true,
     type: 'button',
@@ -502,7 +492,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
     title: intl.formatMessage(commonMessages.remove),
     onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
-  }]));
+  });
   return toolbarItems;
 };
 export var shouldRenderToolbarPulse = function shouldRenderToolbarPulse(embedEnabled, appearance, status, isDiscoverabilityEnabled) {
@@ -575,17 +565,15 @@ export var getStartingToolbarItems = function getStartingToolbarItems(options, a
 };
 export var getEndingToolbarItems = function getEndingToolbarItems(options, api) {
   return function (intl, link) {
-    if (fg('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 _api$analytics3;
-        return [{
-          type: 'separator'
-        }, getHyperlinkToolbarSettingsButton(intl, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, options.userPreferencesLink)];
-      }
+    /**
+     * 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 _api$analytics3;
+      return [{
+        type: 'separator'
+      }, getSettingsButton(intl, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, options.userPreferencesLink)];
     }
     return [];
   };

package/dist/types/toolbar.d.ts

@@ -8,9 +8,7 @@ export declare const removeCard: (editorAnalyticsApi: EditorAnalyticsAPI | undef
 export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink: string | undefined) => Command;
 export declare const floatingToolbar: (cardOptions: CardOptions, lpLinkPicker: boolean, 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 getSettingsButton: (intl: IntlShape, editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink?: string) => FloatingToolbarItem<Command>;
 export declare const shouldRenderToolbarPulse: (embedEnabled: boolean, appearance: string, status: string, isDiscoverabilityEnabled: boolean) => boolean;
 export declare const getStartingToolbarItems: (options: CardPluginOptions, api?: ExtractInjectionAPI<typeof cardPlugin> | undefined) => (intl: IntlShape, link: string, onEditLink: Command, metadata: {
     url: string;

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

@@ -8,9 +8,7 @@ export declare const removeCard: (editorAnalyticsApi: EditorAnalyticsAPI | undef
 export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink: string | undefined) => Command;
 export declare const floatingToolbar: (cardOptions: CardOptions, lpLinkPicker: boolean, 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 getSettingsButton: (intl: IntlShape, editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink?: string) => FloatingToolbarItem<Command>;
 export declare const shouldRenderToolbarPulse: (embedEnabled: boolean, appearance: string, status: string, isDiscoverabilityEnabled: boolean) => boolean;
 export declare const getStartingToolbarItems: (options: CardPluginOptions, api?: ExtractInjectionAPI<typeof cardPlugin> | undefined) => (intl: IntlShape, link: string, onEditLink: Command, metadata: {
     url: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "3.4.5",
+	"version": "4.0.0",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-shared-styles": "^3.0.0",
 		"@atlaskit/frontend-utilities": "^2.7.0",
-		"@atlaskit/icon": "^22.20.0",
+		"@atlaskit/icon": "^22.21.0",
 		"@atlaskit/link-analytics": "^8.5.0",
 		"@atlaskit/link-client-extension": "^2.4.0",
 		"@atlaskit/link-datasource": "^3.4.0",
@@ -57,7 +57,7 @@
 		"@atlaskit/primitives": "^12.2.0",
 		"@atlaskit/smart-card": "^29.0.0",
 		"@atlaskit/theme": "^13.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.2.0",
+		"@atlaskit/tmp-editor-statsig": "^2.3.0",
 		"@atlaskit/tokens": "^2.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -120,9 +120,6 @@
 		"platform.linking-platform.datasource-word_wrap": {
 			"type": "boolean"
 		},
-		"platform.editor.card.inject-settings-button": {
-			"type": "boolean"
-		},
 		"linking-platform-contenteditable-false-live-view": {
 			"type": "boolean"
 		},