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

fix: FeComposite add default value for k1...4 (#2557)

Browse Source 
# Summary

Fixes #2552 by adding default value for k1, k2, k3, k4 according to the
spec: https://www.w3.org/TR/SVG11/filters.html#feCompositeElement

> If the attribute is not specified, the effect is as if a value of 0
were specified.

## Test Plan

[Repro from issue
2552](https://github.com/TomCorvus/RNSVG/blob/main/App.js)

## Compatibility

| OS      | Implemented |
| ------- | :---------: |
| iOS     |    ✅      |
| MacOS   |    ✅      |
This commit is contained in:
Jakub Grzywacz
2024-12-02 13:32:51 +01:00
committed by GitHub
parent 01db444f51
commit 1c9a553db0
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apple/Filters/RNSVGFeComposite.mm
View File

@@ -179,10 +179,10 @@ using namespace facebook::react;
} else if (self.operator1 == SVG_FECOMPOSITE_OPERATOR_ARITHMETIC) { } else if (self.operator1 == SVG_FECOMPOSITE_OPERATOR_ARITHMETIC) {
[filter setValue:inputImage1 forKey:@"inputImage1"]; [filter setValue:inputImage1 forKey:@"inputImage1"];
[filter setValue:inputImage2 forKey:@"inputImage2"]; [filter setValue:inputImage2 forKey:@"inputImage2"];
[filter setValue:(self.k1 != nil ? self.k1 : 0) forKey:@"inputK1"]; [filter setValue:(self.k1 != nil ? self.k1 : @0) forKey:@"inputK1"];
[filter setValue:(self.k2 != nil ? self.k2 : 0) forKey:@"inputK2"]; [filter setValue:(self.k2 != nil ? self.k2 : @0) forKey:@"inputK2"];
[filter setValue:(self.k3 != nil ? self.k3 : 0) forKey:@"inputK3"]; [filter setValue:(self.k3 != nil ? self.k3 : @0) forKey:@"inputK3"];
[filter setValue:(self.k4 != nil ? self.k4 : 0) forKey:@"inputK4"]; [filter setValue:(self.k4 != nil ? self.k4 : @0) forKey:@"inputK4"];
} else { } else {
[filter setValue:inputImage1 forKey:@"inputImage"]; [filter setValue:inputImage1 forKey:@"inputImage"];
[filter setValue:inputImage2 forKey:@"inputBackgroundImage"]; [filter setValue:inputImage2 forKey:@"inputBackgroundImage"];

4
src/elements/filters/FeComposite.tsx
View File

@@ -30,6 +30,10 @@ export default class FeComposite extends FilterPrimitive<FeCompositeProps> {
static defaultProps = { static defaultProps = {
...this.defaultPrimitiveProps, ...this.defaultPrimitiveProps,
k1: 0,
k2: 0,
k3: 0,
k4: 0,
}; };
render() { render() {