Skip to content

Infra/design tokens color swatch #2029

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 3, 2022
Merged

Infra/design tokens color swatch #2029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c1fa5b
Design Tokens - ColorSwatch - not final
M-i-k-e-l May 2, 2022
ff653bc
Add border to transparent
M-i-k-e-l May 3, 2022
a6083ce
Fix ColorPalette fader color
M-i-k-e-l May 3, 2022
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
11 changes: 8 additions & 3 deletions demo/src/screens/componentScreens/ColorSwatchScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ import {ScrollView} from 'react-native';
import {Constants, Colors, View, Text, ColorSwatch, ColorPalette} from 'react-native-ui-lib'; //eslint-disable-line

export default class ColorSwatchScreen extends Component {
colors = ['transparent', Colors.green30, Colors.yellow30, Colors.red30];
colors = [
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sometimes 'red' is just a red color, without a "Danger" meaning...

'transparent',
Colors.$backgroundSuccessHeavy,
Colors.$backgroundWarningHeavy,
Colors.$backgroundDangerHeavy
];
mainColors = [
'#66737C',
'#459FED',
Expand Down Expand Up @@ -50,15 +55,15 @@ export default class ColorSwatchScreen extends Component {
const {color, color1, color2, selected} = this.state;

return (
<ScrollView style={{backgroundColor: Colors.grey80}}>
<ScrollView style={{backgroundColor: Colors.$backgroundNeutralLight}}>
<View flex center useSafeArea>
<Text margin-5 text60 grey10>
Single ColorSwatch
</Text>
<View row>
<ColorSwatch selected={selected} onPress={this.onPress}/>
<View>
<ColorSwatch selected color={Colors.orange60}/>
<ColorSwatch selected color={Colors.$backgroundMajor}/>
<Text>Disabled</Text>
</View>
</View>
Expand Down
1 change: 1 addition & 0 deletions src/components/colorPalette/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ class ColorPalette extends PureComponent<Props, State> {
height={SCROLLABLE_HEIGHT}
containerProps={{width: !scrollable ? contentWidth : undefined}}
gradientHeight={SCROLLABLE_HEIGHT - 12}
gradientColor={Colors.$backgroundDefault}
>
{this.renderPalette(others, styles.scrollContent, this.colors, 0)}
</ScrollBar>
Expand Down
15 changes: 8 additions & 7 deletions src/components/colorSwatch/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import React, {PureComponent} from 'react';
import {StyleSheet, Animated, Easing, LayoutChangeEvent, StyleProp, ViewStyle} from 'react-native';
import Assets from '../../assets';
import {Colors} from '../../style';
import {BorderRadiuses, Colors} from '../../style';
import {Constants, asBaseComponent} from '../../commons/new';
import View from '../view';
import TouchableOpacity from '../touchableOpacity';
import Image from '../image';


interface Props {
/**
* The identifier value of the ColorSwatch in a ColorSwatch palette.
Expand Down Expand Up @@ -110,9 +109,9 @@ class ColorSwatch extends PureComponent<Props> {
getTintColor(color?: string) {
if (color) {
if (Colors.isTransparent(color)) {
return Colors.black;
return Colors.$iconDefault;
}
return Colors.isDark(color) ? Colors.white : Colors.black;
return Colors.isDark(color) ? Colors.$iconDefaultLight : Colors.$iconDefault;
}
}

Expand Down Expand Up @@ -192,7 +191,6 @@ class ColorSwatch extends PureComponent<Props> {

export default asBaseComponent<Props>(ColorSwatch);


function createStyles({color = Colors.grey30}) {
return StyleSheet.create({
container: {
Expand All @@ -202,12 +200,15 @@ function createStyles({color = Colors.grey30}) {
borderRadius: DEFAULT_SIZE / 2,
margin: SWATCH_MARGIN,
borderWidth: color === 'transparent' ? undefined : 1,
borderColor: Colors.rgba(Colors.grey30, 0.2)
borderColor: Colors.rgba(Colors.$outlineDisabledHeavy, 0.2)
},
transparentImage: {
...StyleSheet.absoluteFillObject,
width: DEFAULT_SIZE,
height: DEFAULT_SIZE
height: DEFAULT_SIZE,
borderWidth: 1,
borderRadius: BorderRadiuses.br100,
borderColor: Colors.rgba(Colors.$outlineDisabledHeavy, 0.2)
}
});
}