Merge pull request #33077 from VickyStash/ts-migration/optionRow-comp…

…onent [TS migration] Migrate 'OptionRow.js' component to TypeScript
Expensify · Dec 29, 2023 · 38bb94e · 38bb94e
2 parents 48a0c82 + f178a82
commit 38bb94e
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 134 deletions.
diff --git a/src/components/OfflineWithFeedback.tsx b/src/components/OfflineWithFeedback.tsx
@@ -18,13 +18,13 @@ import MessagesRow from './MessagesRow';
 
 type OfflineWithFeedbackProps = ChildrenProps & {
     /** The type of action that's pending  */
-    pendingAction: OnyxCommon.PendingAction;
+    pendingAction?: OnyxCommon.PendingAction;
 
     /** Determine whether to hide the component's children if deletion is pending */
     shouldHideOnDelete?: boolean;
 
     /** The errors to display  */
-    errors?: OnyxCommon.Errors;
+    errors?: OnyxCommon.Errors | null;
 
     /** Whether we should show the error messages */
     shouldShowErrorMessages?: boolean;
@@ -56,7 +56,7 @@ type OfflineWithFeedbackProps = ChildrenProps & {
 
 type StrikethroughProps = Partial<ChildrenProps> & {style: Array<ViewStyle | TextStyle | ImageStyle>};
 
-function omitBy<T>(obj: Record<string, T> | undefined, predicate: (value: T) => boolean) {
+function omitBy<T>(obj: Record<string, T> | undefined | null, predicate: (value: T) => boolean) {
     // eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-unused-vars
     return Object.fromEntries(Object.entries(obj ?? {}).filter(([_, value]) => !predicate(value)));
 }

diff --git a/src/components/OptionRow.js → src/components/OptionRow.tsx b/src/components/OptionRow.js → src/components/OptionRow.tsx
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -112,6 +112,7 @@ export default {
         add: 'Add',
         resend: 'Resend',
         save: 'Save',
+        select: 'Select',
         saveChanges: 'Save changes',
         submit: 'Submit',
         rotate: 'Rotate',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -96,6 +96,7 @@ export default {
         new: 'Nuevo',
         search: 'Buscar',
         searchWithThreeDots: 'Buscar...',
+        select: 'Seleccionar',
         next: 'Siguiente',
         previous: 'Anterior',
         goBack: 'Volver',

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -310,14 +310,25 @@ type OptimisticIOUReport = Pick<
 >;
 type DisplayNameWithTooltips = Array<Pick<PersonalDetails, 'accountID' | 'pronouns' | 'displayName' | 'login' | 'avatar'>>;
 
+type CustomIcon = {
+    src: IconAsset;
+    color?: string;
+};
+
 type OptionData = {
+    text: string;
     alternateText?: string | null;
     allReportErrors?: Errors | null;
     brickRoadIndicator?: typeof CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR | '' | null;
     tooltipText?: string | null;
+    alternateTextMaxLines?: number;
+    boldStyle?: boolean;
+    customIcon?: CustomIcon;
+    descriptiveText?: string;
     subtitle?: string | null;
     login?: string | null;
     accountID?: number | null;
+    pronouns?: string;
     status?: string | null;
     phoneNumber?: string | null;
     isUnread?: boolean | null;
@@ -1449,7 +1460,7 @@ function getDisplayNameForParticipant(accountID?: number, shouldUseShortForm = f
 }
 
 function getDisplayNamesWithTooltips(
-    personalDetailsList: PersonalDetails[] | PersonalDetailsList,
+    personalDetailsList: PersonalDetails[] | PersonalDetailsList | OptionData[],
     isMultipleParticipantReport: boolean,
     shouldFallbackToHidden = true,
 ): DisplayNameWithTooltips {

diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
@@ -247,6 +247,7 @@ function getOptionData(
     }
 
     const result: ReportUtils.OptionData = {
+        text: '',
         alternateText: null,
         allReportErrors: null,
         brickRoadIndicator: null,

diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
@@ -382,7 +382,7 @@ function getWidthStyle(width: number): ViewStyle {
 /**
  * Returns a style with backgroundColor and borderColor set to the same color
  */
-function getBackgroundAndBorderStyle(backgroundColor: string): ViewStyle {
+function getBackgroundAndBorderStyle(backgroundColor: string | undefined): ViewStyle {
     return {
         backgroundColor,
         borderColor: backgroundColor,

diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
@@ -153,8 +153,7 @@ type Report = {
     nonReimbursableTotal?: number;
     isHidden?: boolean;
     isChatRoom?: boolean;
-    participantsList?: Array<Partial<PersonalDetails>>;
-    text?: string;
+    participantsList?: PersonalDetails[];
     privateNotes?: Record<number, Note>;
     isLoadingPrivateNotes?: boolean;