Skip to content
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

Fixes for selection list #37521

Merged
merged 13 commits into from
Mar 20, 2024
+26 −14
Merged

Fixes for selection list #37521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1512c35
Fix: Workspace - Member and Role can be clicked to select all the mem…
rayane-djouah Feb 29, 2024
8528ef6
Merge branch 'main' into fix/37295
rayane-djouah Feb 29, 2024
c420550
Fix: Category - Checkbox is clickable outside near the right of checkbox
rayane-djouah Feb 29, 2024
61fc1f5
Merge branch 'Expensify:main' into fix/37295
rayane-djouah Feb 29, 2024
2e64a56
Merge branch 'Expensify:main' into fix/37295
rayane-djouah Feb 29, 2024
cb90dbf
Merge branch 'main' into fix/37295
rayane-djouah Mar 2, 2024
94452f5
line up checkboxes
rayane-djouah Mar 4, 2024
a1ad38a
Merge branch 'main' into fix/37295
rayane-djouah Mar 6, 2024
5c62b37
Merge branch 'Expensify:main' into fix/37295
rayane-djouah Mar 10, 2024
885e8db
Merge branch 'Expensify:main' into fix/37295
rayane-djouah Mar 10, 2024
7431057
fix https://github.com/Expensify/App/pull/37521/#issuecomment-1987648277
rayane-djouah Mar 13, 2024
491d70d
Merge branch 'main' into fix/37295
rayane-djouah Mar 13, 2024
6690997
fix https://github.com/Expensify/App/pull/37521/#issuecomment-1987640167
rayane-djouah Mar 13, 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
2 changes: 1 addition & 1 deletion src/components/SelectionList/BaseListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function BaseListItem<TItem extends ListItem>({
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
disabled={isDisabled || item.isDisabledCheckbox}
onPress={handleCheckboxPress}
style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled]}
style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled, styles.mr3]}
>
<View style={selectMultipleStyle}>
{item.isSelected && (
Expand Down
37 changes: 25 additions & 12 deletions src/components/SelectionList/BaseSelectionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Button from '@components/Button';
import Checkbox from '@components/Checkbox';
import FixedFooter from '@components/FixedFooter';
import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
import {PressableWithFeedback} from '@components/Pressable';
import SafeAreaConsumer from '@components/SafeAreaConsumer';
import SectionList from '@components/SectionList';
import ShowMoreButton from '@components/ShowMoreButton';
Expand Down Expand Up @@ -510,18 +511,30 @@ function BaseSelectionList<TItem extends ListItem>(
) : (
<>
{!headerMessage && canSelectMultiple && shouldShowSelectAll && (
<View style={[styles.peopleRow, styles.userSelectNone, styles.ph4, styles.pb3, listHeaderWrapperStyle]}>
<Checkbox
isChecked={flattenedSections.allSelected}
onPress={selectAllRow}
disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
accessibilityLabel={translate('workspace.people.selectAll')}
/>
{customListHeader ?? (
<View style={[styles.flex1]}>
<Text style={[styles.textStrong, styles.ph3]}>{translate('workspace.people.selectAll')}</Text>
</View>
)}
<View style={[styles.userSelectNone, styles.peopleRow, styles.ph5, styles.pb3, listHeaderWrapperStyle]}>
<View style={[styles.flexRow, styles.alignItemsCenter]}>
<Checkbox
accessibilityLabel={translate('workspace.people.selectAll')}
isChecked={flattenedSections.allSelected}
onPress={selectAllRow}
disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
/>
{!customListHeader && (
<PressableWithFeedback
style={[styles.userSelectNone, styles.flexRow, styles.alignItemsCenter]}
onPress={selectAllRow}
accessibilityLabel={translate('workspace.people.selectAll')}
role="button"
accessibilityState={{checked: flattenedSections.allSelected}}
disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
onMouseDown={shouldPreventDefaultFocusOnSelectRow ? (e) => e.preventDefault() : undefined}
>
<Text style={[styles.textStrong, styles.ph3]}>{translate('workspace.people.selectAll')}</Text>
</PressableWithFeedback>
)}
</View>
{customListHeader}
</View>
)}
{!headerMessage && !canSelectMultiple && customListHeader}
Expand Down
1 change: 0 additions & 1 deletion src/styles/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,6 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
getTestToolsModalStyle: (windowWidth: number): ViewStyle[] => [styles.settingsPageBody, styles.p5, {width: windowWidth * 0.9}],

getMultiselectListStyles: (isSelected: boolean, isDisabled: boolean): ViewStyle => ({
...styles.mr3,
...(isSelected && styles.checkedContainer),
...(isSelected && styles.borderColorFocus),
...(isDisabled && styles.cursorDisabled),
Expand Down
Loading