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

fix: Add indenting logic for subcategories #37456

Merged
merged 5 commits into from
Mar 25, 2024
Merged

fix: Add indenting logic for subcategories #37456

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
773cfaf
Add indentation logic to list items
neonbhai Feb 28, 2024
b4c0350
Merge branch 'main' of https://github.com/Expensify/App into category…
neonbhai Mar 8, 2024
fad3686
Update ternary expression to use null
neonbhai Mar 8, 2024
b04fabe
Merge branch 'main' of https://github.com/Expensify/App into category…
neonbhai Mar 22, 2024
ac67125
Fix lint
neonbhai Mar 22, 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
7 changes: 6 additions & 1 deletion src/components/SelectionList/RadioListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {View} from 'react-native';
import TextWithTooltip from '@components/TextWithTooltip';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
import CONST from '@src/CONST';
import BaseListItem from './BaseListItem';
import type {RadioListItemProps} from './types';

Expand All @@ -22,6 +23,9 @@ function RadioListItem({
}: RadioListItemProps) {
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
const fullTitle = isMultilineSupported ? item.text?.trimStart() : item.text;
const indentsLength = (item.text?.length ?? 0) - (fullTitle?.length ?? 0);
const paddingLeft = Math.floor(indentsLength / CONST.INDENTS.length) * styles.ml3.marginLeft;

return (
<BaseListItem
Expand All @@ -44,14 +48,15 @@ function RadioListItem({
<View style={[styles.flex1, styles.alignItemsStart]}>
<TextWithTooltip
shouldShowTooltip={showTooltip}
text={item.text ?? ''}
text={fullTitle ?? ''}
style={[
styles.optionDisplayName,
isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText,
styles.sidebarLinkTextBold,
isMultilineSupported ? styles.preWrap : styles.pre,
item.alternateText ? styles.mb1 : null,
isDisabled && styles.colorMuted,
isMultilineSupported ? {paddingLeft} : null,
]}
numberOfLines={isMultilineSupported ? 2 : 1}
/>
Expand Down
Loading