@hortemo/expo-photos 9.0.0 → 11.0.0

package/build/PHImage.d.ts

@@ -1,4 +1,4 @@
-import { ViewProps } from "react-native";
+import type { ViewProps } from "react-native";
 import { PHImageContentMode, PHImageRequestOptions, RequestImageTargetSize, UIViewContentMode } from "./ExpoPhotos.types";
 export interface PHImageLoadEvent {
     size: {
@@ -25,5 +25,5 @@ export interface PHImageViewProps extends ViewProps {
         nativeEvent: PHImageErrorEvent;
     }) => void;
 }
-export declare function PHImageView({ requestOptions, contentMode, ...rest }: PHImageViewProps): import("react").JSX.Element;
+export declare function PHImageView({ requestOptions, contentMode, ...rest }: PHImageViewProps): any;
 //# sourceMappingURL=PHImage.d.ts.map

package/build/PHImage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PHImage.d.ts","sourceRoot":"","sources":["../src/PHImage.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,yBAA0B,SAAQ,qBAAqB;IACtE,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,UAAU,CAAC,EAAE,sBAAsB,CAAC;CACrC;AAED,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,cAAc,CAAC,EAAE,yBAAyB,CAAC;IAC3C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,gBAAgB,CAAA;KAAE,KAAK,IAAI,CAAC;IAC5D,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,iBAAiB,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/D;AAID,wBAAgB,WAAW,CAAC,EAC1B,cAAc,EACd,WAAW,EACX,GAAG,IAAI,EACR,EAAE,gBAAgB,+BAYlB"}
+{"version":3,"file":"PHImage.d.ts","sourceRoot":"","sources":["../src/PHImage.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,yBAA0B,SAAQ,qBAAqB;IACtE,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,UAAU,CAAC,EAAE,sBAAsB,CAAC;CACrC;AAED,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,cAAc,CAAC,EAAE,yBAAyB,CAAC;IAC3C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,gBAAgB,CAAA;KAAE,KAAK,IAAI,CAAC;IAC5D,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,iBAAiB,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/D;AAID,wBAAgB,WAAW,CAAC,EAC1B,cAAc,EACd,WAAW,EACX,GAAG,IAAI,EACR,EAAE,gBAAgB,OAYlB"}

package/build/PHImage.js.map

@@ -1 +1 @@
-{"version":3,"file":"PHImage.js","sourceRoot":"","sources":["../src/PHImage.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AA+B7D,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;AAEhF,MAAM,UAAU,WAAW,CAAC,EAC1B,cAAc,EACd,WAAW,EACX,GAAG,IAAI,EACU;IACjB,OAAO,CACL,CAAC,iBAAiB,CAChB,eAAe,CAAC,CAAC,WAAW,CAAC,CAC7B,kBAAkB,CAAC,CAAC,cAAc,EAAE,WAAW,CAAC,CAChD,sBAAsB,CAAC,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAC/D,YAAY,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,CAC3C,UAAU,CAAC,CAAC,cAAc,EAAE,UAAU,CAAC,CACvC,UAAU,CAAC,CAAC,cAAc,EAAE,UAAU,CAAC,CACvC,IAAI,IAAI,CAAC,EACT,CACH,CAAC;AACJ,CAAC","sourcesContent":["import { requireNativeViewManager } from \"expo-modules-core\";\nimport { ViewProps } from \"react-native\";\nimport {\n  PHImageContentMode,\n  PHImageRequestOptions,\n  RequestImageTargetSize,\n  UIViewContentMode,\n} from \"./ExpoPhotos.types\";\n\nexport interface PHImageLoadEvent {\n  size: { width: number; height: number };\n  scale: number;\n}\n\nexport interface PHImageErrorEvent {\n  message: string;\n}\n\nexport interface PHImageViewRequestOptions extends PHImageRequestOptions {\n  contentMode?: PHImageContentMode;\n  targetSize?: RequestImageTargetSize;\n}\n\nexport interface PHImageViewProps extends ViewProps {\n  localIdentifier: string;\n  contentMode?: UIViewContentMode;\n  requestOptions?: PHImageViewRequestOptions;\n  onLoad?: (event: { nativeEvent: PHImageLoadEvent }) => void;\n  onError?: (event: { nativeEvent: PHImageErrorEvent }) => void;\n}\n\nconst NativePHImageView = requireNativeViewManager(\"ExpoPhotos\", \"PHImageView\");\n\nexport function PHImageView({\n  requestOptions,\n  contentMode,\n  ...rest\n}: PHImageViewProps) {\n  return (\n    <NativePHImageView\n      viewContentMode={contentMode}\n      requestContentMode={requestOptions?.contentMode}\n      isNetworkAccessAllowed={requestOptions?.isNetworkAccessAllowed}\n      deliveryMode={requestOptions?.deliveryMode}\n      resizeMode={requestOptions?.resizeMode}\n      targetSize={requestOptions?.targetSize}\n      {...rest}\n    />\n  );\n}\n"]}
+{"version":3,"file":"PHImage.js","sourceRoot":"","sources":["../src/PHImage.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AA+B7D,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;AAEhF,MAAM,UAAU,WAAW,CAAC,EAC1B,cAAc,EACd,WAAW,EACX,GAAG,IAAI,EACU;IACjB,OAAO,CACL,CAAC,iBAAiB,CAChB,eAAe,CAAC,CAAC,WAAW,CAAC,CAC7B,kBAAkB,CAAC,CAAC,cAAc,EAAE,WAAW,CAAC,CAChD,sBAAsB,CAAC,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAC/D,YAAY,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,CAC3C,UAAU,CAAC,CAAC,cAAc,EAAE,UAAU,CAAC,CACvC,UAAU,CAAC,CAAC,cAAc,EAAE,UAAU,CAAC,CACvC,IAAI,IAAI,CAAC,EACT,CACH,CAAC;AACJ,CAAC","sourcesContent":["import { requireNativeViewManager } from \"expo-modules-core\";\nimport type { ViewProps } from \"react-native\";\nimport {\n  PHImageContentMode,\n  PHImageRequestOptions,\n  RequestImageTargetSize,\n  UIViewContentMode,\n} from \"./ExpoPhotos.types\";\n\nexport interface PHImageLoadEvent {\n  size: { width: number; height: number };\n  scale: number;\n}\n\nexport interface PHImageErrorEvent {\n  message: string;\n}\n\nexport interface PHImageViewRequestOptions extends PHImageRequestOptions {\n  contentMode?: PHImageContentMode;\n  targetSize?: RequestImageTargetSize;\n}\n\nexport interface PHImageViewProps extends ViewProps {\n  localIdentifier: string;\n  contentMode?: UIViewContentMode;\n  requestOptions?: PHImageViewRequestOptions;\n  onLoad?: (event: { nativeEvent: PHImageLoadEvent }) => void;\n  onError?: (event: { nativeEvent: PHImageErrorEvent }) => void;\n}\n\nconst NativePHImageView = requireNativeViewManager(\"ExpoPhotos\", \"PHImageView\");\n\nexport function PHImageView({\n  requestOptions,\n  contentMode,\n  ...rest\n}: PHImageViewProps) {\n  return (\n    <NativePHImageView\n      viewContentMode={contentMode}\n      requestContentMode={requestOptions?.contentMode}\n      isNetworkAccessAllowed={requestOptions?.isNetworkAccessAllowed}\n      deliveryMode={requestOptions?.deliveryMode}\n      resizeMode={requestOptions?.resizeMode}\n      targetSize={requestOptions?.targetSize}\n      {...rest}\n    />\n  );\n}\n"]}

package/build/PHVideo.d.ts

@@ -1,4 +1,4 @@
-import { ViewProps } from "react-native";
+import type { ViewProps } from "react-native";
 import { PHVideoLoadEvent, PHVideoErrorEvent, PHVideoRequestOptions } from "./ExpoPhotos.types";
 export interface PHVideoViewRequestOptions extends PHVideoRequestOptions {
 }
@@ -12,5 +12,5 @@ export interface PHVideoViewProps extends ViewProps {
         nativeEvent: PHVideoErrorEvent;
     }) => void;
 }
-export declare function PHVideoView({ requestOptions, ...rest }: PHVideoViewProps): import("react").JSX.Element;
+export declare function PHVideoView({ requestOptions, ...rest }: PHVideoViewProps): any;
 //# sourceMappingURL=PHVideo.d.ts.map

package/build/PHVideo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PHVideo.d.ts","sourceRoot":"","sources":["../src/PHVideo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,yBAA0B,SAAQ,qBAAqB;CAAG;AAE3E,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,yBAAyB,CAAC;IAC3C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,gBAAgB,CAAA;KAAE,KAAK,IAAI,CAAC;IAC5D,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,iBAAiB,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/D;AAID,wBAAgB,WAAW,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,EAAE,gBAAgB,+BAQxE"}
+{"version":3,"file":"PHVideo.d.ts","sourceRoot":"","sources":["../src/PHVideo.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,yBAA0B,SAAQ,qBAAqB;CAAG;AAE3E,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,yBAAyB,CAAC;IAC3C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,gBAAgB,CAAA;KAAE,KAAK,IAAI,CAAC;IAC5D,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,iBAAiB,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/D;AAID,wBAAgB,WAAW,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,EAAE,gBAAgB,OAQxE"}

package/build/PHVideo.js.map

@@ -1 +1 @@
-{"version":3,"file":"PHVideo.js","sourceRoot":"","sources":["../src/PHVideo.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAiB7D,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;AAEhF,MAAM,UAAU,WAAW,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,EAAoB;IACvE,OAAO,CACL,CAAC,iBAAiB,CAChB,sBAAsB,CAAC,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAC/D,YAAY,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,CAC3C,IAAI,IAAI,CAAC,EACT,CACH,CAAC;AACJ,CAAC","sourcesContent":["import { requireNativeViewManager } from \"expo-modules-core\";\nimport { ViewProps } from \"react-native\";\nimport {\n  PHVideoLoadEvent,\n  PHVideoErrorEvent,\n  PHVideoRequestOptions,\n} from \"./ExpoPhotos.types\";\n\nexport interface PHVideoViewRequestOptions extends PHVideoRequestOptions {}\n\nexport interface PHVideoViewProps extends ViewProps {\n  localIdentifier: string;\n  requestOptions?: PHVideoViewRequestOptions;\n  onLoad?: (event: { nativeEvent: PHVideoLoadEvent }) => void;\n  onError?: (event: { nativeEvent: PHVideoErrorEvent }) => void;\n}\n\nconst NativePHVideoView = requireNativeViewManager(\"ExpoPhotos\", \"PHVideoView\");\n\nexport function PHVideoView({ requestOptions, ...rest }: PHVideoViewProps) {\n  return (\n    <NativePHVideoView\n      isNetworkAccessAllowed={requestOptions?.isNetworkAccessAllowed}\n      deliveryMode={requestOptions?.deliveryMode}\n      {...rest}\n    />\n  );\n}\n"]}
+{"version":3,"file":"PHVideo.js","sourceRoot":"","sources":["../src/PHVideo.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAiB7D,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;AAEhF,MAAM,UAAU,WAAW,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,EAAoB;IACvE,OAAO,CACL,CAAC,iBAAiB,CAChB,sBAAsB,CAAC,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAC/D,YAAY,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,CAC3C,IAAI,IAAI,CAAC,EACT,CACH,CAAC;AACJ,CAAC","sourcesContent":["import { requireNativeViewManager } from \"expo-modules-core\";\nimport type { ViewProps } from \"react-native\";\nimport {\n  PHVideoLoadEvent,\n  PHVideoErrorEvent,\n  PHVideoRequestOptions,\n} from \"./ExpoPhotos.types\";\n\nexport interface PHVideoViewRequestOptions extends PHVideoRequestOptions {}\n\nexport interface PHVideoViewProps extends ViewProps {\n  localIdentifier: string;\n  requestOptions?: PHVideoViewRequestOptions;\n  onLoad?: (event: { nativeEvent: PHVideoLoadEvent }) => void;\n  onError?: (event: { nativeEvent: PHVideoErrorEvent }) => void;\n}\n\nconst NativePHVideoView = requireNativeViewManager(\"ExpoPhotos\", \"PHVideoView\");\n\nexport function PHVideoView({ requestOptions, ...rest }: PHVideoViewProps) {\n  return (\n    <NativePHVideoView\n      isNetworkAccessAllowed={requestOptions?.isNetworkAccessAllowed}\n      deliveryMode={requestOptions?.deliveryMode}\n      {...rest}\n    />\n  );\n}\n"]}

package/ios/ExpoPhotosModule.swift

@@ -264,43 +264,40 @@ public final class ExpoPhotos: Module {
     }
 
     AsyncFunction("presentLimitedLibraryPicker") { () async throws -> Void in
-      guard let viewController = self.appContext?.utilities?.currentViewController() else {
-        throw ExpoPhotosError.noViewController
+      try await MainActor.run {
+        guard let viewController = self.appContext?.utilities?.currentViewController() else {
+          throw ExpoPhotosError.noViewController
+        }
+        PHPhotoLibrary.shared().presentLimitedLibraryPicker(from: viewController)
       }
-
-      await PHPhotoLibrary.shared().presentLimitedLibraryPicker(from: viewController)
     }
 
     AsyncFunction("pickAssets") { (options: PickAssetsOptions) async throws -> [[String: Any]] in
-      guard let viewController = self.appContext?.utilities?.currentViewController() else {
-        throw ExpoPhotosError.noViewController
-      }
-
-      let picker: PHPickerViewController = await MainActor.run {
-        var config = PHPickerConfiguration(photoLibrary: .shared())
-
-        if let selectionLimit = options.selectionLimit {
-          config.selectionLimit = selectionLimit
-        }
-
-        if let filter = options.filter {
-          config.filter = filter
-        }
-
-        let picker = PHPickerViewController(configuration: config)
-        picker.delegate = self
+      return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<[[String: Any]], Error>) in
+        Task { @MainActor in
+          guard let viewController = self.appContext?.utilities?.currentViewController() else {
+            continuation.resume(throwing: ExpoPhotosError.noViewController)
+            return
+          }
 
-        return picker
-      }
+          var config = PHPickerConfiguration(photoLibrary: .shared())
+          
+          if let selectionLimit = options.selectionLimit {
+            config.selectionLimit = selectionLimit
+          }
+          
+          if let filter = options.filter {
+            config.filter = filter
+          }
 
-      let pickerId = await MainActor.run { picker.id }
+          let picker = PHPickerViewController(configuration: config)
+          picker.delegate = self
 
-      return try await withCheckedThrowingContinuation {
-        (continuation: CheckedContinuation<[[String: Any]], Error>) in
-        self.pickAssetsContinuations[pickerId] = continuation
+          // Disable swipe to dismiss, which does not trigger delegate
+          picker.isModalInPresentation = true
 
-        Task {
-          await viewController.present(picker, animated: true, completion: nil)
+          self.pickAssetsContinuations[picker.id] = continuation
+          viewController.present(picker, animated: true)
         }
       }
     }
@@ -359,12 +356,10 @@ extension ExpoPhotos: PHPickerViewControllerDelegate {
   public func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
     picker.dismiss(animated: true, completion: nil)
 
-    guard let continuation = self.pickAssetsContinuations[picker.id] else {
+    guard let continuation = self.pickAssetsContinuations.removeValue(forKey: picker.id) else {
       return
     }
 
-    self.pickAssetsContinuations.removeValue(forKey: picker.id)
-
     let assetIdentifiers = results.compactMap { $0.assetIdentifier }
     var assets: [[String: Any]] = []
     PHAsset.fetchAssets(withLocalIdentifiers: assetIdentifiers, options: nil).enumerateObjects {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hortemo/expo-photos",
-  "version": "9.0.0",
+  "version": "11.0.0",
   "description": "Expo module exposing advanced iOS Photos APIs.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -29,11 +29,8 @@
   "homepage": "https://github.com/hortemo/expo-photos#readme",
   "dependencies": {},
   "devDependencies": {
-    "@types/react": "~19.1.0",
     "eslint": "^9.24.0",
-    "expo": "^54.0.12",
-    "expo-module-scripts": "^5.0.7",
-    "react-native": "0.81.4"
+    "expo-module-scripts": "^5.0.7"
   },
   "peerDependencies": {
     "expo": "*",

package/src/PHImage.tsx

@@ -1,5 +1,5 @@
 import { requireNativeViewManager } from "expo-modules-core";
-import { ViewProps } from "react-native";
+import type { ViewProps } from "react-native";
 import {
   PHImageContentMode,
   PHImageRequestOptions,

package/src/PHVideo.tsx

@@ -1,5 +1,5 @@
 import { requireNativeViewManager } from "expo-modules-core";
-import { ViewProps } from "react-native";
+import type { ViewProps } from "react-native";
 import {
   PHVideoLoadEvent,
   PHVideoErrorEvent,