@hotta/react-native-imagepicker 0.1.7 → 0.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/ios/NativeImagePicker.mm +24 -23
  2. package/lib/module/index.js +15 -3
  3. package/lib/module/index.js.map +1 -2
  4. package/lib/typescript/src/NativeImagePicker.d.ts +2 -2
  5. package/lib/typescript/src/NativeImagePicker.d.ts.map +1 -1
  6. package/package.json +1 -1
  7. package/src/NativeImagePicker.ts +2 -2
package/ios/NativeImagePicker.mm CHANGED
@@ -121,19 +121,20 @@
121
121
  // 照片最大可选张数
122
122
  NSInteger imageCount = _cameraOptions->imageCount();
123
123
  // 显示内部拍照按钮
124
- BOOL isCamera = _cameraOptions->isCamera();
125
- BOOL isCrop = _cameraOptions->isCrop();
126
- BOOL isGif = _cameraOptions->isGif();
127
- BOOL showCropCircle = _cameraOptions->showCropCircle();
128
- BOOL isRecordSelected = _cameraOptions->isRecordSelected();
129
- BOOL allowPickingOriginalPhoto = _cameraOptions->allowPickingOriginalPhoto();
130
- BOOL allowPickingMultipleVideo = _cameraOptions->allowPickingMultipleVideo();
131
- BOOL sortAscendingByModificationDate = _cameraOptions->sortAscendingByModificationDate();
132
- BOOL showSelectedIndex = _cameraOptions->showSelectedIndex();
133
- NSInteger CropW = _cameraOptions->CropW();
134
- NSInteger CropH = _cameraOptions->CropH();
135
- NSInteger circleCropRadius = _cameraOptions->circleCropRadius();
136
- NSInteger quality = _cameraOptions->quality();
124
+ BOOL isCamera = [self.pickOptions sy_boolForKey:@"isCamera"];
125
+ BOOL isCrop = [self.pickOptions sy_boolForKey:@"isCrop"];
126
+ BOOL isGif = [self.pickOptions sy_boolForKey:@"isGif"];
127
+ BOOL showCropCircle = [self.pickOptions sy_boolForKey:@"showCropCircle"];
128
+ BOOL isRecordSelected = [self.pickOptions sy_boolForKey:@"isRecordSelected"];
129
+ BOOL allowPickingOriginalPhoto = [self.pickOptions sy_boolForKey:@"allowPickingOriginalPhoto"];
130
+ BOOL allowPickingMultipleVideo = [self.pickOptions sy_boolForKey:@"allowPickingMultipleVideo"];
131
+ BOOL sortAscendingByModificationDate = [self.pickOptions sy_boolForKey:@"sortAscendingByModificationDate"];
132
+ BOOL showSelectedIndex = [self.pickOptions sy_boolForKey:@"showSelectedIndex"];
133
+ NSInteger CropW = [self.pickOptions sy_integerForKey:@"CropW"];
134
+ NSInteger CropH = [self.pickOptions sy_integerForKey:@"CropH"];
135
+ NSInteger circleCropRadius = [self.pickOptions sy_integerForKey:@"circleCropRadius"];
136
+ NSInteger quality = [self.pickOptions sy_integerForKey:@"quality"];
137
+
137
138
 
138
139
  TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:imageCount delegate:self];
139
140
  imagePickerVc.iconThemeColor = [UIColor colorWithRed:255.0/255.0 green:177.0/255.0 blue:82.0/255.0 alpha:1.0];
@@ -265,12 +266,12 @@
265
266
  [tzImagePickerVc hideProgressHUD];
266
267
 
267
268
  TZAssetModel *assetModel = [[TZImageManager manager] createModelWithAsset:asset];
268
- BOOL isCrop = self->_cameraOptions->isCrop();
269
- BOOL showCropCircle = self->_cameraOptions->showCropCircle();
270
- NSInteger CropW = self->_cameraOptions->CropW();
271
- NSInteger CropH = self->_cameraOptions->CropH();
272
- NSInteger circleCropRadius = self->_cameraOptions->circleCropRadius();
273
- NSInteger quality = self->_cameraOptions->quality();
269
+ BOOL isCrop = [self.pickOptions sy_boolForKey:@"isCrop"];
270
+ BOOL showCropCircle = [self.pickOptions sy_boolForKey:@"showCropCircle"];
271
+ NSInteger CropW = [self.pickOptions sy_integerForKey:@"CropW"];
272
+ NSInteger CropH = [self.pickOptions sy_integerForKey:@"CropH"];
273
+ NSInteger circleCropRadius = [self.pickOptions sy_integerForKey:@"circleCropRadius"];
274
+ NSInteger quality = [self.pickOptions sy_integerForKey:@"quality"];
274
275
 
