Skip to content

Commit e8baa9a

Browse files
committed
Change double type aliases to num
Closes dart-lang#57 Makes it easier to migrate off of dart:html APIs and allows users to pass integers without having to convert to doubles.
1 parent f3e59ed commit e8baa9a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1781
-1778
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
- Fixed a bug where `typedef`s were not declared with the IDL type's
44
nullability.
5+
- Types that were aliased to `double` are now aliased to `num`. This is to make
6+
it easier for users to pass integer values without going through a cast and to
7+
make migration from `dart:html` easier.
58

69
## 0.2.2-beta
710

lib/src/dom/accelerometer.dart

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ class Accelerometer implements Sensor {
1515
}
1616

1717
extension AccelerometerExtension on Accelerometer {
18-
external double? get x;
19-
external double? get y;
20-
external double? get z;
18+
external num? get x;
19+
external num? get y;
20+
external num? get z;
2121
}
2222

2323
@JS()
@@ -51,19 +51,19 @@ class GravitySensor implements Accelerometer {
5151
@anonymous
5252
class AccelerometerReadingValues implements JSObject {
5353
external factory AccelerometerReadingValues({
54-
required double? x,
55-
required double? y,
56-
required double? z,
54+
required num? x,
55+
required num? y,
56+
required num? z,
5757
});
5858
}
5959

6060
extension AccelerometerReadingValuesExtension on AccelerometerReadingValues {
61-
external set x(double? value);
62-
external double? get x;
63-
external set y(double? value);
64-
external double? get y;
65-
external set z(double? value);
66-
external double? get z;
61+
external set x(num? value);
62+
external num? get x;
63+
external set y(num? value);
64+
external num? get y;
65+
external set z(num? value);
66+
external num? get z;
6767
}
6868

6969
@JS()

lib/src/dom/ambient_light.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ class AmbientLightSensor implements Sensor {
1313
}
1414

1515
extension AmbientLightSensorExtension on AmbientLightSensor {
16-
external double? get illuminance;
16+
external num? get illuminance;
1717
}
1818

1919
@JS()
2020
@staticInterop
2121
@anonymous
2222
class AmbientLightReadingValues implements JSObject {
23-
external factory AmbientLightReadingValues({required double? illuminance});
23+
external factory AmbientLightReadingValues({required num? illuminance});
2424
}
2525

2626
extension AmbientLightReadingValuesExtension on AmbientLightReadingValues {
27-
external set illuminance(double? value);
28-
external double? get illuminance;
27+
external set illuminance(num? value);
28+
external num? get illuminance;
2929
}

lib/src/dom/battery_status.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ class BatteryManager implements EventTarget {}
1313

1414
extension BatteryManagerExtension on BatteryManager {
1515
external bool get charging;
16-
external double get chargingTime;
17-
external double get dischargingTime;
18-
external double get level;
16+
external num get chargingTime;
17+
external num get dischargingTime;
18+
external num get level;
1919
external set onchargingchange(EventHandler value);
2020
external EventHandler get onchargingchange;
2121
external set onchargingtimechange(EventHandler value);

lib/src/dom/compute_pressure.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ extension PressureRecordExtension on PressureRecord {
4343
@staticInterop
4444
@anonymous
4545
class PressureObserverOptions implements JSObject {
46-
external factory PressureObserverOptions({double sampleRate});
46+
external factory PressureObserverOptions({num sampleRate});
4747
}
4848

4949
extension PressureObserverOptionsExtension on PressureObserverOptions {
50-
external set sampleRate(double value);
51-
external double get sampleRate;
50+
external set sampleRate(num value);
51+
external num get sampleRate;
5252
}

lib/src/dom/css_animation_worklet.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class WorkletAnimationEffect implements JSObject {}
2727
extension WorkletAnimationEffectExtension on WorkletAnimationEffect {
2828
external EffectTiming getTiming();
2929
external ComputedEffectTiming getComputedTiming();
30-
external set localTime(double? value);
31-
external double? get localTime;
30+
external set localTime(num? value);
31+
external num? get localTime;
3232
}
3333

3434
@JS('WorkletAnimation')

lib/src/dom/css_animations.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class AnimationEvent implements Event {
1818

1919
extension AnimationEventExtension on AnimationEvent {
2020
external String get animationName;
21-
external double get elapsedTime;
21+
external num get elapsedTime;
2222
external String get pseudoElement;
2323
}
2424

@@ -28,16 +28,16 @@ extension AnimationEventExtension on AnimationEvent {
2828
class AnimationEventInit implements EventInit {
2929
external factory AnimationEventInit({
3030
String animationName,
31-
double elapsedTime,
31+
num elapsedTime,
3232
String pseudoElement,
3333
});
3434
}
3535

3636
extension AnimationEventInitExtension on AnimationEventInit {
3737
external set animationName(String value);
3838
external String get animationName;
39-
external set elapsedTime(double value);
40-
external double get elapsedTime;
39+
external set elapsedTime(num value);
40+
external num get elapsedTime;
4141
external set pseudoElement(String value);
4242
external String get pseudoElement;
4343
}

lib/src/dom/css_font_loading.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ class FontFaceVariationAxis implements JSObject {}
109109
extension FontFaceVariationAxisExtension on FontFaceVariationAxis {
110110
external String get name;
111111
external String get axisTag;
112-
external double get minimumValue;
113-
external double get maximumValue;
114-
external double get defaultValue;
112+
external num get minimumValue;
113+
external num get maximumValue;
114+
external num get defaultValue;
115115
}
116116

117117
@JS('FontFaceVariations')

lib/src/dom/css_layout_api.dart

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ extension LayoutChildExtension on LayoutChild {
5959
class LayoutFragment implements JSObject {}
6060

6161
extension LayoutFragmentExtension on LayoutFragment {
62-
external double get inlineSize;
63-
external double get blockSize;
64-
external set inlineOffset(double value);
65-
external double get inlineOffset;
66-
external set blockOffset(double value);
67-
external double get blockOffset;
62+
external num get inlineSize;
63+
external num get blockSize;
64+
external set inlineOffset(num value);
65+
external num get inlineOffset;
66+
external set blockOffset(num value);
67+
external num get blockOffset;
6868
external JSAny? get data;
6969
external ChildBreakToken? get breakToken;
7070
}
@@ -74,22 +74,22 @@ extension LayoutFragmentExtension on LayoutFragment {
7474
class IntrinsicSizes implements JSObject {}
7575

7676
extension IntrinsicSizesExtension on IntrinsicSizes {
77-
external double get minContentSize;
78-
external double get maxContentSize;
77+
external num get minContentSize;
78+
external num get maxContentSize;
7979
}
8080

8181
@JS('LayoutConstraints')
8282
@staticInterop
8383
class LayoutConstraints implements JSObject {}
8484

8585
extension LayoutConstraintsExtension on LayoutConstraints {
86-
external double get availableInlineSize;
87-
external double get availableBlockSize;
88-
external double? get fixedInlineSize;
89-
external double? get fixedBlockSize;
90-
external double get percentageInlineSize;
91-
external double get percentageBlockSize;
92-
external double? get blockFragmentationOffset;
86+
external num get availableInlineSize;
87+
external num get availableBlockSize;
88+
external num? get fixedInlineSize;
89+
external num? get fixedBlockSize;
90+
external num get percentageInlineSize;
91+
external num get percentageBlockSize;
92+
external num? get blockFragmentationOffset;
9393
external BlockFragmentationType get blockFragmentationType;
9494
external JSAny? get data;
9595
}
@@ -99,33 +99,33 @@ extension LayoutConstraintsExtension on LayoutConstraints {
9999
@anonymous
100100
class LayoutConstraintsOptions implements JSObject {
101101
external factory LayoutConstraintsOptions({
102-
double availableInlineSize,
103-
double availableBlockSize,
104-
double fixedInlineSize,
105-
double fixedBlockSize,
106-
double percentageInlineSize,
107-
double percentageBlockSize,
108-
double blockFragmentationOffset,
102+
num availableInlineSize,
103+
num availableBlockSize,
104+
num fixedInlineSize,
105+
num fixedBlockSize,
106+
num percentageInlineSize,
107+
num percentageBlockSize,
108+
num blockFragmentationOffset,
109109
BlockFragmentationType blockFragmentationType,
110110
JSAny? data,
111111
});
112112
}
113113

114114
extension LayoutConstraintsOptionsExtension on LayoutConstraintsOptions {
115-
external set availableInlineSize(double value);
116-
external double get availableInlineSize;
117-
external set availableBlockSize(double value);
118-
external double get availableBlockSize;
119-
external set fixedInlineSize(double value);
120-
external double get fixedInlineSize;
121-
external set fixedBlockSize(double value);
122-
external double get fixedBlockSize;
123-
external set percentageInlineSize(double value);
124-
external double get percentageInlineSize;
125-
external set percentageBlockSize(double value);
126-
external double get percentageBlockSize;
127-
external set blockFragmentationOffset(double value);
128-
external double get blockFragmentationOffset;
115+
external set availableInlineSize(num value);
116+
external num get availableInlineSize;
117+
external set availableBlockSize(num value);
118+
external num get availableBlockSize;
119+
external set fixedInlineSize(num value);
120+
external num get fixedInlineSize;
121+
external set fixedBlockSize(num value);
122+
external num get fixedBlockSize;
123+
external set percentageInlineSize(num value);
124+
external num get percentageInlineSize;
125+
external set percentageBlockSize(num value);
126+
external num get percentageBlockSize;
127+
external set blockFragmentationOffset(num value);
128+
external num get blockFragmentationOffset;
129129
external set blockFragmentationType(BlockFragmentationType value);
130130
external BlockFragmentationType get blockFragmentationType;
131131
external set data(JSAny? value);
@@ -172,35 +172,35 @@ extension BreakTokenOptionsExtension on BreakTokenOptions {
172172
class LayoutEdges implements JSObject {}
173173

174174
extension LayoutEdgesExtension on LayoutEdges {
175-
external double get inlineStart;
176-
external double get inlineEnd;
177-
external double get blockStart;
178-
external double get blockEnd;
179-
external double get inline;
180-
external double get block;
175+
external num get inlineStart;
176+
external num get inlineEnd;
177+
external num get blockStart;
178+
external num get blockEnd;
179+
external num get inline;
180+
external num get block;
181181
}
182182

183183
@JS()
184184
@staticInterop
185185
@anonymous
186186
class FragmentResultOptions implements JSObject {
187187
external factory FragmentResultOptions({
188-
double inlineSize,
189-
double blockSize,
190-
double autoBlockSize,
188+
num inlineSize,
189+
num blockSize,
190+
num autoBlockSize,
191191
JSArray childFragments,
192192
JSAny? data,
193193
BreakTokenOptions breakToken,
194194
});
195195
}
196196

197197
extension FragmentResultOptionsExtension on FragmentResultOptions {
198-
external set inlineSize(double value);
199-
external double get inlineSize;
200-
external set blockSize(double value);
201-
external double get blockSize;
202-
external set autoBlockSize(double value);
203-
external double get autoBlockSize;
198+
external set inlineSize(num value);
199+
external num get inlineSize;
200+
external set blockSize(num value);
201+
external num get blockSize;
202+
external set autoBlockSize(num value);
203+
external num get autoBlockSize;
204204
external set childFragments(JSArray value);
205205
external JSArray get childFragments;
206206
external set data(JSAny? value);
@@ -216,23 +216,23 @@ class FragmentResult implements JSObject {
216216
}
217217

218218
extension FragmentResultExtension on FragmentResult {
219-
external double get inlineSize;
220-
external double get blockSize;
219+
external num get inlineSize;
220+
external num get blockSize;
221221
}
222222

223223
@JS()
224224
@staticInterop
225225
@anonymous
226226
class IntrinsicSizesResultOptions implements JSObject {
227227
external factory IntrinsicSizesResultOptions({
228-
double maxContentSize,
229-
double minContentSize,
228+
num maxContentSize,
229+
num minContentSize,
230230
});
231231
}
232232

233233
extension IntrinsicSizesResultOptionsExtension on IntrinsicSizesResultOptions {
234-
external set maxContentSize(double value);
235-
external double get maxContentSize;
236-
external set minContentSize(double value);
237-
external double get minContentSize;
234+
external set maxContentSize(num value);
235+
external num get maxContentSize;
236+
external set minContentSize(num value);
237+
external num get minContentSize;
238238
}

lib/src/dom/css_paint_api.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extension PaintWorkletGlobalScopeExtension on PaintWorkletGlobalScope {
1616
String name,
1717
VoidFunction paintCtor,
1818
);
19-
external double get devicePixelRatio;
19+
external num get devicePixelRatio;
2020
}
2121

2222
@JS()
@@ -53,6 +53,6 @@ class PaintRenderingContext2D
5353
class PaintSize implements JSObject {}
5454

5555
extension PaintSizeExtension on PaintSize {
56-
external double get width;
57-
external double get height;
56+
external num get width;
57+
external num get height;
5858
}

0 commit comments

Comments
 (0)