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

chore: resolve merge conflicts

Browse Source
This commit is contained in:
Liam DeBeasi
2023-12-05 14:57:09 -05:00
parent 59bd18a7ff b5dbc101ea
commit fdfc5fc332
109 changed files with 935 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/angular/src/directives/proxies.ts
View File

@@ -1446,7 +1446,8 @@ export declare interface IonPicker extends Components.IonPicker {
@ProxyCmp({
inputs: ['color', 'disabled', 'items', 'mode', 'value']
inputs: ['color', 'disabled', 'items', 'mode', 'value'],
methods: ['setFocus']
})
@Component({
selector: 'ion-picker-column',