Page MenuHomePhorge
Files F32583084

D10820.1767401078.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D10820.1767401078.diff
View Options

diff --git a/web/settings/relationship/add-users-list.react.js b/web/settings/relationship/add-users-list.react.js
--- a/web/settings/relationship/add-users-list.react.js
+++ b/web/settings/relationship/add-users-list.react.js
@@ -51,7 +51,8 @@
const serverSearchResults = useSearchUsers(searchText);
- const searchTextPresent = searchText.length > 0;
+ const searchModeActive = searchText.length > 0;
+
const mergedUserInfos = React.useMemo(() => {
const mergedInfos: { [string]: GlobalAccountUserInfo | AccountUserInfo } =
{};
@@ -60,7 +61,7 @@
mergedInfos[userInfo.id] = userInfo;
}
- const userStoreUserIDs = searchTextPresent
+ const userStoreUserIDs = searchModeActive
? userStoreSearchResults
: Object.keys(userInfos);
for (const id of userStoreUserIDs) {
@@ -72,12 +73,23 @@
return mergedInfos;
}, [
- searchTextPresent,
+ searchModeActive,
serverSearchResults,
userInfos,
userStoreSearchResults,
]);
+ const [previouslySelectedUsers, setPreviouslySelectedUsers] = React.useState<
+ $ReadOnlyMap<string, GlobalAccountUserInfo>,
+ >(new Map());
+
+ React.useEffect(() => {
+ setPreviouslySelectedUsers(pendingUsersToAdd);
+
+ // We want this effect to run ONLY when searchModeActive changes
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [searchModeActive]);
+
const sortedUsers = React.useMemo(
() =>
Object.keys(mergedUserInfos)
@@ -86,10 +98,11 @@
user =>
user.id !== viewerID &&
(!user.relationshipStatus ||
- !excludedStatuses.has(user.relationshipStatus)),
+ !excludedStatuses.has(user.relationshipStatus)) &&
+ !previouslySelectedUsers.has(user.id),
)
.sort((user1, user2) => user1.username.localeCompare(user2.username)),
- [excludedStatuses, mergedUserInfos, viewerID],
+ [excludedStatuses, mergedUserInfos, viewerID, previouslySelectedUsers],
);
const toggleUser = React.useCallback(
@@ -140,7 +153,7 @@
}, [pendingUsersToAdd.size]);
const clearAllButton = React.useMemo(() => {
- if (searchText.length > 0) {
+ if (searchModeActive) {
return null;
}
@@ -158,12 +171,12 @@
clearAllButtonColor,
onClickClearAll,
pendingUsersToAdd.size,
- searchText.length,
+ searchModeActive,
]);
const listHeader = React.useMemo(() => {
let selectionText = 'Select users';
- if (searchText.length > 0) {
+ if (searchModeActive) {
selectionText = 'Search results:';
} else if (pendingUsersToAdd.size > 0) {
selectionText = `${pendingUsersToAdd.size} selected`;
@@ -175,7 +188,7 @@
{clearAllButton}
</div>
);
- }, [clearAllButton, pendingUsersToAdd.size, searchText.length]);
+ }, [clearAllButton, pendingUsersToAdd.size, searchModeActive]);
let errors;
if (errorMessage) {

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 3, 12:44 AM (3 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5877731
Default Alt Text
D10820.1767401078.diff (2 KB)

Event Timeline