From 0dd28827ed383a937d64b78971394469c46068e2 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Wed, 15 Jun 2022 12:32:13 -0700 Subject: [PATCH 1/2] remove workarounds --- .../darwin/ios/framework/Source/FlutterViewController.mm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm index 850ea0cef73a5..48868dbd4b705 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm @@ -862,7 +862,6 @@ - (void)dealloc { - (void)applicationBecameActive:(NSNotification*)notification { TRACE_EVENT0("flutter", "applicationBecameActive"); - self.view.accessibilityElementsHidden = NO; if (_viewportMetrics.physical_width) { [self surfaceUpdated:YES]; } @@ -871,9 +870,6 @@ - (void)applicationBecameActive:(NSNotification*)notification { - (void)applicationWillResignActive:(NSNotification*)notification { TRACE_EVENT0("flutter", "applicationWillResignActive"); - if ([FlutterViewController isUIAccessibilityIsVoiceOverRunning]) { - self.view.accessibilityElementsHidden = YES; - } [self goToApplicationLifecycle:@"AppLifecycleState.inactive"]; } From 3b6c2eb6db70ab9e34074cf129c122ec5947832e Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Wed, 15 Jun 2022 12:38:19 -0700 Subject: [PATCH 2/2] remove tests from workaround --- .../Source/FlutterViewControllerTest.mm | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm index 79894ef3beb7f..7de389b6e65f2 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm @@ -932,54 +932,6 @@ - (void)testHideOverlay { engine.viewController = nil; } -- (void)testHideA11yElements { - FlutterDartProject* project = [[FlutterDartProject alloc] init]; - FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project]; - [engine createShell:@"" libraryURI:@"" initialRoute:nil]; - FlutterViewController* realVC = [[FlutterViewController alloc] initWithEngine:engine - nibName:nil - bundle:nil]; - id flutterViewControllerClassMOCK = OCMClassMock([FlutterViewController class]); - [[[flutterViewControllerClassMOCK stub] andReturnValue:@YES] isUIAccessibilityIsVoiceOverRunning]; - - XCTAssertFalse(realVC.view.accessibilityElementsHidden); - [[NSNotificationCenter defaultCenter] - postNotificationName:UIApplicationWillResignActiveNotification - object:nil]; - XCTAssertTrue(realVC.view.accessibilityElementsHidden); - [[NSNotificationCenter defaultCenter] - postNotificationName:UIApplicationDidBecomeActiveNotification - object:nil]; - XCTAssertFalse(realVC.view.accessibilityElementsHidden); - engine.viewController = nil; - - [flutterViewControllerClassMOCK stopMocking]; -} - -- (void)testDontHideA11yElementsWhenVoiceOverIsOff { - FlutterDartProject* project = [[FlutterDartProject alloc] init]; - FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project]; - [engine createShell:@"" libraryURI:@"" initialRoute:nil]; - FlutterViewController* realVC = [[FlutterViewController alloc] initWithEngine:engine - nibName:nil - bundle:nil]; - id flutterViewControllerClassMOCK = OCMClassMock([FlutterViewController class]); - [[[flutterViewControllerClassMOCK stub] andReturnValue:@NO] isUIAccessibilityIsVoiceOverRunning]; - - XCTAssertFalse(realVC.view.accessibilityElementsHidden); - [[NSNotificationCenter defaultCenter] - postNotificationName:UIApplicationWillResignActiveNotification - object:nil]; - XCTAssertFalse(realVC.view.accessibilityElementsHidden); - [[NSNotificationCenter defaultCenter] - postNotificationName:UIApplicationDidBecomeActiveNotification - object:nil]; - XCTAssertFalse(realVC.view.accessibilityElementsHidden); - engine.viewController = nil; - - [flutterViewControllerClassMOCK stopMocking]; -} - - (void)testNotifyLowMemory { FlutterEnginePartialMock* mockEngine = [[FlutterEnginePartialMock alloc] init]; FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine