-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Fixing box with corner radius doesn't have shadow #15614
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
protikbiswas100
wants to merge
5
commits into
0.82-stable
Choose a base branch
from
15604-shadowbox-0.82
base: 0.82-stable
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+111
−2
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d1beae9
adding fix for shadow in rounded box
protikbiswas100 3014680
Change files
protikbiswas100 79a8d10
Merge branch '0.82-stable' into 15604-shadowbox-0.82
protikbiswas100 eee85f8
Merge branch '0.82-stable' into 15604-shadowbox-0.82
protikbiswas100 3e9c5dd
Skip Xaml WinUI3 component in e2e visitAllPages test
protikbiswas100 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
7 changes: 7 additions & 0 deletions
7
change/react-native-windows-7ee31594-04e3-459a-8d85-f305644d691c.json
This file contains hidden or 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,7 @@ | ||
| { | ||
| "comment": "adding fix for shadow in rounded box", | ||
| "type": "prerelease", | ||
| "packageName": "react-native-windows", | ||
| "email": "protikbiswas@microsoft.com", | ||
| "dependentChangeType": "patch" | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -708,7 +708,86 @@ void ComponentView::applyShadowProps(const facebook::react::ViewProps &viewProps | |
| shadow.Color(theme()->Color(*viewProps.shadowColor)); | ||
| } | ||
|
|
||
| Visual().as<winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual>().Shadow(shadow); | ||
| // Check if any border radius is set | ||
| auto borderMetrics = BorderPrimitive::resolveAndAlignBorderMetrics(m_layoutMetrics, viewProps); | ||
| bool hasBorderRadius = borderMetrics.borderRadii.topLeft.horizontal != 0 || | ||
| borderMetrics.borderRadii.topRight.horizontal != 0 || borderMetrics.borderRadii.bottomLeft.horizontal != 0 || | ||
| borderMetrics.borderRadii.bottomRight.horizontal != 0 || borderMetrics.borderRadii.topLeft.vertical != 0 || | ||
| borderMetrics.borderRadii.topRight.vertical != 0 || borderMetrics.borderRadii.bottomLeft.vertical != 0 || | ||
| borderMetrics.borderRadii.bottomRight.vertical != 0; | ||
|
|
||
| if (hasBorderRadius) { | ||
| // When borderRadius is set, we need to create a shadow mask that follows the rounded rectangle shape. | ||
| // Use CompositionVisualSurface to capture the clipped visual's appearance as the shadow mask. | ||
| bool maskSet = false; | ||
|
|
||
| // Try Microsoft (WinUI3) Composition first | ||
| auto msCompositor = | ||
| winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper::InnerCompositor( | ||
| m_compContext); | ||
| if (msCompositor) { | ||
| auto innerVisual = | ||
| winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper::InnerVisual( | ||
| Visual()); | ||
| if (innerVisual) { | ||
| // Create a VisualSurface that captures the visual (with its clip applied) | ||
| auto visualSurface = msCompositor.CreateVisualSurface(); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Are we doing this even for views that do not have a shadow? Looks expensive. |
||
| visualSurface.SourceVisual(innerVisual); | ||
| visualSurface.SourceSize( | ||
| {m_layoutMetrics.frame.size.width * m_layoutMetrics.pointScaleFactor, | ||
| m_layoutMetrics.frame.size.height * m_layoutMetrics.pointScaleFactor}); | ||
|
|
||
| // Create a brush from the visual surface to use as shadow mask | ||
| auto maskBrush = msCompositor.CreateSurfaceBrush(visualSurface); | ||
| maskBrush.Stretch(winrt::Microsoft::UI::Composition::CompositionStretch::Fill); | ||
|
|
||
| // Get the inner shadow and set the mask | ||
| auto innerShadow = winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper:: | ||
| InnerDropShadow(shadow); | ||
| if (innerShadow) { | ||
| innerShadow.Mask(maskBrush); | ||
| maskSet = true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Fallback to System (Windows.UI) Composition if Microsoft Composition is not available | ||
| if (!maskSet) { | ||
| auto sysCompositor = | ||
| winrt::Microsoft::ReactNative::Composition::Experimental::SystemCompositionContextHelper::InnerCompositor( | ||
| m_compContext); | ||
| if (sysCompositor) { | ||
| auto innerVisual = | ||
| winrt::Microsoft::ReactNative::Composition::Experimental::SystemCompositionContextHelper::InnerVisual( | ||
| Visual()); | ||
| if (innerVisual) { | ||
| auto visualSurface = sysCompositor.CreateVisualSurface(); | ||
| visualSurface.SourceVisual(innerVisual); | ||
| visualSurface.SourceSize( | ||
| {m_layoutMetrics.frame.size.width * m_layoutMetrics.pointScaleFactor, | ||
| m_layoutMetrics.frame.size.height * m_layoutMetrics.pointScaleFactor}); | ||
|
|
||
| auto maskBrush = sysCompositor.CreateSurfaceBrush(visualSurface); | ||
| maskBrush.Stretch(winrt::Windows::UI::Composition::CompositionStretch::Fill); | ||
|
|
||
| auto innerShadow = | ||
| winrt::Microsoft::ReactNative::Composition::Experimental::SystemCompositionContextHelper::InnerDropShadow( | ||
| shadow); | ||
| if (innerShadow) { | ||
| innerShadow.Mask(maskBrush); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Apply shadow to OuterVisual (which is not clipped) so the shadow can extend beyond the clip | ||
| OuterVisual().as<winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual>().Shadow(shadow); | ||
| Visual().as<winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual>().Shadow(nullptr); | ||
| } else { | ||
| // No border radius - apply shadow directly to Visual (original behavior) | ||
| Visual().as<winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual>().Shadow(shadow); | ||
| OuterVisual().as<winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual>().Shadow(nullptr); | ||
| } | ||
| } | ||
|
|
||
| void ComponentView::updateTransformProps( | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why this change added?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The visitAllPages.test.ts E2E test iterates through all component examples in RNTester and visits each page. Some components are skipped because they have known issues with E2E automation (Flyout, XAML, SwipeableCard).
Please see the pipeline error in 0.82 I was getting without this change https://dev.azure.com/ms/react-native-windows/_build/results?buildId=628033&view=logs&s=843cf892-394e-5a95-58a2-f157705529be&j=91433fce-a6a7-5848-fbf7-7248349c63dd