@atlaskit/link-picker 1.16.7 → 1.16.8

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/link-picker
 
+## 1.16.8
+
+### Patch Changes
+
+- [`5441fa9235d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5441fa9235d) - [ux] XPC3P-106 Fix recents not showing when switching tabs in new link picker
+- Updated dependencies
+
 ## 1.16.7
 
 ### Patch Changes

package/dist/cjs/services/use-search-query/index.js

@@ -14,11 +14,13 @@ function useSearchQuery(state) {
 
   var queryState = (0, _react.useRef)(null);
   /*
-   * When state contains a valid url AND is NOT selected from results
-   * queryState should be null to clear the items in plugin state
+   * When state contains a valid url AND is NOT selected from results, and the url was updated
+   * from the textbox, queryState should be null to clear the items in plugin state.
+   *
+   * Checking `lastEditedBy` prevents the items being cleared when the tab is changed.
    */
 
-  if ((0, _url.isSafeUrl)(state.url) && state.selectedIndex === -1) {
+  if ((0, _url.isSafeUrl)(state.url) && state.selectedIndex === -1 && !state.preventHidingRecents) {
     queryState.current = null;
   }
   /*

package/dist/cjs/ui/link-picker/index.js

@@ -100,7 +100,8 @@ var initState = {
   activeIndex: -1,
   selectedIndex: -1,
   invalidUrl: false,
-  activeTab: 0
+  activeTab: 0,
+  preventHidingRecents: false
 };
 
 function reducer(state, payload) {
@@ -193,7 +194,9 @@ function LinkPicker(_ref) {
     /** Any on change event is triggered by manual input or paste, so source is null */
     trackAttribute('linkFieldContentInputSource', null);
     dispatch({
-      url: e.currentTarget.value
+      url: e.currentTarget.value,
+      // If the last action was changing tabs, make sure we're now allowing recents to be hidden
+      preventHidingRecents: false
     });
   }, [dispatch, trackAttribute]);
   var handleChangeText = (0, _react.useCallback)(function (e) {
@@ -332,8 +335,12 @@ function LinkPicker(_ref) {
     var _plugins$activeTab$ta, _plugins$activeTab;
 
     dispatch({
-      selectedIndex: -1,
+      // We don't want any selection to exist after changing tab, as the selection
+      // wouldn't mean anything.
       activeIndex: -1,
+      selectedIndex: -1,
+      // We don't want recents to be hidden, even though we don't have a selection
+      preventHidingRecents: true,
       invalidUrl: false,
       activeTab: activeTab
     });

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-picker",
-	"version": "1.16.7",
+	"version": "1.16.8",
 	"sideEffects": false
 }

package/dist/es2019/services/use-search-query/index.js

@@ -5,11 +5,13 @@ export function useSearchQuery(state) {
 
   const queryState = useRef(null);
   /*
-   * When state contains a valid url AND is NOT selected from results
-   * queryState should be null to clear the items in plugin state
+   * When state contains a valid url AND is NOT selected from results, and the url was updated
+   * from the textbox, queryState should be null to clear the items in plugin state.
+   *
+   * Checking `lastEditedBy` prevents the items being cleared when the tab is changed.
    */
 
-  if (isSafeUrl(state.url) && state.selectedIndex === -1) {
+  if (isSafeUrl(state.url) && state.selectedIndex === -1 && !state.preventHidingRecents) {
     queryState.current = null;
   }
   /*

package/dist/es2019/ui/link-picker/index.js

@@ -47,7 +47,8 @@ const initState = {
   activeIndex: -1,
   selectedIndex: -1,
   invalidUrl: false,
-  activeTab: 0
+  activeTab: 0,
+  preventHidingRecents: false
 };
 
 function reducer(state, payload) {
@@ -137,7 +138,9 @@ function LinkPicker({
     /** Any on change event is triggered by manual input or paste, so source is null */
     trackAttribute('linkFieldContentInputSource', null);
     dispatch({
-      url: e.currentTarget.value
+      url: e.currentTarget.value,
+      // If the last action was changing tabs, make sure we're now allowing recents to be hidden
+      preventHidingRecents: false
     });
   }, [dispatch, trackAttribute]);
   const handleChangeText = useCallback(e => {
@@ -277,8 +280,12 @@ function LinkPicker({
     var _plugins$activeTab$ta, _plugins$activeTab;
 
     dispatch({
-      selectedIndex: -1,
+      // We don't want any selection to exist after changing tab, as the selection
+      // wouldn't mean anything.
       activeIndex: -1,
+      selectedIndex: -1,
+      // We don't want recents to be hidden, even though we don't have a selection
+      preventHidingRecents: true,
       invalidUrl: false,
       activeTab
     });

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-picker",
-	"version": "1.16.7",
+	"version": "1.16.8",
 	"sideEffects": false
 }

package/dist/esm/services/use-search-query/index.js

@@ -5,11 +5,13 @@ export function useSearchQuery(state) {
 
   var queryState = useRef(null);
   /*
-   * When state contains a valid url AND is NOT selected from results
-   * queryState should be null to clear the items in plugin state
+   * When state contains a valid url AND is NOT selected from results, and the url was updated
+   * from the textbox, queryState should be null to clear the items in plugin state.
+   *
+   * Checking `lastEditedBy` prevents the items being cleared when the tab is changed.
    */
 
-  if (isSafeUrl(state.url) && state.selectedIndex === -1) {
+  if (isSafeUrl(state.url) && state.selectedIndex === -1 && !state.preventHidingRecents) {
     queryState.current = null;
   }
   /*

package/dist/esm/ui/link-picker/index.js

@@ -52,7 +52,8 @@ var initState = {
   activeIndex: -1,
   selectedIndex: -1,
   invalidUrl: false,
-  activeTab: 0
+  activeTab: 0,
+  preventHidingRecents: false
 };
 
 function reducer(state, payload) {
@@ -145,7 +146,9 @@ function LinkPicker(_ref) {
     /** Any on change event is triggered by manual input or paste, so source is null */
     trackAttribute('linkFieldContentInputSource', null);
     dispatch({
-      url: e.currentTarget.value
+      url: e.currentTarget.value,
+      // If the last action was changing tabs, make sure we're now allowing recents to be hidden
+      preventHidingRecents: false
     });
   }, [dispatch, trackAttribute]);
   var handleChangeText = useCallback(function (e) {
@@ -284,8 +287,12 @@ function LinkPicker(_ref) {
     var _plugins$activeTab$ta, _plugins$activeTab;
 
     dispatch({
-      selectedIndex: -1,
+      // We don't want any selection to exist after changing tab, as the selection
+      // wouldn't mean anything.
       activeIndex: -1,
+      selectedIndex: -1,
+      // We don't want recents to be hidden, even though we don't have a selection
+      preventHidingRecents: true,
       invalidUrl: false,
       activeTab: activeTab
     });

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-picker",
-	"version": "1.16.7",
+	"version": "1.16.8",
 	"sideEffects": false
 }

package/dist/types/ui/link-picker/index.d.ts

@@ -72,6 +72,8 @@ export interface PickerState {
     displayText: string;
     invalidUrl: boolean;
     activeTab: number;
+    /** When true, even if the selected index is -1, don't hide the recents. */
+    preventHidingRecents: boolean;
 }
 declare const _default: import("react").ComponentType<LinkPickerProps>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-picker",
-  "version": "1.16.7",
+  "version": "1.16.8",
   "description": "Standalone link picker",
   "author": "Atlassian Pty Ltd",
   "publishConfig": {
@@ -37,7 +37,7 @@
     "@atlaskit/form": "^8.8.0",
     "@atlaskit/frontend-utilities": "^2.1.0",
     "@atlaskit/icon": "^21.11.0",
-    "@atlaskit/linking-common": "^1.17.0",
+    "@atlaskit/linking-common": "^1.18.0",
     "@atlaskit/spinner": "^15.3.0",
     "@atlaskit/tabs": "^13.3.0",
     "@atlaskit/textfield": "^5.3.0",
@@ -74,7 +74,7 @@
     "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
     "@atlassian/link-picker-atlassian-plugin": "^26.0.0",
-    "@atlassian/link-picker-plugins": "^14.0.0",
+    "@atlassian/link-picker-plugins": "^14.1.0",
     "@atlassian/recent-work-client": "^1.6.0",
     "@atlassian/search-provider": "^2.3.0",
     "@testing-library/dom": "^8.17.1",