@hotta/react-native-imagepicker 0.1.2 → 0.1.4

package/README.md

@@ -1,6 +1,6 @@
 # 基于react-native0.82版本的图片选择器（TurboModule）
 
-This is a fork of  [react-native-syan-image-picker]([GitHub - syanbo/react-native-syan-image-picker: React-Native 多图片选择 支持裁剪 压缩](https://github.com/syanbo/react-native-syan-image-picker))
+This is a fork of  [react-native-syan-image-picker](https://github.com/syanbo/react-native-syan-image-picker)
 
 ### 原生框架依赖
 
@@ -8,6 +8,12 @@ This is a fork of  [react-native-syan-image-picker]([GitHub - syanbo/react-nativ
 
 - iOS:[TZImagePickerController](https://github.com/banchichen/TZImagePickerController) - by [banchichen](https://github.com/banchichen)
 
+### 安装
+
+```
+yarn add @hotta/react-native-imagepicker@0.1.3
+```
+
 ### 使用方法
 
 ```

package/ios/NativeImagePicker.mm

@@ -7,6 +7,8 @@
 @interface NativeImagePicker ()
 
 @property (nonatomic, strong) UIImagePickerController *imagePickerVc;
+@property (nonatomic, strong) NSDictionary *pickOptions;
+
 /**
  保存Promise的resolve block
  */
@@ -25,9 +27,7 @@
 @property (nonatomic, strong) NSMutableArray *selectedAssets;
 @end
 @implementation NativeImagePicker
-{
-    std::optional<JS::NativeImagePicker::ImagePickerOption> _cameraOptions;
-}
+
 
 - (instancetype)init {
     self = [super init];
@@ -52,8 +52,8 @@
     _selectedAssets = nil;
 }
 
-- (void)asyncShowImagePicker:(JS::NativeImagePicker::ImagePickerOption &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
-    _cameraOptions = options;
+- (void)asyncShowImagePicker:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+    self.pickOptions = options;
     self.resolveBlock = resolve;
     self.rejectBlock = reject;
     self.callback = nil;
@@ -62,21 +62,21 @@
 
 - (void)openImagePicker {
     // 照片最大可选张数
-    NSInteger imageCount = _cameraOptions->imageCount();
+    NSInteger imageCount = [self.pickOptions sy_integerForKey:@"imageCount"];
     // 显示内部拍照按钮
-    BOOL isCamera        = _cameraOptions->isCamera();
-    BOOL isCrop          = _cameraOptions->isCrop();
-    BOOL isGif           = _cameraOptions->isGif();
-    BOOL showCropCircle  = _cameraOptions->showCropCircle();
-    BOOL isRecordSelected = _cameraOptions->isRecordSelected();
-    BOOL allowPickingOriginalPhoto = _cameraOptions->allowPickingOriginalPhoto();
-    BOOL allowPickingMultipleVideo = _cameraOptions->allowPickingMultipleVideo();
-    BOOL sortAscendingByModificationDate = _cameraOptions->sortAscendingByModificationDate();
-    BOOL showSelectedIndex = _cameraOptions->showSelectedIndex();
-    NSInteger CropW      = _cameraOptions->CropW();
-    NSInteger CropH      = _cameraOptions->CropH();
-    NSInteger circleCropRadius = _cameraOptions->circleCropRadius();
-    NSInteger   quality  = _cameraOptions->quality();
+    BOOL isCamera        = [self.pickOptions sy_boolForKey:@"isCamera"];
+    BOOL isCrop          = [self.pickOptions sy_boolForKey:@"isCrop"];
+    BOOL isGif           = [self.pickOptions sy_boolForKey:@"isGif"];
+    BOOL showCropCircle  = [self.pickOptions sy_boolForKey:@"showCropCircle"];
+    BOOL isRecordSelected = [self.pickOptions sy_boolForKey:@"isRecordSelected"];
+    BOOL allowPickingOriginalPhoto = [self.pickOptions sy_boolForKey:@"allowPickingOriginalPhoto"];
+    BOOL allowPickingMultipleVideo = [self.pickOptions sy_boolForKey:@"allowPickingMultipleVideo"];
+    BOOL sortAscendingByModificationDate = [self.pickOptions sy_boolForKey:@"sortAscendingByModificationDate"];
+    BOOL showSelectedIndex = [self.pickOptions sy_boolForKey:@"showSelectedIndex"];
+    NSInteger CropW      = [self.pickOptions sy_integerForKey:@"CropW"];
+    NSInteger CropH      = [self.pickOptions sy_integerForKey:@"CropH"];
+    NSInteger circleCropRadius = [self.pickOptions sy_integerForKey:@"circleCropRadius"];
+    NSInteger   quality  = [self.pickOptions sy_integerForKey:@"quality"];
 
     TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:imageCount delegate:self];
     imagePickerVc.iconThemeColor = [UIColor colorWithRed:255.0/255.0 green:177.0/255.0 blue:82.0/255.0 alpha:1.0];
@@ -208,12 +208,12 @@
                     [tzImagePickerVc hideProgressHUD];
 
                     TZAssetModel *assetModel = [[TZImageManager manager] createModelWithAsset:asset];
-                    BOOL isCrop          = self->_cameraOptions->isCrop();
-                    BOOL showCropCircle  = self->_cameraOptions->showCropCircle();
-                    NSInteger CropW      = self->_cameraOptions->CropW();
-                    NSInteger CropH      = self->_cameraOptions->CropH();
-                    NSInteger circleCropRadius = self->_cameraOptions->circleCropRadius();
-                    NSInteger   quality = self->_cameraOptions->quality();
+                    BOOL isCrop          = [self.pickOptions sy_boolForKey:@"isCrop"];
+                    BOOL showCropCircle  = [self.pickOptions sy_boolForKey:@"showCropCircle"];
+                    NSInteger CropW      = [self.pickOptions sy_integerForKey:@"CropW"];
+                    NSInteger CropH      = [self.pickOptions sy_integerForKey:@"CropH"];
+                    NSInteger circleCropRadius = [self.pickOptions sy_integerForKey:@"circleCropRadius"];
+                    NSInteger quality = [self.pickOptions sy_integerForKey:@"quality"];
 
                     if (isCrop) {
                         TZImagePickerController *imagePicker = [[TZImagePickerController alloc] initCropTypeWithAsset:assetModel.asset photo:image completion:^(UIImage *cropImage, id asset) {
@@ -253,7 +253,7 @@
 }
 
 - (BOOL)isAssetCanSelect:(PHAsset *)asset {
-    BOOL allowPickingGif = _cameraOptions->isGif();
+    BOOL allowPickingGif = [self.pickOptions sy_boolForKey:@"isGif"];
     BOOL isGIF = [[TZImageManager manager] getAssetType:asset] == TZAssetModelMediaTypePhotoGif;
     if (!allowPickingGif && isGIF) {
         return NO;
@@ -311,7 +311,7 @@
     NSString *fileExtension    = [filename pathExtension];
     NSMutableString *filePath = [NSMutableString string];
     BOOL isPNG = [fileExtension hasSuffix:@"PNG"] || [fileExtension hasSuffix:@"png"];
-    BOOL compressFocusAlpha = _cameraOptions->compressFocusAlpha();
+    BOOL compressFocusAlpha = [self.pickOptions sy_boolForKey:@"compressFocusAlpha"];
     
     if (isPNG) {
         [filePath appendString:[NSString stringWithFormat:@"%@SyanImageCaches/%@", NSTemporaryDirectory(), filename]];
@@ -328,7 +328,7 @@
     NSInteger size = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil].fileSize;
     photo[@"size"] = @(size);
     photo[@"mediaType"] = @(phAsset.mediaType);
-    if (_cameraOptions->enableBase64()) {
+    if ([self.pickOptions sy_boolForKey:@"enableBase64"]) {
         if(isPNG){
             photo[@"base64"] = [NSString stringWithFormat:@"data:image/png;base64,%@", [writeData base64EncodedStringWithOptions:0]];
         }else{
@@ -350,7 +350,7 @@
     NSData *writeData = nil;
     NSMutableString *filePath = [NSMutableString string];
     BOOL isPNG = [fileExtension hasSuffix:@"PNG"] || [fileExtension hasSuffix:@"png"];
-    BOOL compressFocusAlpha = _cameraOptions->compressFocusAlpha();
+    BOOL compressFocusAlpha = [self.pickOptions sy_boolForKey:@"compressFocusAlpha"];
     
     if (isGIF) {
         image = [UIImage sd_tz_animatedGIFWithData:data];
@@ -374,7 +374,7 @@
     NSInteger size      = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil].fileSize;
     photo[@"size"]      = @(size);
     photo[@"mediaType"] = @(phAsset.mediaType);
-    if (_cameraOptions->enableBase64() && !isGIF) {
+    if ([self.pickOptions sy_boolForKey:@"enableBase64"] && !isGIF) {
         if(isPNG){
             photo[@"base64"] = [NSString stringWithFormat:@"data:image/png;base64,%@", [writeData base64EncodedStringWithOptions:0]];
         }else{

package/lib/module/index.js

@@ -1,9 +1,15 @@
 "use strict";
 
-import NativeImagePicker from "./NativeImagePicker.js";
+import NativeImagePicker, { defaultOptions } from "./NativeImagePicker.js";
 const HTNativeImagePicker = (() => {
   return {
-    asyncShowImagePicker: NativeImagePicker.asyncShowImagePicker
+    asyncShowImagePicker: options => {
+      const _options = {
+        ...defaultOptions,
+        ...options
+      };
+      return NativeImagePicker.asyncShowImagePicker(_options);
+    }
   };
 })();
 export default HTNativeImagePicker;

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeImagePicker","HTNativeImagePicker","asyncShowImagePicker"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,OAAOA,iBAAiB,MAAM,wBAAqB;AAEnD,MAAMC,mBAAmB,GAAG,CAAC,MAAM;EACjC,OAAO;IACLC,oBAAoB,EAAEF,iBAAiB,CAACE;EAC1C,CAAC;AACH,CAAC,EAAE,CAAC;AAEJ,eAAeD,mBAAmB","ignoreList":[]}
+{"version":3,"names":["NativeImagePicker","defaultOptions","HTNativeImagePicker","asyncShowImagePicker","options","_options"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;AAAA,OAAOA,iBAAiB,IAAIC,cAAc,QAAoD,wBAAqB;AAEnH,MAAMC,mBAAmB,GAAG,CAAC,MAAM;EACjC,OAAO;IACLC,oBAAoB,EAAGC,OAA0B,IAAM;MACrD,MAAMC,QAAQ,GAAG;QAAE,GAAGJ,cAAc;QAAE,GAAGG;MAAQ,CAAC;MAClD,OAAOJ,iBAAiB,CAACG,oBAAoB,CAACE,QAAQ,CAAC;IACzD;EACF,CAAC;AACH,CAAC,EAAE,CAAC;AAEJ,eAAeH,mBAAmB","ignoreList":[]}

package/lib/typescript/src/NativeImagePicker.d.ts

@@ -69,7 +69,7 @@ export declare const defaultOptions: {
     showSelectedIndex: boolean;
 };
 export interface Spec extends TurboModule {
-    asyncShowImagePicker(options: ImagePickerOption): Promise<Array<SelectedPhoto>>;
+    asyncShowImagePicker(options: Object): Promise<Array<SelectedPhoto>>;
 }
 declare const _default: Spec;
 export default _default;

package/lib/typescript/src/NativeImagePicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeImagePicker.d.ts","sourceRoot":"","sources":["../../../src/NativeImagePicker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAC,OAAO,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,yBAAyB,EAAE,OAAO,CAAC;IACnC,yBAAyB,EAAE,OAAO,CAAC;IACnC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,+BAA+B,EAAE,OAAO,CAAA;IACxC,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAA;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAC,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAC,MAAM,CAAC;IACZ,MAAM,EAAC,MAAM,CAAA;CACd;AAGH;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;CA0B1B,CAAC;AACF,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,oBAAoB,CAAC,OAAO,EAAC,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CAChF;;AAED,wBAA2E"}
+{"version":3,"file":"NativeImagePicker.d.ts","sourceRoot":"","sources":["../../../src/NativeImagePicker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAC,OAAO,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,yBAAyB,EAAE,OAAO,CAAC;IACnC,yBAAyB,EAAE,OAAO,CAAC;IACnC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,+BAA+B,EAAE,OAAO,CAAA;IACxC,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAA;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAC,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAC,MAAM,CAAC;IACZ,MAAM,EAAC,MAAM,CAAA;CACd;AAGH;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;CA0B1B,CAAC;AACF,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,oBAAoB,CAAC,OAAO,EAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CACrE;;AAED,wBAA2E"}

package/lib/typescript/src/index.d.ts

@@ -1,5 +1,7 @@
+import { type ImagePickerOption, type SelectedPhoto } from './NativeImagePicker';
+export type { SelectedPhoto, ImagePickerOption };
 declare const HTNativeImagePicker: {
-    asyncShowImagePicker: (options: import("./NativeImagePicker").ImagePickerOption) => Promise<Array<import("./NativeImagePicker").SelectedPhoto>>;
+    asyncShowImagePicker: (options: ImagePickerOption) => Promise<SelectedPhoto[]>;
 };
 export default HTNativeImagePicker;
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,mBAAmB;;CAIrB,CAAA;AAEJ,eAAe,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAA0B,EAAkB,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpH,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAC;AACjD,QAAA,MAAM,mBAAmB;oCAEW,iBAAiB;CAKjD,CAAA;AAEJ,eAAe,mBAAmB,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hotta/react-native-imagepicker",
-  "version": "0.1.2",
-  "description": "@ht/react-native-imagepicker",
+  "version": "0.1.4",
+  "description": "@hotta/react-native-imagepicker",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
   "exports": {

package/src/NativeImagePicker.ts

@@ -73,7 +73,7 @@ export const defaultOptions = {
     showSelectedIndex: false, // 是否显示序号， 默认不显示
 };
 export interface Spec extends TurboModule {
-  asyncShowImagePicker(options:ImagePickerOption): Promise<Array<SelectedPhoto>>;
+  asyncShowImagePicker(options:Object): Promise<Array<SelectedPhoto>>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('NativeImagePicker');

package/src/index.ts

@@ -0,0 +1,12 @@
+import NativeImagePicker, { defaultOptions, type ImagePickerOption, type SelectedPhoto } from './NativeImagePicker';
+export type { SelectedPhoto, ImagePickerOption };
+const HTNativeImagePicker = (() => {
+  return {
+    asyncShowImagePicker: (options: ImagePickerOption ) => {
+      const _options = { ...defaultOptions, ...options }
+      return NativeImagePicker.asyncShowImagePicker(_options)
+    } 
+  };
+})()
+
+export default HTNativeImagePicker

package/src/index.tsx

@@ -1,9 +0,0 @@
-import NativeImagePicker from './NativeImagePicker';
-
-const HTNativeImagePicker = (() => {
-  return {
-    asyncShowImagePicker: NativeImagePicker.asyncShowImagePicker
-  };
-})()
-
-export default HTNativeImagePicker