-
Notifications
You must be signed in to change notification settings - Fork 985
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## Summary This commit swaps the fork of @react-native-community/blur with a patch and upgrades the library to latest version of 4.4.0 needed for : #18138 ## Review & Test notes Verify if blur stuff still works. ## Platforms - iOS - Android status: ready
- Loading branch information
1 parent
a6b19c0
commit db06d64
Showing
8 changed files
with
107 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- /tmp/tmp-status-mobile-851dbcb56/tmp.gcyqIAUEIA/build.gradle 2024-04-16 18:11:12.481819000 +0200 | ||
+++ ./node_modules/@react-native-community/blur/android/build.gradle 2024-04-16 18:11:18.889991702 +0200 | ||
@@ -5,7 +5,7 @@ | ||
} | ||
|
||
dependencies { | ||
- classpath 'com.android.tools.build:gradle:3.5.3' | ||
+ classpath 'com.android.tools.build:gradle:3.5.4' | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- /tmp/tmp-status-mobile-61974dae4/tmp.6k5ZPUa0Hp/BlurView.ios.tsx 2024-04-16 17:07:33.229847000 +0200 | ||
+++ ./node_modules/@react-native-community/blur/src/components/BlurView.ios.tsx 2024-04-16 17:07:58.540617624 +0200 | ||
@@ -6,6 +6,7 @@ | ||
| 'dark' | ||
| 'light' | ||
| 'xlight' | ||
+ | 'transparent' | ||
| 'prominent' | ||
| 'regular' | ||
| 'extraDark' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
--- /tmp/tmp-status-mobile-851dbcb56/tmp.beqWjtcNwi/BlurView.mm 2024-04-16 17:55:00.688450000 +0200 | ||
+++ ./node_modules/@react-native-community/blur/ios/BlurView.mm 2024-04-16 17:56:17.772952042 +0200 | ||
@@ -73,7 +73,7 @@ | ||
{ | ||
const auto &oldViewProps = *std::static_pointer_cast<const BlurViewProps>(_props); | ||
const auto &newViewProps = *std::static_pointer_cast<const BlurViewProps>(props); | ||
- | ||
+ | ||
if (oldViewProps.blurAmount != newViewProps.blurAmount) { | ||
NSNumber *blurAmount = [NSNumber numberWithInt:newViewProps.blurAmount]; | ||
[self setBlurAmount:blurAmount]; | ||
@@ -83,12 +83,12 @@ | ||
NSString *blurType = [NSString stringWithUTF8String:toString(newViewProps.blurType).c_str()]; | ||
[self setBlurType:blurType]; | ||
} | ||
- | ||
+ | ||
if (oldViewProps.reducedTransparencyFallbackColor != newViewProps.reducedTransparencyFallbackColor) { | ||
UIColor *color = RCTUIColorFromSharedColor(newViewProps.reducedTransparencyFallbackColor); | ||
[self setReducedTransparencyFallbackColor:color]; | ||
} | ||
- | ||
+ | ||
[super updateProps:props oldProps:oldProps]; | ||
} | ||
#endif // RCT_NEW_ARCH_ENABLED | ||
@@ -131,6 +131,7 @@ | ||
|
||
- (UIBlurEffectStyle)blurEffectStyle | ||
{ | ||
+ if ([self.blurType isEqual: @"transparent"]) return UIBlurEffectStyleDark; | ||
if ([self.blurType isEqual: @"xlight"]) return UIBlurEffectStyleExtraLight; | ||
if ([self.blurType isEqual: @"light"]) return UIBlurEffectStyleLight; | ||
if ([self.blurType isEqual: @"dark"]) return UIBlurEffectStyleDark; | ||
@@ -160,7 +161,7 @@ | ||
if ([self.blurType isEqual: @"thinMaterialLight"]) return UIBlurEffectStyleSystemThinMaterialLight; | ||
if ([self.blurType isEqual: @"ultraThinMaterialLight"]) return UIBlurEffectStyleSystemUltraThinMaterialLight; | ||
#endif | ||
- | ||
+ | ||
#if TARGET_OS_TV | ||
if ([self.blurType isEqual: @"regular"]) return UIBlurEffectStyleRegular; | ||
if ([self.blurType isEqual: @"prominent"]) return UIBlurEffectStyleProminent; | ||
@@ -183,6 +184,13 @@ | ||
UIBlurEffectStyle style = [self blurEffectStyle]; | ||
self.blurEffect = [BlurEffectWithAmount effectWithStyle:style andBlurAmount:self.blurAmount]; | ||
self.blurEffectView.effect = self.blurEffect; | ||
+ | ||
+ if ([self.blurType isEqual: @"transparent"]) { | ||
+ for (UIView *subview in self.blurEffectView.subviews) { | ||
+ subview.backgroundColor = [UIColor clearColor]; | ||
+ } | ||
+ } | ||
+ | ||
} | ||
|
||
- (void)updateFallbackView |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- /tmp/tmp-status-mobile-61974dae4/tmp.NHLSFZG6LG/BlurViewNativeComponent.ts 2024-04-16 17:08:42.755929000 +0200 | ||
+++ ./node_modules/@react-native-community/blur/src/fabric/BlurViewNativeComponent.ts 2024-04-16 17:08:57.634037113 +0200 | ||
@@ -10,6 +10,7 @@ | ||
| 'dark' | ||
| 'light' | ||
| 'xlight' | ||
+ | 'transparent' | ||
| 'prominent' | ||
| 'regular' | ||
| 'extraDark' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- /tmp/tmp-status-mobile-61974dae4/tmp.zy6uXqO4gW/VibrancyViewNativeComponent.ts 2024-04-16 17:09:23.772623000 +0200 | ||
+++ ./node_modules/@react-native-community/blur/src/fabric/VibrancyViewNativeComponent.ts 2024-04-16 17:09:39.033737349 +0200 | ||
@@ -10,6 +10,7 @@ | ||
| 'dark' | ||
| 'light' | ||
| 'xlight' | ||
+ | 'transparent' | ||
| 'prominent' | ||
| 'regular' | ||
| 'extraDark' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2594,9 +2594,10 @@ | |
eventemitter3 "^1.2.0" | ||
lodash "^4.17.15" | ||
|
||
"@react-native-community/blur@git+https://github.com/status-im/react-native-blur.git#refs/tags/v4.3.3-status": | ||
version "4.3.3" | ||
resolved "git+https://github.com/status-im/react-native-blur.git#c140cc8e7d54e3318af0a7c149b5d64b54de3419" | ||
"@react-native-community/[email protected]": | ||
version "4.4.0" | ||
resolved "https://registry.yarnpkg.com/@react-native-community/blur/-/blur-4.4.0.tgz#b2440dab17d94e480fbc4470e03155573b5b7375" | ||
integrity sha512-P+xdT2LIq1ewOsF3zx7C0nu4dj7nxl2NVTsMXEzRDjM3bWMdrrEbTRA7uwPV5ngn7/BXIommBPlT/JW4SAedrw== | ||
|
||
"@react-native-community/[email protected]": | ||
version "12.3.6" | ||
|