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

Corrige erro da async storage #42

Merged
merged 5 commits into from
Mar 6, 2024
Merged

Corrige erro da async storage #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d459e47
corrige erro da async storage
leocpadua7 Mar 1, 2024
0d95547
ajuste da api de persistencia
leocpadua7 Mar 5, 2024
0e1cdf6
muda o async-storage para devDependencies
leocpadua7 Mar 5, 2024
7291467
lint oops
leocpadua7 Mar 5, 2024
661b71f
ajustes CR
leocpadua7 Mar 6, 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
7 changes: 3 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
"storybook-design-token": "^3.0.0-beta.3",
"style-dictionary": "^3.8.0",
"ts-node": "^10.9.1",
"typescript": "^5.1.6"
"typescript": "^5.1.6",
"@react-native-community/async-storage": "^1.12.1"
},
"engines": {
"node": ">=16.17.1"
Expand Down Expand Up @@ -71,9 +72,7 @@
"chromatic": "npx chromatic",
"test": "jest"
},
"dependencies": {
"@react-native-community/async-storage": "^1.12.1"
},
"dependencies": {},
"overrides": {
"@types/react": "^18.0.33"
}
Expand Down
23 changes: 12 additions & 11 deletions themes/DarkModeEnabledContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ import {
type ReactNode,
} from 'react';

import AsyncStorage from '@react-native-community/async-storage';

import { type ThemeType, defaultTheme } from './themes';

const storeToggledTheme = async (currentTheme: ThemeType): Promise<void> => {
await AsyncStorage.setItem('dsa_theme', currentTheme);
const storeToggledTheme = async (
currentTheme: ThemeType,
setPersistedTheme: (value: ThemeType) => Promise<void>
): Promise<void> => {
await setPersistedTheme(currentTheme);
};

interface DarkModeEnabledContextProps {
Expand All @@ -25,16 +26,16 @@ const DarkModeEnabledContext = createContext<DarkModeEnabledContextProps>({
toggleDarkMode: () => {},
});

const DarkModeEnabledProvider: React.FC<{ children: ReactNode }> = ({
children,
}) => {
const DarkModeEnabledProvider: React.FC<{
children: ReactNode;
setPersistedTheme: (value: ThemeType) => Promise<void>;
getPersistedTheme: () => Promise<ThemeType | null>;
}> = ({ children, setPersistedTheme, getPersistedTheme }) => {
const [theme, setTheme] = useState<ThemeType>(defaultTheme);

useEffect(() => {
const setStoredThemeAsDefault = async (): Promise<void> => {
const storedTheme = (await AsyncStorage.getItem(
'dsa_theme'
)) as ThemeType | null;
const storedTheme = await getPersistedTheme();
if (storedTheme !== null) {
setTheme(storedTheme);
}
Expand All @@ -47,7 +48,7 @@ const DarkModeEnabledProvider: React.FC<{ children: ReactNode }> = ({
const toggleDarkMode = (): void => {
setTheme((prevTheme) => {
const currentTheme = prevTheme === 'light' ? 'dark' : 'light';
storeToggledTheme(currentTheme).catch((e) => {
storeToggledTheme(currentTheme, setPersistedTheme).catch((e) => {
console.log(e);
});
return currentTheme;
Expand Down
14 changes: 13 additions & 1 deletion themes/__tests__/DarkModeEnabledContext.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
defaultTheme,
useDarkMode,
} from '../DarkModeEnabledContext';
import { type ThemeType } from '../themes';

const ThemeDisplay = (): React.JSX.Element => {
const { theme } = useDarkMode();
Expand All @@ -18,9 +19,20 @@ const ThemeToggle = (): React.JSX.Element => {
return <button onClick={toggleDarkMode}>Trocar de tema</button>;
};

const getPersistedTheme = async (): Promise<ThemeType | null> => {
return (await AsyncStorage.getItem('dsa_theme')) as ThemeType | null;
};

const setPersistedTheme = async (value: ThemeType): Promise<void> => {
await AsyncStorage.setItem('dsa_theme', value);
};

const customRender = (): any => {
return render(
<DarkModeEnabledProvider>
<DarkModeEnabledProvider
getPersistedTheme={getPersistedTheme}
setPersistedTheme={setPersistedTheme}
>
<ThemeDisplay />
<ThemeToggle />
</DarkModeEnabledProvider>,
Expand Down
14 changes: 13 additions & 1 deletion utils/CustomDesignTokenDocBlock/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
} from '../../themes/DarkModeEnabledContext';
import { type ThemeType } from '../../themes/themes';
import * as allTokens from '../../built-tokens/js/tokens';
import AsyncStorage from '@react-native-community/async-storage';

type FontStyle = 'normal' | 'italic' | 'oblique';

Expand Down Expand Up @@ -237,8 +238,19 @@ const CustomDesignTokenDocBlock: React.FC<CustomDesignTokenDocBlockProps> = (
) => {
const { previewType } = props;

const getPersistedTheme = async (): Promise<ThemeType | null> => {
return (await AsyncStorage.getItem('dsa_theme')) as ThemeType | null;
};

const setPersistedTheme = async (value: ThemeType): Promise<void> => {
await AsyncStorage.setItem('dsa_theme', value);
};

return previewType === 'semantic-color' ? (
<DarkModeEnabledProvider>
<DarkModeEnabledProvider
getPersistedTheme={getPersistedTheme}
setPersistedTheme={setPersistedTheme}
>
<ThemeSwitch hideTitle={false} />

<BlockWithCategory {...props} />
Expand Down
Loading