Merge pull request #34008 from software-mansion-labs/@szymczak/Select…

…ionList [TS migration] Migrate 'SelectionList' component to TypeScript
Expensify · Jan 17, 2024 · 3033f99 · 3033f99
2 parents fe9c2e8 + 7d65ede
commit 3033f99
Show file tree

Hide file tree

Showing 15 changed files with 505 additions and 222 deletions.
diff --git a/src/components/SectionList/index.android.tsx b/src/components/SectionList/index.android.tsx
@@ -1,19 +1,22 @@
 import React, {forwardRef} from 'react';
+import type {ForwardedRef} from 'react';
 import {SectionList as RNSectionList} from 'react-native';
-import type ForwardedSectionList from './types';
+import type {SectionListProps} from 'react-native';
 
 // eslint-disable-next-line react/function-component-definition
-const SectionListWithRef: ForwardedSectionList = (props, ref) => (
-    <RNSectionList
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        ref={ref}
-        // For Android we want to use removeClippedSubviews since it helps manage memory consumption. When we
-        // run out memory images stop loading and appear as grey circles
-        // eslint-disable-next-line react/jsx-props-no-multi-spaces
-        removeClippedSubviews
-    />
-);
+function SectionListWithRef<ItemT, SectionT>(props: SectionListProps<ItemT, SectionT>, ref: ForwardedRef<RNSectionList<ItemT, SectionT>>) {
+    return (
+        <RNSectionList
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            ref={ref}
+            // For Android we want to use removeClippedSubviews since it helps manage memory consumption. When we
+            // run out memory images stop loading and appear as grey circles
+            // eslint-disable-next-line react/jsx-props-no-multi-spaces
+            removeClippedSubviews
+        />
+    );
+}
 
 SectionListWithRef.displayName = 'SectionListWithRef';
 

diff --git a/src/components/SectionList/index.tsx b/src/components/SectionList/index.tsx
@@ -1,16 +1,17 @@
 import React, {forwardRef} from 'react';
+import type {ForwardedRef} from 'react';
 import {SectionList as RNSectionList} from 'react-native';
-import type ForwardedSectionList from './types';
+import type {SectionListProps} from 'react-native';
 
 // eslint-disable-next-line react/function-component-definition
-const SectionList: ForwardedSectionList = (props, ref) => (
-    <RNSectionList
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        ref={ref}
-    />
-);
-
-SectionList.displayName = 'SectionList';
+function SectionList<ItemT, SectionT>(props: SectionListProps<ItemT, SectionT>, ref: ForwardedRef<RNSectionList<ItemT, SectionT>>) {
+    return (
+        <RNSectionList
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            ref={ref}
+        />
+    );
+}
 
 export default forwardRef(SectionList);
diff --git a/src/components/SectionList/types.ts b/src/components/SectionList/types.ts
diff --git a/src/components/SelectionList/BaseListItem.js → ...components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.js → ...components/SelectionList/BaseListItem.tsx
@@ -1,4 +1,3 @@
-import lodashGet from 'lodash/get';
 import React from 'react';
 import {View} from 'react-native';
 import Icon from '@components/Icon';
@@ -12,10 +11,10 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 import RadioListItem from './RadioListItem';
-import {baseListItemPropTypes} from './selectionListPropTypes';
+import type {BaseListItemProps, RadioItem, User} from './types';
 import UserListItem from './UserListItem';
 
-function BaseListItem({
+function BaseListItem<TItem extends User | RadioItem>({
     item,
     isFocused = false,
     isDisabled = false,
@@ -26,13 +25,12 @@ function BaseListItem({
     onDismissError = () => {},
     rightHandSideComponent,
     keyForList,
-}) {
+}: BaseListItemProps<TItem>) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const isUserItem = lodashGet(item, 'icons.length', 0) > 0;
-    const ListItem = isUserItem ? UserListItem : RadioListItem;
+    const isRadioItem = item.rightElement === undefined;
 
     const rightHandSideComponentRender = () => {
         if (canSelectMultiple || !rightHandSideComponent) {
@@ -70,7 +68,7 @@ function BaseListItem({
                         styles.justifyContentBetween,
                         styles.sidebarLinkInner,
                         styles.userSelectNone,
-                        isUserItem ? styles.peopleRow : styles.optionRow,
+                        isRadioItem ? styles.optionRow : styles.peopleRow,
                         isFocused && styles.sidebarLinkActive,
                     ]}
                 >
@@ -100,20 +98,32 @@ function BaseListItem({
                             </View>
                         </View>
                     )}
-                    <ListItem
-                        item={item}
-                        textStyles={[
-                            styles.optionDisplayName,
-                            isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText,
-                            styles.sidebarLinkTextBold,
-                            styles.pre,
-                            item.alternateText ? styles.mb1 : null,
-                        ]}
-                        alternateTextStyles={[styles.textLabelSupporting, styles.lh16, styles.pre]}
-                        isDisabled={isDisabled}
-                        onSelectRow={onSelectRow}
-                        showTooltip={showTooltip}
-                    />
+
+                    {isRadioItem ? (
+                        <RadioListItem
+                            item={item}
+                            textStyles={[styles.optionDisplayName, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.pre, item.alternateText ? styles.mb1 : null]}
+                            alternateTextStyles={[styles.textLabelSupporting, styles.lh16, styles.pre]}
+                            isDisabled={isDisabled}
+                            onSelectRow={() => onSelectRow(item)}
+                            showTooltip={showTooltip}
+                        />
+                    ) : (
+                        <UserListItem
+                            item={item}
+                            textStyles={[
+                                styles.optionDisplayName,
+                                isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText,
+                                styles.sidebarLinkTextBold,
+                                styles.pre,
+                                item.alternateText ? styles.mb1 : null,
+                            ]}
+                            alternateTextStyles={[styles.textLabelSupporting, styles.lh16, styles.pre]}
+                            isDisabled={isDisabled}
+                            onSelectRow={() => onSelectRow(item)}
+                            showTooltip={showTooltip}
+                        />
+                    )}
                     {!canSelectMultiple && item.isSelected && !rightHandSideComponent && (
                         <View
                             style={[styles.flexRow, styles.alignItemsCenter, styles.ml3]}
@@ -129,7 +139,7 @@ function BaseListItem({
                     )}
                     {rightHandSideComponentRender()}
                 </View>
-                {Boolean(item.invitedSecondaryLogin) && (
+                {!!item.invitedSecondaryLogin && (
                     <Text style={[styles.ml9, styles.ph5, styles.pb3, styles.textLabelSupporting]}>
                         {translate('workspace.people.invitedBySecondaryLogin', {secondaryLogin: item.invitedSecondaryLogin})}
                     </Text>
@@ -140,6 +150,5 @@ function BaseListItem({
 }
 
 BaseListItem.displayName = 'BaseListItem';
-BaseListItem.propTypes = baseListItemPropTypes;
 
 export default BaseListItem;