From 07f68123974ac5bf59e974c5e7b75b79fc32c50a Mon Sep 17 00:00:00 2001 From: Zuzanna Furtak Date: Wed, 5 Nov 2025 18:21:13 +0100 Subject: [PATCH 1/5] Fix safe padding --- src/components/SelectionList/BaseSelectionList.tsx | 10 ++++------ src/components/SelectionList/types.ts | 3 --- .../OnboardingEmployees/BaseOnboardingEmployees.tsx | 1 - .../workspace/reports/ReportFieldsListValuesPage.tsx | 1 - 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx index a6894efe0db4..519ce06e3774 100644 --- a/src/components/SelectionList/BaseSelectionList.tsx +++ b/src/components/SelectionList/BaseSelectionList.tsx @@ -60,7 +60,6 @@ function BaseSelectionList({ isLoadingNewOptions, isRowMultilineSupported = false, addBottomSafeAreaPadding, - includeSafeAreaPaddingBottom = true, showListEmptyContent = true, showLoadingPlaceholder, showScrollIndicator = true, @@ -100,10 +99,9 @@ function BaseSelectionList({ [isSelected, selectedItems, canSelectMultiple], ); - const paddingBottomStyle = useMemo( - () => (!isKeyboardShown || !!footerContent) && includeSafeAreaPaddingBottom && safeAreaPaddingBottomStyle, - [footerContent, includeSafeAreaPaddingBottom, isKeyboardShown, safeAreaPaddingBottomStyle], - ); + const paddingBottomStyle = useMemo(() => !isKeyboardShown && safeAreaPaddingBottomStyle, [footerContent, isKeyboardShown, safeAreaPaddingBottomStyle]); + + const hasFooter = confirmButtonConfig?.showButton || footerContent; const dataDetails = useMemo>(() => { const {disabledIndexes, disabledArrowKeyIndexes, selectedOptions} = data.reduce( @@ -378,7 +376,7 @@ function BaseSelectionList({ useImperativeHandle(ref, () => ({scrollAndHighlightItem, scrollToIndex}), [scrollAndHighlightItem, scrollToIndex]); return ( - + {textInputComponent({shouldBeInsideList: false})} {data.length === 0 ? ( renderListEmptyContent() diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts index 7b6afe5a6c53..3a30e3ed2e61 100644 --- a/src/components/SelectionList/types.ts +++ b/src/components/SelectionList/types.ts @@ -96,9 +96,6 @@ type SelectionListProps = { /** Whether to add bottom safe area padding */ addBottomSafeAreaPadding?: boolean; - /** Whether to include padding bottom */ - includeSafeAreaPaddingBottom?: boolean; - /** Whether to show the empty list content */ showListEmptyContent?: boolean; diff --git a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx index 2af650bef111..c240f89b6196 100644 --- a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx +++ b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx @@ -98,7 +98,6 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE ListItem={RadioListItem} footerContent={footerContent} style={{listItemWrapperStyle: onboardingIsMediumOrLargerScreenWidth ? [styles.pl8, styles.pr8] : []}} - includeSafeAreaPaddingBottom={false} /> ); diff --git a/src/pages/workspace/reports/ReportFieldsListValuesPage.tsx b/src/pages/workspace/reports/ReportFieldsListValuesPage.tsx index 326cc6e229af..5d708ed3f74d 100644 --- a/src/pages/workspace/reports/ReportFieldsListValuesPage.tsx +++ b/src/pages/workspace/reports/ReportFieldsListValuesPage.tsx @@ -388,7 +388,6 @@ function ReportFieldsListValuesPage({ )} {!shouldShowEmptyState && ( item && toggleValue(item)} From 1f76b8fa4abedee258c3c3c7bf4524819732981c Mon Sep 17 00:00:00 2001 From: Zuzanna Furtak Date: Wed, 5 Nov 2025 18:31:38 +0100 Subject: [PATCH 2/5] Fix lint --- src/components/SelectionList/BaseSelectionList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx index 519ce06e3774..24e82b8915af 100644 --- a/src/components/SelectionList/BaseSelectionList.tsx +++ b/src/components/SelectionList/BaseSelectionList.tsx @@ -99,7 +99,7 @@ function BaseSelectionList({ [isSelected, selectedItems, canSelectMultiple], ); - const paddingBottomStyle = useMemo(() => !isKeyboardShown && safeAreaPaddingBottomStyle, [footerContent, isKeyboardShown, safeAreaPaddingBottomStyle]); + const paddingBottomStyle = useMemo(() => !isKeyboardShown && safeAreaPaddingBottomStyle, [isKeyboardShown, safeAreaPaddingBottomStyle]); const hasFooter = confirmButtonConfig?.showButton || footerContent; From fe78a32302af37d574ca04fae3b6af57920a5f2e Mon Sep 17 00:00:00 2001 From: Zuzanna Furtak Date: Wed, 5 Nov 2025 18:32:33 +0100 Subject: [PATCH 3/5] Fix lint --- src/components/SelectionList/BaseSelectionList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx index 24e82b8915af..7f0b1da3e1e0 100644 --- a/src/components/SelectionList/BaseSelectionList.tsx +++ b/src/components/SelectionList/BaseSelectionList.tsx @@ -101,7 +101,7 @@ function BaseSelectionList({ const paddingBottomStyle = useMemo(() => !isKeyboardShown && safeAreaPaddingBottomStyle, [isKeyboardShown, safeAreaPaddingBottomStyle]); - const hasFooter = confirmButtonConfig?.showButton || footerContent; + const hasFooter = footerContent ?? confirmButtonConfig?.showButton; const dataDetails = useMemo>(() => { const {disabledIndexes, disabledArrowKeyIndexes, selectedOptions} = data.reduce( From b6d2ba88dad6664a392eb26b1d713be17740e015 Mon Sep 17 00:00:00 2001 From: Zuzanna Furtak Date: Thu, 6 Nov 2025 14:01:46 +0100 Subject: [PATCH 4/5] Revert change --- src/pages/workspace/reports/ReportFieldsListValuesPage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/reports/ReportFieldsListValuesPage.tsx b/src/pages/workspace/reports/ReportFieldsListValuesPage.tsx index 5d708ed3f74d..326cc6e229af 100644 --- a/src/pages/workspace/reports/ReportFieldsListValuesPage.tsx +++ b/src/pages/workspace/reports/ReportFieldsListValuesPage.tsx @@ -388,6 +388,7 @@ function ReportFieldsListValuesPage({ )} {!shouldShowEmptyState && ( item && toggleValue(item)} From 56087c63233635621c06a955261669e88261eb4a Mon Sep 17 00:00:00 2001 From: Zuzanna Furtak Date: Fri, 7 Nov 2025 16:57:25 +0100 Subject: [PATCH 5/5] Adjust to review --- src/components/SelectionList/BaseSelectionList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx index 7f0b1da3e1e0..826c76c6aa96 100644 --- a/src/components/SelectionList/BaseSelectionList.tsx +++ b/src/components/SelectionList/BaseSelectionList.tsx @@ -101,7 +101,7 @@ function BaseSelectionList({ const paddingBottomStyle = useMemo(() => !isKeyboardShown && safeAreaPaddingBottomStyle, [isKeyboardShown, safeAreaPaddingBottomStyle]); - const hasFooter = footerContent ?? confirmButtonConfig?.showButton; + const hasFooter = !!footerContent || confirmButtonConfig?.showButton; const dataDetails = useMemo>(() => { const {disabledIndexes, disabledArrowKeyIndexes, selectedOptions} = data.reduce(