DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check a11y bridge alive before returning a11y container (flutter/engine#27865)

Browse Source
This commit is contained in:
chunhtai 2021-08-04 08:30:02 -07:00 committed by GitHub
parent 19633e9d0d
commit 55e38ef779
2 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/src/flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm
View File

@ -207,6 +207,10 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
}
- (id)accessibilityContainer {
if (![_semanticsObject isAccessibilityBridgeAlive]) {
return nil;
}
if ([_semanticsObject hasChildren] || [_semanticsObject uid] == kRootNodeId) {
if (_container == nil) {
_container.reset([[SemanticsObjectContainer alloc]
@ -682,6 +686,10 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
}
- (id)accessibilityContainer {
if (![self isAccessibilityBridgeAlive]) {
return nil;
}
if ([self hasChildren] || [self uid] == kRootNodeId) {
if (_container == nil)
_container.reset([[SemanticsObjectContainer alloc] initWithSemanticsObject:self

72
engine/src/flutter/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm
View File

@ -644,4 +644,76 @@ class MockAccessibilityBridge : public AccessibilityBridgeIos {
XCTAssertEqual(object.accessibilityValue, nativeSwitch.accessibilityValue);
}
- (void)testFlutterSemanticsObjectReturnsNilContainerWhenBridgeIsNotAlive {
FlutterSemanticsObject* parentObject;
FlutterSemanticsObject* delegate;
FlutterScrollableSemanticsObject* scrollable;
SemanticsObject* scrollable_object;
FlutterSemanticsObject* object2;
flutter::SemanticsNode parent;
parent.id = 0;
parent.rect = SkRect::MakeXYWH(0, 0, 100, 200);
parent.label = "label";
parent.value = "value";
parent.hint = "hint";
flutter::SemanticsNode node;
node.id = 1;
node.flags = static_cast<int32_t>(flutter::SemanticsFlags::kHasImplicitScrolling);
node.actions = flutter::kHorizontalScrollSemanticsActions;
node.rect = SkRect::MakeXYWH(0, 0, 100, 200);
node.label = "label";
node.value = "value";
node.hint = "hint";
node.scrollExtentMax = 100.0;
node.scrollPosition = 0.0;
parent.childrenInTraversalOrder.push_back(1);
flutter::SemanticsNode node2;
node2.id = 2;
node2.rect = SkRect::MakeXYWH(0, 0, 100, 200);
node2.label = "label";
node2.value = "value";
node2.hint = "hint";
node2.scrollExtentMax = 100.0;
node2.scrollPosition = 0.0;
parent.childrenInTraversalOrder.push_back(2);
{
flutter::MockAccessibilityBridge* mock = new flutter::MockAccessibilityBridge();
mock->isVoiceOverRunningValue = true;
fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(mock);
fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
parentObject = [[FlutterSemanticsObject alloc] initWithBridge:bridge uid:0];
[parentObject setSemanticsNode:&parent];
delegate = [[FlutterSemanticsObject alloc] initWithBridge:bridge uid:1];
scrollable = [[FlutterScrollableSemanticsObject alloc] initWithSemanticsObject:delegate];
scrollable_object = static_cast<SemanticsObject*>(scrollable);
[scrollable_object setSemanticsNode:&node];
object2 = [[FlutterSemanticsObject alloc] initWithBridge:bridge uid:2];
[object2 setSemanticsNode:&node2];
parentObject.children = @[ scrollable_object, object2 ];
[parentObject accessibilityBridgeDidFinishUpdate];
[scrollable_object accessibilityBridgeDidFinishUpdate];
[object2 accessibilityBridgeDidFinishUpdate];
// Returns the correct container if the bridge is alive.
SemanticsObjectContainer* container =
static_cast<SemanticsObjectContainer*>(scrollable_object.accessibilityContainer);
XCTAssertEqual(container.semanticsObject, parentObject);
SemanticsObjectContainer* container2 =
static_cast<SemanticsObjectContainer*>(object2.accessibilityContainer);
XCTAssertEqual(container2.semanticsObject, parentObject);
}
// The bridge pointer went out of scope and was deallocated.
XCTAssertNil(scrollable_object.accessibilityContainer);
XCTAssertNil(object2.accessibilityContainer);
}
@end