Skip to content

Commit fb2ab7d

Browse files
committed
fix: fix mediaType of PHFetchOptions()
1 parent 7af22e9 commit fb2ab7d

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

example/ios/.xcode.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
# Customize the NODE_BINARY variable here.
88
# For example, to use nvm with brew, add the following line
99
# . "$(brew --prefix nvm)/nvm.sh" --no-use
10-
export NODE_BINARY=$(command -v node)
10+
export NODE_BINARY=$(command -v node)

example/ios/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,12 +330,12 @@ PODS:
330330
- React-jsinspector (0.71.5)
331331
- React-logger (0.71.5):
332332
- glog
333-
- react-native-multiple-image-picker (1.1.3):
333+
- react-native-multiple-image-picker (1.1.5):
334334
- CropViewController (= 2.6.1)
335335
- React-Core
336-
- react-native-multiple-image-picker/Viewer (= 1.1.3)
336+
- react-native-multiple-image-picker/Viewer (= 1.1.5)
337337
- TLPhotoPicker (= 2.1.9)
338-
- react-native-multiple-image-picker/Viewer (1.1.3):
338+
- react-native-multiple-image-picker/Viewer (1.1.5):
339339
- CropViewController (= 2.6.1)
340340
- React-Core
341341
- TLPhotoPicker (= 2.1.9)
@@ -618,7 +618,7 @@ SPEC CHECKSUMS:
618618
React-jsiexecutor: 1579bf3207afadc72ac3638a66a102d1bf5263e3
619619
React-jsinspector: 14a342151ab810862998dfc99e2720746734e9b3
620620
React-logger: 94ec392ae471683635e4bf874d4e82f675399d2d
621-
react-native-multiple-image-picker: 5a00e1b775cd483a4a5622c73a8ca45cb77571dd
621+
react-native-multiple-image-picker: 87f2655d149443b576cec0cba8b5fc9f88de57bb
622622
React-perflogger: 883a55a9a899535eaf06d0029108ef9ef22cce92
623623
React-RCTActionSheet: 1a3b8416688a3d291367be645022886f71d6842a
624624
React-RCTAnimation: e5560cb72d91ba35151d51e2eb0d467b42763f43

ios/MultipleImagePicker.swift

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,20 @@ class MultipleImagePicker: NSObject, UINavigationControllerDelegate {
6060

6161
private func fetchAssetCount() -> Int {
6262
let options = PHFetchOptions()
63-
options.predicate = NSPredicate(format: "mediaType = %d", config.mediaType != nil ?
64-
(config.mediaType == .image ? PHAssetMediaType.image.rawValue : PHAssetMediaType.video.rawValue) : PHAssetMediaType.unknown.rawValue)
63+
64+
if config.mediaType != nil {
65+
let mediaType =
66+
config.mediaType == .image ? PHAssetMediaType.image.rawValue : PHAssetMediaType.video.rawValue
67+
options.predicate = NSPredicate(format: "mediaType = %d", mediaType)
68+
}
69+
6570
let fetchResult = PHAsset.fetchAssets(with: options)
6671
return fetchResult.count
6772
}
6873

6974
private func handleLimitedCondition() {
7075
let count = self.fetchAssetCount()
76+
print("count: ", count)
7177
if count == 0 {
7278
self.presentLimitedController()
7379
} else {

0 commit comments

Comments
 (0)