javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge on api.txt

Browse Source
This commit is contained in:
Liam DeBeasi
2023-12-05 14:58:31 -05:00
parent fdfc5fc332
commit ca1b51938d
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/api.txt
View File

@@ -916,12 +916,8 @@ ion-picker-column,prop,disabled,boolean,false,false,false
ion-picker-column,prop,items,PickerColumnItem[],[],false,false
ion-picker-column,prop,mode,"ios" | "md",undefined,false,false
ion-picker-column,prop,value,number | string | undefined,undefined,false,false
<<<<<<< HEAD
ion-picker-column,event,ionChange,{ value: string | number | undefined; },true
=======
ion-picker-column,method,setFocus,setFocus() => Promise<void>
ion-picker-column,event,ionChange,PickerColumnItem,true
>>>>>>> origin/FW-5580
ion-picker-column,event,ionChange,{ value: string | number | undefined; },true
ion-picker-column-option,shadow
ion-picker-column-option,prop,color,"danger" | "dark" | "light" | "medium" | "primary" | "secondary" | "success" | "tertiary" | "warning" | string & Record<never, never> | undefined,'primary',false,true