You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/25 03:55:47 UTC
[1/3] incubator-weex git commit: * [ios] fix a component accessible
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev d9547f114 -> 2abe322f2
* [ios] fix a component accessible
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d877b0f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d877b0f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d877b0f8
Branch: refs/heads/0.16-dev
Commit: d877b0f8e3cf0ebccecd1e6cd3bbd9423a524eb9
Parents: b2a1d53
Author: acton393 <zh...@gmail.com>
Authored: Fri Aug 25 11:39:03 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Aug 25 11:39:03 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXAComponent.m | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d877b0f8/ios/sdk/WeexSDK/Sources/Component/WXAComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXAComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXAComponent.m
index a8e803b..7d90771 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXAComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXAComponent.m
@@ -58,9 +58,6 @@
- (void)viewDidLoad
{
[self.view addGestureRecognizer:_tap];
- if (!_testId) {
- self.view.isAccessibilityElement = YES;
- }
}
- (void)openURL
[2/3] incubator-weex git commit: * [ios] fix accessible about weex
component
Posted by ac...@apache.org.
* [ios] fix accessible about weex component
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1d5e00a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1d5e00a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1d5e00a0
Branch: refs/heads/0.16-dev
Commit: 1d5e00a0a97b48b2235626f96468a45f4e66d9c1
Parents: d877b0f
Author: acton393 <zh...@gmail.com>
Authored: Fri Aug 25 11:52:20 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Aug 25 11:52:20 2017 +0800
----------------------------------------------------------------------
.../Sources/Component/WXComponent_internal.h | 4 +--
.../Sources/Component/WXImageComponent.m | 4 +--
.../Sources/Component/WXSwitchComponent.m | 4 +--
.../Sources/Component/WXTextAreaComponent.m | 4 +--
.../WeexSDK/Sources/Component/WXTextComponent.m | 5 +---
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 29 ++++++++++----------
6 files changed, 20 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d5e00a0/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
index 3bac966..1452118 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -66,8 +66,8 @@
*/
UIAccessibilityTraits _role; //accessibility
NSString * _ariaLabel; //accessibilityLabel
- BOOL _ariaHidden; // accessibilityElementsHidden
- BOOL _accessible; // accessible
+ NSString * _ariaHidden; // accessibilityElementsHidden
+ NSString * _accessible; // accessible
NSString * _testId;// just for auto-test
/**
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d5e00a0/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
index 45ecff3..a422e35 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -249,9 +249,7 @@ WX_EXPORT_METHOD(@selector(save:))
imageView.userInteractionEnabled = YES;
imageView.clipsToBounds = YES;
imageView.exclusiveTouch = YES;
- if (!_testId) {
- imageView.isAccessibilityElement = YES;
- }
+ imageView.isAccessibilityElement = YES;
[self _clipsToBounds];
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d5e00a0/ios/sdk/WeexSDK/Sources/Component/WXSwitchComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXSwitchComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXSwitchComponent.m
index e6ed2cf..2ab57a9 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXSwitchComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXSwitchComponent.m
@@ -60,9 +60,7 @@
- (void)viewDidLoad
{
_switchView = (WXSwitchView *)self.view;
- if (!_testId) {
- _switchView.isAccessibilityElement = YES;
- }
+ _switchView.isAccessibilityElement = YES;
[_switchView setOn:_checked animated:YES];
[_switchView setEnabled:!_disabled];
[_switchView addTarget:self action:@selector(checkChanged) forControlEvents:UIControlEventValueChanged];
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d5e00a0/ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.m
index 6acb272..24ee17f 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.m
@@ -49,9 +49,7 @@ typedef UITextView WXTextAreaView;
}
// default placeholder hide from voice over
self.placeHolderLabel.isAccessibilityElement = NO;
- if(!_testId) {
- _textView.isAccessibilityElement = YES;
- }
+ _textView.isAccessibilityElement = YES;
_textView.delegate = self;
[_textView setNeedsDisplay];
[_textView setClipsToBounds:YES];
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d5e00a0/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index d52061d..ab11b14 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -281,10 +281,7 @@ do {\
if (!useCoreText) {
((WXText *)self.view).textStorage = _textStorage;
}
-
- if (!_testId) {
- self.view.isAccessibilityElement = YES;
- }
+ self.view.isAccessibilityElement = YES;
[self setNeedsDisplay];
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d5e00a0/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
index c811760..c2424c0 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -91,7 +91,8 @@
_isNeedJoinLayoutSystem = YES;
_isLayoutDirty = YES;
_isViewFrameSyncWithCalculated = YES;
- _ariaHidden = NO;
+ _ariaHidden = nil;
+ _accessible = nil;
_async = NO;
@@ -110,13 +111,14 @@
_role = [WXConvert WXUIAccessibilityTraits:attributes[@"role"]];
}
if (attributes[@"ariaHidden"]) {
- _ariaHidden = [WXConvert BOOL:attributes[@"ariaHidden"]];
+
+ _ariaHidden = [WXConvert NSString:attributes[@"ariaHidden"]];
}
if (attributes[@"ariaLabel"]) {
_ariaLabel = [WXConvert NSString:attributes[@"ariaLabel"]];
}
if (attributes[@"accessible"]) {
- _accessible = [WXConvert BOOL:attributes[@"accessible"]];
+ _accessible = [WXConvert NSString:attributes[@"accessible"]];
}
if (attributes[@"testId"]) {
@@ -263,11 +265,12 @@
if (_ariaLabel) {
_view.accessibilityLabel = _ariaLabel;
}
- if (_view.isAccessibilityElement != _accessible) {
- [_view setIsAccessibilityElement:_accessible];
+ if (_accessible) {
+ [_view setIsAccessibilityElement:[WXConvert BOOL:_accessible]];
}
- if (self.view.accessibilityElementsHidden != _ariaHidden) {
- _view.accessibilityElementsHidden = _ariaHidden;
+
+ if (_ariaHidden) {
+ [_view setAccessibilityElementsHidden:[WXConvert BOOL:_ariaHidden]];
}
[self _initEvents:self.events];
@@ -609,16 +612,12 @@
self.view.accessibilityTraits = _role;
}
if (attributes[@"ariaHidden"]) {
- _ariaHidden = [WXConvert BOOL:attributes[@"ariaHidden"]];
- if (self.view.accessibilityElementsHidden != _ariaHidden) {
- self.view.accessibilityElementsHidden = _ariaHidden;
- }
+ _ariaHidden = [WXConvert NSString:attributes[@"ariaHidden"]];
+ [self.view setAccessibilityElementsHidden:[WXConvert BOOL:_ariaHidden]];
}
if (attributes[@"accessible"]) {
- _accessible = [WXConvert BOOL:attributes[@"accessible"]];
- if (self.view.isAccessibilityElement != _accessible) {
- [self.view setIsAccessibilityElement:_accessible];
- }
+ _accessible = [WXConvert NSString:attributes[@"accessible"]];
+ [self.view setIsAccessibilityElement:[WXConvert BOOL:_accessible]];
}
if (attributes[@"ariaLabel"]) {
_ariaLabel = [WXConvert NSString:attributes[@"ariaLabel"]];
[3/3] incubator-weex git commit: Merge branch
'ios-feature-accessibility' of https://github.com/acton393/incubator-weex
into wip-us-0.16-dev
Posted by ac...@apache.org.
Merge branch 'ios-feature-accessibility' of https://github.com/acton393/incubator-weex into wip-us-0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2abe322f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2abe322f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2abe322f
Branch: refs/heads/0.16-dev
Commit: 2abe322f26ed2069076de25a8176d0455fb0f2bc
Parents: d9547f1 1d5e00a
Author: acton393 <zh...@gmail.com>
Authored: Fri Aug 25 11:56:40 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Aug 25 11:56:40 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXAComponent.m | 3 --
.../Sources/Component/WXComponent_internal.h | 4 +--
.../Sources/Component/WXImageComponent.m | 4 +--
.../Sources/Component/WXSwitchComponent.m | 4 +--
.../Sources/Component/WXTextAreaComponent.m | 4 +--
.../WeexSDK/Sources/Component/WXTextComponent.m | 5 +---
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 29 ++++++++++----------
7 files changed, 20 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2abe322f/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2abe322f/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
----------------------------------------------------------------------
diff --cc ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index 98ec82c,ab11b14..664b0e8
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@@ -280,12 -279,9 +280,9 @@@ do {
useCoreText = [(WXTextComponent*)self.view.wx_component useCoreText];
}
if (!useCoreText) {
- ((WXText *)self.view).textStorage = _textStorage;
+ ((WXTextView *)self.view).textStorage = _textStorage;
}
-
- if (!_testId) {
- self.view.isAccessibilityElement = YES;
- }
+ self.view.isAccessibilityElement = YES;
[self setNeedsDisplay];
}