You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/03 10:26:29 UTC
[1/3] incubator-weex git commit: * [ios] support accessibility magic
Tap event
Repository: incubator-weex
Updated Branches:
refs/heads/master cf4dcd96e -> 9237765dd
* [ios] support accessibility magic Tap event
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ddadd543
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ddadd543
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ddadd543
Branch: refs/heads/master
Commit: ddadd5434f9eda04592e1cd730ccfa5ca8ed2a08
Parents: cf4dcd9
Author: acton393 <zh...@gmail.com>
Authored: Mon Oct 2 15:09:01 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Oct 2 15:09:01 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXComponent_internal.h | 2 ++
ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m | 15 ++++++++++++++-
ios/sdk/WeexSDK/Sources/View/WXView.m | 9 +++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ddadd543/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 5d9b687..f1163a9 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -72,6 +72,8 @@ typedef id (^WXDataBindingBlock)(NSDictionary *data, BOOL *needUpdate);
NSString * _accessibilityHintContent; // hint for the action
NSString * _testId;// just for auto-test
+ BOOL _accessibilityMagicTapEvent;
+
/**
* PseudoClass
*/
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ddadd543/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
index 6247f07..2c343f4 100644
--- a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
+++ b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
@@ -172,6 +172,7 @@ if ([removeEventName isEqualToString:@#eventName]) {\
WX_ADD_EVENT(touchmove, addTouchMoveEvent)
WX_ADD_EVENT(touchend, addTouchEndEvent)
WX_ADD_EVENT(touchcancel, addTouchCancelEvent)
+ WX_ADD_EVENT(accessibilityMagicTap, addAccessibilityMagicTapEvent)
if(_isListenPseudoTouch) {
self.touchGesture.listenPseudoTouch = YES;
@@ -200,7 +201,7 @@ if ([removeEventName isEqualToString:@#eventName]) {\
WX_REMOVE_EVENT(touchmove, removeTouchMoveEvent)
WX_REMOVE_EVENT(touchend, removeTouchEndEvent)
WX_REMOVE_EVENT(touchcancel, removeTouchCancelEvent)
-
+ WX_REMOVE_EVENT(accessibilityMagicTap, removeAccessibilityMagicTapEvent)
if(_isListenPseudoTouch) {
self.touchGesture.listenPseudoTouch = NO;
}
@@ -259,6 +260,18 @@ if ([removeEventName isEqualToString:@#eventName]) {\
[self checkRemoveTouchGesture];
}
+#pragma mark - Accessibility Event
+
+- (void)addAccessibilityMagicTapEvent
+{
+ _accessibilityMagicTapEvent = YES;
+}
+
+- (void)removeAccessibilityMagicTapEvent
+{
+ _accessibilityMagicTapEvent = NO;
+}
+
#pragma mark - Click Event
- (void)addClickEvent
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ddadd543/ios/sdk/WeexSDK/Sources/View/WXView.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXView.m b/ios/sdk/WeexSDK/Sources/View/WXView.m
index 4619ef1..397ece3 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXView.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXView.m
@@ -20,6 +20,7 @@
#import "WXView.h"
#import "WXComponent.h"
#import "WXLayer.h"
+#import "WXComponent_internal.h"
@implementation WXView
@@ -61,4 +62,12 @@
return nil;
}
+- (BOOL)accessibilityPerformMagicTap
+{
+ if (self.wx_component->_accessibilityMagicTapEvent) {
+ [self.wx_component fireEvent:@"accessibilityPerformMagicTap" params:nil];
+ }
+ return [super accessibilityPerformMagicTap];
+}
+
@end
[2/3] incubator-weex git commit: * [ios] fire accessibilityMagicTap
Event
Posted by gu...@apache.org.
* [ios] fire accessibilityMagicTap Event
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f7e2591c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f7e2591c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f7e2591c
Branch: refs/heads/master
Commit: f7e2591c44257208ad3f4799bb080e2364776492
Parents: ddadd54
Author: acton393 <zh...@gmail.com>
Authored: Tue Oct 3 16:02:03 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Oct 3 16:02:03 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/View/WXView.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f7e2591c/ios/sdk/WeexSDK/Sources/View/WXView.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXView.m b/ios/sdk/WeexSDK/Sources/View/WXView.m
index 397ece3..5e099c3 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXView.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXView.m
@@ -65,7 +65,7 @@
- (BOOL)accessibilityPerformMagicTap
{
if (self.wx_component->_accessibilityMagicTapEvent) {
- [self.wx_component fireEvent:@"accessibilityPerformMagicTap" params:nil];
+ [self.wx_component fireEvent:@"accessibilityMagicTap" params:nil];
}
return [super accessibilityPerformMagicTap];
}
[3/3] incubator-weex git commit: * [ios] make WXTextView inherited
from WXView
Posted by gu...@apache.org.
* [ios] make WXTextView inherited from WXView
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9237765d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9237765d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9237765d
Branch: refs/heads/master
Commit: 9237765ddfed1f2aaec993a1fbc6de59f3c113ee
Parents: f7e2591
Author: acton393 <zh...@gmail.com>
Authored: Tue Oct 3 18:24:00 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Oct 3 18:24:00 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9237765d/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 4653089..1470189 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -25,11 +25,12 @@
#import "WXConvert.h"
#import "WXRuleManager.h"
#import "WXDefine.h"
+#import "WXView.h"
#import <pthread/pthread.h>
#import <CoreText/CoreText.h>
// WXText is a non-public is not permitted
-@interface WXTextView : UIView
+@interface WXTextView : WXView
@property (nonatomic, strong) NSTextStorage *textStorage;
@end