int migrate

Author: joshualitt

lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart

@@ -251,7 +251,9 @@ class JsFlutterConfiguration {}
 extension JsFlutterConfigurationExtension on JsFlutterConfiguration {
   external String? get canvasKitBaseUrl;
   external bool? get canvasKitForceCpuOnly;
-  external int? get canvasKitMaximumSurfaces;
+  @JS('canvasKitMaximumSurfaces')
+  external double? get _canvasKitMaximumSurfaces;
+  int? get canvasKitMaximumSurfaces => _canvasKitMaximumSurfaces?.toInt();
   external bool? get debugShowSemanticsNodes;
   external DomElement? get hostElement;
   external String? get renderer;

lib/web_ui/lib/src/engine/configuration.dart

@@ -900,8 +900,12 @@ extension DomHTMLTextAreaElementExtension on DomHTMLTextAreaElement {
   external void select();
   external set placeholder(String? value);
   external set name(String value);
-  external int? get selectionStart;
-  external int? get selectionEnd;
+  @JS('selectionStart')
+  external double? get _selectionStart;
+  @JS('selectionEnd')
+  external double? get _selectionEnd;
+  int? get selectionStart => _selectionStart?.toInt();
+  int? get selectionEnd => _selectionEnd?.toInt();
   external set selectionStart(int? value);
   external set selectionEnd(int? value);
   external String? get value;
@@ -1681,9 +1685,15 @@ class DomV8BreakIterator {}
 
 extension DomV8BreakIteratorExtension on DomV8BreakIterator {
   external void adoptText(String text);
-  external int first();
-  external int next();
-  external int current();
+  @JS('first')
+  external double _first();
+  int first() => _first().toInt();
+  @JS('next')
+  external double _next();
+  int next() => _next().toInt();
+  @JS('current')
+  external double _current();
+  int current() => _current().toInt();
   external String breakType();
 }
 

lib/web_ui/lib/src/engine/dom.dart

@@ -23,6 +23,8 @@ typedef _StateOperation = void Function(
 
 typedef _HistoryMove = Future<void> Function(int count);
 
+typedef _HistoryMoveInternal = Future<void> Function(double count);
+
 /// The JavaScript representation of a URL strategy.
 ///
 /// This is used to pass URL strategy implementations across a JS-interop
@@ -33,15 +35,33 @@ typedef _HistoryMove = Future<void> Function(int count);
 abstract class JsUrlStrategy {
   /// Creates an instance of [JsUrlStrategy] from a bag of URL strategy
   /// functions.
-  external factory JsUrlStrategy({
+  external factory JsUrlStrategy._({
     required _PathGetter getPath,
     required _StateGetter getState,
     required _AddPopStateListener addPopStateListener,
     required _StringToString prepareExternalUrl,
     required _StateOperation pushState,
     required _StateOperation replaceState,
-    required _HistoryMove go,
+    required _HistoryMoveInternal go,
   });
+
+  factory JsUrlStrategy({
+    required _PathGetter getPath,
+    required _StateGetter getState,
+    required _AddPopStateListener addPopStateListener,
+    required _StringToString prepareExternalUrl,
+    required _StateOperation pushState,
+    required _StateOperation replaceState,
+    required _HistoryMove go,
+  }) => JsUrlStrategy._(
+    getPath: getPath,
+    getState: getState,
+    addPopStateListener: allowInterop((DomEventListener event) =>
+                             allowInterop(addPopStateListener(event))),
+    prepareExternalUrl: prepareExternalUrl,
+    pushState: pushState,
+    replaceState: replaceState,
+    go: allowInterop((double count) => go(count.toInt())));
 }
 
 extension JsUrlStrategyExtension on JsUrlStrategy {
@@ -82,5 +102,5 @@ extension JsUrlStrategyExtension on JsUrlStrategy {
   /// * `go(3)` moves forward 3 steps in hisotry.
   ///
   /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/go
-  external Future<void> go(int count);
+  external Future<void> go(double count);
 }

lib/web_ui/lib/src/engine/navigation/js_url_strategy.dart

@@ -179,7 +179,7 @@ class CustomUrlStrategy extends UrlStrategy {
       delegate.replaceState(state, title, url);
 
   @override
-  Future<void> go(int count) => delegate.go(count);
+  Future<void> go(int count) => delegate.go(count.toDouble());
 }
 
 /// Encapsulates all calls to DOM apis, which allows the [UrlStrategy] classes

lib/web_ui/lib/src/engine/navigation/url_strategy.dart

@@ -336,14 +336,26 @@ class DecodeOptions {
 class VideoFrame implements DomCanvasImageSource {}
 
 extension VideoFrameExtension on VideoFrame {
-  external int allocationSize();
+  @JS('allocationSize')
+  external double _allocationSize();
+  int allocationSize() => _allocationSize().toInt();
   external JsPromise copyTo(Uint8List destination);
   external String? get format;
-  external int get codedWidth;
-  external int get codedHeight;
-  external int get displayWidth;
-  external int get displayHeight;
-  external int? get duration;
+  @JS('codedWidth')
+  external double get _codedWidth;
+  int get codedWidth => _codedWidth.toInt();
+  @JS('codedHeight')
+  external double get _codedHeight;
+  int get codedHeight => _codedHeight.toInt();
+  @JS('displayWidth')
+  external double get _displayWidth;
+  int get displayWidth => _displayWidth.toInt();
+  @JS('displayHeight')
+  external double get _displayHeight;
+  int get displayHeight => _displayHeight.toInt();
+  @JS('duration')
+  external double? get _duration;
+  int? get duration => _duration?.toInt();
   external VideoFrame clone();
   external void close();
 }
@@ -374,8 +386,12 @@ extension ImageTrackListExtension on ImageTrackList {
 class ImageTrack {}
 
 extension ImageTrackExtension on ImageTrack {
-  external int get repetitionCount;
-  external int get frameCount;
+  @JS('repetitionCount')
+  external double get _repetitionCount;
+  int get repetitionCount => _repetitionCount.toInt();
+  @JS('frameCount')
+  external double get _frameCount;
+  int get frameCount =>_frameCount.toInt();
 }
 
 void scaleCanvas2D(Object context2d, num x, num y) {

lib/web_ui/lib/src/engine/safe_browser_api.dart

@@ -5,6 +5,14 @@ publish_to: none
 environment:
   sdk: ">=2.17.0-0 <3.0.0"
 
+dependency_overrides:
+  test:
+    path: /usr/local/google/home/joshualitt/f/test/pkgs/test
+  test_api:
+    path: /usr/local/google/home/joshualitt/f/test/pkgs/test_api
+  test_core:
+    path: /usr/local/google/home/joshualitt/f/test/pkgs/test_core
+
 dependencies:
   js: 0.6.4
   meta: ^1.7.0
@@ -26,7 +34,7 @@ dev_dependencies:
   shelf_static: any
   shelf_web_socket: any
   stack_trace: any
-  stream_channel: any
+  stream_channel: 2.1.1
   test: 1.22.0
   test_api: any
   test_core: any

lib/web_ui/pubspec.yaml

@@ -6,7 +6,7 @@ environment:
 
 dependencies:
   js: 0.6.4
-  stream_channel: 2.1.0
+  stream_channel: 2.1.1
   test: 1.22.0
   webkit_inspection_protocol: 1.0.0
   stack_trace: 1.10.0