@atlaskit/user-picker 8.4.0 → 8.4.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/user-picker
 
+## 8.4.1
+
+### Patch Changes
+
+- [`22928ac80d0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/22928ac80d0) - Fix: user sources would keep being fetched in a loop as long as the tooltip was displayed
+
 ## 8.4.0
 
 ### Minor Changes

package/dist/cjs/clients/UserSourceProvider.js

@@ -37,10 +37,10 @@ var useUserSource = function useUserSource(accountId, shouldFetchSources, existi
   var _useContext = (0, _react.useContext)(ExusUserSourceContext),
       fetchUserSource = _useContext.fetchUserSource;
 
-  var _useState = (0, _react.useState)(new Set(existingSources)),
+  var _useState = (0, _react.useState)([]),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      sources = _useState2[0],
-      setUserSources = _useState2[1];
+      externalSources = _useState2[0],
+      setExternalSources = _useState2[1];
 
   var _useState3 = (0, _react.useState)(true),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
@@ -72,26 +72,33 @@ var useUserSource = function useUserSource(accountId, shouldFetchSources, existi
       return cleanup;
     }
 
-    if (isMounted) {
-      fetchUserSource(accountId, abortController === null || abortController === void 0 ? void 0 : abortController.signal).then(function (externalSources) {
-        setLoading(false);
-        var externalSourceTypes = externalSources.map(function (source) {
-          return source.sourceType;
-        });
-        setUserSources(new Set([].concat((0, _toConsumableArray2.default)(sources), (0, _toConsumableArray2.default)(externalSourceTypes))));
-      }).catch(function (error) {
-        setLoading(false);
-        setError(error);
+    fetchUserSource(accountId, abortController === null || abortController === void 0 ? void 0 : abortController.signal).then(function (externalSources) {
+      if (!isMounted) {
+        return;
+      }
+
+      setLoading(false);
+      var externalSourceTypes = externalSources.map(function (source) {
+        return source.sourceType;
       });
-    }
+      setExternalSources(externalSourceTypes);
+    }).catch(function (error) {
+      if (!isMounted) {
+        return;
+      }
 
+      setLoading(false);
+      setError(error);
+    });
     return cleanup;
-  }, [fetchUserSource, accountId, sources, abortController, shouldFetchSources]);
-  return {
-    sources: Array.from(sources),
-    loading: loading,
-    error: error
-  };
+  }, [fetchUserSource, accountId, abortController, shouldFetchSources]);
+  return (0, _react.useMemo)(function () {
+    return {
+      sources: Array.from(new Set([].concat((0, _toConsumableArray2.default)(existingSources !== null && existingSources !== void 0 ? existingSources : []), (0, _toConsumableArray2.default)(externalSources)))),
+      loading: loading,
+      error: error
+    };
+  }, [error, existingSources, externalSources, loading]);
 };
 
 exports.useUserSource = useUserSource;

package/dist/cjs/components/ExternalUserSourcesContainer.js

@@ -15,8 +15,7 @@ var ExternalUserSourcesContainer = function ExternalUserSourcesContainer(_ref) {
   var children = _ref.children,
       accountId = _ref.accountId,
       shouldFetchSources = _ref.shouldFetchSources,
-      _ref$initialSources = _ref.initialSources,
-      initialSources = _ref$initialSources === void 0 ? [] : _ref$initialSources;
+      initialSources = _ref.initialSources;
 
   var _useUserSource = (0, _UserSourceProvider.useUserSource)(accountId, shouldFetchSources, initialSources),
       sources = _useUserSource.sources,

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "8.4.0",
+	"version": "8.4.1",
 	"sideEffects": false
 }

package/dist/es2019/clients/UserSourceProvider.js

@@ -12,7 +12,7 @@ export const useUserSource = (accountId, shouldFetchSources, existingSources) =>
   const {
     fetchUserSource
   } = useContext(ExusUserSourceContext);
-  const [sources, setUserSources] = useState(new Set(existingSources));
+  const [externalSources, setExternalSources] = useState([]);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
   const abortController = useMemo(() => {
@@ -35,22 +35,27 @@ export const useUserSource = (accountId, shouldFetchSources, existingSources) =>
       return cleanup;
     }
 
-    if (isMounted) {
-      fetchUserSource(accountId, abortController === null || abortController === void 0 ? void 0 : abortController.signal).then(externalSources => {
-        setLoading(false);
-        const externalSourceTypes = externalSources.map(source => source.sourceType);
-        setUserSources(new Set([...sources, ...externalSourceTypes]));
-      }).catch(error => {
-        setLoading(false);
-        setError(error);
-      });
-    }
+    fetchUserSource(accountId, abortController === null || abortController === void 0 ? void 0 : abortController.signal).then(externalSources => {
+      if (!isMounted) {
+        return;
+      }
+
+      setLoading(false);
+      const externalSourceTypes = externalSources.map(source => source.sourceType);
+      setExternalSources(externalSourceTypes);
+    }).catch(error => {
+      if (!isMounted) {
+        return;
+      }
 
+      setLoading(false);
+      setError(error);
+    });
     return cleanup;
-  }, [fetchUserSource, accountId, sources, abortController, shouldFetchSources]);
-  return {
-    sources: Array.from(sources),
+  }, [fetchUserSource, accountId, abortController, shouldFetchSources]);
+  return useMemo(() => ({
+    sources: Array.from(new Set([...(existingSources !== null && existingSources !== void 0 ? existingSources : []), ...externalSources])),
     loading,
     error
-  };
+  }), [error, existingSources, externalSources, loading]);
 };

package/dist/es2019/components/ExternalUserSourcesContainer.js

@@ -4,7 +4,7 @@ export const ExternalUserSourcesContainer = ({
   children,
   accountId,
   shouldFetchSources,
-  initialSources = []
+  initialSources
 }) => {
   const {
     sources,

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "8.4.0",
+	"version": "8.4.1",
 	"sideEffects": false
 }

package/dist/esm/clients/UserSourceProvider.js

@@ -15,10 +15,10 @@ export var useUserSource = function useUserSource(accountId, shouldFetchSources,
   var _useContext = useContext(ExusUserSourceContext),
       fetchUserSource = _useContext.fetchUserSource;
 
-  var _useState = useState(new Set(existingSources)),
+  var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
-      sources = _useState2[0],
-      setUserSources = _useState2[1];
+      externalSources = _useState2[0],
+      setExternalSources = _useState2[1];
 
   var _useState3 = useState(true),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -50,24 +50,31 @@ export var useUserSource = function useUserSource(accountId, shouldFetchSources,
       return cleanup;
     }
 
-    if (isMounted) {
-      fetchUserSource(accountId, abortController === null || abortController === void 0 ? void 0 : abortController.signal).then(function (externalSources) {
-        setLoading(false);
-        var externalSourceTypes = externalSources.map(function (source) {
-          return source.sourceType;
-        });
-        setUserSources(new Set([].concat(_toConsumableArray(sources), _toConsumableArray(externalSourceTypes))));
-      }).catch(function (error) {
-        setLoading(false);
-        setError(error);
+    fetchUserSource(accountId, abortController === null || abortController === void 0 ? void 0 : abortController.signal).then(function (externalSources) {
+      if (!isMounted) {
+        return;
+      }
+
+      setLoading(false);
+      var externalSourceTypes = externalSources.map(function (source) {
+        return source.sourceType;
       });
-    }
+      setExternalSources(externalSourceTypes);
+    }).catch(function (error) {
+      if (!isMounted) {
+        return;
+      }
 
+      setLoading(false);
+      setError(error);
+    });
     return cleanup;
-  }, [fetchUserSource, accountId, sources, abortController, shouldFetchSources]);
-  return {
-    sources: Array.from(sources),
-    loading: loading,
-    error: error
-  };
+  }, [fetchUserSource, accountId, abortController, shouldFetchSources]);
+  return useMemo(function () {
+    return {
+      sources: Array.from(new Set([].concat(_toConsumableArray(existingSources !== null && existingSources !== void 0 ? existingSources : []), _toConsumableArray(externalSources)))),
+      loading: loading,
+      error: error
+    };
+  }, [error, existingSources, externalSources, loading]);
 };

package/dist/esm/components/ExternalUserSourcesContainer.js

@@ -4,8 +4,7 @@ export var ExternalUserSourcesContainer = function ExternalUserSourcesContainer(
   var children = _ref.children,
       accountId = _ref.accountId,
       shouldFetchSources = _ref.shouldFetchSources,
-      _ref$initialSources = _ref.initialSources,
-      initialSources = _ref$initialSources === void 0 ? [] : _ref$initialSources;
+      initialSources = _ref.initialSources;
 
   var _useUserSource = useUserSource(accountId, shouldFetchSources, initialSources),
       sources = _useUserSource.sources,

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "8.4.0",
+	"version": "8.4.1",
 	"sideEffects": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/user-picker",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "description": "Fabric component for display a dropdown to select a user from",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"