expo-splash-screen 0.29.3 → 0.29.5

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 0.29.5 — 2024-11-10
+
+### 🐛 Bug fixes
+
+- [Android] Added guard to prevent null pointer exception when the splashScreen property is referenced without an activity (headless JS) ([#32707](https://github.com/expo/expo/pull/32707) by [@chrfalch](https://github.com/chrfalch))
+
+## 0.29.4 — 2024-11-07
+
+_This version does not introduce any user-facing changes._
+
 ## 0.29.3 — 2024-11-06
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '0.29.3'
+version = '0.29.5'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.splashscreen"
   defaultConfig {
     versionCode 17
-    versionName '0.29.3'
+    versionName '0.29.5'
   }
 }
 

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

@@ -23,6 +23,12 @@ object SplashScreenManager {
   }
 
   private fun configureSplashScreen(options: SplashScreenOptions = SplashScreenOptions()) {
+    // If loaded in a headless JS context we might not have initialized the splash screen
+    // lateinit variable, so let's check to be nice citizens
+    if (!::splashScreen.isInitialized) {
+      return
+    }
+
     val duration = options.duration
 
     splashScreen.setOnExitAnimationListener { splashScreenViewProvider ->

package/build/SplashScreen.types.d.ts

@@ -7,7 +7,7 @@ export type SplashScreenOptions = {
     duration?: number;
     /**
      * Whether to hide the splash screen with a fade out animation.
-     * @ios
+     * @platform ios
      * @default false
      */
     fade?: boolean;

package/build/SplashScreen.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"SplashScreen.types.js","sourceRoot":"","sources":["../src/SplashScreen.types.ts"],"names":[],"mappings":"","sourcesContent":["import { NativeModule } from 'expo-modules-core/types';\n\nexport type SplashScreenOptions = {\n  /**\n   * The duration of the fade out animation in milliseconds.\n   * @default 400\n   */\n  duration?: number;\n  /**\n   * Whether to hide the splash screen with a fade out animation.\n   * @ios\n   * @default false\n   */\n  fade?: boolean;\n};\n\nexport interface SplashScreenNativeModule extends NativeModule {\n  setOptions: (options: SplashScreenOptions) => void;\n  preventAutoHideAsync: () => Promise<boolean>;\n  hide: () => void;\n  hideAsync: () => Promise<void>;\n  // @private\n  _internal_maybeHideAsync: () => Promise<void>;\n  // @private\n  _internal_preventAutoHideAsync: () => Promise<boolean>;\n}\n"]}
+{"version":3,"file":"SplashScreen.types.js","sourceRoot":"","sources":["../src/SplashScreen.types.ts"],"names":[],"mappings":"","sourcesContent":["import { NativeModule } from 'expo-modules-core/types';\n\nexport type SplashScreenOptions = {\n  /**\n   * The duration of the fade out animation in milliseconds.\n   * @default 400\n   */\n  duration?: number;\n  /**\n   * Whether to hide the splash screen with a fade out animation.\n   * @platform ios\n   * @default false\n   */\n  fade?: boolean;\n};\n\nexport interface SplashScreenNativeModule extends NativeModule {\n  setOptions: (options: SplashScreenOptions) => void;\n  preventAutoHideAsync: () => Promise<boolean>;\n  hide: () => void;\n  hideAsync: () => Promise<void>;\n  // @private\n  _internal_maybeHideAsync: () => Promise<void>;\n  // @private\n  _internal_preventAutoHideAsync: () => Promise<boolean>;\n}\n"]}

package/build/index.d.ts

@@ -1,4 +1,4 @@
-import { SplashScreenOptions } from './SplashScreen.types';
+import type { SplashScreenOptions } from './SplashScreen.types';
 /**
  * Makes the native splash screen (configured in `app.json`) remain visible until `hideAsync` is called.
  *
@@ -18,6 +18,11 @@ import { SplashScreenOptions } from './SplashScreen.types';
  * ```
  */
 export declare function preventAutoHideAsync(): Promise<boolean>;
+/**
+ *
+ * Configures the splashscreens default animation behavior.
+ *
+ */
 export declare function setOptions(options: SplashScreenOptions): void;
 /**
  * Hides the native splash screen immediately. Be careful to ensure that your app has content ready
@@ -25,5 +30,10 @@ export declare function setOptions(options: SplashScreenOptions): void;
  * ["Usage"](#usage) section for an example.
  */
 export declare function hide(): void;
+/**
+ * Hides the native splash screen immediately. This method is provided for backwards compatability. See the
+ * ["Usage"](#usage) section for an example.
+ */
 export declare function hideAsync(): Promise<void>;
+export { SplashScreenOptions };
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC,CAE7D;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAAG;AAGjE;;;;GAIG;AACH,wBAAgB,IAAI,IAAI,IAAI,CAAG;AAE/B,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAAG;AAGjE;;;;GAIG;AACH,wBAAgB,IAAI,IAAI,IAAI,CAAG;AAE/B;;;GAGG;AACH,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAG;AAEnD,OAAO,EAAE,mBAAmB,EAAE,CAAC"}

package/build/index.js

@@ -20,6 +20,11 @@
 export async function preventAutoHideAsync() {
     return false;
 }
+/**
+ *
+ * Configures the splashscreens default animation behavior.
+ *
+ */
 export function setOptions(options) { }
 // @needsAudit
 /**
@@ -28,5 +33,9 @@ export function setOptions(options) { }
  * ["Usage"](#usage) section for an example.
  */
 export function hide() { }
+/**
+ * Hides the native splash screen immediately. This method is provided for backwards compatability. See the
+ * ["Usage"](#usage) section for an example.
+ */
 export async function hideAsync() { }
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc;AAId;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,OAA4B,IAAS,CAAC;AAEjE,cAAc;AACd;;;;GAIG;AACH,MAAM,UAAU,IAAI,KAAU,CAAC;AAE/B,MAAM,CAAC,KAAK,UAAU,SAAS,KAAmB,CAAC","sourcesContent":["// @needsAudit\n\nimport { SplashScreenOptions } from './SplashScreen.types';\n\n/**\n * Makes the native splash screen (configured in `app.json`) remain visible until `hideAsync` is called.\n *\n * > **Important note**: It is recommended to call this in global scope without awaiting, rather than\n * > inside React components or hooks, because otherwise this might be called too late,\n * > when the splash screen is already hidden.\n *\n * @example\n * ```ts\n * import * as SplashScreen from 'expo-splash-screen';\n *\n * SplashScreen.preventAutoHideAsync();\n *\n * export default function App() {\n *  // ...\n * }\n * ```\n */\nexport async function preventAutoHideAsync(): Promise<boolean> {\n  return false;\n}\n\nexport function setOptions(options: SplashScreenOptions): void {}\n\n// @needsAudit\n/**\n * Hides the native splash screen immediately. Be careful to ensure that your app has content ready\n * to display when you hide the splash screen, or you may see a blank screen briefly. See the\n * [\"Usage\"](#usage) section for an example.\n */\nexport function hide(): void {}\n\nexport async function hideAsync(): Promise<void> {}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc;AAId;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,OAA4B,IAAS,CAAC;AAEjE,cAAc;AACd;;;;GAIG;AACH,MAAM,UAAU,IAAI,KAAU,CAAC;AAE/B;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,KAAmB,CAAC","sourcesContent":["// @needsAudit\n\nimport type { SplashScreenOptions } from './SplashScreen.types';\n\n/**\n * Makes the native splash screen (configured in `app.json`) remain visible until `hideAsync` is called.\n *\n * > **Important note**: It is recommended to call this in global scope without awaiting, rather than\n * > inside React components or hooks, because otherwise this might be called too late,\n * > when the splash screen is already hidden.\n *\n * @example\n * ```ts\n * import * as SplashScreen from 'expo-splash-screen';\n *\n * SplashScreen.preventAutoHideAsync();\n *\n * export default function App() {\n *  // ...\n * }\n * ```\n */\nexport async function preventAutoHideAsync(): Promise<boolean> {\n  return false;\n}\n\n/**\n *\n * Configures the splashscreens default animation behavior.\n *\n */\nexport function setOptions(options: SplashScreenOptions): void {}\n\n// @needsAudit\n/**\n * Hides the native splash screen immediately. Be careful to ensure that your app has content ready\n * to display when you hide the splash screen, or you may see a blank screen briefly. See the\n * [\"Usage\"](#usage) section for an example.\n */\nexport function hide(): void {}\n\n/**\n * Hides the native splash screen immediately. This method is provided for backwards compatability. See the\n * [\"Usage\"](#usage) section for an example.\n */\nexport async function hideAsync(): Promise<void> {}\n\nexport { SplashScreenOptions };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-splash-screen",
-  "version": "0.29.3",
+  "version": "0.29.5",
   "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": "8.0.9"
+    "@expo/prebuild-config": "8.0.10"
   },
   "devDependencies": {
     "expo-module-scripts": "^4.0.0"
@@ -42,5 +42,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "d7775d436fab9d9601c193dfe2cc65a2949ef2ed"
+  "gitHead": "1f84b4c952ed9785c41ee65c9877e44f1df27af9"
 }

package/plugin/build/withSplashScreen.d.ts

@@ -3,10 +3,15 @@ import { IOSSplashConfig } from '@expo/prebuild-config/build/plugins/unversioned
 import { ConfigPlugin } from 'expo/config-plugins';
 type PluginConfig = {
     backgroundColor: string;
-    logoWidth: number;
-    image?: string | null;
-    android: AndroidSplashConfig;
-    ios: IOSSplashConfig;
+    imageWidth?: number;
+    enableFullScreenImage_legacy?: boolean;
+    image?: string;
+    dark?: {
+        image?: string;
+        backgroundColor?: string;
+    };
+    android?: AndroidSplashConfig;
+    ios?: IOSSplashConfig;
 };
 declare const _default: ConfigPlugin<PluginConfig>;
 export default _default;

package/plugin/build/withSplashScreen.js

@@ -6,18 +6,27 @@ const config_plugins_1 = require("expo/config-plugins");
 const pkg = require('expo-splash-screen/package.json');
 const withSplashScreen = (config, props) => {
     const android = {
-        ...config.splash,
-        ...config.android?.splash,
         ...props,
         ...props?.android,
+        resizeMode: 'contain',
+        dark: {
+            ...props?.android?.dark,
+            ...props?.dark,
+            resizeMode: 'contain',
+        },
     };
     const ios = {
-        ...config.splash,
-        ...config.ios?.splash,
         ...props,
         ...props?.ios,
+        resizeMode: 'contain',
+        dark: {
+            ...props?.ios?.dark,
+            ...props?.dark,
+        },
     };
-    config = (0, withAndroidSplashScreen_1.withAndroidSplashScreen)(config, android);
+    // Need to pass null here if we don't receive any props. This means that the plugin has not been used.
+    // This only happens on Android. On iOS, if you don't use the plugin, this function won't be called.
+    config = (0, withAndroidSplashScreen_1.withAndroidSplashScreen)(config, props ? android : null);
     config = (0, withIosSplashScreen_1.withIosSplashScreen)(config, ios);
     return config;
 };

package/plugin/src/withSplashScreen.ts

@@ -8,27 +8,41 @@ const pkg = require('expo-splash-screen/package.json');
 
 type PluginConfig = {
   backgroundColor: string;
-  logoWidth: number;
-  image?: string | null;
-  android: AndroidSplashConfig;
-  ios: IOSSplashConfig;
+  imageWidth?: number;
+  enableFullScreenImage_legacy?: boolean;
+  image?: string;
+  dark?: {
+    image?: string;
+    backgroundColor?: string;
+  };
+  android?: AndroidSplashConfig;
+  ios?: IOSSplashConfig;
 };
 
 const withSplashScreen: ConfigPlugin<PluginConfig> = (config, props) => {
   const android: AndroidSplashConfig = {
-    ...config.splash,
-    ...config.android?.splash,
     ...props,
     ...props?.android,
+    resizeMode: 'contain',
+    dark: {
+      ...props?.android?.dark,
+      ...props?.dark,
+      resizeMode: 'contain',
+    },
   };
-  const ios = {
-    ...config.splash,
-    ...config.ios?.splash,
+  const ios: IOSSplashConfig = {
     ...props,
     ...props?.ios,
+    resizeMode: 'contain',
+    dark: {
+      ...props?.ios?.dark,
+      ...props?.dark,
+    },
   };
 
-  config = withAndroidSplashScreen(config, android);
+  // Need to pass null here if we don't receive any props. This means that the plugin has not been used.
+  // This only happens on Android. On iOS, if you don't use the plugin, this function won't be called.
+  config = withAndroidSplashScreen(config, props ? android : null);
   config = withIosSplashScreen(config, ios);
   return config;
 };

package/src/SplashScreen.types.ts

@@ -8,7 +8,7 @@ export type SplashScreenOptions = {
   duration?: number;
   /**
    * Whether to hide the splash screen with a fade out animation.
-   * @ios
+   * @platform ios
    * @default false
    */
   fade?: boolean;

package/src/index.ts

@@ -1,6 +1,6 @@
 // @needsAudit
 
-import { SplashScreenOptions } from './SplashScreen.types';
+import type { SplashScreenOptions } from './SplashScreen.types';
 
 /**
  * Makes the native splash screen (configured in `app.json`) remain visible until `hideAsync` is called.
@@ -24,6 +24,11 @@ export async function preventAutoHideAsync(): Promise<boolean> {
   return false;
 }
 
+/**
+ *
+ * Configures the splashscreens default animation behavior.
+ *
+ */
 export function setOptions(options: SplashScreenOptions): void {}
 
 // @needsAudit
@@ -34,4 +39,10 @@ export function setOptions(options: SplashScreenOptions): void {}
  */
 export function hide(): void {}
 
+/**
+ * Hides the native splash screen immediately. This method is provided for backwards compatability. See the
+ * ["Usage"](#usage) section for an example.
+ */
 export async function hideAsync(): Promise<void> {}
+
+export { SplashScreenOptions };