forked from flutter/engine
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes accessibility issue that bridge fails to clean up FlutterScroll…
…ableSemanticsObject (flutter#28495)
- Loading branch information
Showing
9 changed files
with
587 additions
and
255 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_SEMANTICS_SCROLL_VIEW_H_ | ||
| #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_SEMANTICS_SCROLL_VIEW_H_ | ||
|
|
||
| #import <UIKit/UIKit.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
| @class SemanticsObject; | ||
|
|
||
| /** | ||
| * A UIScrollView to represent Flutter scrollable in iOS accessibility | ||
| * services. | ||
| * | ||
| * This class is hidden from the user and can't be interacted with. It | ||
| * sends all of selector calls from accessibility services to the | ||
| * owner SemanticsObject. | ||
| */ | ||
| @interface FlutterSemanticsScrollView : UIScrollView | ||
|
|
||
| - (instancetype)init NS_UNAVAILABLE; | ||
| - (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE; | ||
| - (instancetype)initWithCoder:(NSCoder*)coder NS_UNAVAILABLE; | ||
| - (instancetype)initWithSemanticsObject:(SemanticsObject*)semanticsObject; | ||
|
|
||
| @end | ||
| NS_ASSUME_NONNULL_END | ||
| #endif // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_SEMANTICS_SCROLL_VIEW_H_ |
138 changes: 138 additions & 0 deletions
138
shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.mm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.h" | ||
|
|
||
| #import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h" | ||
|
|
||
| @interface FlutterSemanticsScrollView () | ||
| @property(nonatomic, assign) SemanticsObject* semanticsObject; | ||
| @end | ||
|
|
||
| @implementation FlutterSemanticsScrollView | ||
|
|
||
| - (instancetype)initWithSemanticsObject:(SemanticsObject*)semanticsObject { | ||
| self = [super initWithFrame:CGRectZero]; | ||
| if (self) { | ||
| _semanticsObject = semanticsObject; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (UIView*)hitTest:(CGPoint)point withEvent:(UIEvent*)event { | ||
| return nil; | ||
| } | ||
|
|
||
| // The following methods are explicitly forwarded to the wrapped SemanticsObject because the | ||
| // forwarding logic above doesn't apply to them since they are also implemented in the | ||
| // UIScrollView class, the base class. | ||
|
|
||
| - (BOOL)isAccessibilityElement { | ||
| if (![_semanticsObject isAccessibilityBridgeAlive]) { | ||
| return NO; | ||
| } | ||
|
|
||
| if ([_semanticsObject isAccessibilityElement]) { | ||
| return YES; | ||
| } | ||
| if (self.contentSize.width > self.frame.size.width || | ||
| self.contentSize.height > self.frame.size.height) { | ||
| // In SwitchControl or VoiceControl, the isAccessibilityElement must return YES | ||
| // in order to use scroll actions. | ||
| return !_semanticsObject.bridge->isVoiceOverRunning(); | ||
| } else { | ||
| return NO; | ||
| } | ||
| } | ||
|
|
||
| - (NSString*)accessibilityLabel { | ||
| return [_semanticsObject accessibilityLabel]; | ||
| } | ||
|
|
||
| - (NSAttributedString*)accessibilityAttributedLabel { | ||
| return [_semanticsObject accessibilityAttributedLabel]; | ||
| } | ||
|
|
||
| - (NSString*)accessibilityValue { | ||
| return [_semanticsObject accessibilityValue]; | ||
| } | ||
|
|
||
| - (NSAttributedString*)accessibilityAttributedValue { | ||
| return [_semanticsObject accessibilityAttributedValue]; | ||
| } | ||
|
|
||
| - (NSString*)accessibilityHint { | ||
| return [_semanticsObject accessibilityHint]; | ||
| } | ||
|
|
||
| - (NSAttributedString*)accessibilityAttributedHint { | ||
| return [_semanticsObject accessibilityAttributedHint]; | ||
| } | ||
|
|
||
| - (BOOL)accessibilityActivate { | ||
| return [_semanticsObject accessibilityActivate]; | ||
| } | ||
|
|
||
| - (void)accessibilityIncrement { | ||
| [_semanticsObject accessibilityIncrement]; | ||
| } | ||
|
|
||
| - (void)accessibilityDecrement { | ||
| [_semanticsObject accessibilityDecrement]; | ||
| } | ||
|
|
||
| - (BOOL)accessibilityScroll:(UIAccessibilityScrollDirection)direction { | ||
| return [_semanticsObject accessibilityScroll:direction]; | ||
| } | ||
|
|
||
| - (BOOL)accessibilityPerformEscape { | ||
| return [_semanticsObject accessibilityPerformEscape]; | ||
| } | ||
|
|
||
| - (void)accessibilityElementDidBecomeFocused { | ||
| [_semanticsObject accessibilityElementDidBecomeFocused]; | ||
| } | ||
|
|
||
| - (void)accessibilityElementDidLoseFocus { | ||
| [_semanticsObject accessibilityElementDidLoseFocus]; | ||
| } | ||
|
|
||
| - (id)accessibilityContainer { | ||
| return [_semanticsObject accessibilityContainer]; | ||
| } | ||
|
|
||
| - (NSInteger)accessibilityElementCount { | ||
| return [[_semanticsObject children] count]; | ||
| } | ||
|
|
||
| - (id)accessibilityElementAtIndex:(NSInteger)index { | ||
| SemanticsObject* child = [_semanticsObject children][index]; | ||
|
|
||
| // Swap the original `SemanticsObject` to a `PlatformViewSemanticsContainer` | ||
| if (child.node.IsPlatformViewNode()) { | ||
| child.platformViewSemanticsContainer.index = index; | ||
| return child.platformViewSemanticsContainer; | ||
| } | ||
|
|
||
| if ([child hasChildren]) | ||
| return [child accessibilityContainer]; | ||
| return [child nativeAccessibility]; | ||
| } | ||
|
|
||
| - (NSInteger)indexOfAccessibilityElement:(id)element { | ||
| if ([element isKindOfClass:[FlutterPlatformViewSemanticsContainer class]]) { | ||
| return ((FlutterPlatformViewSemanticsContainer*)element).index; | ||
| } | ||
|
|
||
| NSArray<SemanticsObject*>* children = [_semanticsObject children]; | ||
| for (size_t i = 0; i < [children count]; i++) { | ||
| SemanticsObject* child = children[i]; | ||
| if ((![child hasChildren] && child == element) || | ||
| ([child hasChildren] && [child accessibilityContainer] == element)) | ||
| return i; | ||
| } | ||
| return NSNotFound; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.