Replace values[action] with fromAction(action).

flutter · Apr 8, 2023 · 99eabed · 99eabed
1 parent a467aaf
commit 99eabed
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/lib/ui/platform_dispatcher.dart b/lib/ui/platform_dispatcher.dart
@@ -1155,7 +1155,7 @@ class PlatformDispatcher {
       onSemanticsAction,
       _onSemanticsActionZone,
       nodeId,
-      SemanticsAction.values[action]!,
+      SemanticsAction.fromAction(action)!,
       args,
     );
   }

diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
@@ -233,6 +233,8 @@ class SemanticsAction {
 
   static List<SemanticsAction> get values => _kActionById.values.toList(growable: false);
 
+  static SemanticsAction? fromAction(int index) => _kActionById[index];
+
   /// Temporary API until [values] return a list.
   /// https://github.com/flutter/flutter/issues/123346
   @Deprecated('This getter is temporary and will be removed shortly.')
@@ -569,6 +571,8 @@ class SemanticsFlag {
 
   static List<SemanticsFlag> get values => _kFlagById.values.toList(growable: false);
 
+  static SemanticsFlag? fromFlag(int index) => _kFlagById[index];
+
   /// Temporary API until [values] return a list.
   /// https://github.com/flutter/flutter/issues/123346
   @Deprecated('This getter is temporary and will be removed shortly.')

diff --git a/lib/web_ui/lib/semantics.dart b/lib/web_ui/lib/semantics.dart
@@ -83,6 +83,8 @@ class SemanticsAction {
 
   static List<SemanticsAction> get values => _kActionById.values.toList(growable: false);
 
+  static SemanticsAction? fromAction(int index) => _kActionById[index];
+
   /// Temporary API until [values] return a list.
   /// https://github.com/flutter/flutter/issues/123346
   @Deprecated('This getter is temporary and will be removed shortly.')
@@ -188,6 +190,8 @@ class SemanticsFlag {
 
   static List<SemanticsFlag> get values => _kFlagById.values.toList(growable: false);
 
+  static SemanticsFlag? fromFlag(int index) => _kFlagById[index];
+
   /// Temporary API until [values] return a list.
   /// https://github.com/flutter/flutter/issues/123346
   @Deprecated('This getter is temporary and will be removed shortly.')

diff --git a/lib/web_ui/test/engine/semantics/semantics_api_test.dart b/lib/web_ui/test/engine/semantics/semantics_api_test.dart
@@ -23,8 +23,8 @@ void testMain() {
     expect(SemanticsFlag.values.length, equals(numSemanticsFlags));
     for (int index = 0; index < numSemanticsFlags; ++index) {
       final int flag = 1 << index;
-      expect(SemanticsFlag.values[flag], isNotNull);
-      expect(SemanticsFlag.values[flag].toString(), startsWith('SemanticsFlag.'));
+      expect(SemanticsFlag.fromFlag(flag), isNotNull);
+      expect(SemanticsFlag.fromFlag(flag).toString(), startsWith('SemanticsFlag.'));
     }
   });
 
@@ -34,8 +34,8 @@ void testMain() {
     expect(SemanticsAction.values.length, equals(numSemanticsActions));
     for (int index = 0; index < numSemanticsActions; ++index) {
       final int flag = 1 << index;
-      expect(SemanticsAction.values[flag], isNotNull);
-      expect(SemanticsAction.values[flag].toString(), startsWith('SemanticsAction.'));
+      expect(SemanticsAction.fromAction(flag), isNotNull);
+      expect(SemanticsAction.fromAction(flag).toString(), startsWith('SemanticsAction.'));
     }
   });
 

diff --git a/testing/dart/semantics_test.dart b/testing/dart/semantics_test.dart
@@ -16,8 +16,8 @@ void main() {
     expect(SemanticsFlag.values.length, equals(numSemanticsFlags));
     for (int index = 0; index < numSemanticsFlags; ++index) {
       final int flag = 1 << index;
-      expect(SemanticsFlag.values[flag], isNotNull);
-      expect(SemanticsFlag.values[flag].toString(), startsWith('SemanticsFlag.'));
+      expect(SemanticsFlag.fromFlag(flag), isNotNull);
+      expect(SemanticsFlag.fromFlag(flag).toString(), startsWith('SemanticsFlag.'));
     }
   });
 
@@ -27,8 +27,8 @@ void main() {
     expect(SemanticsAction.values.length, equals(numSemanticsActions));
     for (int index = 0; index < numSemanticsActions; ++index) {
       final int flag = 1 << index;
-      expect(SemanticsAction.values[flag], isNotNull);
-      expect(SemanticsAction.values[flag].toString(), startsWith('SemanticsAction.'));
+      expect(SemanticsAction.fromAction(flag), isNotNull);
+      expect(SemanticsAction.fromAction(flag).toString(), startsWith('SemanticsAction.'));
     }
   });