@atlaskit/editor-plugin-card 6.6.1 → 6.6.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-card
 
+## 6.6.3
+
+### Patch Changes
+
+- [#166368](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/166368)
+  [`5f46eb74d8fa5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5f46eb74d8fa5) -
+  [ux] ED-27810: Added the link preference button when control is on
+
+## 6.6.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.6.1
 
 ### Patch Changes

package/dist/cjs/ui/toolbar.js

@@ -674,10 +674,24 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     // testId is required to show focus on trigger button on ESC key press
     // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
     var testId = (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_8') ? 'datasource-overflow-dropdown-trigger' : undefined;
-    toolbarItems.push({
-      type: 'separator',
-      fullHeight: true
-    });
+
+    // When canShowAppearanceSwitch is true, and platform_editor_controls is on, the link appearance dropdown shows, which includes a link preference button
+    // So only add the link appearance button when canShowAppearanceSwitch is false
+    if (!canShowAppearanceSwitch() && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_12')) {
+      var linkPreferenceButton = getSettingsButton(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink);
+      toolbarItems.push({
+        type: 'separator',
+        fullHeight: true
+      }, linkPreferenceButton, {
+        type: 'separator',
+        fullHeight: true
+      });
+    } else {
+      toolbarItems.push({
+        type: 'separator',
+        fullHeight: true
+      });
+    }
     var overflowMenuConfig = [{
       type: 'overflow-dropdown',
       testId: testId,

package/dist/es2019/ui/toolbar.js

@@ -667,10 +667,24 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
     // testId is required to show focus on trigger button on ESC key press
     // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
     const testId = fg('platform_editor_controls_patch_8') ? 'datasource-overflow-dropdown-trigger' : undefined;
-    toolbarItems.push({
-      type: 'separator',
-      fullHeight: true
-    });
+
+    // When canShowAppearanceSwitch is true, and platform_editor_controls is on, the link appearance dropdown shows, which includes a link preference button
+    // So only add the link appearance button when canShowAppearanceSwitch is false
+    if (!canShowAppearanceSwitch() && fg('platform_editor_controls_patch_12')) {
+      const linkPreferenceButton = getSettingsButton(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink);
+      toolbarItems.push({
+        type: 'separator',
+        fullHeight: true
+      }, linkPreferenceButton, {
+        type: 'separator',
+        fullHeight: true
+      });
+    } else {
+      toolbarItems.push({
+        type: 'separator',
+        fullHeight: true
+      });
+    }
     const overflowMenuConfig = [{
       type: 'overflow-dropdown',
       testId,

package/dist/esm/ui/toolbar.js

@@ -665,10 +665,24 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     // testId is required to show focus on trigger button on ESC key press
     // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
     var testId = fg('platform_editor_controls_patch_8') ? 'datasource-overflow-dropdown-trigger' : undefined;
-    toolbarItems.push({
-      type: 'separator',
-      fullHeight: true
-    });
+
+    // When canShowAppearanceSwitch is true, and platform_editor_controls is on, the link appearance dropdown shows, which includes a link preference button
+    // So only add the link appearance button when canShowAppearanceSwitch is false
+    if (!canShowAppearanceSwitch() && fg('platform_editor_controls_patch_12')) {
+      var linkPreferenceButton = getSettingsButton(intl, editorAnalyticsApi, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.userPreferencesLink);
+      toolbarItems.push({
+        type: 'separator',
+        fullHeight: true
+      }, linkPreferenceButton, {
+        type: 'separator',
+        fullHeight: true
+      });
+    } else {
+      toolbarItems.push({
+        type: 'separator',
+        fullHeight: true
+      });
+    }
     var overflowMenuConfig = [{
       type: 'overflow-dropdown',
       testId: testId,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "6.6.1",
+	"version": "6.6.3",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^106.3.0",
+		"@atlaskit/editor-common": "^106.5.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-base": "^3.0.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -63,7 +63,7 @@
 		"@atlaskit/primitives": "^14.8.0",
 		"@atlaskit/smart-card": "^38.8.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^5.14.0",
+		"@atlaskit/tmp-editor-statsig": "^6.0.0",
 		"@atlaskit/tokens": "^5.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -141,6 +141,9 @@
 		"platform_editor_controls_patch_9": {
 			"type": "boolean"
 		},
+		"platform_editor_controls_patch_12": {
+			"type": "boolean"
+		},
 		"smart_link_editor_update_toolbar_open_link": {
 			"type": "boolean"
 		},