Skip to content
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

fix: currentColor dimming #2465

Merged
merged 3 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apple/Elements/RNSVGSvgView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ - (instancetype)initWithFrame:(CGRect)frame
// This is necessary to ensure that [self setNeedsDisplay] actually triggers
// a redraw when our parent transitions between hidden and visible.
self.contentMode = UIViewContentModeRedraw;
// We don't want the dimming effect on tint as it's used as currentColor
self.tintAdjustmentMode = UIViewTintAdjustmentModeNormal;
#endif // TARGET_OS_OSX
rendered = false;
#ifdef RCT_NEW_ARCH_ENABLED
Expand Down
1 change: 1 addition & 0 deletions apps/test-examples/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import Test2397 from './src/Test2397';
import Test2403 from './src/Test2403';
import Test2407 from './src/Test2407';
import Test2417 from './src/Test2417';
import Test2455 from './src/Test2455';

export default function App() {
return <ColorTest />;
Expand Down
37 changes: 37 additions & 0 deletions apps/test-examples/src/Test2455.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React from 'react';
import {Button, Share, Text, TouchableOpacity, View} from 'react-native';
import {G, Path, Rect, Svg} from 'react-native-svg';

const Favorite = ({color}: {color: string}): JSX.Element => {
return (
<Svg color={color} width="60" height="60" viewBox="0 0 24 24" fill="none">
<Path
d="M22.7927 11.1242C21.359 18.5187 12.0003 22.7782 12.0003 22.7782C12.0003 22.7782 2.64153 18.5187 1.20661 11.1242C0.326598 6.58719 2.24925 2.02329 7.13701 2.00007C10.7781 1.98296 12.0003 5.65211 12.0003 5.65211C12.0003 5.65211 13.2226 1.98173 16.8624 2.00007C21.7612 2.02329 23.6727 6.58841 22.7927 11.1242Z"
fill="currentColor"
/>
<G color={color === 'green' ? 'red' : 'green'} fill={'purple'}>
<Rect x="16" y="16" width="8" height="8" fill="currentColor" />
<G color="pink">
<Rect x="0" y="16" width="8" height="8" fill="currentColor" />
</G>
</G>
</Svg>
);
};

export default () => {
const [color, setColor] = React.useState('green');
return (
<View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
<Favorite color={color} />
<Button
onPress={() => setColor(prev => (prev === 'green' ? 'red' : 'green'))}
title="toggle color"
/>
<Button
title="share"
onPress={() => Share.share({message: 'This is test message'})}
/>
</View>
);
};
Loading