expo-keep-awake 10.0.2 → 10.2.0

package/CHANGELOG.md

@@ -10,7 +10,27 @@
 
 ### 💡 Others
 
-## 10.0.2 — 2022-02-01
+## 10.2.0 — 2022-07-07
+
+### 🐛 Bug fixes
+
+- Fixed `Unable to deactivate keep awake. However, it probably is deactivated already` unhandled promise rejection warning when resuming apps on Android. ([#17319](https://github.com/expo/expo/pull/17319) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Migrated Expo modules definitions to the new naming convention. ([#17193](https://github.com/expo/expo/pull/17193) by [@tsapeta](https://github.com/tsapeta))
+
+## 10.1.0 — 2022-04-18
+
+### 🎉 New features
+
+- Native module on iOS is now written in Swift using the new API. ([#15705](https://github.com/expo/expo/pull/15705) by [@tsapeta](https://github.com/tsapeta))
+
+### ⚠️ Notices
+
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+## 10.0.2 - 2022-02-01
 
 ### 🐛 Bug fixes
 

package/README.md

@@ -4,12 +4,12 @@ Provides a React component that prevents the screen sleeping when rendered. It a
 
 # API documentation
 
-- [Documentation for the master branch](https://github.com/expo/expo/blob/master/docs/pages/versions/unversioned/sdk/keep-awake.md)
-- [Documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/keep-awake/)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/keep-awake.md)
+- [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/keep-awake/)
 
 # Installation in managed Expo projects
 
-For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/keep-awake/).
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/keep-awake/).
 
 # Installation in bare React Native projects
 

package/android/build.gradle

@@ -3,20 +3,35 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '10.0.2'
+version = '10.2.0'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
@@ -44,22 +59,22 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 
   kotlinOptions {
-    jvmTarget = "1.8"
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 16
-    versionName "10.0.2"
+    versionName "10.2.0"
   }
   lintOptions {
     abortOnError false
@@ -69,5 +84,5 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 }

package/build/ExpoKeepAwake.d.ts

@@ -1,2 +1,3 @@
 declare const _default: import("expo-modules-core").ProxyNativeModule;
 export default _default;
+//# sourceMappingURL=ExpoKeepAwake.d.ts.map

package/build/ExpoKeepAwake.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoKeepAwake.d.ts","sourceRoot":"","sources":["../src/ExpoKeepAwake.ts"],"names":[],"mappings":";AACA,wBAAgD"}

package/build/ExpoKeepAwake.web.d.ts

@@ -1,2 +1,3 @@
 declare const _default: {};
 export default _default;
+//# sourceMappingURL=ExpoKeepAwake.web.d.ts.map

package/build/ExpoKeepAwake.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoKeepAwake.web.d.ts","sourceRoot":"","sources":["../src/ExpoKeepAwake.web.ts"],"names":[],"mappings":";AAAA,wBAAkB"}

package/build/index.d.ts

@@ -1,11 +1,20 @@
+export declare const ExpoKeepAwakeTag = "ExpoKeepAwakeDefaultTag";
 /**
  * A React hook to keep the screen awake for as long as the owner component is mounted.
  * The optionally provided `tag` argument is used when activating and deactivating the keep-awake
  * feature. If unspecified, the default `tag` is used. See the documentation for `activateKeepAwake`
  * below to learn more about the `tag` argument.
- * @param tag *Optional*
+ *
+ * @param tag *Optional* - Tag to lock screen sleep prevention. If not provided, the default tag is used.
+ * @param options *Optional*
+ *   - `suppressDeactivateWarnings` *Optional* -
+ *      The call will throw an unhandled promise rejection on Android
+ *      when the original Activity is dead or deactivated.
+ *      Set the value to true for suppressing the uncaught exception.
  */
-export declare function useKeepAwake(tag?: string): void;
+export declare function useKeepAwake(tag?: string, options?: {
+    suppressDeactivateWarnings: boolean;
+}): void;
 /**
  * Prevents the screen from sleeping until `deactivateKeepAwake` is called with the same `tag` value.
  *
@@ -14,11 +23,12 @@ export declare function useKeepAwake(tag?: string): void;
  * each one in order to re-enable screen sleep. If tag is unspecified, the default `tag` is used.
  * @param tag *Optional* - Tag to lock screen sleep prevention. If not provided, the default tag is used.
  */
-export declare function activateKeepAwake(tag?: string): void;
+export declare function activateKeepAwake(tag?: string): Promise<void>;
 /**
  * Releases the lock on screen-sleep prevention associated with the given `tag` value. If `tag`
  * is unspecified, it defaults to the same default tag that `activateKeepAwake` uses.
  * @param tag *Optional* - Tag to release the lock on screen sleep prevention. If not provided,
  * the default tag is used.
  */
-export declare function deactivateKeepAwake(tag?: string): void;
+export declare function deactivateKeepAwake(tag?: string): Promise<void>;
+//# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,gBAAgB,4BAA4B,CAAC;AAG1D;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAC1B,GAAG,GAAE,MAAyB,EAC9B,OAAO,CAAC,EAAE;IACR,0BAA0B,EAAE,OAAO,CAAC;CACrC,GACA,IAAI,CAWN;AAGD;;;;;;;GAOG;AAEH,wBAAsB,iBAAiB,CAAC,GAAG,GAAE,MAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAErF;AAGD;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,GAAG,GAAE,MAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvF"}

package/build/index.js

@@ -1,18 +1,31 @@
 import { useEffect } from 'react';
 import ExpoKeepAwake from './ExpoKeepAwake';
-const ExpoKeepAwakeTag = 'ExpoKeepAwakeDefaultTag';
+export const ExpoKeepAwakeTag = 'ExpoKeepAwakeDefaultTag';
 // @needsAudit
 /**
  * A React hook to keep the screen awake for as long as the owner component is mounted.
  * The optionally provided `tag` argument is used when activating and deactivating the keep-awake
  * feature. If unspecified, the default `tag` is used. See the documentation for `activateKeepAwake`
  * below to learn more about the `tag` argument.
- * @param tag *Optional*
+ *
+ * @param tag *Optional* - Tag to lock screen sleep prevention. If not provided, the default tag is used.
+ * @param options *Optional*
+ *   - `suppressDeactivateWarnings` *Optional* -
+ *      The call will throw an unhandled promise rejection on Android
+ *      when the original Activity is dead or deactivated.
+ *      Set the value to true for suppressing the uncaught exception.
  */
-export function useKeepAwake(tag = ExpoKeepAwakeTag) {
+export function useKeepAwake(tag = ExpoKeepAwakeTag, options) {
     useEffect(() => {
         activateKeepAwake(tag);
-        return () => deactivateKeepAwake(tag);
+        return () => {
+            if (options?.suppressDeactivateWarnings) {
+                deactivateKeepAwake(tag).catch(() => { });
+            }
+            else {
+                deactivateKeepAwake(tag);
+            }
+        };
     }, [tag]);
 }
 // @needsAudit
@@ -24,9 +37,8 @@ export function useKeepAwake(tag = ExpoKeepAwakeTag) {
  * each one in order to re-enable screen sleep. If tag is unspecified, the default `tag` is used.
  * @param tag *Optional* - Tag to lock screen sleep prevention. If not provided, the default tag is used.
  */
-export function activateKeepAwake(tag = ExpoKeepAwakeTag) {
-    if (ExpoKeepAwake.activate)
-        ExpoKeepAwake.activate(tag);
+export async function activateKeepAwake(tag = ExpoKeepAwakeTag) {
+    await ExpoKeepAwake.activate?.(tag);
 }
 // @needsAudit
 /**
@@ -35,8 +47,7 @@ export function activateKeepAwake(tag = ExpoKeepAwakeTag) {
  * @param tag *Optional* - Tag to release the lock on screen sleep prevention. If not provided,
  * the default tag is used.
  */
-export function deactivateKeepAwake(tag = ExpoKeepAwakeTag) {
-    if (ExpoKeepAwake.deactivate)
-        ExpoKeepAwake.deactivate(tag);
+export async function deactivateKeepAwake(tag = ExpoKeepAwakeTag) {
+    await ExpoKeepAwake.deactivate?.(tag);
 }
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,MAAM,gBAAgB,GAAG,yBAAyB,CAAC;AAEnD,cAAc;AACd;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc,gBAAgB;IACzD,SAAS,CAAC,GAAG,EAAE;QACb,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,GAAG,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,cAAc;AACd;;;;;;;GAOG;AAEH,MAAM,UAAU,iBAAiB,CAAC,MAAc,gBAAgB;IAC9D,IAAI,aAAa,CAAC,QAAQ;QAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC1D,CAAC;AAED,cAAc;AACd;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAc,gBAAgB;IAChE,IAAI,aAAa,CAAC,UAAU;QAAE,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AAC9D,CAAC","sourcesContent":["import { useEffect } from 'react';\n\nimport ExpoKeepAwake from './ExpoKeepAwake';\n\nconst ExpoKeepAwakeTag = 'ExpoKeepAwakeDefaultTag';\n\n// @needsAudit\n/**\n * A React hook to keep the screen awake for as long as the owner component is mounted.\n * The optionally provided `tag` argument is used when activating and deactivating the keep-awake\n * feature. If unspecified, the default `tag` is used. See the documentation for `activateKeepAwake`\n * below to learn more about the `tag` argument.\n * @param tag *Optional*\n */\nexport function useKeepAwake(tag: string = ExpoKeepAwakeTag): void {\n  useEffect(() => {\n    activateKeepAwake(tag);\n    return () => deactivateKeepAwake(tag);\n  }, [tag]);\n}\n\n// @needsAudit\n/**\n * Prevents the screen from sleeping until `deactivateKeepAwake` is called with the same `tag` value.\n *\n * If the `tag` argument is specified, the screen will not sleep until you call `deactivateKeepAwake`\n * with the same `tag` argument. When using multiple `tags` for activation you'll have to deactivate\n * each one in order to re-enable screen sleep. If tag is unspecified, the default `tag` is used.\n * @param tag *Optional* - Tag to lock screen sleep prevention. If not provided, the default tag is used.\n */\n\nexport function activateKeepAwake(tag: string = ExpoKeepAwakeTag): void {\n  if (ExpoKeepAwake.activate) ExpoKeepAwake.activate(tag);\n}\n\n// @needsAudit\n/**\n * Releases the lock on screen-sleep prevention associated with the given `tag` value. If `tag`\n * is unspecified, it defaults to the same default tag that `activateKeepAwake` uses.\n * @param tag *Optional* - Tag to release the lock on screen sleep prevention. If not provided,\n * the default tag is used.\n */\nexport function deactivateKeepAwake(tag: string = ExpoKeepAwakeTag): void {\n  if (ExpoKeepAwake.deactivate) ExpoKeepAwake.deactivate(tag);\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,gBAAgB,GAAG,yBAAyB,CAAC;AAE1D,cAAc;AACd;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,YAAY,CAC1B,MAAc,gBAAgB,EAC9B,OAEC;IAED,SAAS,CAAC,GAAG,EAAE;QACb,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,GAAG,EAAE;YACV,IAAI,OAAO,EAAE,0BAA0B,EAAE;gBACvC,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;aAC1C;iBAAM;gBACL,mBAAmB,CAAC,GAAG,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,cAAc;AACd;;;;;;;GAOG;AAEH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAc,gBAAgB;IACpE,MAAM,aAAa,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAAc,gBAAgB;IACtE,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC;AACxC,CAAC","sourcesContent":["import { useEffect } from 'react';\n\nimport ExpoKeepAwake from './ExpoKeepAwake';\n\nexport const ExpoKeepAwakeTag = 'ExpoKeepAwakeDefaultTag';\n\n// @needsAudit\n/**\n * A React hook to keep the screen awake for as long as the owner component is mounted.\n * The optionally provided `tag` argument is used when activating and deactivating the keep-awake\n * feature. If unspecified, the default `tag` is used. See the documentation for `activateKeepAwake`\n * below to learn more about the `tag` argument.\n *\n * @param tag *Optional* - Tag to lock screen sleep prevention. If not provided, the default tag is used.\n * @param options *Optional*\n *   - `suppressDeactivateWarnings` *Optional* -\n *      The call will throw an unhandled promise rejection on Android\n *      when the original Activity is dead or deactivated.\n *      Set the value to true for suppressing the uncaught exception.\n */\nexport function useKeepAwake(\n  tag: string = ExpoKeepAwakeTag,\n  options?: {\n    suppressDeactivateWarnings: boolean;\n  }\n): void {\n  useEffect(() => {\n    activateKeepAwake(tag);\n    return () => {\n      if (options?.suppressDeactivateWarnings) {\n        deactivateKeepAwake(tag).catch(() => {});\n      } else {\n        deactivateKeepAwake(tag);\n      }\n    };\n  }, [tag]);\n}\n\n// @needsAudit\n/**\n * Prevents the screen from sleeping until `deactivateKeepAwake` is called with the same `tag` value.\n *\n * If the `tag` argument is specified, the screen will not sleep until you call `deactivateKeepAwake`\n * with the same `tag` argument. When using multiple `tags` for activation you'll have to deactivate\n * each one in order to re-enable screen sleep. If tag is unspecified, the default `tag` is used.\n * @param tag *Optional* - Tag to lock screen sleep prevention. If not provided, the default tag is used.\n */\n\nexport async function activateKeepAwake(tag: string = ExpoKeepAwakeTag): Promise<void> {\n  await ExpoKeepAwake.activate?.(tag);\n}\n\n// @needsAudit\n/**\n * Releases the lock on screen-sleep prevention associated with the given `tag` value. If `tag`\n * is unspecified, it defaults to the same default tag that `activateKeepAwake` uses.\n * @param tag *Optional* - Tag to release the lock on screen sleep prevention. If not provided,\n * the default tag is used.\n */\nexport async function deactivateKeepAwake(tag: string = ExpoKeepAwakeTag): Promise<void> {\n  await ExpoKeepAwake.deactivate?.(tag);\n}\n"]}

package/expo-module.config.json

@@ -0,0 +1,6 @@
+{
+  "platforms": ["ios", "android"],
+  "ios": {
+    "modulesClassNames": ["KeepAwakeModule"]
+  }
+}

package/ios/{EXKeepAwake.podspec → ExpoKeepAwake.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name           = 'EXKeepAwake'
+  s.name           = 'ExpoKeepAwake'
   s.version        = package['version']
   s.summary        = package['description']
   s.description    = package['description']
@@ -11,15 +11,22 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.homepage       = package['homepage']
   s.platform       = :ios, '12.0'
+  s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
 
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+  }
+
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
-    s.source_files = "#{s.name}/**/*.h"
+    s.source_files = "**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"
   else
-    s.source_files = "#{s.name}/**/*.{h,m}"
+    s.source_files = "**/*.{h,m,swift}"
   end
 end

package/ios/KeepAwakeModule.swift

@@ -0,0 +1,54 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+
+public final class KeepAwakeModule: Module {
+  private var activeTags = Set<String>()
+
+  public func definition() -> ModuleDefinition {
+    Name("ExpoKeepAwake")
+
+    AsyncFunction("activate", activate)
+    AsyncFunction("deactivate", deactivate)
+    AsyncFunction("isActivated", isActivated)
+
+    OnAppEntersForeground {
+      if !self.activeTags.isEmpty {
+        setActivated(true)
+      }
+    }
+    OnAppEntersBackground {
+      if !self.activeTags.isEmpty {
+        setActivated(false)
+      }
+    }
+  }
+
+  private func activate(tag: String) -> Bool {
+    if activeTags.isEmpty {
+      setActivated(true)
+    }
+    activeTags.insert(tag)
+    return true
+  }
+
+  private func deactivate(tag: String) -> Bool {
+    activeTags.remove(tag)
+    if activeTags.isEmpty {
+      setActivated(false)
+    }
+    return true
+  }
+}
+
+private func isActivated() -> Bool {
+  return DispatchQueue.main.sync {
+    return UIApplication.shared.isIdleTimerDisabled
+  }
+}
+
+private func setActivated(_ activated: Bool) {
+  DispatchQueue.main.async {
+    UIApplication.shared.isIdleTimerDisabled = activated
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-keep-awake",
-  "version": "10.0.2",
+  "version": "10.2.0",
   "description": "Provides a React component that prevents the screen sleeping when rendered. It also exposes static methods to control the behavior imperatively.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -33,10 +33,14 @@
   "homepage": "https://docs.expo.dev/versions/latest/sdk/keep-awake/",
   "dependencies": {},
   "devDependencies": {
+    "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^2.0.0"
   },
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ba24eba18bf4f4d4b0d54828992d81a2bb18246a"
+  "jest": {
+    "preset": "expo-module-scripts"
+  },
+  "gitHead": "e893ff2b01e108cf246cec02318c0df9d6bc603c"
 }

package/src/index.ts

@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 
 import ExpoKeepAwake from './ExpoKeepAwake';
 
-const ExpoKeepAwakeTag = 'ExpoKeepAwakeDefaultTag';
+export const ExpoKeepAwakeTag = 'ExpoKeepAwakeDefaultTag';
 
 // @needsAudit
 /**
@@ -10,12 +10,29 @@ const ExpoKeepAwakeTag = 'ExpoKeepAwakeDefaultTag';
  * The optionally provided `tag` argument is used when activating and deactivating the keep-awake
  * feature. If unspecified, the default `tag` is used. See the documentation for `activateKeepAwake`
  * below to learn more about the `tag` argument.
- * @param tag *Optional*
+ *
+ * @param tag *Optional* - Tag to lock screen sleep prevention. If not provided, the default tag is used.
+ * @param options *Optional*
+ *   - `suppressDeactivateWarnings` *Optional* -
+ *      The call will throw an unhandled promise rejection on Android
+ *      when the original Activity is dead or deactivated.
+ *      Set the value to true for suppressing the uncaught exception.
  */
-export function useKeepAwake(tag: string = ExpoKeepAwakeTag): void {
+export function useKeepAwake(
+  tag: string = ExpoKeepAwakeTag,
+  options?: {
+    suppressDeactivateWarnings: boolean;
+  }
+): void {
   useEffect(() => {
     activateKeepAwake(tag);
-    return () => deactivateKeepAwake(tag);
+    return () => {
+      if (options?.suppressDeactivateWarnings) {
+        deactivateKeepAwake(tag).catch(() => {});
+      } else {
+        deactivateKeepAwake(tag);
+      }
+    };
   }, [tag]);
 }
 
@@ -29,8 +46,8 @@ export function useKeepAwake(tag: string = ExpoKeepAwakeTag): void {
  * @param tag *Optional* - Tag to lock screen sleep prevention. If not provided, the default tag is used.
  */
 
-export function activateKeepAwake(tag: string = ExpoKeepAwakeTag): void {
-  if (ExpoKeepAwake.activate) ExpoKeepAwake.activate(tag);
+export async function activateKeepAwake(tag: string = ExpoKeepAwakeTag): Promise<void> {
+  await ExpoKeepAwake.activate?.(tag);
 }
 
 // @needsAudit
@@ -40,6 +57,6 @@ export function activateKeepAwake(tag: string = ExpoKeepAwakeTag): void {
  * @param tag *Optional* - Tag to release the lock on screen sleep prevention. If not provided,
  * the default tag is used.
  */
-export function deactivateKeepAwake(tag: string = ExpoKeepAwakeTag): void {
-  if (ExpoKeepAwake.deactivate) ExpoKeepAwake.deactivate(tag);
+export async function deactivateKeepAwake(tag: string = ExpoKeepAwakeTag): Promise<void> {
+  await ExpoKeepAwake.deactivate?.(tag);
 }

package/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "./build"
   },
   "include": ["./src"],
-  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__stories__/*"]
 }

package/ios/EXKeepAwake/EXKeepAwake.h

@@ -1,7 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXExportedModule.h>
-#import <ExpoModulesCore/EXModuleRegistryConsumer.h>
-
-@interface EXKeepAwake : EXExportedModule <EXModuleRegistryConsumer>
-@end

package/ios/EXKeepAwake/EXKeepAwake.m

@@ -1,92 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXModuleRegistry.h>
-#import <EXKeepAwake/EXKeepAwake.h>
-#import <ExpoModulesCore/EXAppLifecycleService.h>
-#import <ExpoModulesCore/EXUtilities.h>
-
-@interface EXKeepAwake () <EXAppLifecycleListener>
-
-@property (nonatomic, weak) id<EXAppLifecycleService> lifecycleManager;
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
-
-@end
-
-@implementation EXKeepAwake {
-  NSMutableSet *_activeTags;
-}
-
-- (instancetype)init {
-  self = [super init];
-  _activeTags = [NSMutableSet set];
-  return self;
-}
-
-EX_EXPORT_MODULE(ExpoKeepAwake);
-
-# pragma mark - EXModuleRegistryConsumer
-
-- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  if (_moduleRegistry) {
-    [_lifecycleManager unregisterAppLifecycleListener:self];
-  }
-  
-  _lifecycleManager = nil;
-  
-  if (moduleRegistry) {
-    _lifecycleManager = [moduleRegistry getModuleImplementingProtocol:@protocol(EXAppLifecycleService)];
-  }
-  
-  if (_lifecycleManager) {
-    [_lifecycleManager registerAppLifecycleListener:self];
-  }
-}
-
-EX_EXPORT_METHOD_AS(activate, activate:(NSString *)tag
-                    resolve:(EXPromiseResolveBlock)resolve
-                    reject:(EXPromiseRejectBlock)reject)
-{
-  if(![self shouldBeActive]) {
-    [EXUtilities performSynchronouslyOnMainThread:^{
-      [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
-    }];
-  }
-  [_activeTags addObject:tag];
-  resolve(@YES);
-}
-
-EX_EXPORT_METHOD_AS(deactivate, deactivate:(NSString *)tag
-                    resolve:(EXPromiseResolveBlock)resolve
-                    reject:(EXPromiseRejectBlock)reject)
-{
-  [_activeTags removeObject:tag];
-  if (![self shouldBeActive]) {
-    [EXUtilities performSynchronouslyOnMainThread:^{
-      [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
-    }];
-  }
-  resolve(@YES);
-}
-
-# pragma mark - EXAppLifecycleListener
-
-- (void)onAppBackgrounded {
-  [EXUtilities performSynchronouslyOnMainThread:^{
-    [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
-  }];
-}
-
-- (void)onAppForegrounded {
-  if ([self shouldBeActive]) {
-    [EXUtilities performSynchronouslyOnMainThread:^{
-      [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
-    }];
-  }
-}
-
-- (BOOL)shouldBeActive {
-  return [_activeTags count] > 0;
-}
-
-@end

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-keep-awake",
-  "platforms": ["ios", "android"]
-}