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.

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

Jump to bottom

fix: Light mode colors in the make mutable example in docs #6375

Merged
merged 2 commits into from
Aug 5, 2024
Merged

fix: Light mode colors in the make mutable example in docs #6375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7479f69
Fix light mode colors of the make mutable example in docs
MatiPl01 Aug 5, 2024
7529711
Change purple colors to css vars
MatiPl01 Aug 5, 2024
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
45 changes: 23 additions & 22 deletions packages/docs-reanimated/src/examples/MakeMutable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import {
Text,
StyleSheet,
View,
TouchableOpacity,
useColorScheme,
} from 'react-native';
import { Text, StyleSheet, View, TouchableOpacity } from 'react-native';
import { useColorScheme } from '@mui/material';

import React, { useCallback, useMemo, useState } from 'react';
import Animated, {
Expand All @@ -15,6 +10,12 @@ import Animated, {
} from 'react-native-reanimated';
import type { SharedValue } from 'react-native-reanimated';

function useTextColorStyle() {
const { colorScheme } = useColorScheme();

return colorScheme === 'light' ? styles.darkText : styles.lightText;
}

type CheckListSelectorProps = {
items: string[];
onSubmit: (selectedItems: string[]) => void;
Expand Down Expand Up @@ -59,7 +60,8 @@ type CheckListItemProps = {
};

function CheckListItem({ item, selected }: CheckListItemProps) {
const scheme = useColorScheme();
const textColor = useTextColorStyle();

const onPress = useCallback(() => {
// highlight-start
// No need to update the array of selected items, just toggle
Expand All @@ -76,13 +78,7 @@ function CheckListItem({ item, selected }: CheckListItemProps) {
{/* No need to use `useDerivedValue` hook to get the `selected` value */}
<CheckBox value={selected} />
{/* highlight-end */}
<Text
style={[
styles.listItemText,
{ color: scheme === 'dark' ? 'white' : 'black' },
]}>
{item}
</Text>
<Text style={[styles.listItemText, textColor]}>{item}</Text>
</TouchableOpacity>
);
}
Expand Down Expand Up @@ -113,13 +109,13 @@ const ITEMS = [
];

export default function App() {
const textColor = useTextColorStyle();
const [selectedItems, setSelectedItems] = useState<string[]>([]);
const scheme = useColorScheme();

return (
<View style={styles.container}>
<CheckListSelector items={ITEMS} onSubmit={setSelectedItems} />
<Text style={{ color: scheme === 'dark' ? 'white' : 'black' }}>
<Text style={textColor}>
Selected items:{' '}
{selectedItems.length ? selectedItems.join(', ') : 'None'}
</Text>
Expand Down Expand Up @@ -151,24 +147,29 @@ const styles = StyleSheet.create({
borderRadius: 4,
borderWidth: 1,
padding: 2,
borderColor: '#b58df1',
borderColor: 'var(--swm-purple-dark-100)',
},
checkBoxTick: {
flex: 1,
borderRadius: 2,
backgroundColor: '#b58df1',
backgroundColor: 'var(--swm-purple-dark-100)',
},
submitButton: {
backgroundColor: '#b58df1',
color: 'white',
backgroundColor: 'var(--swm-purple-dark-100)',
alignItems: 'center',
borderRadius: 4,
padding: 8,
marginTop: 16,
},
submitButtonText: {
color: 'white',
color: 'var(--swm-off-white)',
fontSize: 16,
fontWeight: 'bold',
},
lightText: {
color: 'var(--swm-off-white)',
},
darkText: {
color: 'var(--swm-navy-light-100)',
},
});