Merge branch 'main' into fix-hangs

Author: nouvist

packages/camera/camera_avfoundation/CHANGELOG.md

@@ -1,8 +1,11 @@
+## 0.9.20
+
+* Fixes incorrect types in image stream events.
+
 ## 0.9.19+3
 
 * Fixes race condition when starting image stream.
 
-
 ## 0.9.19+2
 
 * Adds the `Camera` Swift protocol.

packages/camera/camera_avfoundation/example/ios/RunnerTests/StreamingTests.swift

@@ -123,4 +123,41 @@ final class StreamingTests: XCTestCase {
 
     waitForExpectations(timeout: 30, handler: nil)
   }
+
+  func testImageStreamEventFormat() {
+    let (camera, testAudioOutput, sampleBuffer, testAudioConnection) = createCamera()
+
+    let expectation = expectation(description: "Received a valid event")
+
+    let handlerMock = MockImageStreamHandler()
+    handlerMock.eventSinkStub = { event in
+      let imageBuffer = event as! [String: Any]
+
+      XCTAssertTrue(imageBuffer["width"] is NSNumber)
+      XCTAssertTrue(imageBuffer["height"] is NSNumber)
+      XCTAssertTrue(imageBuffer["format"] is NSNumber)
+      XCTAssertTrue(imageBuffer["lensAperture"] is NSNumber)
+      XCTAssertTrue(imageBuffer["sensorExposureTime"] is NSNumber)
+      XCTAssertTrue(imageBuffer["sensorSensitivity"] is NSNumber)
+
+      let planes = imageBuffer["planes"] as! [[String: Any]]
+      let planeBuffer = planes[0]
+
+      XCTAssertTrue(planeBuffer["bytesPerRow"] is NSNumber)
+      XCTAssertTrue(planeBuffer["width"] is NSNumber)
+      XCTAssertTrue(planeBuffer["height"] is NSNumber)
+      XCTAssertTrue(planeBuffer["bytes"] is FlutterStandardTypedData)
+
+      expectation.fulfill()
+    }
+    let messenger = MockFlutterBinaryMessenger()
+    camera.startImageStream(with: messenger, imageStreamHandler: handlerMock) { _ in }
+
+    waitForQueueRoundTrip(with: DispatchQueue.main)
+    XCTAssertEqual(camera.isStreamingImages, true)
+
+    camera.captureOutput(testAudioOutput, didOutput: sampleBuffer, from: testAudioConnection)
+
+    waitForExpectations(timeout: 30, handler: nil)
+  }
 }

packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/DefaultCamera.swift

