Skip to content

fix: 修复不小心提交的bug #925

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

Merged
merged 1 commit into from
Jan 15, 2025
Merged

fix: 修复不小心提交的bug #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions packages/react-native-picker/src/picker/components/Normal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ function NormalPicker<T>(props: ImperativeModalChildrenProps<NormalPickerProps<T
const {
title,
data,
request,
value,
onChange,
cancelText = '取消',
Expand All @@ -23,15 +22,16 @@ function NormalPicker<T>(props: ImperativeModalChildrenProps<NormalPickerProps<T
...restProps
} = props;

const { selectedValue, handleOk, handleChange, handleClose, options } = useNormalPicker({
data,
request,
const initialValue = data.length > 0 ? data[0].value : undefined;

const { selectedValue, handleOk, handleChange, handleClose } = useNormalPicker({
value,
initialValue,
onChange,
closeModal,
});

if (options.length === 0) return null;
if (data.length === 0) return null;

return (
<>
Expand Down Expand Up @@ -59,7 +59,7 @@ function NormalPicker<T>(props: ImperativeModalChildrenProps<NormalPickerProps<T
</Pressable>
</Flex>
<Box height={px(200)}>
<WheelPicker {...restProps} data={options} value={selectedValue} onChange={handleChange} />
<WheelPicker {...restProps} data={data} value={selectedValue} onChange={handleChange} />
</Box>
</>
);
Expand Down
5 changes: 2 additions & 3 deletions packages/react-native-picker/src/picker/components/Normal/useNormalPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ import { NormalPickerProps } from '../../type';

export default function useNormalPicker<T>({
value,
initialValue,
onChange,
closeModal,
}: ImperativeModalChildrenProps<Omit<NormalPickerProps<T>, 'data'>>) {
const initialValue = data.length > 0 ? data[0].value : undefined;

}: ImperativeModalChildrenProps<Omit<NormalPickerProps<T>, 'data'> & { initialValue?: T }>) {
const [selectedValue, selectValue] = useSafeState<T | undefined>(value || initialValue);

const handleChange = (val: PickerData<T>) => {
Expand Down
10 changes: 1 addition & 9 deletions packages/react-native-picker/src/picker/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,13 @@ import { CascadePickerItemProps, WheelPickerPropsBase } from '../components/Whee

export interface PickerProps<T> extends WheelPickerPropsBase {
/** 选择项列表 */
data?: CascadePickerItemProps<T>[];
/** 请求数据 */
request?: () => Promise<CascadePickerItemProps<T>[]>;
data: CascadePickerItemProps<T>[];
/** 是否级联 */
cascade?: boolean;
/** 展示几列 */
cols?: number;
value?: T[] | T;
onChange?: (value?: T extends (infer U)[] ? U[] : T) => void;
/** 字段名 */
fieldNames?: {
label?: string;
value?: string;
children?: string;
};
}

/** 弹窗Picker的属性 */
Expand Down