Skip to content

Commit 644576c

Browse files
committed
added shouldShowRoleFilterEmptyState check to infer shouldShowEmptySearchMessage from it
1 parent ed2d6b1 commit 644576c

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

src/pages/workspace/WorkspaceMembersPage.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,11 +620,12 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
620620
isOffline && data?.some((member) => member.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || member.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
621621
const shouldShowSearchBar = data.length > CONST.SEARCH_ITEM_LIMIT;
622622
const debouncedFilteredData = useDebouncedValue(filteredData, CONST.TIMING.SEARCH_OPTION_LIST_DEBOUNCE_TIME);
623-
const hasNoFilteredMembers = filteredData.length === 0;
624-
const hasNoDebouncedFilteredMembers = debouncedFilteredData?.length === 0;
625-
const shouldShowEmptySearchMessage = !!shouldShowSearchBar && inputValue.length !== 0 && hasNoFilteredMembers;
623+
const isFilteringMembers = filteredData?.length < debouncedFilteredData?.length;
624+
const displayedFilteredData = isFilteringMembers ? debouncedFilteredData : filteredData;
625+
const hasNoDisplayedMembers = displayedFilteredData.length === 0;
626626
const shouldShowRoleFilter = data.length > 0;
627-
const shouldShowRoleFilterEmptyState = shouldShowRoleFilter && !!selectedRoleFilter && inputValue.length === 0 && hasNoFilteredMembers && hasNoDebouncedFilteredMembers;
627+
const shouldShowRoleFilterEmptyState = shouldShowRoleFilter && !!selectedRoleFilter && inputValue.length === 0 && hasNoDisplayedMembers;
628+
const shouldShowEmptySearchMessage = !shouldShowRoleFilterEmptyState && hasNoDisplayedMembers;
628629
const noResultsMessage = translate('common.noResultsFoundMatching', inputValue);
629630

630631
// SearchBar's built-in empty state also controls screen-reader announcements.

0 commit comments

Comments
 (0)