Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 1 deletion src/pages/home/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ function HomePage() {
contentContainerStyle={styles.homePageContentContainer}
addBottomSafeAreaPadding
>
{!shouldUseNarrowLayout && <QuickCreationActionsBar />}
{!shouldUseNarrowLayout && (
<View style={styles.centeredContentWidthLimiter}>
<QuickCreationActionsBar />
</View>
)}
<View style={styles.homePageMainLayout(shouldUseNarrowLayout)}>
{/* Widgets handle their own visibility and may return null to avoid duplicating visibility logic here */}
{shouldUseNarrowLayout ? (
Expand Down
10 changes: 9 additions & 1 deletion src/styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7227,11 +7227,19 @@ const plainStyles = (theme: ThemeColors) =>
flexDirection: shouldUseNarrowLayout ? 'column' : 'row',
gap: 20,
width: '100%',
maxWidth: variables.centeredContentMaxWidth,
alignSelf: 'center',
}) satisfies ViewStyle,

centeredContentWidthLimiter: {
width: '100%',
maxWidth: variables.centeredContentMaxWidth,
alignSelf: 'center',
},

homePageLeftColumn: {flex: 7, flexBasis: '58.333%', maxWidth: variables.homePageLeftColumnMaxWidth, flexDirection: 'column', gap: 20} satisfies ViewStyle,

homePageRightColumn: {flex: 5, flexBasis: '41.667%', maxWidth: variables.homePageRightColumnMaxWidth, flexDirection: 'column', gap: 20} satisfies ViewStyle,
homePageRightColumn: {flex: 5, flexBasis: '41.667%', flexDirection: 'column', gap: 20} satisfies ViewStyle,
}) satisfies Styles;

const styles = (theme: ThemeColors) =>
Expand Down
2 changes: 1 addition & 1 deletion src/styles/variables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export default {
receiptPreviewWidth: 380,
widgetHeaderTitleLineHeight: 20,
homePageLeftColumnMaxWidth: 680,
homePageRightColumnMaxWidth: 488,
centeredContentMaxWidth: 1200,

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.

This doesn't match the columns' real maximum total of 1188 (680 + 20 gap + 488)
Above ~1240px both columns freeze at their maxWidth, leaving 12px of free space that justifyContent: 'flex-start' parks on the right — so the widget block sits 6px left of true center.
cc: @MelvinBot

Image

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.

@MelvinBot to solve this, can we simply remove the 488 max width from the right columns and allow them to fill whatever remaining space is available?

minScanTooltipWidth: 320,
uploadViewMargin: 20,
chooseFilesViewMargin: 8,
Expand Down
Loading