expo-splash-screen 0.13.2 → 0.13.3

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.13.3 — 2021-10-15
+
+### 🐛 Bug fixes
+
+- Fix `No native splash screen registered for given view controller` error happening when project is using both `expo-dev-client` and `expo-splash-screen` packages. ([#14745](https://github.com/expo/expo/pull/14745) by [@kudo](https://github.com/kudo))
+
 ## 0.13.2 — 2021-10-15
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.13.2'
+version = '0.13.3'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -57,7 +57,7 @@ android {
     minSdkVersion safeExtGet('minSdkVersion', 21)
     targetSdkVersion safeExtGet('targetSdkVersion', 30)
     versionCode 17
-    versionName '0.13.2'
+    versionName '0.13.3'
   }
   lintOptions {
     abortOnError false

package/ios/EXSplashScreen/EXSplashScreenService.m

@@ -4,12 +4,22 @@
 #import <EXSplashScreen/EXSplashScreenViewNativeProvider.h>
 #import <ExpoModulesCore/EXDefines.h>
 
-static const NSString *kView = @"view";
+static NSString * const kRootViewController = @"rootViewController";
+static NSString * const kView = @"view";
 
 @interface EXSplashScreenService ()
 
 @property (nonatomic, strong) NSMapTable<UIViewController *, EXSplashScreenViewController *> *splashScreenControllers;
-@property (nonatomic, assign) BOOL isObservingRootViewController;
+/**
+ * This module holds a reference to rootViewController acting as a flag to indicate KVO is enabled.
+ * When KVO is enabled, actually we are observing two targets and re-show splash screen if targets changed:
+ *   - `keyWindow.rootViewController`: it is for expo-dev-client which replaced it in startup.
+ *   - `rootViewController.rootView`: it is for expo-updates which replaced it in startup.
+ *
+ * If `rootViewController` is changed, we also need the old `rootViewController` to unregister rootView KVO.
+ * That's why we keep a weak reference here but not a boolean flag.
+ */
+@property (nonatomic, weak) UIViewController *observingRootViewController;
 
 @end
 
@@ -21,7 +31,6 @@ EX_REGISTER_SINGLETON_MODULE(SplashScreen);
 {
   if (self = [super init]) {
     _splashScreenControllers = [NSMapTable weakToStrongObjectsMapTable];
-    _isObservingRootViewController = NO;
   }
   return self;
 }
@@ -141,23 +150,39 @@ EX_REGISTER_SINGLETON_MODULE(SplashScreen);
 - (void)addRootViewControllerListener
 {
   NSAssert([NSThread isMainThread], @"Method must be called on main thread");
-  if (!_isObservingRootViewController) {
-    [UIApplication.sharedApplication.keyWindow.rootViewController addObserver:self forKeyPath:kView options:NSKeyValueObservingOptionNew context:nil];
-    _isObservingRootViewController = YES;
+  if (self.observingRootViewController == nil) {
+    UIViewController *rootViewController = UIApplication.sharedApplication.keyWindow.rootViewController;
+
+    [UIApplication.sharedApplication.keyWindow addObserver:self
+                                                forKeyPath:kRootViewController
+                                                   options:NSKeyValueObservingOptionNew
+                                                   context:nil];
+
+    [rootViewController addObserver:self forKeyPath:kView options:NSKeyValueObservingOptionNew context:nil];
+    self.observingRootViewController = rootViewController;
   }
 }
 
 - (void)removeRootViewControllerListener
 {
   NSAssert([NSThread isMainThread], @"Method must be called on main thread");
-  if (_isObservingRootViewController) {
-    [UIApplication.sharedApplication.keyWindow.rootViewController removeObserver:self forKeyPath:kView context:nil];
-    _isObservingRootViewController = NO;
+  if (self.observingRootViewController != nil) {
+    [UIApplication.sharedApplication.keyWindow removeObserver:self forKeyPath:kRootViewController context:nil];
+    [self.observingRootViewController removeObserver:self forKeyPath:kView context:nil];
+    self.observingRootViewController = nil;
   }
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
 {
+  if (object == UIApplication.sharedApplication.keyWindow && [keyPath isEqualToString:kRootViewController]) {
+    UIViewController *newRootViewController = change[@"new"];
+    if (newRootViewController != nil) {
+      [self removeRootViewControllerListener];
+      [self showSplashScreenFor:newRootViewController];
+      [self addRootViewControllerListener];
+    }
+  }
   if (object == UIApplication.sharedApplication.keyWindow.rootViewController && [keyPath isEqualToString:kView]) {
     UIView *newView = change[@"new"];
     if (newView != nil && [newView.nextResponder isKindOfClass:[UIViewController class]]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-splash-screen",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "Provides a module to allow keeping the native Splash Screen visible until you choose to hide it.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -39,10 +39,10 @@
   "dependencies": {
     "@expo/configure-splash-screen": "^0.6.0",
     "@expo/prebuild-config": "^3.0.0",
-    "expo-modules-core": "~0.4.3"
+    "expo-modules-core": "~0.4.4"
   },
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "d23e1ac491da96b51c25eb2533efcd56499ee287"
+  "gitHead": "e30402e90972d9e1838d7b63a40a71a41398a772"
 }