275
276
  if (isCrop) {
276
277
  TZImagePickerController *imagePicker = [[TZImagePickerController alloc] initCropTypeWithAsset:assetModel.asset photo:image completion:^(UIImage *cropImage, id asset) {
@@ -310,7 +311,7 @@
310
311
  }
311
312
 
312
313
  - (BOOL)isAssetCanSelect:(PHAsset *)asset {
313
- BOOL allowPickingGif = _cameraOptions->isGif();
314
+ BOOL allowPickingGif = [self.pickOptions sy_boolForKey:@"isGif"];;
314
315
  BOOL isGIF = [[TZImageManager manager] getAssetType:asset] == TZAssetModelMediaTypePhotoGif;
315
316
  if (!allowPickingGif && isGIF) {
316
317
  return NO;
@@ -368,7 +369,7 @@
368
369
  NSString *fileExtension = [filename pathExtension];
369
370
  NSMutableString *filePath = [NSMutableString string];
370
371
  BOOL isPNG = [fileExtension hasSuffix:@"PNG"] || [fileExtension hasSuffix:@"png"];
371
- BOOL compressFocusAlpha = _cameraOptions->compressFocusAlpha();
372
+ BOOL compressFocusAlpha = [self.pickOptions sy_boolForKey:@"compressFocusAlpha"];
372
373
 
373
374
  if (isPNG) {
374
375
  [filePath appendString:[NSString stringWithFormat:@"%@SyanImageCaches/%@", NSTemporaryDirectory(), filename]];
@@ -385,7 +386,7 @@
385
386
  NSInteger size = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil].fileSize;
386
387
  photo[@"size"] = @(size);
387
388
  photo[@"mediaType"] = @(phAsset.mediaType);
388
- if (_cameraOptions->enableBase64()) {
389
+ if ([self.pickOptions sy_boolForKey:@"enableBase64"]) {
389
390
  if(isPNG){
390
391
  photo[@"base64"] = [NSString stringWithFormat:@"data:image/png;base64,%@", [writeData base64EncodedStringWithOptions:0]];
391
392
  }else{
@@ -431,7 +432,7 @@
431
432
  NSInteger size = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil].fileSize;
432
433
  photo[@"size"] = @(size);
433
434
  photo[@"mediaType"] = @(phAsset.mediaType);
434
- if (_cameraOptions->enableBase64() && !isGIF) {
435
+ if ([self.pickOptions sy_boolForKey:@"enableBase64"] && !isGIF) {
435
436
  if(isPNG){
436
437
  photo[@"base64"] = [NSString stringWithFormat:@"data:image/png;base64,%@", [writeData base64EncodedStringWithOptions:0]];
437
438
  }else{
package/lib/module/index.js CHANGED
@@ -1,10 +1,22 @@
1
1
  "use strict";
2
2
 
3
- import NativeImagePicker from "./NativeImagePicker.js";
3
+ import NativeImagePicker, { defaultOptions } from "./NativeImagePicker.js";
4
4
  const HTNativeImagePicker = (() => {
5
5
  return {
6
- asyncShowImagePicker: NativeImagePicker.asyncShowImagePicker,
7
- asyncShowVideoPicker: NativeImagePicker.asyncShowVideoPicker
6
+ asyncShowImagePicker: options => {
7
+ const _options = {
8
+ ...defaultOptions,
9
+ ...options
10
+ };
11
+ return NativeImagePicker.asyncShowImagePicker(_options);
12
+ },
13
+ asyncShowVideoPicker: options => {
14
+ const _options = {
15
+ ...defaultOptions,
16
+ ...options
17
+ };
18
+ return NativeImagePicker.asyncShowVideoPicker(_options);
19
+ }
8
20
  };
9
21
  })();
10
22
  export default HTNativeImagePicker;
package/lib/module/index.js.map CHANGED
@@ -1,2 +1 @@
1
- {"version":3,"names":["NativeImagePicker","HTNativeImagePicker","asyncShowImagePicker","asyncShowVideoPicker"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,OAAOA,iBAAiB,MAAM,wBAAqB;AAEnD,MAAMC,mBAAmB,GAAG,CAAC,MAAM;EACjC,OAAO;IACLC,oBAAoB,EAAEF,iBAAiB,CAACE,oBAAoB;IAC5DC,oBAAoB,EAAEH,iBAAiB,CAACG;EAC1C,CAAC;AACH,CAAC,EAAE,CAAC;AAEJ,eAAeF,mBAAmB","ignoreList":[]}
2
- AClD,OAAOJ,iBAAiB,CAACG,oBAAoB,CAACE,QAAQ,CAAC;IACzD,CAAC;IACDC,oBAAoB,EAAGF,OAA0B,IAAM;MACrD,MAAMC,QAAQ,GAAG;QAAE,GAAGJ,cAAc;QAAE,GAAGG;MAAQ,CAAC;MAClD,OAAOJ,iBAAiB,CAACM,oBAAoB,CAACD,QAAQ,CAAC;IACzD;EACF,CAAC;AACH,CAAC,EAAE,CAAC;AAEJ,eAAeH,mBAAmB","ignoreList":[]}
1
+ {"version":3,"names":["NativeImagePicker","defaultOptions","HTNativeImagePicker","asyncShowImagePicker","options","_options","asyncShowVideoPicker"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;AAAA,OAAOA,iBAAiB,IACtBC,cAAc,QAIR,wBAAqB;AAE7B,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,CAAC;IACDC,oBAAoB,EAAGF,OAA0B,IAAM;MACrD,MAAMC,QAAQ,GAAG;QAAE,GAAGJ,cAAc;QAAE,GAAGG;MAAQ,CAAC;MAClD,OAAOJ,iBAAiB,CAACM,oBAAoB,CAACD,QAAQ,CAAC;IACzD;EACF,CAAC;AACH,CAAC,EAAE,CAAC;AAEJ,eAAeH,mBAAmB","ignoreList":[]}
package/lib/typescript/src/NativeImagePicker.d.ts CHANGED
@@ -96,8 +96,8 @@ export declare const defaultVideoOptions: {
96
96
  showSelectedIndex: boolean;
97
97
  };
98
98
  export interface Spec extends TurboModule {
99
- asyncShowImagePicker(options: ImagePickerOption): Promise<Array<SelectedPhoto>>;
100
- asyncShowVideoPicker(options: VideoPickerOption): Promise<Array<SelectedVideo>>;
99
+ asyncShowImagePicker(options: Object): Promise<Array<SelectedPhoto>>;
100
+ asyncShowVideoPicker(options: Object): Promise<Array<SelectedVideo>>;
101
101
  }
102
102
  declare const _default: Spec;
103
103
  export default _default;
package/lib/typescript/src/NativeImagePicker.d.ts.map CHANGED
@@ -1 +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;AAEH,MAAM,WAAW,aAAa;IAC1B,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,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAC1C,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B,CAAA;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,mBAAmB;;;;;;;;CAQ/B,CAAA;AAED,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,oBAAoB,CAAC,OAAO,EAAC,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;IAC/E,oBAAoB,CAAC,OAAO,EAAC,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CAChF;;AAED,wBAA2E"}
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;AAEH,MAAM,WAAW,aAAa;IAC1B,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,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAC1C,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B,CAAA;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,mBAAmB;;;;;;;;CAQ/B,CAAA;AAED,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,oBAAoB,CAAC,OAAO,EAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;IACpE,oBAAoB,CAAC,OAAO,EAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CACrE;;AAED,wBAA2E"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hotta/react-native-imagepicker",
3
- "version": "0.1.7",
3
+ "version": "0.1.8",
4
4
  "description": "@hotta/react-native-imagepicker",
5
5
  "main": "./lib/module/index.js",
6
6
  "types": "./lib/typescript/src/index.d.ts",
package/src/NativeImagePicker.ts CHANGED
@@ -103,8 +103,8 @@ export const defaultVideoOptions = {
103
103
  }
104
104
 
105
105
  export interface Spec extends TurboModule {
106
- asyncShowImagePicker(options:ImagePickerOption): Promise<Array<SelectedPhoto>>;
107
- asyncShowVideoPicker(options:VideoPickerOption): Promise<Array<SelectedVideo>>;
106
+ asyncShowImagePicker(options:Object): Promise<Array<SelectedPhoto>>;
107
+ asyncShowVideoPicker(options:Object): Promise<Array<SelectedVideo>>;
108
108
  }
109
109
 
110
110
  export default TurboModuleRegistry.getEnforcing<Spec>('NativeImagePicker');