expo-image-picker 14.3.2 → 14.4.0

package/CHANGELOG.md

@@ -10,11 +10,15 @@
 
 ### 💡 Others
 
-## 14.3.2 — 2023-07-23
+## 14.4.0 — 2023-07-28
+
+_This version does not introduce any user-facing changes._
+
+## 14.3.2 - 2023-07-23
 
 ### 💡 Others
 
-- On Android, restore behavior from [#22658](https://github.com/expo/expo/pull/22658). ([#23617](https://github.com/expo/expo/pull/23617) by [@alanhughes](https://github.com/alanjhughes))
+- On Android, restore behavior from [#22658](https://github.com/expo/expo/pull/22658). ([#23617](https://github.com/expo/expo/pull/23617) by [@alanhughes](https://github.com/alanjhughes)) ([#22658](https://github.com/expo/expo/pull/22658), [#23617](https://github.com/expo/expo/pull/23617) by [@alanjhughes](https://github.com/alanjhughes))
 
 ## 14.3.1 - 2023-07-04
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '14.3.2'
+version = '14.4.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -67,7 +67,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 22
-    versionName "14.3.2"
+    versionName "14.4.0"
   }
   lintOptions {
     abortOnError false

package/build/ExponentImagePicker.d.ts

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

package/build/ExponentImagePicker.d.ts.map

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

package/build/ExponentImagePicker.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExponentImagePicker;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExponentImagePicker');
 //# sourceMappingURL=ExponentImagePicker.js.map

package/build/ExponentImagePicker.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExponentImagePicker.js","sourceRoot":"","sources":["../src/ExponentImagePicker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,eAAe,kBAAkB,CAAC,mBAAmB,CAAC","sourcesContent":["import { NativeModulesProxy } from 'expo-modules-core';\nexport default NativeModulesProxy.ExponentImagePicker;\n"]}
+{"version":3,"file":"ExponentImagePicker.js","sourceRoot":"","sources":["../src/ExponentImagePicker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,eAAe,mBAAmB,CAAC,qBAAqB,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\nexport default requireNativeModule('ExponentImagePicker');\n"]}

package/ios/ImagePickerModule.swift

@@ -102,6 +102,7 @@ public class ImagePickerModule: Module, OnMediaPickingResultHandler {
     let options = pickingContext.options
 
     let picker = UIImagePickerController()
+    picker.fixCannotMoveEditingBox()
 
     if sourceType == .camera {
 #if targetEnvironment(simulator)

package/ios/UIImagePickerControllerExtentsion.swift

@@ -0,0 +1,58 @@
+// Copyright 2016-present 650 Industries. All rights reserved.
+
+extension UIImagePickerController {
+  func fixCannotMoveEditingBox() {
+    if let cropView = cropView,
+      let scrollView = scrollView,
+      scrollView.contentOffset.y == 0
+    {
+      let top = cropView.frame.minY + self.view.safeAreaInsets.top
+      let bottom = scrollView.frame.height - cropView.frame.height - top
+      scrollView.contentInset = UIEdgeInsets(top: top, left: 0, bottom: bottom, right: 0)
+
+      var offset: CGFloat = 0
+      if scrollView.contentSize.height > scrollView.contentSize.width {
+        offset = 0.5 * (scrollView.contentSize.height - scrollView.contentSize.width)
+      }
+      scrollView.contentOffset = CGPoint(x: 0, y: -top + offset)
+    }
+
+    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
+      self?.fixCannotMoveEditingBox()
+    }
+  }
+
+  var cropView: UIView? {
+    return findCropView(from: self.view)
+  }
+
+  var scrollView: UIScrollView? {
+    return findScrollView(from: self.view)
+  }
+
+  func findCropView(from view: UIView) -> UIView? {
+    let width = UIScreen.main.bounds.width
+    let size = view.bounds.size
+    if width == size.height, width == size.height {
+      return view
+    }
+    for view in view.subviews {
+      if let cropView = findCropView(from: view) {
+        return cropView
+      }
+    }
+    return nil
+  }
+
+  func findScrollView(from view: UIView) -> UIScrollView? {
+    if let scrollView = view as? UIScrollView {
+      return scrollView
+    }
+    for view in view.subviews {
+      if let scrollView = findScrollView(from: view) {
+        return scrollView
+      }
+    }
+    return nil
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-image-picker",
-  "version": "14.3.2",
+  "version": "14.4.0",
   "description": "Provides access to the system's UI for selecting images and videos from the phone's library or taking a photo with the camera.",
   "main": "build/ImagePicker.js",
   "types": "build/ImagePicker.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "c0d646e9295094bca877513e500d3c9f2e990c42"
+  "gitHead": "663654577a7068c641b5e9474efbc502e3f334ea"
 }

package/src/ExponentImagePicker.ts

@@ -1,2 +1,2 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExponentImagePicker;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExponentImagePicker');