zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-01 22:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: get currentColor from caller instead of parent (#2521)

Browse Source 
# Summary

Fixes #2520
When an element uses `currentColor`, it should look for color in its
caller, not in its parent.
Example: 
```svg
<Svg width="100" height="100" viewBox="0 0 100 100" color="red">
  <Defs color="blue">
    <G color="green">
      <Rect id="a" x="0" y="0" width="50" height="50" fill="currentColor"/>
    </G>
  </Defs>
  <G color="pink">
    <Use href="#a"/>												<!-- #1 -->
  </G>
  <Use href="#a" transform="translate(25 25)"/>						<!-- #2 -->
  <G color="green">
    <Use href="#a" transform="translate(50 50)"/>					<!-- #3 -->
  </G>
</Svg>
```

* `#1` should be **pink**
* `#2` should be **red**
* `#3` should be **green**


![image](https://github.com/user-attachments/assets/b7ba2ec6-ea05-4bcb-9f40-0cf024e5c749)

## Test Plan

Example app -> test -> Test2520

## Compatibility

| OS      | Implemented |
| ------- | :---------: |
| iOS     |    ✅      |
| MacOS   |    ✅      |
| Android |    ✅      |
This commit is contained in:
Jakub Grzywacz
2024-10-31 16:00:36 +01:00
committed by GitHub
parent 405ff97eea
commit 2a58016ec1
14 changed files with 82 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apple/Text/RNSVGTSpan.mm
+2 -2
View File
@@ -133,7 +133,7 @@ using namespace facebook::react;
if (self.inlineSize != nil && self.inlineSize.value != 0) {
if (self.fill) {
if (self.fill.class == RNSVGBrush.class) {
CGColorRef color = [self.tintColor CGColor];
CGColorRef color = [self getCurrentColor];
[self drawWrappedText:context gc:gc rect:rect color:color];
} else {
CGColorRef color = [self.fill getColorWithOpacity:self.fillOpacity];
@@ -143,7 +143,7 @@ using namespace facebook::react;
}
if (self.stroke) {
if (self.stroke.class == RNSVGBrush.class) {
CGColorRef color = [self.tintColor CGColor];
CGColorRef color = [self getCurrentColor];
[self drawWrappedText:context gc:gc rect:rect color:color];
} else {
CGColorRef color = [self.stroke getColorWithOpacity:self.strokeOpacity];