FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(date-picker): ios native setter · NativeScript/NativeScript@154c601 · GitHub

/ NativeScript Public

Commit 154c601

Browse files
sis0k0
committed
fix(date-picker): ios native setter
1 parent d949712 commit 154c601

1 file changed

Lines changed: 17 additions & 25 deletions

File tree

‎tns-core-modules/ui/date-picker/date-picker.ios.ts‎

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,29 @@ export class DatePicker extends DatePickerBase {
2929
return this.nativeView.date.getFullYear();
3030
}
3131
[yearProperty.setNative](value: number) {
32-
let picker = this.nativeView;
33-
let comps = ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, picker.date);
34-
comps.year = value;
35-
this.date = new Date(comps.year, comps.month - 1, comps.day);
32+
this.date = new Date(value, this.month, this.day);
3633
}
3734

3835
[monthProperty.getDefault](): number {
3936
return this.nativeView.date.getMonth();
4037
}
4138
[monthProperty.setNative](value: number) {
42-
let picker = this.nativeView;
43-
let comps = ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, picker.date);
44-
comps.month = value;
45-
this.date = new Date(comps.year, comps.month - 1, comps.day);
39+
this.date = new Date(this.year, value, this.day);
4640
}
4741

4842
[dayProperty.getDefault](): number {
4943
return this.nativeView.date.getDay();
5044
}
5145
[dayProperty.setNative](value: number) {
52-
let picker = this.nativeView;
53-
let comps = ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, picker.date);
54-
comps.day = value;
55-
this.date = new Date(comps.year, comps.month - 1, comps.day);
46+
this.date = new Date(this.year, this.month, value);
5647
}
5748

5849
[dateProperty.getDefault](): Date {
5950
return this.nativeView.date;
6051
}
6152
[dateProperty.setNative](value: Date) {
62-
let picker = this.nativeView;
63-
let comps = ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, picker.date);
53+
const picker = this.nativeView;
54+
const comps = ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, picker.date);
6455
comps.year = value.getFullYear();
6556
comps.month = value.getMonth() + 1;
6657
comps.day = value.getDate();
@@ -71,25 +62,25 @@ export class DatePicker extends DatePickerBase {
7162
return this.nativeView.maximumDate;
7263
}
7364
[maxDateProperty.setNative](value: Date) {
74-
let picker = this.nativeView;
75-
let nsDate = NSDate.dateWithTimeIntervalSince1970(value.getTime() / 1000);
65+
const picker = this.nativeView;
66+
const nsDate = NSDate.dateWithTimeIntervalSince1970(value.getTime() / 1000);
7667
picker.maximumDate = <any>nsDate;
7768
}
7869

7970
[minDateProperty.getDefault](): Date {
8071
return this.nativeView.minimumDate;
8172
}
8273
[minDateProperty.setNative](value: Date) {
83-
let picker = this.nativeView;
84-
let nsDate = NSDate.dateWithTimeIntervalSince1970(value.getTime() / 1000);
74+
const picker = this.nativeView;
75+
const nsDate = NSDate.dateWithTimeIntervalSince1970(value.getTime() / 1000);
8576
picker.minimumDate = <any>nsDate;
8677
}
8778

8879
[colorProperty.getDefault](): UIColor {
8980
return this.nativeView.valueForKey("textColor");
9081
}
9182
[colorProperty.setNative](value: Color | UIColor) {
92-
let picker = this.nativeView;
83+
const picker = this.nativeView;
9384
picker.setValueForKey(value instanceof Color ? value.ios : value, "textColor");
9485
}
9586
}
@@ -98,15 +89,15 @@ class UIDatePickerChangeHandlerImpl extends NSObject {
9889
private _owner: WeakRef<DatePicker>;
9990

10091
public static initWithOwner(owner: WeakRef<DatePicker>): UIDatePickerChangeHandlerImpl {
101-
let impl = <UIDatePickerChangeHandlerImpl>UIDatePickerChangeHandlerImpl.new();
92+
const impl = <UIDatePickerChangeHandlerImpl>UIDatePickerChangeHandlerImpl.new();
10293
impl._owner = owner;
10394
return impl;
10495
}
10596

10697
public valueChanged(sender: UIDatePicker) {
107-
let comps = ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, sender.date);
98+
const comps = ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, sender.date);
10899

109-
let owner = this._owner.get();
100+
const owner = this._owner.get();
110101
if (!owner) {
111102
return;
112103
}
@@ -117,8 +108,9 @@ class UIDatePickerChangeHandlerImpl extends NSObject {
117108
dateChanged = true;
118109
}
119110

120-
if (comps.month !== owner.month) {
121-
monthProperty.nativeValueChange(owner, comps.month);
111+
const jsMonth = comps.month - 1;
112+
if (jsMonth !== owner.month) {
113+
monthProperty.nativeValueChange(owner, jsMonth);
122114
dateChanged = true;
123115
}
124116

@@ -128,7 +120,7 @@ class UIDatePickerChangeHandlerImpl extends NSObject {
128120
}
129121

130122
if (dateChanged) {
131-
dateProperty.nativeValueChange(owner, new Date(comps.year, comps.month - 1, comps.day));
123+
dateProperty.nativeValueChange(owner, new Date(comps.year, jsMonth, comps.day));
132124
}
133125
}
134126

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL