Skip to content

fix style of select multiple #60062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasperhuangg merged 2 commits into from Apr 15, 2025
Merged

fix style of select multiple #60062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8079128
fix style of select multiple
Apr 10, 2025
4eb3857
resolve conflict
Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/pages/workspace/WorkspaceMembersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ function WorkspaceMembersPage({personalDetails, route, policy, currentUserPerson
headerContent={!shouldUseNarrowLayout && getHeaderButtons()}
testID={WorkspaceMembersPage.displayName}
shouldShowLoading={false}
shouldUseHeadlineHeader={!selectionModeHeader}
shouldShowOfflineIndicatorInWideScreen
shouldShowThreeDotsButton={isPolicyAdmin}
threeDotsMenuItems={threeDotsMenuItems}
Expand Down
6 changes: 5 additions & 1 deletion src/pages/workspace/WorkspacePageWithSections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ type WorkspacePageWithSectionsProps = WithPolicyAndFullscreenLoadingProps &
/** Whether the page is loading, example any other API call in progres */
isLoading?: boolean;

/** Whether to use the headline header */
shouldUseHeadlineHeader?: boolean;

/**
* If enabled, the content will have a bottom padding equal to account for the safe bottom area inset.
*/
Expand Down Expand Up @@ -121,6 +124,7 @@ function WorkspacePageWithSections({
shouldShowThreeDotsButton,
threeDotsMenuItems,
threeDotsAnchorPosition,
shouldUseHeadlineHeader = true,
addBottomSafeAreaPadding = false,
}: WorkspacePageWithSectionsProps) {
const styles = useThemeStyles();
Expand Down Expand Up @@ -206,7 +210,7 @@ function WorkspacePageWithSections({
shouldShowThreeDotsButton={shouldShowThreeDotsButton}
threeDotsMenuItems={threeDotsMenuItems}
threeDotsAnchorPosition={threeDotsAnchorPosition}
shouldUseHeadlineHeader
shouldUseHeadlineHeader={shouldUseHeadlineHeader}
>
{headerContent}
</HeaderWithBackButton>
Expand Down