Skip to content

ColorPicker - Remove UNSAFE method #940

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 14 commits into from
Nov 11, 2020
Merged

ColorPicker - Remove UNSAFE method #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d2e5310
ColorPicker to become uncontrolled component - Phase 1: Migration war…
Inbal-Tish Sep 16, 2020
48c515b
Wrapping with 'asBaseComponent' HOC
Inbal-Tish Sep 19, 2020
51f7ca9
removing 'forwardedRef'
Inbal-Tish Sep 23, 2020
3719f5c
removing android/gradlew.bat
Inbal-Tish Sep 23, 2020
4cc7d14
remove expoDemo/android/gradlew.bat
ethanshar Oct 12, 2020
37be211
Merge branch 'master' into infra/ColorPicker_remove_UNSAFE
ethanshar Oct 12, 2020
521403b
Merge branch 'master' of github.com:wix/react-native-ui-lib into infr…
Inbal-Tish Oct 13, 2020
399515f
Merge branch 'infra/ColorPicker_remove_UNSAFE' of github.com:wix/reac…
Inbal-Tish Oct 13, 2020
e31fde0
Merge branch 'master' of github.com:wix/react-native-ui-lib into infr…
Inbal-Tish Oct 27, 2020
d34e497
Splitting component to sub components
Inbal-Tish Oct 27, 2020
1cf7220
Removing UNSAFE componentWillReceiveProps by passing a key to ColorPi…
Inbal-Tish Oct 27, 2020
47865dd
Reorganising props
Inbal-Tish Oct 27, 2020
c9f197d
Deleting key example
Inbal-Tish Oct 27, 2020
51d8f8d
editing comment
Inbal-Tish Oct 27, 2020
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
34 changes: 25 additions & 9 deletions demo/src/screens/componentScreens/ColorPickerScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,24 @@ export default class ColorPickerScreen extends Component {
return (
<ScrollView style={styles.container} contentContainerStyle={{paddingBottom: 20}}>
<View center bg-white marginV-10>
<Text text60 margin-10 style={{color}}>Selected Color: {color}</Text>
<Text text60 margin-10 style={{color}}>
Selected Color: {color}
</Text>
<View center marginB-10 style={{height: 50, width: 200, backgroundColor: color}}>
<Text text60 style={{color: textColor}}>{color}</Text>
<Text text60 style={{color: textColor}}>
{color}
</Text>
</View>
</View>
<View bg-white>
<Text text60 marginL-20 marginB-4 marginT-24>Theme Color</Text>
<Text text60 marginL-20 marginB-4 marginT-24>
Theme Color
</Text>
<Text marginL-20>Choose a color for your place’s theme.</Text>
<ColorPalette value={paletteValue} onValueChange={this.onPaletteValueChange} colors={colors}/>
<Text marginL-20 marginT-16>Custom Colors</Text>
<ColorPalette value={paletteValue} onValueChange={this.onPaletteValueChange} colors={colors} />
<Text marginL-20 marginT-16>
Custom Colors
</Text>
<ColorPicker
initialColor={color}
colors={customColors}
Expand All @@ -82,11 +90,19 @@ export default class ColorPickerScreen extends Component {
</View>

<View marginV-10 bg-white>
<Text center text60 marginT-10>Color Name</Text>
<Text center text60 marginT-10>
Color Name
</Text>
<View spread row margin-10 style={{backgroundColor: nearestColor}}>
<Text margin-5 text70 style={{color: textColor}}>{nearestColor}</Text>
<Text margin-5 text60 style={{color: textColor}}>{colorName}</Text>
<Text margin-5 text70 style={{color: textColor}}>{isMapped}</Text>
<Text margin-5 text70 style={{color: textColor}}>
{nearestColor}
</Text>
<Text margin-5 text60 style={{color: textColor}}>
{colorName}
</Text>
<Text margin-5 text70 style={{color: textColor}}>
{isMapped}
</Text>
</View>
</View>
</ScrollView>
Expand Down
Loading