forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Proper fix for iOS cropper being stuck (#7194)
* Revert "Add iOS hack to fix cropper failing to show (#7191)"
This reverts commit 25d20c6395a093a6cfc6aed4d08469f7f128f358.
* Proper fix
+17
-15
+14
patches/react-native-image-crop-picker+0.41.6.patch
+14
patches/react-native-image-crop-picker+0.41.6.patch
···
1
+
diff --git a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
2
+
index 9f20973..68d4766 100644
3
+
--- a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
4
+
+++ b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
5
+
@@ -126,7 +126,8 @@ - (void) setConfiguration:(NSDictionary *)options
6
+
7
+
- (UIViewController*) getRootVC {
8
+
UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
9
+
- while (root.presentedViewController != nil) {
10
+
+ while (root.presentedViewController != nil &&
11
+
+ !root.presentedViewController.isBeingDismissed) {
12
+
root = root.presentedViewController;
13
+
}
14
+
+1
-5
src/screens/Onboarding/StepProfile/index.tsx
+1
-5
src/screens/Onboarding/StepProfile/index.tsx
···
15
15
import {getDataUriSize} from '#/lib/media/util'
16
16
import {useRequestNotificationsPermission} from '#/lib/notifications/notifications'
17
17
import {logEvent, useGate} from '#/lib/statsig/statsig'
18
-
import {isIOS, isNative, isWeb} from '#/platform/detection'
18
+
import {isNative, isWeb} from '#/platform/detection'
19
19
import {
20
20
DescriptionText,
21
21
OnboardingControls,
···
181
181
if (!image) return
182
182
183
183
if (!isWeb) {
184
-
if (isIOS) {
185
-
// https://github.com/ivpusic/react-native-image-crop-picker/issues/1631
186
-
await new Promise(resolve => setTimeout(resolve, 800))
187
-
}
188
184
image = await openCropper({
189
185
mediaType: 'photo',
190
186
cropperCircleOverlay: true,
+1
-5
src/view/com/util/UserAvatar.tsx
+1
-5
src/view/com/util/UserAvatar.tsx
···
16
16
import {makeProfileLink} from '#/lib/routes/links'
17
17
import {colors} from '#/lib/styles'
18
18
import {logger} from '#/logger'
19
-
import {isAndroid, isIOS, isNative, isWeb} from '#/platform/detection'
19
+
import {isAndroid, isNative, isWeb} from '#/platform/detection'
20
20
import {precacheProfile} from '#/state/queries/profile'
21
21
import {HighPriorityImage} from '#/view/com/util/images/Image'
22
22
import {tokens, useTheme} from '#/alf'
···
319
319
}
320
320
321
321
try {
322
-
if (isIOS) {
323
-
// https://github.com/ivpusic/react-native-image-crop-picker/issues/1631
324
-
await new Promise(resolve => setTimeout(resolve, 800))
325
-
}
326
322
const croppedImage = await openCropper({
327
323
mediaType: 'photo',
328
324
cropperCircleOverlay: true,
+1
-5
src/view/com/util/UserBanner.tsx
+1
-5
src/view/com/util/UserBanner.tsx
···
14
14
import {colors} from '#/lib/styles'
15
15
import {useTheme} from '#/lib/ThemeContext'
16
16
import {logger} from '#/logger'
17
-
import {isAndroid, isIOS, isNative} from '#/platform/detection'
17
+
import {isAndroid, isNative} from '#/platform/detection'
18
18
import {EventStopper} from '#/view/com/util/EventStopper'
19
19
import {tokens, useTheme as useAlfTheme} from '#/alf'
20
20
import {useSheetWrapper} from '#/components/Dialog/sheet-wrapper'
···
68
68
}
69
69
70
70
try {
71
-
if (isIOS) {
72
-
// https://github.com/ivpusic/react-native-image-crop-picker/issues/1631
73
-
await new Promise(resolve => setTimeout(resolve, 800))
74
-
}
75
71
onSelectNewBanner?.(
76
72
await openCropper({
77
73
mediaType: 'photo',