feat: improve types

Liamandrew · Jun 15, 2022 · 91e78bb · 91e78bb
1 parent e6cdd64
commit 91e78bb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/NativePicker.tsx b/src/NativePicker.tsx
@@ -7,7 +7,7 @@ import {
 } from 'react-native';
 import type {
   NativeColorType,
-  NativeOnChangeEvent,
+  NativeOnChange,
   NativePickerDataItem,
 } from './types';
 
@@ -19,7 +19,7 @@ type NativeAndroidData = NativePickerDataItem;
 type NativeCommonProps = {
   loop?: boolean;
   data: NativeIOSData | NativeAndroidData;
-  onChange?: NativeOnChangeEvent;
+  onChange?: NativeOnChange;
 };
 
 type NativeIOSProps = {
@@ -41,8 +41,7 @@ type NativeAndroidProps = {
 };
 
 export type NativePickerProps = NativeCommonProps &
-  NativeIOSProps &
-  NativeAndroidProps;
+  (NativeIOSProps | NativeAndroidProps);
 
 export const NativePicker =
   UIManager.getViewManagerConfig(ComponentName) != null

diff --git a/src/Picker.tsx b/src/Picker.tsx
@@ -11,7 +11,7 @@ import { NativePicker } from './NativePicker';
 import type { PickerGroupProps } from './PickerGroup';
 import type {
   NativeItem,
-  NativeOnChangeEvent,
+  NativeOnChange,
   NativePickerDataItem,
   PickerGroupChangeItem,
 } from './types';
@@ -53,7 +53,7 @@ export const Picker = ({
     textColor,
   });
 
-  const handleOnChange: NativeOnChangeEvent = useCallback(
+  const handleOnChange: NativeOnChange = useCallback(
     ({ nativeEvent }) => {
       if (onChange) {
         onChange(nativeEvent);

diff --git a/src/index.ts b/src/index.ts
@@ -5,3 +5,4 @@ export { PickerItem } from './PickerItem';
 export type { PickerProps } from './Picker';
 export type { PickerGroupProps } from './PickerGroup';
 export type { PickerItemProps } from './PickerItem';
+export type { PickerGroupChangeItem } from './types';
diff --git a/src/types.ts b/src/types.ts
@@ -23,6 +23,6 @@ export type NativePickerChangeEvent = {
   value: string | number;
 };
 
-export type NativeOnChangeEvent = (
+export type NativeOnChange = (
   event: NativeSyntheticEvent<NativePickerChangeEvent>
 ) => void;