fix tamagui types

This commit is contained in:
0xturboblitz
2024-02-12 12:21:37 +01:00
parent 49047a03b7
commit 4046497e29
5 changed files with 28 additions and 13 deletions

View File

@@ -6,8 +6,9 @@ import { AppRegistry } from 'react-native';
import App from './App';
import { name as appName } from './app.json';
import { TamaguiProvider } from 'tamagui';
import { createTamagui, createTokens } from 'tamagui';
import { config } from '@tamagui/config/v2-native'
import { createTamagui } from 'tamagui';
import { config } from '@tamagui/config/v3'
const tamaguiConfig = createTamagui(config)

View File

@@ -1,5 +1,6 @@
const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
const path = require('path');
const { withTamagui } = require('@tamagui/metro-plugin')
const extraNodeModules = {
'common': path.resolve(__dirname + '/../common'),
};
@@ -20,4 +21,11 @@ const config = {
watchFolders,
};
module.exports = mergeConfig(getDefaultConfig(__dirname), config);
module.exports = withTamagui(
mergeConfig(getDefaultConfig(__dirname), config),
{
components: ['tamagui'],
config: './tamagui.config.ts',
outputCSS: './tamagui-web.css'
}
);

View File

@@ -194,7 +194,7 @@ const MainScreen: React.FC<MainScreenProps> = ({
Broken camera
</Label>
<Switch size="$4" checked={brokenCamera} onCheckedChange={setBrokenCamera}>
<Switch.Thumb animation="bouncy" backgroundColor="white" color />
<Switch.Thumb animation="bouncy" backgroundColor="white"/>
</Switch>
</Fieldset>
{

View File

@@ -1,9 +0,0 @@
// src/tamagui.config.js
import { createTamagui } from 'tamagui';
export const tamaguiConfig = createTamagui({
// Your basic Tamagui configuration goes here
// You can start with an empty config and extend it as needed
});

15
app/tamagui.config.ts Normal file
View File

@@ -0,0 +1,15 @@
import { config } from '@tamagui/config/v3'
import { createTamagui } from 'tamagui' // or '@tamagui/core'
const appConfig = createTamagui(config)
export type AppConfig = typeof appConfig
declare module 'tamagui' {
// or '@tamagui/core'
// overrides TamaguiCustomConfig so your custom types
// work everywhere you import `tamagui`
interface TamaguiCustomConfig extends AppConfig {}
}
export default appConfig