Skip to content

Fix pending join workspace name is not displayed #44716

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
yuwenmemon merged 2 commits into from
Jul 3, 2024
Merged

Fix pending join workspace name is not displayed #44716

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
936f24b
fix ws list item name doesn't show
bernhardoj Jul 2, 2024
94167e5
fix alignment
bernhardoj Jul 2, 2024
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
6 changes: 3 additions & 3 deletions src/pages/workspace/WorkspacesListRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ function WorkspacesListRow({
const isDeleted = style && Array.isArray(style) ? style.includes(styles.offlineFeedback.deleted) : false;

const ThreeDotMenuOrPendingIcon = (
<View style={[styles.flexRow]}>
<View style={[styles.flexRow, !isSmallScreenWidth && styles.workspaceThreeDotMenu]}>
{isJoinRequestPending && (
<View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.flex1, styles.justifyContentEnd, isNarrow && styles.workspaceListBadge]}>
<View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.justifyContentEnd]}>
<Badge
text={translate('workspace.common.requested')}
textStyles={styles.textStrong}
Expand All @@ -154,7 +154,7 @@ function WorkspacesListRow({
</View>
)}
{!isJoinRequestPending && (
<View style={[styles.flexRow, styles.ml2, styles.gap1, !isSmallScreenWidth && styles.workspaceThreeDotMenu]}>
<View style={[styles.flexRow, styles.ml2, styles.gap1]}>
<View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, isNarrow && styles.workspaceListRBR]}>
<BrickRoadIndicatorIcon brickRoadIndicator={brickRoadIndicator} />
</View>
Expand Down
9 changes: 2 additions & 7 deletions src/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3359,13 +3359,8 @@ const styles = (theme: ThemeColors) =>
},

workspaceThreeDotMenu: {
marginLeft: 84,
},

workspaceListBadge: {
flexDirection: 'column',
justifyContent: 'flex-start',
marginTop: 6,
justifyContent: 'flex-end',
width: 124,

@shawnborton shawnborton Jul 2, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you share some mobile screenshots of the workspaces page where the workspace names are quite long? If I recall correctly from before, setting a fixed width here means that when there is no badge shown, we still lose a lot of horizontal space for the workspace name to display.

@bernhardoj bernhardoj Jul 2, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is how it looks:
image

Btw, the above style is only applied to a large screen.

@shawnborton shawnborton Jul 2, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, thanks for confirming - that looks good on mobile.

},

workspaceListRBR: {
Expand Down