Release 2.1.4

sensorsdata · Aug 28, 2021 · 6f9ed65 · 6f9ed65
1 parent 9b5c2af
commit 6f9ed65
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 191 deletions.
diff --git a/RNSensorsAnalyticsModule.podspec b/RNSensorsAnalyticsModule.podspec
@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "RNSensorsAnalyticsModule"
-  s.version      = "2.1.3"
+  s.version      = "2.1.4"
   s.summary      = "The official React Native SDK of Sensors Analytics."
   s.description  = <<-DESC
                   神策分析 RN 组件

diff --git a/android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsPackage.java b/android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsPackage.java
@@ -28,7 +28,7 @@
 import java.util.List;
 
 public class RNSensorsAnalyticsPackage implements ReactPackage {
-    public static final String VERSION = "2.1.3";
+    public static final String VERSION = "2.1.4";
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();

diff --git a/ios/RNSensorsAnalyticsModule.m b/ios/RNSensorsAnalyticsModule.m
@@ -32,7 +32,7 @@
 #import "SAReactNativeManager.h"
 #import "SAReactNativeEventProperty.h"
 
-NSString *const kSAReactNativePluginVersion = @"react_native:2.1.3";
+NSString *const kSAReactNativePluginVersion = @"react_native:2.1.4";
 
 @implementation RNSensorsAnalyticsModule
 

diff --git a/ios/SAReactNativeManager.m b/ios/SAReactNativeManager.m
@@ -225,6 +225,15 @@ - (RCTRootView *)rootView {
         current = current.presentingViewController;
         rootView = [self rootViewWithCurrentView:current.view];
     }
+
+    if (!rootView) {
+        // 当 rootViewController 为普通 UIViewController，且添加了 childController 时无法获取到 RCTRootView
+        // 此时直接通过 rootViewController 的 subview 获取 RCTRootView
+        // 这里是通过遍历所有的  subviews 查找，作为补充逻辑存在
+        UIViewController *root = [UIApplication sharedApplication].keyWindow.rootViewController;
+        rootView = [self rootViewWithCurrentView:root.view];
+    }
+
     return rootView;
 }
 

diff --git a/ios/SAReactNativeswizzler.h b/ios/SAReactNativeswizzler.h
diff --git a/ios/SAReactNativeswizzler.m b/ios/SAReactNativeswizzler.m
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sensorsdata-analytics-react-native",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "private": false,
   "description": "神策分析 RN 组件",
   "main": "index.js",