Skip to content
This repository was archived by the owner on May 20, 2023. It is now read-only.

Commit 607ddd7

Browse files
zacharydentonnshahan
authored andcommitted
Switch to bool inputs instead of getBool in material_datepicker.
PiperOrigin-RevId: 193248965
1 parent 94f043b commit 607ddd7

File tree

8 files changed

+40
-48
lines changed

8 files changed

+40
-48
lines changed

lib/material_datepicker/date_input.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:intl/intl.dart';
99
import 'package:quiver/time.dart';
1010
import 'package:angular_components/material_input/material_input.dart';
1111
import 'package:angular_components/model/date/date.dart';
12-
import 'package:angular_components/utils/angular/properties/properties.dart';
1312
import 'package:angular_components/utils/disposer/disposer.dart';
1413

1514
import 'calendar.dart';
@@ -148,8 +147,8 @@ class DateInputDirective implements OnDestroy {
148147
///
149148
/// Only used when [isMonthInput] is true.
150149
@Input()
151-
set rangeEnd(isRangeEnd) {
152-
_isRangeEnd = getBool(isRangeEnd);
150+
set rangeEnd(bool isRangeEnd) {
151+
_isRangeEnd = isRangeEnd;
153152
}
154153

155154
bool _isRangeEnd = false;

lib/material_datepicker/date_range_editor.dart

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import 'package:angular_components/model/date/date.dart';
3535
import 'package:angular_components/model/date/date_formatter.dart';
3636
import 'package:angular_components/model/observable/observable.dart';
3737
import 'package:angular_components/utils/angular/managed_zone/interface.dart';
38-
import 'package:angular_components/utils/angular/properties/properties.dart';
3938
import 'package:angular_components/utils/browser/dom_service/dom_service.dart';
4039
import 'package:angular_components/utils/showhide/showhide.dart';
4140

@@ -90,8 +89,8 @@ class DateRangeEditorComponent implements OnInit, AfterViewInit, Focusable {
9089
/// This is useful for reducing visual noise during popup open/close
9190
/// animations. Defaults to true.
9291
@Input()
93-
set allowHighlightUpdates(value) {
94-
_allowHighlightUpdates = getBool(value);
92+
set allowHighlightUpdates(bool value) {
93+
_allowHighlightUpdates = value;
9594
}
9695

9796
bool get allowHighlightUpdates => _allowHighlightUpdates;
@@ -103,8 +102,8 @@ class DateRangeEditorComponent implements OnInit, AfterViewInit, Focusable {
103102
///
104103
/// Defaults to `true`.
105104
@Input()
106-
set supportsComparison(value) {
107-
_supportsComparison = getBool(value);
105+
set supportsComparison(bool value) {
106+
_supportsComparison = value;
108107
}
109108

110109
bool get supportsComparison => _supportsComparison;
@@ -117,8 +116,8 @@ class DateRangeEditorComponent implements OnInit, AfterViewInit, Focusable {
117116

118117
/// Whether to enable compact calendar styles.
119118
@Input()
120-
set compact(value) {
121-
_compact = getBool(value);
119+
set compact(bool value) {
120+
_compact = value;
122121
}
123122

124123
bool get compact => _compact;
@@ -130,8 +129,8 @@ class DateRangeEditorComponent implements OnInit, AfterViewInit, Focusable {
130129
///
131130
/// Defaults to `true`.
132131
@Input()
133-
set supportsDaysInputs(value) {
134-
_supportsDaysInputs = getBool(value);
132+
set supportsDaysInputs(bool value) {
133+
_supportsDaysInputs = value;
135134
}
136135

137136
bool get supportsDaysInputs => _supportsDaysInputs;
@@ -211,8 +210,8 @@ class DateRangeEditorComponent implements OnInit, AfterViewInit, Focusable {
211210
bool get isCalendarCreated => _isCalendarCreated ?? false;
212211

213212
@Input('calendarCreated')
214-
set isCalendarCreated(value) {
215-
_isCalendarCreated = getBool(value);
213+
set isCalendarCreated(bool value) {
214+
_isCalendarCreated = value;
216215
}
217216

218217
/// Whether or not this date range picker supports clearing date range.

lib/material_datepicker/material_calendar_picker.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'package:angular_components/material_datepicker/calendar.dart';
1313
import 'package:angular_components/material_datepicker/module.dart';
1414
import 'package:angular_components/model/date/date.dart';
1515
import 'package:angular_components/model/observable/observable.dart';
16-
import 'package:angular_components/utils/angular/properties/properties.dart';
1716
import 'package:angular_components/utils/browser/feature_detector/feature_detector.dart'
1817
show isEdge, isFirefox;
1918

@@ -187,8 +186,8 @@ class MaterialCalendarPickerComponent
187186
///
188187
/// Defaults to true.
189188
@Input()
190-
set allowHighlightUpdates(value) {
191-
var nowAllowed = getBool(value);
189+
set allowHighlightUpdates(bool value) {
190+
var nowAllowed = value;
192191
if (_allowHighlightUpdates != nowAllowed) {
193192
_allowHighlightUpdates = nowAllowed;
194193
if (nowAllowed) _onCalendarChange(_model.value);
@@ -242,8 +241,8 @@ class MaterialCalendarPickerComponent
242241

243242
/// Whether to enable compact calendar styles.
244243
@Input()
245-
set compact(value) {
246-
_compact = getBool(value);
244+
set compact(bool value) {
245+
_compact = value;
247246
_isResetNeeded = true;
248247
}
249248

lib/material_datepicker/material_date_grid_base.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import 'package:angular_components/src/material_datepicker/calendar_listener.dar
1414
import 'package:angular_components/src/material_datepicker/enum_parsing.dart';
1515
import 'package:angular_components/model/date/date.dart';
1616
import 'package:angular_components/model/observable/observable.dart';
17-
import 'package:angular_components/utils/angular/properties/properties.dart';
1817
import 'package:angular_components/utils/browser/dom_service/dom_service.dart';
1918
import 'package:angular_components/utils/disposer/disposer.dart';
2019

@@ -78,8 +77,8 @@ abstract class MaterialDateGridBase
7877
/// Set this to false to temporarily suppress updates to the calendar's range
7978
/// highlights. Defaults to true.
8079
@Input()
81-
set allowHighlightUpdates(value) {
82-
var nowAllowed = getBool(value);
80+
set allowHighlightUpdates(bool value) {
81+
var nowAllowed = value;
8382
if (_allowHighlightUpdates != nowAllowed) {
8483
_allowHighlightUpdates = nowAllowed;
8584
if (nowAllowed) onCalendarChange(model.value);
@@ -183,8 +182,8 @@ abstract class MaterialDateGridBase
183182

184183
/// Whether to enable compact calendar styles.
185184
@Input()
186-
set compact(value) {
187-
_compact = getBool(value);
185+
set compact(bool value) {
186+
_compact = value;
188187
}
189188

190189
bool get compact => _compact;

lib/material_datepicker/material_date_range_picker.dart

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import 'package:angular_components/model/a11y/keyboard_handler_mixin.dart';
2828
import 'package:angular_components/model/date/date.dart';
2929
import 'package:angular_components/model/date/date_formatter.dart';
3030
import 'package:angular_components/model/observable/observable.dart';
31-
import 'package:angular_components/utils/angular/properties/properties.dart';
3231
import 'package:angular_components/utils/browser/dom_service/dom_service.dart';
3332
import 'package:angular_components/utils/disposer/disposer.dart';
3433

@@ -169,8 +168,8 @@ class MaterialDateRangePickerComponent extends KeyboardHandlerMixin
169168
///
170169
/// Defaults to true.
171170
@Input()
172-
set supportsComparison(value) {
173-
_supportsComparison = getBool(value);
171+
set supportsComparison(bool value) {
172+
_supportsComparison = value;
174173
if (!supportsComparison && selection.value?.comparison != null) {
175174
selection.value =
176175
new DatepickerComparison.noComparison(selection.value.range);
@@ -185,8 +184,8 @@ class MaterialDateRangePickerComponent extends KeyboardHandlerMixin
185184
///
186185
/// Defaults to true.
187186
@Input()
188-
set showNextPrevButtons(value) {
189-
_showNextPrevButtons = getBool(value);
187+
set showNextPrevButtons(bool value) {
188+
_showNextPrevButtons = value;
190189
}
191190

192191
bool get showNextPrevButtons => _showNextPrevButtons;
@@ -198,8 +197,8 @@ class MaterialDateRangePickerComponent extends KeyboardHandlerMixin
198197
///
199198
/// Defaults to `true`.
200199
@Input()
201-
set supportsDaysInputs(value) {
202-
_supportsDaysInputs = getBool(value);
200+
set supportsDaysInputs(bool value) {
201+
_supportsDaysInputs = value;
203202
}
204203

205204
bool get supportsDaysInputs => _supportsDaysInputs;
@@ -208,8 +207,8 @@ class MaterialDateRangePickerComponent extends KeyboardHandlerMixin
208207

209208
/// Whether to enable compact calendar styles.
210209
@Input()
211-
set compact(value) {
212-
_compact = getBool(value);
210+
set compact(bool value) {
211+
_compact = value;
213212
}
214213

215214
bool get compact => _compact;
@@ -224,8 +223,8 @@ class MaterialDateRangePickerComponent extends KeyboardHandlerMixin
224223

225224
/// Whether changing the selected date range should be disabled.
226225
@Input()
227-
set disabled(value) {
228-
_disabled = getBool(value);
226+
set disabled(bool value) {
227+
_disabled = value;
229228
// Hide popup if visible.
230229
if (_popupVisible && disabled) close();
231230
}

lib/material_datepicker/material_date_time_picker.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import 'package:angular_components/material_datepicker/material_time_picker.dart
1212
import 'package:angular_components/material_datepicker/module.dart';
1313
import 'package:angular_components/material_input/material_input.dart';
1414
import 'package:angular_components/model/date/date.dart';
15-
import 'package:angular_components/utils/angular/properties/properties.dart';
1615

1716
/// A material-design-styled single date and time picker.
1817
///
@@ -91,7 +90,7 @@ class MaterialDateTimePickerComponent {
9190

9291
/// Whether changing the selected date and time should be disabled.
9392
@Input()
94-
set disabled(dynamic value) => _disabled = getBool(value);
93+
set disabled(bool value) => _disabled = value;
9594

9695
bool _required = false;
9796
bool get required => _required;
@@ -101,7 +100,7 @@ class MaterialDateTimePickerComponent {
101100
/// If true, the embedded text fields will display an error to the user if
102101
/// blank. If false, clearing the text fields will set [dateTime] to `null`.
103102
@Input()
104-
set required(dynamic value) => _required = getBool(value);
103+
set required(bool value) => _required = value;
105104

106105
bool get utc => _utc;
107106
bool _utc = false;
@@ -110,8 +109,8 @@ class MaterialDateTimePickerComponent {
110109
///
111110
/// In default, the widget returns time in the local time zone.
112111
@Input()
113-
set utc(dynamic value) {
114-
_utc = getBool(value);
112+
set utc(bool value) {
113+
_utc = value;
115114
dateTime = _utc ? _dateTime?.toUtc() : _dateTime?.toLocal();
116115
}
117116

lib/material_datepicker/material_datepicker.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import 'package:angular_components/material_select/material_select_item.dart';
2929
import 'package:angular_components/mixins/focusable_mixin.dart';
3030
import 'package:angular_components/model/a11y/keyboard_handler_mixin.dart';
3131
import 'package:angular_components/model/date/date.dart';
32-
import 'package:angular_components/utils/angular/properties/properties.dart';
3332

3433
/// A material-design-styled single date picker -- a date parsing input and
3534
/// calendar picker. Users can type in their own custom dates, or click on the
@@ -100,8 +99,8 @@ class MaterialDatepickerComponent extends KeyboardHandlerMixin
10099

101100
/// Whether to enable compact calendar styles.
102101
@Input()
103-
set compact(value) {
104-
_compact = getBool(value);
102+
set compact(bool value) {
103+
_compact = value;
105104
}
106105

107106
bool get compact => _compact;

lib/material_datepicker/material_time_picker.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import 'package:angular_components/model/a11y/keyboard_handler_mixin.dart';
1515
import 'package:angular_components/model/selection/select.dart';
1616
import 'package:angular_components/model/selection/selection_model.dart';
1717
import 'package:angular_components/model/selection/string_selection_options.dart';
18-
import 'package:angular_components/utils/angular/properties/properties.dart';
1918
import 'package:angular_components/utils/disposer/disposer.dart';
2019

2120
/// A material-design-styled time input component.
@@ -95,7 +94,7 @@ class MaterialTimePickerComponent extends KeyboardHandlerMixin
9594

9695
/// Whether changing the selected time should be disabled.
9796
@Input()
98-
set disabled(dynamic value) => _disabled = getBool(value);
97+
set disabled(bool value) => _disabled = value;
9998

10099
bool _required = false;
101100
bool get required => _required;
@@ -105,7 +104,7 @@ class MaterialTimePickerComponent extends KeyboardHandlerMixin
105104
/// If true, the embedded text field will display an error to the user if
106105
/// blank. If false, clearing the text field will set `time` to `null`.
107106
@Input()
108-
set required(dynamic value) => _required = getBool(value);
107+
set required(bool value) => _required = value;
109108

110109
bool get utc => _utc;
111110
bool _utc = false;
@@ -114,8 +113,8 @@ class MaterialTimePickerComponent extends KeyboardHandlerMixin
114113
///
115114
/// By default, the widget returns time in the local time zone.
116115
@Input()
117-
set utc(dynamic value) {
118-
_utc = getBool(value);
116+
set utc(bool value) {
117+
_utc = value;
119118

120119
timeOptions = new TimeSelectionOptions(
121120
new List<DateTime>.generate(24, _utc ? _utcTime : _localTime));

0 commit comments

Comments
 (0)