@@ -105,10 +105,9 @@ final class DefaultCamera: FLTCam, Camera {
           "height": imageHeight,
           "format": videoFormat,
           "planes": planes,
-          "lensAperture": captureDevice.lensAperture,
-          "sensorExposureTime": NSNumber(
-            value: captureDevice.exposureDuration().seconds * 1_000_000_000),
-          "sensorSensitivity": NSNumber(value: captureDevice.iso()),
+          "lensAperture": Double(captureDevice.lensAperture()),
+          "sensorExposureTime": Int(captureDevice.exposureDuration().seconds * 1_000_000_000),
+          "sensorSensitivity": Double(captureDevice.iso()),
         ]
 
         DispatchQueue.main.async {

packages/camera/camera_avfoundation/pubspec.yaml

@@ -2,7 +2,7 @@ name: camera_avfoundation
 description: iOS implementation of the camera plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_avfoundation
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.9.19+3
+version: 0.9.20
 
 environment:
   sdk: ^3.6.0

packages/go_router/CHANGELOG.md

@@ -5,14 +5,26 @@
   `RouteInformationState` and `ImperativeRouteMatch`.
   [flutter#141251](https://github.com/flutter/flutter/issues/141251)
 
+## 15.2.3
+
+- Updates Type-safe routes topic documentation to use the mixin from `go_router_builder` 3.0.0.
+
+## 15.2.2
+
+- Fixes calling `PopScope.onPopInvokedWithResult` in branch routes.
+
+## 15.2.1
+
+* Fixes Popping state and re-rendering scaffold at the same time doesn't update the URL on web.
+
 ## 15.2.0
 
-- `GoRouteData` now defines `.location`, `.go(context)`, `.push(context)`, `.pushReplacement(context)`, and `replace(context)` to be used for [Type-safe routing](https://pub.dev/documentation/go_router/latest/topics/Type-safe%20routes-topic.html). **Requires go_router_builder >= 3.0.0**.
+* `GoRouteData` now defines `.location`, `.go(context)`, `.push(context)`, `.pushReplacement(context)`, and `replace(context)` to be used for [Type-safe routing](https://pub.dev/documentation/go_router/latest/topics/Type-safe%20routes-topic.html). **Requires go_router_builder >= 3.0.0**.
 
 ## 15.1.3
 
-- Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
-- Fixes typo in API docs.
+* Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
+* Fixes typo in API docs.
 
 ## 15.1.2
 

packages/go_router/doc/type-safe-routes.md

@@ -1,5 +1,5 @@
 Instead of using URL strings to navigate, go_router supports
-type-safe routes using the go_router_builder package. 
+type-safe routes using the go_router_builder package.
 
 To get started, add [go_router_builder][], [build_runner][], and
 [build_verify][] to the dev_dependencies section of your pubspec.yaml:
@@ -28,15 +28,15 @@ part 'go_router_builder.g.dart';
     ]
 )
 @immutable
-class HomeScreenRoute extends GoRouteData {
+class HomeScreenRoute extends GoRouteData with _$HomeScreenRoute {
   @override
   Widget build(BuildContext context, GoRouterState state) {
     return const HomeScreen();
   }
 }
 
 @immutable
-class SongRoute extends GoRouteData {
+class SongRoute extends GoRouteData with _$SongRoute {
   final int id;
 
   const SongRoute({
@@ -74,4 +74,4 @@ package documentation](https://pub.dev/documentation/go_router_builder/latest/).
 
 [go_router_builder]: https://pub.dev/packages/go_router_builder
 [build_runner]: https://pub.dev/packages/build_runner
-[build_verify]: https://pub.dev/packages/build_verify
+[build_verify]: https://pub.dev/packages/build_verify

packages/go_router/lib/src/delegate.dart

@@ -55,8 +55,8 @@ class GoRouterDelegate extends RouterDelegate<RouteMatchList>
 
   @override
   Future<bool> popRoute() async {
-    final NavigatorState? state = _findCurrentNavigator();
-    if (state != null) {
+    final Iterable<NavigatorState> states = _findCurrentNavigators();
+    for (final NavigatorState state in states) {
       final bool didPop = await state.maybePop(); // Call maybePop() directly
       if (didPop) {
         return true; // Return true if maybePop handled the pop
@@ -96,17 +96,27 @@ class GoRouterDelegate extends RouterDelegate<RouteMatchList>
 
   /// Pops the top-most route.
   void pop<T extends Object?>([T? result]) {
-    final NavigatorState? state = _findCurrentNavigator();
-    if (state == null || !state.canPop()) {
+    final Iterable<NavigatorState> states = _findCurrentNavigators().where(
+      (NavigatorState element) => element.canPop(),
+    );
+    if (states.isEmpty) {
       throw GoError('There is nothing to pop');
     }
-    state.pop(result);
+    states.first.pop(result);
   }
 
-  NavigatorState? _findCurrentNavigator() {
-    NavigatorState? state;
-    state =
-        navigatorKey.currentState; // Set state directly without canPop check
+  /// Get a prioritized list of NavigatorStates,
+  /// which either can pop or are exit routes.
+  ///
+  /// 1. Sub route within branches of shell navigation
+  /// 2. Branch route
+  /// 3. Parent route
+  Iterable<NavigatorState> _findCurrentNavigators() {
+    final List<NavigatorState> states = <NavigatorState>[];
+    if (navigatorKey.currentState != null) {
+      // Set state directly without canPop check
+      states.add(navigatorKey.currentState!);
+    }
 
     RouteMatchBase walker = currentConfiguration.matches.last;
     while (walker is ShellRouteMatch) {
@@ -119,13 +129,10 @@ class GoRouterDelegate extends RouterDelegate<RouteMatchList>
         // Stop if there is a pageless route on top of the shell route.
         break;
       }
-
-      if (potentialCandidate.canPop()) {
-        state = walker.navigatorKey.currentState;
-      }
+      states.add(potentialCandidate);
       walker = walker.matches.last;
     }
-    return state;
+    return states.reversed;
   }
 
   bool _handlePopPageWithRouteMatch(

packages/go_router/lib/src/match.dart

@@ -9,7 +9,7 @@ import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:logging/logging.dart';
-import 'package:meta/meta.dart';
+import 'package:meta/meta.dart' as meta;
 
 import 'configuration.dart';
 import 'information_provider.dart';
@@ -403,7 +403,7 @@ class ShellRouteMatch extends RouteMatchBase {
   ///
   /// This is typically used when pushing or popping [RouteMatchBase] from
   /// [RouteMatchList].
-  @internal
+  @meta.internal
   ShellRouteMatch copyWith({
     required List<RouteMatchBase>? matches,
   }) {
@@ -773,7 +773,7 @@ class RouteMatchList with Diagnosticable {
   /// returns false.
   ///
   /// This method visit recursively into shell route matches.
-  @internal
+  @meta.internal
   void visitRouteMatches(RouteMatchVisitor visitor) {
     _visitRouteMatches(matches, visitor);
   }
@@ -793,7 +793,7 @@ class RouteMatchList with Diagnosticable {
   }
 
   /// Create a new [RouteMatchList] with given parameter replaced.
-  @internal
+  @meta.internal
   RouteMatchList copyWith({
     List<RouteMatchBase>? matches,
     Uri? uri,
@@ -848,7 +848,7 @@ class RouteMatchList with Diagnosticable {
 /// suitable for using with [StandardMessageCodec].
 ///
 /// The primary use of this class is for state restoration and browser history.
-@internal
+@meta.internal
 class RouteMatchListCodec extends Codec<RouteMatchList, Map<Object?, Object?>> {
   /// Creates a new [RouteMatchListCodec] object.
   RouteMatchListCodec(RouteConfiguration configuration)

packages/go_router/lib/src/route.dart

@@ -7,7 +7,7 @@ import 'dart:async';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:meta/meta.dart';
+import 'package:meta/meta.dart' as meta;
 
 import 'configuration.dart';
 import 'match.dart';
@@ -459,7 +459,7 @@ class GoRoute extends RouteBase {
       extractPathParameters(pathParameters, match);
 
   /// The path parameters in this route.
-  @internal
+  @meta.internal
   final List<String> pathParameters = <String>[];
 
   @override

packages/go_router/lib/src/router.dart

@@ -525,12 +525,16 @@ class GoRouter implements RouterConfig<RouteMatchList> {
   ///
   /// If the top-most route is a pop up or dialog, this method pops it instead
   /// of any GoRoute under it.
+  ///
+  /// Ensure that the `value` of `routeInformationProvider` is synced
+  ///  with `routerDelegate.currentConfiguration`.
   void pop<T extends Object?>([T? result]) {
     assert(() {
       log('popping ${routerDelegate.currentConfiguration.uri}');
       return true;
     }());
     routerDelegate.pop<T>(result);
+    restore(routerDelegate.currentConfiguration);
   }
 
   /// Refresh the route.