Skip to content

Commit f0cbcb6

Browse files
Viraj Ajay JoshiViraj Ajay Joshi
authored andcommitted
fix: vstack and button
1 parent b56beb8 commit f0cbcb6

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

example/storybook-nativewind/src/core-components/nativewind/button/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,12 @@ const buttonIconStyle = tva({
216216
],
217217
});
218218

219-
type IButtonProps = React.ComponentProps<typeof UIButton> &
219+
type IButtonProps = Omit<React.ComponentProps<typeof UIButton>, 'context'> &
220220
VariantProps<typeof buttonStyle>;
221221

222222
type IButtonTextProps = React.ComponentProps<typeof UIButton.Text> &
223223
VariantProps<typeof buttonTextStyle>;
224+
224225
const Button = React.forwardRef(
225226
(
226227
{
@@ -244,6 +245,8 @@ const Button = React.forwardRef(
244245
}
245246
);
246247

248+
<Button></Button>;
249+
247250
type IButtonIcon = React.ComponentProps<typeof UIButton.Icon> & {
248251
as?: any;
249252
};

example/storybook-nativewind/src/core-components/nativewind/vstack/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { tva, VariantProps } from '@gluestack-ui/nativewind-utils';
33
import { View } from 'react-native';
44

55
const vstackStyle = tva({
6-
base: 'flex-column',
6+
base: 'flex-col',
77
variants: {
88
space: {
99
'xs': 'gap-1',

yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3297,11 +3297,6 @@
32973297
"@react-native-aria/focus" "^0.2.9"
32983298
"@react-native-aria/interactions" "^0.2.11"
32993299

3300-
"@gluestack-ui/config-v2@^1.0.1":
3301-
version "1.0.1"
3302-
resolved "https://registry.yarnpkg.com/@gluestack-ui/config-v2/-/config-v2-1.0.1.tgz#4dafb76fe5c2fcf2666764e5dad4a402369116e6"
3303-
integrity sha512-7t/rpZ09iwxCJfN4x9EoScahuqIkc4BEQsWV0aF5AV4KPIVQZwwIJxLF5xIRpZ2guEGUomYCW/eHWTr5AJiRyA==
3304-
33053300
"@gluestack-ui/toast@^0.1.7":
33063301
version "0.1.20"
33073302
resolved "https://registry.yarnpkg.com/@gluestack-ui/toast/-/toast-0.1.20.tgz#863453f75d2e941000204a9524161bfd2500e320"

0 commit comments

Comments
 (0)