Release 2.0.2

Author: chenru

README.md

@@ -10,7 +10,7 @@
 
 ## 基本要求
 App 元素点击事件要求 React Native 0.23 ~ 0.61.5；   
-App 页面浏览事件要求 React Navigation ^2.0 ~ ^4.0；  
+App 页面浏览事件要求 React Navigation ^2.0 ~ ^4.0；
 App 可视化全埋点要求 React Native 0.46 ~ 0.60。
 
 ## 集成方式

RNSensorsAnalyticsModule.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "RNSensorsAnalyticsModule"
-  s.version      = "2.0.1"
+  s.version      = "2.0.2"
   s.summary      = "The official React Native SDK of Sensors Analytics."
   s.description  = <<-DESC
                   神策分析 RN 组件

android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsPackage.java

@@ -15,7 +15,7 @@
  */
 
 public class RNSensorsAnalyticsPackage implements ReactPackage {
-    public static final String VERSION = "2.0.1";
+    public static final String VERSION = "2.0.2";
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();

ios/SAReactNativeManager.m

@@ -36,10 +36,26 @@
 #import "SAReactNativeswizzler.h"
 #import <objc/runtime.h>
 
+
+@interface UIView(SAReactNative)
+@property (nonatomic, copy) NSDictionary *sa_reactnative_screenProperties;
+@end
+
+@implementation UIView(SAReactNative)
+
+- (NSDictionary *)sa_reactnative_screenProperties {
+    return objc_getAssociatedObject(self, @"SensorsAnalyticsRNScreenProperties");
+}
+
+- (void)setSa_reactnative_screenProperties:(NSDictionary *)sa_reactnative_screenProperties {
+    objc_setAssociatedObject(self, @"SensorsAnalyticsRNScreenProperties", sa_reactnative_screenProperties, OBJC_ASSOCIATION_COPY_NONATOMIC);
+}
+
+@end
+
 @interface SAReactNativeManager ()
 
-@property (nonatomic, copy) NSString *currentScreenName;
-@property (nonatomic, copy) NSString *currentTitle;
+@property (nonatomic, copy) NSDictionary *screenProperties;
 @property (nonatomic, strong) NSSet *ignoreClasses;
 @property (nonatomic, strong) NSMutableSet *clickableViewTags;
 @property (nonatomic, assign) BOOL isRootViewVisible;
@@ -167,14 +183,18 @@ - (instancetype)init {
 
 #pragma mark - visualize
 - (NSDictionary *)visualizeProperties {
-    return _isRootViewVisible ? [self screenProperties] : nil;
+    return _isRootViewVisible ? self.screenProperties : nil;
 }
 
 - (BOOL)clickableForView:(UIView *)view {
     if ([_ignoreClasses containsObject:NSStringFromClass(view.class)]) {
         return NO;
     }
-    return [_clickableViewTags containsObject:view.reactTag];
+    BOOL clickable = [_clickableViewTags containsObject:view.reactTag];
+    if (clickable) {
+        view.sa_reactnative_screenProperties = self.screenProperties;
+    }
+    return clickable;
 }
 
 - (BOOL)prepareView:(NSNumber *)reactTag clickable:(BOOL)clickable paramters:(NSDictionary *)paramters {
@@ -198,8 +218,7 @@ - (void)trackViewClick:(NSNumber *)reactTag {
     dispatch_async(dispatch_get_main_queue(), ^{
         UIView *view = [[SAReactNativeManager sharedInstance] viewForTag:reactTag];
         NSMutableDictionary *properties = [NSMutableDictionary dictionary];
-        NSDictionary *screenProperties = [self screenProperties];
-        [properties addEntriesFromDictionary:screenProperties];
+        [properties addEntriesFromDictionary:self.screenProperties];
         properties[@"$element_content"] = [view.accessibilityLabel stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
 
         [[SensorsAnalyticsSDK sharedInstance] trackViewAppClick:view withProperties:[properties copy]];
@@ -213,8 +232,11 @@ - (void)trackViewScreen:(nullable NSString *)url properties:(nullable NSDictiona
         return;
     }
     NSString *screenName = properties[@"$screen_name"] ?: url;
-    NSString *title = properties[@"$title"];
-    NSDictionary *pageProps = [self viewScreenProperties:screenName title:title];
+    NSString *title = properties[@"$title"] ?: screenName;
+    NSMutableDictionary *pageProps = [NSMutableDictionary dictionary];
+    pageProps[@"$screen_name"] = screenName;
+    pageProps[@"$title"] = title;
+    self.screenProperties = pageProps;
 
     if (autoTrack && ![[SensorsAnalyticsSDK sharedInstance] isAutoTrackEnabled]) {
         return;
@@ -268,17 +290,4 @@ - (UIView *)viewForTag:(NSNumber *)reactTag {
     return [manager viewForReactTag:reactTag];
 }
 
-- (NSDictionary *)viewScreenProperties:(NSString *)screenName title:(NSString *)title {
-    _currentScreenName = screenName;
-    _currentTitle = title ?: screenName;
-    return [self screenProperties];
-}
-
-- (NSDictionary *)screenProperties {
-    NSMutableDictionary *properties = [NSMutableDictionary dictionary];
-    properties[@"$screen_name"] = _currentScreenName;
-    properties[@"$title"] = _currentTitle;
-    return [properties copy];
-}
-
 @end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sensorsdata-analytics-react-native",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "private": false,
   "description": "神策分析 RN 组件",
   "main": "index.js",