@atlaskit/editor-plugin-card 5.3.1 → 5.3.3

package/dist/esm/ui/toolbar.js

@@ -391,9 +391,11 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
           allowEmbeds: allowEmbeds,
           allowBlockCards: allowBlockCards,
           editorAnalyticsApi: editorAnalyticsApi,
+          allowDatasource: cardOptions.allowDatasource,
           showUpgradeDiscoverability: showUpgradeDiscoverability,
-          settingsConfig: getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink)
-        })], _toConsumableArray(showDatasourceAppearance ? [{
+          settingsConfig: getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink),
+          isDatasourceView: isDatasource
+        })], _toConsumableArray(showDatasourceAppearance && editorExperiment('platform_editor_controls', 'control') ? [{
           type: 'custom',
           fallback: [],
           render: function render(editorView) {
@@ -481,51 +483,59 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       allowEmbeds = cardOptions.allowEmbeds,
       showUpgradeDiscoverability = cardOptions.showUpgradeDiscoverability;
     var url = metadata.url;
-    toolbarItems.push(editorExperiment('platform_editor_controls', 'control') ? {
-      type: 'custom',
-      fallback: [],
-      render: function render(editorView) {
-        return /*#__PURE__*/React.createElement(LinkToolbarAppearance, {
-          key: "link-appearance",
-          url: url,
-          intl: intl,
-          currentAppearance: currentAppearance,
-          editorView: editorView,
-          editorState: state,
-          allowEmbeds: allowEmbeds,
-          allowBlockCards: allowBlockCards,
-          editorAnalyticsApi: editorAnalyticsApi,
-          showUpgradeDiscoverability: showUpgradeDiscoverability,
-          isDatasourceView: true
-        });
-      }
-    } : getLinkAppearanceDropdown({
-      url: url,
-      intl: intl,
-      currentAppearance: currentAppearance,
-      editorState: state,
-      allowEmbeds: allowEmbeds,
-      allowBlockCards: allowBlockCards,
-      editorAnalyticsApi: editorAnalyticsApi,
-      showUpgradeDiscoverability: showUpgradeDiscoverability,
-      settingsConfig: getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink)
-    }), {
-      type: 'custom',
-      fallback: [],
-      render: function render(editorView) {
-        return /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
-          intl: intl,
-          editorAnalyticsApi: editorAnalyticsApi,
-          url: url,
-          editorView: editorView,
-          editorState: state,
-          selected: true,
-          inputMethod: INPUT_METHOD.FLOATING_TB
-        });
-      }
-    }, {
-      type: 'separator'
-    });
+    if (editorExperiment('platform_editor_controls', 'control')) {
+      toolbarItems.push({
+        type: 'custom',
+        fallback: [],
+        render: function render(editorView) {
+          return /*#__PURE__*/React.createElement(LinkToolbarAppearance, {
+            key: "link-appearance",
+            url: url,
+            intl: intl,
+            currentAppearance: currentAppearance,
+            editorView: editorView,
+            editorState: state,
+            allowEmbeds: allowEmbeds,
+            allowBlockCards: allowBlockCards,
+            editorAnalyticsApi: editorAnalyticsApi,
+            showUpgradeDiscoverability: showUpgradeDiscoverability,
+            isDatasourceView: true
+          });
+        }
+      }, {
+        type: 'custom',
+        fallback: [],
+        render: function render(editorView) {
+          return /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
+            intl: intl,
+            editorAnalyticsApi: editorAnalyticsApi,
+            url: url,
+            editorView: editorView,
+            editorState: state,
+            selected: true,
+            inputMethod: INPUT_METHOD.FLOATING_TB
+          });
+        }
+      }, {
+        type: 'separator'
+      });
+    } else {
+      toolbarItems.push(getLinkAppearanceDropdown({
+        url: url,
+        intl: intl,
+        currentAppearance: currentAppearance,
+        editorState: state,
+        allowEmbeds: allowEmbeds,
+        allowBlockCards: allowBlockCards,
+        editorAnalyticsApi: editorAnalyticsApi,
+        allowDatasource: cardOptions.allowDatasource,
+        showUpgradeDiscoverability: showUpgradeDiscoverability,
+        settingsConfig: getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink),
+        isDatasourceView: true
+      }), {
+        type: 'separator'
+      });
+    }
   }
   toolbarItems.push({
     type: 'custom',
@@ -638,29 +648,14 @@ export var getStartingToolbarItems = function getStartingToolbarItems(options, a
         intl: intl,
         editorState: state,
         editorAnalyticsApi: api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions,
+        allowDatasource: options.allowDatasource,
         editorPluginApi: api,
         cardOptions: options,
-        settingsConfig: getSettingsButton(intl, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, options.userPreferencesLink)
-      })].concat(_toConsumableArray(options !== null && options !== void 0 && options.allowDatasource ? [{
-        type: 'custom',
-        fallback: [],
-        render: function render(editorView) {
-          var _api$analytics4;
-          if (!editorView) {
-            return null;
-          }
-          return /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
-            intl: intl,
-            editorAnalyticsApi: api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions,
-            url: link,
-            editorView: editorView,
-            editorState: editorView.state,
-            inputMethod: INPUT_METHOD.FLOATING_TB
-          });
-        }
-      }] : []), [{
+        settingsConfig: getSettingsButton(intl, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, options.userPreferencesLink),
+        isDatasourceView: false
+      }), {
         type: 'separator'
-      }], editLinkItem);
+      }].concat(editLinkItem);
     }
     return [{
       type: 'custom',
@@ -677,7 +672,7 @@ export var getStartingToolbarItems = function getStartingToolbarItems(options, a
       type: 'custom',
       fallback: [],
       render: function render(editorView) {
-        var _api$analytics5;
+        var _api$analytics4;
         if (!editorView) {
           return null;
         }
@@ -688,7 +683,7 @@ export var getStartingToolbarItems = function getStartingToolbarItems(options, a
           editorView: editorView,
           editorState: editorView.state,
           cardOptions: options,
-          editorAnalyticsApi: api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions,
+          editorAnalyticsApi: api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions,
           editorPluginApi: api
         });
       }
@@ -702,10 +697,10 @@ export var getEndingToolbarItems = function getEndingToolbarItems(options, api)
      * Or explicit user preferences config in order to enable button
      */
     if ((options.provider || options.userPreferencesLink) && editorExperiment('platform_editor_controls', 'control')) {
-      var _api$analytics6;
+      var _api$analytics5;
       return [{
         type: 'separator'
-      }, getSettingsButton(intl, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions, options.userPreferencesLink)];
+      }, getSettingsButton(intl, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions, options.userPreferencesLink)];
     }
     return [];
   };

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

