Skip to content

[CP Staging] Prevent overflow empty UI and space above skeleton #47555

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
Beamanator merged 1 commit into from
Aug 17, 2024
Merged

[CP Staging] Prevent overflow empty UI and space above skeleton #47555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/components/EmptySelectionListContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function EmptySelectionListContent({contentType}: EmptySelectionListContentProps
);

return (
<View style={[styles.flex1, styles.overflowHidden]}>
<View style={[styles.flex1, styles.overflowHidden, styles.minHeight65]}>
Copy link
Contributor

@Pujan92 Pujan92 Jan 2, 2025

Choose a reason for hiding this comment

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

This min-height without ScrollView causes the issue #53689

<BlockingView
icon={Illustrations.ToddWithPhones}
iconWidth={variables.emptySelectionListIconWidth}
Expand Down
5 changes: 3 additions & 2 deletions src/components/SelectionList/BaseSelectionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,9 +687,10 @@ function BaseSelectionList<TItem extends ListItem>(
)}
{/* If we are loading new options we will avoid showing any header message. This is mostly because one of the header messages says there are no options. */}
{/* This is misleading because we might be in the process of loading fresh options from the server. */}
{(((!isLoadingNewOptions || headerMessage !== translate('common.noResultsFound')) && !!headerMessage) || flattenedSections.allOptions.length === 0) && (
{(((!isLoadingNewOptions || headerMessage !== translate('common.noResultsFound')) && !!headerMessage) ||
(flattenedSections.allOptions.length === 0 && !showLoadingPlaceholder)) && (
<View style={headerMessageStyle ?? [styles.ph5, styles.pb5]}>
<Text style={[styles.textLabel, styles.colorMuted]}>{headerMessage}</Text>
<Text style={[styles.textLabel, styles.colorMuted, styles.minHeight5]}>{headerMessage}</Text>
</View>
)}
{!!headerContent && headerContent}
Expand Down
8 changes: 8 additions & 0 deletions src/styles/utils/spacing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,4 +664,12 @@ export default {
rowGap4: {
rowGap: 16,
},

minHeight5: {
minHeight: 20,
},

minHeight65: {
Copy link
Contributor

@allroundexperts allroundexperts Aug 16, 2024

Choose a reason for hiding this comment

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

Is there a reason behind this naming? 65 seems random to me.

Copy link
Contributor

@allroundexperts allroundexperts Aug 16, 2024

Choose a reason for hiding this comment

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

Ah, I see. Multiple of 4.

Copy link
Contributor

@Beamanator Beamanator Aug 17, 2024

Choose a reason for hiding this comment

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

Hmm wouldn't 64 be a multiple of 4?

minHeight: 260,
},
} satisfies Record<string, ViewStyle>;