Fix typescript issues

Author: alex-page

polaris-react/src/components/OptionList/tests/OptionList.test.tsx

@@ -539,12 +539,9 @@ function firstOption(
   options?: OptionDescriptor[],
   sections?: OptionListProps['sections'],
 ): string {
-  const firstOptionsValue =
-    options == null || options === [] ? '' : options[0].value;
+  const firstOptionsValue = options == null ? '' : options[0].value;
   const firstSectionOptionsValue =
-    sections == null || sections === [] || sections[0].options === []
-      ? ''
-      : sections[0].options[0].value;
+    sections == null ? '' : sections[0].options[0].value;
   return firstOptionsValue || firstSectionOptionsValue;
 }
 

polaris-react/src/components/ResourceList/ResourceList.tsx

@@ -57,10 +57,7 @@ const isBreakpointsXS = () => {
         parseFloat(toPx(tokens.breakpoints['breakpoints-sm']) ?? '');
 };
 
-function defaultIdForItem<TItemType extends {id?: any}>(
-  item: TItemType,
-  index: number,
-) {
+function defaultIdForItem(item: any, index: number) {
   return Object.prototype.hasOwnProperty.call(item, 'id')
     ? item.id
     : index.toString();

polaris-react/src/utilities/merge.ts

@@ -24,14 +24,18 @@ export function merge<TSource1, TSource2, TSource3, TSource4, TSource5>(
   source5: TSource5,
 ): TSource1 & TSource2 & TSource3 & TSource4 & TSource5;
 export function merge<TResult>(...objs: any[]): TResult;
-export function merge<TSource1, TSource2, TSource3, TSource4, TSource5>(
-  ...objs: (TSource1 | TSource2 | TSource3 | TSource4 | TSource5)[]
-) {
+export function merge<
+  TSource1 extends GeneralObject,
+  TSource2 extends GeneralObject,
+  TSource3 extends GeneralObject,
+  TSource4 extends GeneralObject,
+  TSource5 extends GeneralObject,
+>(...objs: (TSource1 | TSource2 | TSource3 | TSource4 | TSource5)[]) {
   let final = {};
 
-  for (const obj of objs) {
+  objs.forEach((obj) => {
     final = mergeRecursively(final, obj);
-  }
+  });
 
   return final;
 }