@@ -0,0 +1,28 @@
+import React from 'react';
+import type { IntlShape } from 'react-intl-next';
+import type { Command } from '@atlaskit/editor-common/types';
+interface Props {
+    allowDatasource?: boolean;
+    intl: IntlShape;
+    url: string;
+    selected: boolean;
+    inputMethod: string;
+    dispatchCommand: (command: Command) => void;
+}
+export declare const datasourceDisplayInformation: {
+    title: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    icon: {
+        (props: import("@atlaskit/icon").NewCoreIconProps): JSX.Element;
+        displayName: string;
+    };
+    iconFallback: {
+        (props: import("@atlaskit/icon").NewCoreIconProps): JSX.Element;
+        displayName: string;
+    };
+};
+export declare const DatasourceDropdownOption: ({ allowDatasource, intl, url, selected, inputMethod, dispatchCommand, }: Props) => React.JSX.Element | null;
+export {};

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

@@ -1,7 +1,9 @@
 import type { Command, FloatingToolbarDropdown, FloatingToolbarItem } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { HyperlinkToolbarAppearanceProps } from './HyperlinkToolbarAppearance';
-export declare const getHyperlinkAppearanceDropdown: ({ url, intl, editorState, editorAnalyticsApi, editorPluginApi, settingsConfig, cardOptions, }: Omit<HyperlinkToolbarAppearanceProps, "editorState"> & {
+export declare const getHyperlinkAppearanceDropdown: ({ url, intl, editorState, editorAnalyticsApi, editorPluginApi, settingsConfig, cardOptions, allowDatasource, isDatasourceView, }: Omit<HyperlinkToolbarAppearanceProps, "editorState"> & {
     settingsConfig: FloatingToolbarItem<Command>;
     editorState?: EditorState | undefined;
+    allowDatasource?: boolean | undefined;
+    isDatasourceView?: boolean | undefined;
 }) => FloatingToolbarDropdown<Command>;

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

@@ -1,10 +1,14 @@
 import React from 'react';
 import type { Command, FloatingToolbarDropdown, FloatingToolbarItem } from '@atlaskit/editor-common/types';
 import { type LinkToolbarAppearanceProps } from './LinkToolbarAppearance';
-export declare const LinkAppearanceMenu: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, dispatchCommand, settingsConfig, }: LinkToolbarAppearanceProps & {
+type Props = LinkToolbarAppearanceProps & {
     dispatchCommand: (command: Command) => void;
     settingsConfig: FloatingToolbarItem<Command>;
-}) => React.JSX.Element | null;
-export declare const getLinkAppearanceDropdown: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, settingsConfig, }: LinkToolbarAppearanceProps & {
+    allowDatasource?: boolean;
+};
+export declare const LinkAppearanceMenu: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, allowDatasource, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, dispatchCommand, settingsConfig, }: Props) => React.JSX.Element | null;
+export declare const getLinkAppearanceDropdown: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, allowDatasource, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, settingsConfig, }: LinkToolbarAppearanceProps & {
     settingsConfig: FloatingToolbarItem<Command>;
+    allowDatasource?: boolean | undefined;
 }) => FloatingToolbarDropdown<Command>;
