@atlaskit/editor-plugin-card 4.3.11 → 4.4.2

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @atlaskit/editor-plugin-card
 
+## 4.4.2
+
+### Patch Changes
+
+- [#163012](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/163012)
+  [`3b6b07774a436`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3b6b07774a436) -
+  Removes window.open call within link preferences button on click handler in toolbar to prevent
+  duplicate opening of link
+- Updated dependencies
+
+## 4.4.1
+
+### Patch Changes
+
+- [#161054](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/161054)
+  [`20f069140338e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/20f069140338e) -
+  Remove enable_datasource_nourl_edit_dropdown_datafetch FF
+
+## 4.4.0
+
+### Minor Changes
+
+- [#159018](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/159018)
+  [`14d5e189df870`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/14d5e189df870) -
+  [ux] ED-25367-remove-copy-button-from-view-mode-when-its-the-only-item
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.3.11
 
 ### Patch Changes

package/dist/cjs/toolbar.js

@@ -26,6 +26,7 @@ var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove
 var _settings2 = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/settings"));
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
 var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _doc = require("./pm-plugins/doc");
 var _main = require("./pm-plugins/main");
 var _DatasourceAppearanceButton = require("./ui/DatasourceAppearanceButton");
@@ -86,12 +87,11 @@ var visitCardLink = exports.visitCardLink = function visitCardLink(editorAnalyti
     return true;
   };
 };
-var openLinkSettings = exports.openLinkSettings = function openLinkSettings(editorAnalyticsApi, userPreferencesLink) {
+var openLinkSettings = exports.openLinkSettings = function openLinkSettings(editorAnalyticsApi) {
   return function (state, dispatch) {
     if (!(state.selection instanceof _state.NodeSelection)) {
       return false;
     }
-    window.open(userPreferencesLink || (0, _link.getLinkPreferencesURLFromENV)());
     if (dispatch) {
       var tr = state.tr,
         type = state.selection.node.type;
@@ -262,7 +262,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         type: 'separator'
       }], (0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
         type: 'copy-button',
-        supportsViewMode: true,
+        supportsViewMode: !(0, _platformFeatureFlags.fg)('platform_editor_remove_copy_button_from_view_mode'),
         items: [{
           state: state,
           formatMessage: intl.formatMessage,
@@ -362,7 +362,7 @@ var getSettingsButton = exports.getSettingsButton = function getSettingsButton(i
     icon: _settings.default,
     iconFallback: _settings2.default,
     title: intl.formatMessage(_messages.linkToolbarMessages.settingsLink),
-    onClick: openLinkSettings(editorAnalyticsApi, userPreferencesLink),
+    onClick: openLinkSettings(editorAnalyticsApi),
     href: userPreferencesLink || (0, _link.getLinkPreferencesURLFromENV)(),
     target: '_blank'
   };

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

@@ -15,7 +15,6 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
 var _menu = require("@atlaskit/menu");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _utils = require("../../utils");
 var _CardContextProvider = require("../CardContextProvider");
@@ -253,30 +252,28 @@ var EditToolbarButton = exports.EditToolbarButton = function EditToolbarButton(p
     url = props.url;
   return (0, _react2.jsx)(_CardContextProvider.CardContextProvider, null, function (_ref) {
     var cardContext = _ref.cardContext;
-    if ((0, _platformFeatureFlags.fg)('enable_datasource_nourl_edit_dropdown_datafetch')) {
-      if (props.url) {
-        return (0, _react2.jsx)(EditToolbarButtonWithUrl, {
-          datasourceId: datasourceId,
-          url: props.url,
-          intl: intl,
-          editorAnalyticsApi: editorAnalyticsApi,
-          editorView: editorView,
-          cardContext: cardContext,
-          onLinkEditClick: onLinkEditClick,
-          currentAppearance: currentAppearance
-        });
-      }
-      if (props.datasourceId && props.node) {
-        return (0, _react2.jsx)(EditToolbarButtonWithDatasourceId, {
-          datasourceId: props.datasourceId,
-          node: props.node,
-          intl: intl,
-          editorAnalyticsApi: editorAnalyticsApi,
-          editorView: editorView,
-          onLinkEditClick: onLinkEditClick,
-          currentAppearance: currentAppearance
-        });
-      }
+    if (props.url) {
+      return (0, _react2.jsx)(EditToolbarButtonWithUrl, {
+        datasourceId: datasourceId,
+        url: props.url,
+        intl: intl,
+        editorAnalyticsApi: editorAnalyticsApi,
+        editorView: editorView,
+        cardContext: cardContext,
+        onLinkEditClick: onLinkEditClick,
+        currentAppearance: currentAppearance
+      });
+    }
+    if (props.datasourceId && props.node) {
+      return (0, _react2.jsx)(EditToolbarButtonWithDatasourceId, {
+        datasourceId: props.datasourceId,
+        node: props.node,
+        intl: intl,
+        editorAnalyticsApi: editorAnalyticsApi,
+        editorView: editorView,
+        onLinkEditClick: onLinkEditClick,
+        currentAppearance: currentAppearance
+      });
     }
     return (0, _react2.jsx)(EditToolbarButtonWithCardContext, {
       datasourceId: datasourceId,

package/dist/es2019/toolbar.js

@@ -16,6 +16,7 @@ import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { changeSelectedCardToText } from './pm-plugins/doc';
 import { pluginKey } from './pm-plugins/main';
 import { DatasourceAppearanceButton } from './ui/DatasourceAppearanceButton';
@@ -75,11 +76,10 @@ export const visitCardLink = editorAnalyticsApi => (state, dispatch) => {
   }
   return true;
 };
-export const openLinkSettings = (editorAnalyticsApi, userPreferencesLink) => (state, dispatch) => {
+export const openLinkSettings = editorAnalyticsApi => (state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
   }
-  window.open(userPreferencesLink || getLinkPreferencesURLFromENV());
   if (dispatch) {
     const {
       tr,
@@ -254,7 +254,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       type: 'separator'
     }, ...getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi), {
       type: 'copy-button',
-      supportsViewMode: true,
+      supportsViewMode: !fg('platform_editor_remove_copy_button_from_view_mode'),
       items: [{
         state,
         formatMessage: intl.formatMessage,
@@ -351,7 +351,7 @@ export const getSettingsButton = (intl, editorAnalyticsApi, userPreferencesLink)
     icon: SettingsIcon,
     iconFallback: CogIcon,
     title: intl.formatMessage(linkToolbarMessages.settingsLink),
-    onClick: openLinkSettings(editorAnalyticsApi, userPreferencesLink),
+    onClick: openLinkSettings(editorAnalyticsApi),
     href: userPreferencesLink || getLinkPreferencesURLFromENV(),
     target: '_blank'
   };

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

@@ -12,7 +12,6 @@ import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { focusEditorView, isDatasourceConfigEditable } from '../../utils';
 import { CardContextProvider } from '../CardContextProvider';
@@ -245,30 +244,28 @@ export const EditToolbarButton = props => {
   return jsx(CardContextProvider, null, ({
     cardContext
   }) => {
-    if (fg('enable_datasource_nourl_edit_dropdown_datafetch')) {
-      if (props.url) {
-        return jsx(EditToolbarButtonWithUrl, {
-          datasourceId: datasourceId,
-          url: props.url,
-          intl: intl,
-          editorAnalyticsApi: editorAnalyticsApi,
-          editorView: editorView,
-          cardContext: cardContext,
-          onLinkEditClick: onLinkEditClick,
-          currentAppearance: currentAppearance
-        });
-      }
-      if (props.datasourceId && props.node) {
-        return jsx(EditToolbarButtonWithDatasourceId, {
-          datasourceId: props.datasourceId,
-          node: props.node,
-          intl: intl,
-          editorAnalyticsApi: editorAnalyticsApi,
-          editorView: editorView,
-          onLinkEditClick: onLinkEditClick,
-          currentAppearance: currentAppearance
-        });
-      }
+    if (props.url) {
+      return jsx(EditToolbarButtonWithUrl, {
+        datasourceId: datasourceId,
+        url: props.url,
+        intl: intl,
+        editorAnalyticsApi: editorAnalyticsApi,
+        editorView: editorView,
+        cardContext: cardContext,
+        onLinkEditClick: onLinkEditClick,
+        currentAppearance: currentAppearance
+      });
+    }
+    if (props.datasourceId && props.node) {
+      return jsx(EditToolbarButtonWithDatasourceId, {
+        datasourceId: props.datasourceId,
+        node: props.node,
+        intl: intl,
+        editorAnalyticsApi: editorAnalyticsApi,
+        editorView: editorView,
+        onLinkEditClick: onLinkEditClick,
+        currentAppearance: currentAppearance
+      });
     }
     return jsx(EditToolbarButtonWithCardContext, {
       datasourceId: datasourceId,

package/dist/esm/toolbar.js

@@ -20,6 +20,7 @@ import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { changeSelectedCardToText } from './pm-plugins/doc';
 import { pluginKey } from './pm-plugins/main';
 import { DatasourceAppearanceButton } from './ui/DatasourceAppearanceButton';
@@ -76,12 +77,11 @@ export var visitCardLink = function visitCardLink(editorAnalyticsApi) {
     return true;
   };
 };
-export var openLinkSettings = function openLinkSettings(editorAnalyticsApi, userPreferencesLink) {
+export var openLinkSettings = function openLinkSettings(editorAnalyticsApi) {
   return function (state, dispatch) {
     if (!(state.selection instanceof NodeSelection)) {
       return false;
     }
-    window.open(userPreferencesLink || getLinkPreferencesURLFromENV());
     if (dispatch) {
       var tr = state.tr,
         type = state.selection.node.type;
@@ -252,7 +252,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         type: 'separator'
       }], _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
         type: 'copy-button',
-        supportsViewMode: true,
+        supportsViewMode: !fg('platform_editor_remove_copy_button_from_view_mode'),
         items: [{
           state: state,
           formatMessage: intl.formatMessage,
@@ -352,7 +352,7 @@ export var getSettingsButton = function getSettingsButton(intl, editorAnalyticsA
     icon: SettingsIcon,
     iconFallback: CogIcon,
     title: intl.formatMessage(linkToolbarMessages.settingsLink),
-    onClick: openLinkSettings(editorAnalyticsApi, userPreferencesLink),
+    onClick: openLinkSettings(editorAnalyticsApi),
     href: userPreferencesLink || getLinkPreferencesURLFromENV(),
     target: '_blank'
   };

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

@@ -15,7 +15,6 @@ import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { focusEditorView, isDatasourceConfigEditable } from '../../utils';
 import { CardContextProvider } from '../CardContextProvider';
@@ -247,30 +246,28 @@ export var EditToolbarButton = function EditToolbarButton(props) {
     url = props.url;
   return jsx(CardContextProvider, null, function (_ref) {
     var cardContext = _ref.cardContext;
-    if (fg('enable_datasource_nourl_edit_dropdown_datafetch')) {
-      if (props.url) {
-        return jsx(EditToolbarButtonWithUrl, {
-          datasourceId: datasourceId,
-          url: props.url,
-          intl: intl,
-          editorAnalyticsApi: editorAnalyticsApi,
-          editorView: editorView,
-          cardContext: cardContext,
-          onLinkEditClick: onLinkEditClick,
-          currentAppearance: currentAppearance
-        });
-      }
-      if (props.datasourceId && props.node) {
-        return jsx(EditToolbarButtonWithDatasourceId, {
-          datasourceId: props.datasourceId,
-          node: props.node,
-          intl: intl,
-          editorAnalyticsApi: editorAnalyticsApi,
-          editorView: editorView,
-          onLinkEditClick: onLinkEditClick,
-          currentAppearance: currentAppearance
-        });
-      }
+    if (props.url) {
+      return jsx(EditToolbarButtonWithUrl, {
+        datasourceId: datasourceId,
+        url: props.url,
+        intl: intl,
+        editorAnalyticsApi: editorAnalyticsApi,
+        editorView: editorView,
+        cardContext: cardContext,
+        onLinkEditClick: onLinkEditClick,
+        currentAppearance: currentAppearance
+      });
+    }
+    if (props.datasourceId && props.node) {
+      return jsx(EditToolbarButtonWithDatasourceId, {
+        datasourceId: props.datasourceId,
+        node: props.node,
+        intl: intl,
+        editorAnalyticsApi: editorAnalyticsApi,
+        editorView: editorView,
+        onLinkEditClick: onLinkEditClick,
+        currentAppearance: currentAppearance
+      });
     }
     return jsx(EditToolbarButtonWithCardContext, {
       datasourceId: datasourceId,

package/dist/types/toolbar.d.ts

@@ -6,7 +6,7 @@ import type { CardPluginOptions } from './types';
 import type { cardPlugin } from './index';
 export declare const removeCard: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
-export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink: string | undefined) => Command;
+export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const floatingToolbar: (cardOptions: CardOptions, lpLinkPicker: boolean, linkPickerOptions?: LinkPickerOptions, pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>, disableFloatingToolbar?: boolean) => FloatingToolbarHandler;
 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;

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

@@ -6,7 +6,7 @@ import type { CardPluginOptions } from './types';
 import type { cardPlugin } from './index';
 export declare const removeCard: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
-export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink: string | undefined) => Command;
+export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const floatingToolbar: (cardOptions: CardOptions, lpLinkPicker: boolean, linkPickerOptions?: LinkPickerOptions, pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>, disableFloatingToolbar?: boolean) => FloatingToolbarHandler;
 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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "4.3.11",
+	"version": "4.4.2",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"@atlaskit/adf-schema": "^44.2.0",
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/custom-steps": "^0.8.0",
-		"@atlaskit/editor-common": "^94.11.0",
+		"@atlaskit/editor-common": "^94.19.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -49,16 +49,16 @@
 		"@atlaskit/icon": "^22.24.0",
 		"@atlaskit/link-analytics": "^8.5.0",
 		"@atlaskit/link-client-extension": "^2.4.0",
-		"@atlaskit/link-datasource": "^3.7.0",
+		"@atlaskit/link-datasource": "^3.8.0",
 		"@atlaskit/linking-common": "^6.0.0",
-		"@atlaskit/linking-types": "^9.3.0",
+		"@atlaskit/linking-types": "^9.5.0",
 		"@atlaskit/menu": "2.13.2",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/primitives": "^13.0.0",
+		"@atlaskit/primitives": "^13.1.0",
 		"@atlaskit/smart-card": "^30.2.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.11.0",
-		"@atlaskit/tokens": "^2.0.0",
+		"@atlaskit/tmp-editor-statsig": "^2.14.0",
+		"@atlaskit/tokens": "^2.2.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"lodash": "^4.17.21",
@@ -108,9 +108,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"enable_datasource_nourl_edit_dropdown_datafetch": {
-			"type": "boolean"
-		},
 		"platform-datasources-enable-two-way-sync": {
 			"type": "boolean"
 		},
@@ -131,6 +128,9 @@
 		},
 		"platform_editor_ssr_fix_smartlinks": {
 			"type": "boolean"
+		},
+		"platform_editor_remove_copy_button_from_view_mode": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {