From aaa8a86170f25e1e438f19110a4043a85afd39a0 Mon Sep 17 00:00:00 2001
From: Chun-Heng Tai <chtai@google.com>
Date: Fri, 6 Aug 2021 11:34:40 -0700
Subject: [PATCH 1/2] Fix routerinformationupdate can take complex json

---
 lib/web_ui/lib/src/engine/window.dart |  2 +-
 lib/web_ui/test/window_test.dart      | 42 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/lib/web_ui/lib/src/engine/window.dart b/lib/web_ui/lib/src/engine/window.dart
index 6f89a08dd070b..419aa8070e47a 100644
--- a/lib/web_ui/lib/src/engine/window.dart
+++ b/lib/web_ui/lib/src/engine/window.dart
@@ -171,7 +171,7 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
           assert(arguments != null);
           browserHistory.setRouteName(
             arguments!.tryString('location'),
-            state: arguments.tryString('state'),
+            state: arguments['state'],
             replace: arguments.tryBool('replace') ?? false,
           );
           return true;
diff --git a/lib/web_ui/test/window_test.dart b/lib/web_ui/test/window_test.dart
index 2180f442e7682..ce79cdb0de6c8 100644
--- a/lib/web_ui/test/window_test.dart
+++ b/lib/web_ui/test/window_test.dart
@@ -187,6 +187,7 @@ void testMain() {
 
   test('should not throw when using nav1 and nav2 together',
       () async {
+    // Regression test https://github.com/flutter/flutter/issues/87823.
     await window.debugInitializeHistory(TestUrlStrategy.fromEntry(
       const TestHistoryEntry('initial state', null, '/initial'),
     ), useSingle: false);
@@ -237,6 +238,47 @@ void testMain() {
     expect(window.browserHistory.urlStrategy!.getPath(), '/foo');
   });
 
+  test('should not throw when state is complex json object',
+      () async {
+    await window.debugInitializeHistory(TestUrlStrategy.fromEntry(
+      const TestHistoryEntry('initial state', null, '/initial'),
+    ), useSingle: false);
+    expect(window.browserHistory, isA<MultiEntriesBrowserHistory>());
+
+    // routeInformationUpdated does not
+    final Completer<void> callback = Completer<void>();
+    window.sendPlatformMessage(
+      'flutter/navigation',
+      const JSONMethodCodec().encodeMethodCall(const MethodCall(
+        'routeInformationUpdated',
+        // ignore: prefer_const_literals_to_create_immutables
+        <String, dynamic>{
+          'location': '/baz',
+          'state': <String, dynamic>{
+            'state1': true,
+            'state2': 1,
+            'state3': 'string',
+            'state4': <String, dynamic> {
+              'substate1': 1.0,
+              'substate2': 'string2',
+            }
+          },
+        },
+      )),
+      (_) { callback.complete(); },
+    );
+    await callback.future;
+    expect(window.browserHistory, isA<MultiEntriesBrowserHistory>());
+    expect(window.browserHistory.urlStrategy!.getPath(), '/baz');
+    final dynamic wrappedState = window.browserHistory.urlStrategy!.getState()!;
+    final dynamic actualState = wrappedState['state'];
+    expect(actualState['state1'], true);
+    expect(actualState['state2'], 1);
+    expect(actualState['state3'], 'string');
+    expect(actualState['state4']['substate1'], 1.0);
+    expect(actualState['state4']['substate2'], 'string2');
+  });
+
   test('can replace in MultiEntriesBrowserHistory',
       () async {
     await window.debugInitializeHistory(TestUrlStrategy.fromEntry(

From d2ffa8cdcd1a488c0877498b28b71e2744869ba7 Mon Sep 17 00:00:00 2001
From: Chun-Heng Tai <chtai@google.com>
Date: Fri, 6 Aug 2021 11:40:03 -0700
Subject: [PATCH 2/2] comment

---
 lib/web_ui/test/window_test.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web_ui/test/window_test.dart b/lib/web_ui/test/window_test.dart
index ce79cdb0de6c8..9069db61e0b2c 100644
--- a/lib/web_ui/test/window_test.dart
+++ b/lib/web_ui/test/window_test.dart
@@ -187,7 +187,6 @@ void testMain() {
 
   test('should not throw when using nav1 and nav2 together',
       () async {
-    // Regression test https://github.com/flutter/flutter/issues/87823.
     await window.debugInitializeHistory(TestUrlStrategy.fromEntry(
       const TestHistoryEntry('initial state', null, '/initial'),
     ), useSingle: false);
@@ -240,6 +239,7 @@ void testMain() {
 
   test('should not throw when state is complex json object',
       () async {
+    // Regression test https://github.com/flutter/flutter/issues/87823.
     await window.debugInitializeHistory(TestUrlStrategy.fromEntry(
       const TestHistoryEntry('initial state', null, '/initial'),
     ), useSingle: false);