+export {};

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

@@ -0,0 +1,28 @@
+import React from 'react';
+import type { IntlShape } from 'react-intl-next';
+import type { Command } from '@atlaskit/editor-common/types';
+interface Props {
+    allowDatasource?: boolean;
+    intl: IntlShape;
+    url: string;
+    selected: boolean;
+    inputMethod: string;
+    dispatchCommand: (command: Command) => void;
+}
+export declare const datasourceDisplayInformation: {
+    title: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    icon: {
+        (props: import("@atlaskit/icon").NewCoreIconProps): JSX.Element;
+        displayName: string;
+    };
+    iconFallback: {
+        (props: import("@atlaskit/icon").NewCoreIconProps): JSX.Element;
+        displayName: string;
+    };
+};
+export declare const DatasourceDropdownOption: ({ allowDatasource, intl, url, selected, inputMethod, dispatchCommand, }: Props) => React.JSX.Element | null;
+export {};

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

@@ -1,7 +1,9 @@
 import type { Command, FloatingToolbarDropdown, FloatingToolbarItem } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { HyperlinkToolbarAppearanceProps } from './HyperlinkToolbarAppearance';
-export declare const getHyperlinkAppearanceDropdown: ({ url, intl, editorState, editorAnalyticsApi, editorPluginApi, settingsConfig, cardOptions, }: Omit<HyperlinkToolbarAppearanceProps, "editorState"> & {
+export declare const getHyperlinkAppearanceDropdown: ({ url, intl, editorState, editorAnalyticsApi, editorPluginApi, settingsConfig, cardOptions, allowDatasource, isDatasourceView, }: Omit<HyperlinkToolbarAppearanceProps, "editorState"> & {
     settingsConfig: FloatingToolbarItem<Command>;
     editorState?: EditorState | undefined;
+    allowDatasource?: boolean | undefined;
+    isDatasourceView?: boolean | undefined;
 }) => FloatingToolbarDropdown<Command>;

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

@@ -1,10 +1,14 @@
 import React from 'react';
 import type { Command, FloatingToolbarDropdown, FloatingToolbarItem } from '@atlaskit/editor-common/types';
 import { type LinkToolbarAppearanceProps } from './LinkToolbarAppearance';
-export declare const LinkAppearanceMenu: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, dispatchCommand, settingsConfig, }: LinkToolbarAppearanceProps & {
+type Props = LinkToolbarAppearanceProps & {
     dispatchCommand: (command: Command) => void;
     settingsConfig: FloatingToolbarItem<Command>;
-}) => React.JSX.Element | null;
-export declare const getLinkAppearanceDropdown: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, settingsConfig, }: LinkToolbarAppearanceProps & {
+    allowDatasource?: boolean;
+};
+export declare const LinkAppearanceMenu: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, allowDatasource, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, dispatchCommand, settingsConfig, }: Props) => React.JSX.Element | null;
+export declare const getLinkAppearanceDropdown: ({ url, intl, currentAppearance, editorState, allowEmbeds, allowBlockCards, allowDatasource, editorAnalyticsApi, showUpgradeDiscoverability, isDatasourceView, settingsConfig, }: LinkToolbarAppearanceProps & {
     settingsConfig: FloatingToolbarItem<Command>;
+    allowDatasource?: boolean | undefined;
 }) => FloatingToolbarDropdown<Command>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "5.3.1",
+	"version": "5.3.3",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^21.1.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^102.7.0",
+		"@atlaskit/editor-common": "^102.9.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-base": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -62,7 +62,7 @@
 		"@atlaskit/primitives": "^14.1.0",
 		"@atlaskit/smart-card": "^35.2.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^3.6.0",
+		"@atlaskit/tmp-editor-statsig": "^4.1.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -137,9 +137,6 @@
 		"platform_editor_fix_card_plugin_state": {
 			"type": "boolean"
 		},
-		"platform_fix_embedded_card_re-rendering": {
-			"type": "boolean"
-		},
 		"platform-editor-plugin-card-icon-migration": {
 			"type": "boolean"
 		},