expo-splash-screen 0.24.0 → 0.26.0

package/CHANGELOG.md

@@ -10,6 +10,27 @@
 
 ### 💡 Others
 
+## 0.26.0 — 2023-12-12
+
+### 💡 Others
+
+- Removed 'The current activity is no longer available' warning on Android. ([#25608](https://github.com/expo/expo/pull/25608) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+## 0.25.0 — 2023-11-14
+
+### 🛠 Breaking changes
+
+- Bumped iOS deployment target to 13.4. ([#25063](https://github.com/expo/expo/pull/25063) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- On `Android` bump `compileSdkVersion` and `targetSdkVersion` to `34`. ([#24708](https://github.com/expo/expo/pull/24708) by [@alanjhughes](https://github.com/alanjhughes))
+
+### 🎉 New features
+
+- Automatically dismiss splash screen when an error is thrown to prevent blocking error information. ([#24893](https://github.com/expo/expo/pull/24893) by [@EvanBacon](https://github.com/EvanBacon))
+
+### 💡 Others
+
+- Moved changes required for splash screen orchestration from `expo-router` to `expo-splash-screen`. ([#24893](https://github.com/expo/expo/pull/24893) by [@EvanBacon](https://github.com/EvanBacon))
+
 ## 0.24.0 — 2023-10-17
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.24.0'
+version = '0.26.0'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -61,11 +61,11 @@ if (!safeExtGet("expoProvidesDefaultConfig", false)) {
 android {
   // Remove this if and it's contents, when support for SDK49 is dropped
   if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    compileSdkVersion safeExtGet("compileSdkVersion", 33)
+    compileSdkVersion safeExtGet("compileSdkVersion", 34)
 
     defaultConfig {
       minSdkVersion safeExtGet("minSdkVersion", 23)
-      targetSdkVersion safeExtGet("targetSdkVersion", 33)
+      targetSdkVersion safeExtGet("targetSdkVersion", 34)
     }
 
     publishing {
@@ -93,10 +93,8 @@ android {
 
   namespace "expo.modules.splashscreen"
   defaultConfig {
-    minSdkVersion safeExtGet('minSdkVersion', 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 17
-    versionName '0.24.0'
+    versionName '0.26.0'
   }
 }
 

package/android/src/main/java/expo/modules/splashscreen/NativeResourcesBasedSplashScreenViewProvider.kt

@@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat
 /* ktlint-disable no-unused-imports */
 import expo.modules.splashscreen.SplashScreenImageResizeMode
 import expo.modules.splashscreen.SplashScreenViewProvider
-// EXPO_VERSIONING_NEEDS_EXPOVIEW_R
+// EXPO_VERSIONING_NEEDS_PACKAGE_R
 /* ktlint-enable no-unused-imports */
 
 /**

package/android/src/main/java/expo/modules/splashscreen/SplashScreenModule.kt

@@ -1,7 +1,6 @@
 package expo.modules.splashscreen
 
 import expo.modules.kotlin.Promise
-import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.splashscreen.exceptions.HideAsyncException
@@ -18,25 +17,27 @@ class SplashScreenModule : Module() {
     Name("ExpoSplashScreen")
 
     AsyncFunction("preventAutoHideAsync") { promise: Promise ->
-      val currentActivity =
-        appContext.currentActivity ?: throw Exceptions.MissingActivity()
-
-      SplashScreen.preventAutoHide(
-        currentActivity,
-        { hasEffect -> promise.resolve(hasEffect) },
-        { m -> promise.reject(PreventAutoHideException(m)) }
-      )
+      appContext.currentActivity?.let {
+        SplashScreen.preventAutoHide(
+          it,
+          { hasEffect -> promise.resolve(hasEffect) },
+          { m -> promise.reject(PreventAutoHideException(m)) }
+        )
+      } ?: run {
+        promise.resolve(false)
+      }
     }
 
     AsyncFunction("hideAsync") { promise: Promise ->
-      val currentActivity =
-        appContext.currentActivity ?: throw Exceptions.MissingActivity()
-
-      SplashScreen.hide(
-        currentActivity,
-        { hasEffect -> promise.resolve(hasEffect) },
-        { m -> promise.reject(HideAsyncException(m)) }
-      )
+      appContext.currentActivity?.let {
+        SplashScreen.hide(
+          it,
+          { hasEffect -> promise.resolve(hasEffect) },
+          { m -> promise.reject(HideAsyncException(m)) }
+        )
+      } ?: run {
+        promise.resolve(false)
+      }
     }
   }
 }

package/android/src/main/java/expo/modules/splashscreen/SplashScreenReactActivityLifecycleListener.kt

@@ -9,7 +9,7 @@ import expo.modules.splashscreen.singletons.SplashScreen
 // this needs to stay for versioning to work
 /* ktlint-disable no-unused-imports */
 import expo.modules.splashscreen.SplashScreenImageResizeMode
-// EXPO_VERSIONING_NEEDS_EXPOVIEW_R
+// EXPO_VERSIONING_NEEDS_PACKAGE_R
 /* ktlint-enable no-unused-imports */
 
 class SplashScreenReactActivityLifecycleListener(activityContext: Context) : ReactActivityLifecycleListener {

package/build/index.native.d.ts

@@ -1,2 +1,20 @@
-export declare const preventAutoHideAsync: () => Promise<boolean>, hideAsync: () => Promise<boolean>;
+/**
+ * Expo Router uses this internal method to ensure that we can detect if the user
+ * has explicitly opted into preventing the splash screen from hiding. This means
+ * they will also explicitly hide it. If they don't, we will hide it for them after
+ * the navigation render completes.
+ *
+ * @private
+ */
+export declare const _internal_preventAutoHideAsync: () => void;
+/**
+ * Used for Expo libraries to attempt hiding the splash screen after they've completed their work.
+ * If the user has explicitly opted into preventing the splash screen from hiding, we should not
+ * hide it for them. This is often used for animated splash screens.
+ *
+ * @private
+ */
+export declare const _internal_maybeHideAsync: () => void;
+export declare function hideAsync(): Promise<boolean | void>;
+export declare const preventAutoHideAsync: () => void;
 //# sourceMappingURL=index.native.d.ts.map

package/build/index.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../src/index.native.ts"],"names":[],"mappings":"AAEA,eAAO,MAAQ,oBAAoB,QACL,QAAQ,OAAO,CAAC,EADT,SAAS,QAE3B,QAAQ,OAAO,CACjC,CAAC"}
+{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../src/index.native.ts"],"names":[],"mappings":"AAUA;;;;;;;GAOG;AACH,eAAO,MAAM,8BAA8B,YAkB1C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,YAOpC,CAAC;AAEF,wBAAgB,SAAS,4BAYxB;AAED,eAAO,MAAM,oBAAoB,YAKhC,CAAC"}

package/build/index.native.js

@@ -1,3 +1,63 @@
 import { requireNativeModule } from 'expo-modules-core';
-export const { preventAutoHideAsync, hideAsync } = requireNativeModule('ExpoSplashScreen');
+const SplashModule = requireNativeModule('ExpoSplashScreen');
+let _userControlledAutoHideEnabled = false;
+let _preventAutoHideAsyncInvoked = false;
+/**
+ * Expo Router uses this internal method to ensure that we can detect if the user
+ * has explicitly opted into preventing the splash screen from hiding. This means
+ * they will also explicitly hide it. If they don't, we will hide it for them after
+ * the navigation render completes.
+ *
+ * @private
+ */
+export const _internal_preventAutoHideAsync = () => {
+    // Memoize, this should only be called once.
+    if (_preventAutoHideAsyncInvoked) {
+        return;
+    }
+    _preventAutoHideAsyncInvoked = true;
+    // Append error handling to ensure any uncaught exceptions result in the splash screen being hidden.
+    // This prevents the splash screen from floating over error screens.
+    if (ErrorUtils?.getGlobalHandler) {
+        const originalHandler = ErrorUtils.getGlobalHandler();
+        ErrorUtils.setGlobalHandler((error, isFatal) => {
+            hideAsync();
+            originalHandler(error, isFatal);
+        });
+    }
+    SplashModule.preventAutoHideAsync();
+};
+/**
+ * Used for Expo libraries to attempt hiding the splash screen after they've completed their work.
+ * If the user has explicitly opted into preventing the splash screen from hiding, we should not
+ * hide it for them. This is often used for animated splash screens.
+ *
+ * @private
+ */
+export const _internal_maybeHideAsync = () => {
+    // If the user has explicitly opted into preventing the splash screen from hiding,
+    // we should not hide it for them. This is often used for animated splash screens.
+    if (_userControlledAutoHideEnabled) {
+        return;
+    }
+    hideAsync();
+};
+export function hideAsync() {
+    return SplashModule.hideAsync().catch((error) => {
+        // Hide this very unfortunate error.
+        if (
+        // Only throw the error is something unexpected happened.
+        _preventAutoHideAsyncInvoked &&
+            error.message.includes('No native splash screen registered for ')) {
+            return;
+        }
+        throw error;
+    });
+}
+export const preventAutoHideAsync = () => {
+    // Indicate that the user is controlling the auto hide behavior.
+    _userControlledAutoHideEnabled = true;
+    // Prevent as usual...
+    _internal_preventAutoHideAsync();
+};
 //# sourceMappingURL=index.native.js.map

package/build/index.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.native.js","sourceRoot":"","sources":["../src/index.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,kBAAkB,CAGxF,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\n\nexport const { preventAutoHideAsync, hideAsync } = requireNativeModule('ExpoSplashScreen') as {\n  preventAutoHideAsync: () => Promise<boolean>;\n  hideAsync: () => Promise<boolean>;\n};\n"]}
+{"version":3,"file":"index.native.js","sourceRoot":"","sources":["../src/index.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,YAAY,GAAG,mBAAmB,CAAC,kBAAkB,CAG1D,CAAC;AAEF,IAAI,8BAA8B,GAAG,KAAK,CAAC;AAC3C,IAAI,4BAA4B,GAAG,KAAK,CAAC;AAEzC;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,GAAG,EAAE;IACjD,4CAA4C;IAC5C,IAAI,4BAA4B,EAAE;QAChC,OAAO;KACR;IACD,4BAA4B,GAAG,IAAI,CAAC;IAEpC,oGAAoG;IACpG,oEAAoE;IACpE,IAAI,UAAU,EAAE,gBAAgB,EAAE;QAChC,MAAM,eAAe,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;QACtD,UAAU,CAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAC7C,SAAS,EAAE,CAAC;YACZ,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;KACJ;IAED,YAAY,CAAC,oBAAoB,EAAE,CAAC;AACtC,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,EAAE;IAC3C,kFAAkF;IAClF,kFAAkF;IAClF,IAAI,8BAA8B,EAAE;QAClC,OAAO;KACR;IACD,SAAS,EAAE,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,UAAU,SAAS;IACvB,OAAO,YAAY,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;QACnD,oCAAoC;QACpC;QACE,yDAAyD;QACzD,4BAA4B;YAC5B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,yCAAyC,CAAC,EACjE;YACA,OAAO;SACR;QACD,MAAM,KAAK,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACvC,gEAAgE;IAChE,8BAA8B,GAAG,IAAI,CAAC;IACtC,sBAAsB;IACtB,8BAA8B,EAAE,CAAC;AACnC,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\n\nconst SplashModule = requireNativeModule('ExpoSplashScreen') as {\n  preventAutoHideAsync: () => Promise<boolean>;\n  hideAsync: () => Promise<boolean>;\n};\n\nlet _userControlledAutoHideEnabled = false;\nlet _preventAutoHideAsyncInvoked = false;\n\n/**\n * Expo Router uses this internal method to ensure that we can detect if the user\n * has explicitly opted into preventing the splash screen from hiding. This means\n * they will also explicitly hide it. If they don't, we will hide it for them after\n * the navigation render completes.\n *\n * @private\n */\nexport const _internal_preventAutoHideAsync = () => {\n  // Memoize, this should only be called once.\n  if (_preventAutoHideAsyncInvoked) {\n    return;\n  }\n  _preventAutoHideAsyncInvoked = true;\n\n  // Append error handling to ensure any uncaught exceptions result in the splash screen being hidden.\n  // This prevents the splash screen from floating over error screens.\n  if (ErrorUtils?.getGlobalHandler) {\n    const originalHandler = ErrorUtils.getGlobalHandler();\n    ErrorUtils.setGlobalHandler((error, isFatal) => {\n      hideAsync();\n      originalHandler(error, isFatal);\n    });\n  }\n\n  SplashModule.preventAutoHideAsync();\n};\n\n/**\n * Used for Expo libraries to attempt hiding the splash screen after they've completed their work.\n * If the user has explicitly opted into preventing the splash screen from hiding, we should not\n * hide it for them. This is often used for animated splash screens.\n *\n * @private\n */\nexport const _internal_maybeHideAsync = () => {\n  // If the user has explicitly opted into preventing the splash screen from hiding,\n  // we should not hide it for them. This is often used for animated splash screens.\n  if (_userControlledAutoHideEnabled) {\n    return;\n  }\n  hideAsync();\n};\n\nexport function hideAsync() {\n  return SplashModule.hideAsync().catch((error: any) => {\n    // Hide this very unfortunate error.\n    if (\n      // Only throw the error is something unexpected happened.\n      _preventAutoHideAsyncInvoked &&\n      error.message.includes('No native splash screen registered for ')\n    ) {\n      return;\n    }\n    throw error;\n  });\n}\n\nexport const preventAutoHideAsync = () => {\n  // Indicate that the user is controlling the auto hide behavior.\n  _userControlledAutoHideEnabled = true;\n  // Prevent as usual...\n  _internal_preventAutoHideAsync();\n};\n"]}

package/ios/EXSplashScreen.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platforms      = { :ios => '13.0', :tvos => '13.0' }
+  s.platforms      = { :ios => '13.4', :tvos => '13.4' }
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-splash-screen",
-  "version": "0.24.0",
+  "version": "0.26.0",
   "description": "Provides a module to allow keeping the native Splash Screen visible until you choose to hide it.",
   "main": "build",
   "types": "build",
@@ -34,7 +34,7 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/splash-screen/",
   "dependencies": {
-    "@expo/prebuild-config": "6.5.0"
+    "@expo/prebuild-config": "6.7.0"
   },
   "devDependencies": {
     "expo-module-scripts": "^3.0.0"
@@ -42,5 +42,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "da25937e2a99661cbe5eb60ca1d8d6245fc96a50"
+  "gitHead": "6aca7ce098ddc667776a3d7cf612adbb985e264a"
 }

package/src/index.native.ts

@@ -1,6 +1,74 @@
 import { requireNativeModule } from 'expo-modules-core';
 
-export const { preventAutoHideAsync, hideAsync } = requireNativeModule('ExpoSplashScreen') as {
+const SplashModule = requireNativeModule('ExpoSplashScreen') as {
   preventAutoHideAsync: () => Promise<boolean>;
   hideAsync: () => Promise<boolean>;
 };
+
+let _userControlledAutoHideEnabled = false;
+let _preventAutoHideAsyncInvoked = false;
+
+/**
+ * Expo Router uses this internal method to ensure that we can detect if the user
+ * has explicitly opted into preventing the splash screen from hiding. This means
+ * they will also explicitly hide it. If they don't, we will hide it for them after
+ * the navigation render completes.
+ *
+ * @private
+ */
+export const _internal_preventAutoHideAsync = () => {
+  // Memoize, this should only be called once.
+  if (_preventAutoHideAsyncInvoked) {
+    return;
+  }
+  _preventAutoHideAsyncInvoked = true;
+
+  // Append error handling to ensure any uncaught exceptions result in the splash screen being hidden.
+  // This prevents the splash screen from floating over error screens.
+  if (ErrorUtils?.getGlobalHandler) {
+    const originalHandler = ErrorUtils.getGlobalHandler();
+    ErrorUtils.setGlobalHandler((error, isFatal) => {
+      hideAsync();
+      originalHandler(error, isFatal);
+    });
+  }
+
+  SplashModule.preventAutoHideAsync();
+};
+
+/**
+ * Used for Expo libraries to attempt hiding the splash screen after they've completed their work.
+ * If the user has explicitly opted into preventing the splash screen from hiding, we should not
+ * hide it for them. This is often used for animated splash screens.
+ *
+ * @private
+ */
+export const _internal_maybeHideAsync = () => {
+  // If the user has explicitly opted into preventing the splash screen from hiding,
+  // we should not hide it for them. This is often used for animated splash screens.
+  if (_userControlledAutoHideEnabled) {
+    return;
+  }
+  hideAsync();
+};
+
+export function hideAsync() {
+  return SplashModule.hideAsync().catch((error: any) => {
+    // Hide this very unfortunate error.
+    if (
+      // Only throw the error is something unexpected happened.
+      _preventAutoHideAsyncInvoked &&
+      error.message.includes('No native splash screen registered for ')
+    ) {
+      return;
+    }
+    throw error;
+  });
+}
+
+export const preventAutoHideAsync = () => {
+  // Indicate that the user is controlling the auto hide behavior.
+  _userControlledAutoHideEnabled = true;
+  // Prevent as usual...
+  _internal_preventAutoHideAsync();
+};