-
Notifications
You must be signed in to change notification settings - Fork 116
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1593 from gluestack/release/@gluestack-style/reac…
…t@1.0.32 Release/@gluestack style/react@1.0.32
- Loading branch information
Showing
40 changed files
with
10,207 additions
and
1,003 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,8 @@ node_modules | |
| # testing | ||
| coverage | ||
|
|
||
| logs/ | ||
|
|
||
| # next.js | ||
| .next/ | ||
| .swc/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,161 +1,27 @@ | ||
| import { StyleSheet } from 'react-native'; | ||
| import React from 'react'; | ||
| import { Text, View, Pressable } from 'react-native'; | ||
| import { styled } from '@gluestack-style/react'; | ||
| import { Link } from 'expo-router'; | ||
| import { Text, View } from 'react-native'; | ||
| import { Theme, styled } from '@gluestack-style/react'; | ||
|
|
||
| const Box = styled( | ||
| View, | ||
| { | ||
| p: '$10', | ||
| bg: '$amber500', | ||
| }, | ||
| { | ||
| componentName: 'Boxxx', | ||
| } | ||
| ); | ||
|
|
||
| const StyledButton = styled( | ||
| Pressable, | ||
| { | ||
| 'p': '$3', | ||
| 'bg': '$blue500', | ||
| 'variants': { | ||
| variant: { | ||
| solid: { | ||
| ':active': { | ||
| bg: '$pink500', | ||
| }, | ||
| // '_text': { | ||
| // ':active': { | ||
| // bg: '$textLight0', | ||
| // }, | ||
| // }, | ||
| }, | ||
| }, | ||
| }, | ||
|
|
||
| 'props': { | ||
| variant: 'solid', | ||
| }, | ||
|
|
||
| ':disabled': { | ||
| opacity: 0.4, | ||
| _light: { | ||
| bg: '$amber400', | ||
| }, | ||
| p: '$10', | ||
| }, | ||
| { | ||
| descendantStyle: ['_text'], | ||
| componentName: 'Button', | ||
| componentName: 'MyBox', | ||
| } | ||
| ); | ||
|
|
||
| const Button = ({ children, onPressIn, onPressOut, ...props }: any) => { | ||
| const [active, setActive] = React.useState(false); | ||
| return ( | ||
| <StyledButton | ||
| role={props?.role || 'button'} | ||
| states={{ | ||
| active, | ||
| }} | ||
| onPressIn={() => { | ||
| setActive(true); | ||
| onPressIn && onPressIn(); | ||
| }} | ||
| onPressOut={() => { | ||
| setActive(false); | ||
| onPressOut && onPressOut(); | ||
| }} | ||
| {...props} | ||
| > | ||
| {children} | ||
| </StyledButton> | ||
| ); | ||
| }; | ||
|
|
||
| const linkSx = { | ||
| props: { | ||
| as: View, | ||
| }, | ||
| }; | ||
|
|
||
| const WrapperComp = ({ children }: any) => { | ||
| console.log('herhehre'); | ||
|
|
||
| React.useEffect(() => { | ||
| console.log('mounted'); | ||
|
|
||
| return () => { | ||
| console.log('unmounted'); | ||
| }; | ||
| }, []); | ||
|
|
||
| return children; | ||
| }; | ||
| const MyText = styled(Text, {}); | ||
|
|
||
| export default function TabOneScreen() { | ||
| // const [click, setClick] = React.useState(false); | ||
| return ( | ||
| <View style={styles.container}> | ||
| <Text style={styles.title}>dlfkvndlnv One</Text> | ||
| <Button | ||
| // onPressIn={() => setClick(true)} | ||
| // onPressOut={() => setClick(false)} | ||
| onPress={() => { | ||
| console.log('Hello word'); | ||
| }} | ||
| sx={{ | ||
| _text: { | ||
| // color: click ? '$red500' : '$amber500', | ||
| ':active': { | ||
| bg: '$textLight0', | ||
| }, | ||
| }, | ||
| }} | ||
| > | ||
| <Box | ||
| href="/modal" | ||
| sx={{ | ||
| props: { | ||
| as: Link, | ||
| }, | ||
| }} | ||
| /> | ||
| </Button> | ||
| <Button | ||
| sx={{ | ||
| _text: { | ||
| ':active': { | ||
| bg: '$textLight0', | ||
| }, | ||
| }, | ||
| }} | ||
| > | ||
| <Box | ||
| href="/modal" | ||
| as={Link} | ||
| sx={{ | ||
| bg: '$red500', | ||
| }} | ||
| /> | ||
| </Button> | ||
| </View> | ||
| <> | ||
| <Box $light-bg="pink" $t_modern-bg="purple" states={{ hover: true }} /> | ||
| <MyText fontFamily="$body">hello</MyText> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| const styles = StyleSheet.create({ | ||
| container: { | ||
| flex: 1, | ||
| alignItems: 'center', | ||
| justifyContent: 'center', | ||
| gap: 12, | ||
| }, | ||
| title: { | ||
| fontSize: 20, | ||
| fontWeight: 'bold', | ||
| }, | ||
| separator: { | ||
| marginVertical: 30, | ||
| height: 1, | ||
| width: '80%', | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.