From d5994f1d48a4a2be357ba2728de7e7214de33606 Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Sun, 17 Dec 2023 02:35:56 +0100 Subject: [PATCH 1/3] SemanticsUpdateBuilder: make all args non-null --- lib/ui/semantics.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart index 6d2283bdac3cd..6e75672a3450c 100644 --- a/lib/ui/semantics.dart +++ b/lib/ui/semantics.dart @@ -818,8 +818,8 @@ abstract class SemanticsUpdateBuilder { required List decreasedValueAttributes, required String hint, required List hintAttributes, - String? tooltip, - TextDirection? textDirection, + required String tooltip, + required TextDirection? textDirection, required Float64List transform, required Int32List childrenInTraversalOrder, required Int32List childrenInHitTestOrder, @@ -888,8 +888,8 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1 implem required List decreasedValueAttributes, required String hint, required List hintAttributes, - String? tooltip, - TextDirection? textDirection, + required String tooltip, + required TextDirection? textDirection, required Float64List transform, required Int32List childrenInTraversalOrder, required Int32List childrenInHitTestOrder, @@ -927,7 +927,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1 implem decreasedValueAttributes, hint, hintAttributes, - tooltip ?? '', + tooltip, textDirection != null ? textDirection.index + 1 : 0, transform, childrenInTraversalOrder, From ffeae508949b26f17450a92035948dab9a4bc797 Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Sun, 17 Dec 2023 14:34:18 +0100 Subject: [PATCH 2/3] fix tests --- shell/platform/embedder/fixtures/main.dart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/shell/platform/embedder/fixtures/main.dart b/shell/platform/embedder/fixtures/main.dart index 5d9bc6d0b4382..eb035c11f2123 100644 --- a/shell/platform/embedder/fixtures/main.dart +++ b/shell/platform/embedder/fixtures/main.dart @@ -167,6 +167,7 @@ Future a11y_main() async { decreasedValue: '', decreasedValueAttributes: [], tooltip: 'tooltip', + textDirection: TextDirection.ltr, additionalActions: Int32List(0), ) ..updateNode( @@ -199,6 +200,7 @@ Future a11y_main() async { decreasedValue: '', decreasedValueAttributes: [], tooltip: 'tooltip', + textDirection: TextDirection.ltr, additionalActions: Int32List(0), childrenInHitTestOrder: Int32List(0), childrenInTraversalOrder: Int32List(0), @@ -235,6 +237,7 @@ Future a11y_main() async { decreasedValue: '', decreasedValueAttributes: [], tooltip: 'tooltip', + textDirection: TextDirection.ltr, additionalActions: Int32List(0), ) ..updateNode( @@ -268,6 +271,7 @@ Future a11y_main() async { decreasedValue: '', decreasedValueAttributes: [], tooltip: 'tooltip', + textDirection: TextDirection.ltr, childrenInHitTestOrder: Int32List(0), childrenInTraversalOrder: Int32List(0), ) @@ -364,6 +368,7 @@ Future a11y_string_attributes() async { decreasedValue: '41', decreasedValueAttributes: [], tooltip: 'tooltip', + textDirection: TextDirection.ltr, additionalActions: Int32List(0), ); From be5bb16514686f4640cc2df2db1c370488180787 Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Sun, 17 Dec 2023 20:20:57 +0100 Subject: [PATCH 3/3] fix another test --- lib/ui/fixtures/ui_test.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ui/fixtures/ui_test.dart b/lib/ui/fixtures/ui_test.dart index d1c482e93dc90..05727c6e9e011 100644 --- a/lib/ui/fixtures/ui_test.dart +++ b/lib/ui/fixtures/ui_test.dart @@ -173,6 +173,8 @@ void sendSemanticsUpdate() { ), ]; + String tooltip = "tooltip"; + final Float64List transform = Float64List(16); final Int32List childrenInTraversalOrder = Int32List(0); final Int32List childrenInHitTestOrder = Int32List(0); @@ -224,6 +226,7 @@ void sendSemanticsUpdate() { decreasedValueAttributes: decreasedValueAttributes, hint: hint, hintAttributes: hintAttributes, + tooltip: tooltip, textDirection: TextDirection.ltr, transform: transform, childrenInTraversalOrder: childrenInTraversalOrder,