Skip to content

Commit 19f1848

Browse files
ujjwal2608ujjwal2608
authored
Merge pull request #3080 from gluestack/fix/upgrade-command-dependency
Fix/upgrade command dependency
2 parents 436d2d5 + d62f185 commit 19f1848

File tree

55 files changed

+470
-424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+470
-424
lines changed

‎apps/starter-kit-expo/components/ui/accordion/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ const AccordionIcon = React.forwardRef<
256256
ref={ref}
257257
{...props}
258258
className={accordionIconStyle({
259-
size,
259+
size: size as any,
260260
class: className,
261261
parentVariants: { size: parentSize },
262262
})}

‎apps/starter-kit-expo/components/ui/actionsheet/index.tsx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -352,11 +352,11 @@ const ActionsheetItemText = React.forwardRef<
352352
<UIActionsheet.ItemText
353353
className={actionsheetItemTextStyle({
354354
class: className,
355-
isTruncated,
356-
bold,
357-
underline,
358-
strikeThrough,
359-
size,
355+
isTruncated: Boolean(isTruncated),
356+
bold: Boolean(bold),
357+
underline: Boolean(underline),
358+
strikeThrough: Boolean(strikeThrough),
359+
size: size as any,
360360
})}
361361
ref={ref}
362362
{...props}
@@ -500,14 +500,14 @@ const ActionsheetSectionHeaderText = React.forwardRef<
500500
<UIActionsheet.SectionHeaderText
501501
className={actionsheetSectionHeaderTextStyle({
502502
class: className,
503-
isTruncated,
504-
bold,
505-
underline,
506-
strikeThrough,
507-
size,
508-
sub,
509-
italic,
510-
highlight,
503+
isTruncated: Boolean(isTruncated),
504+
bold: Boolean(bold),
505+
underline: Boolean(underline),
506+
strikeThrough: Boolean(strikeThrough),
507+
size: size as any,
508+
sub: Boolean(sub),
509+
italic: Boolean(italic),
510+
highlight: Boolean(highlight),
511511
})}
512512
ref={ref}
513513
{...props}

‎apps/starter-kit-expo/components/ui/alert-dialog/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ const AlertDialogContent = React.forwardRef<
177177
parentVariants: {
178178
size: parentSize,
179179
},
180-
size,
180+
size: size as any,
181181
class: className,
182182
})}
183183
/>

‎apps/starter-kit-expo/components/ui/avatar/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ const AvatarBadge = React.forwardRef<
108108
parentVariants: {
109109
size: parentSize,
110110
},
111-
size,
111+
size: size as any,
112112
class: className,
113113
})}
114114
/>
@@ -133,7 +133,7 @@ const AvatarFallbackText = React.forwardRef<
133133
parentVariants: {
134134
size: parentSize,
135135
},
136-
size,
136+
size: size as any,
137137
class: className,
138138
})}
139139
/>

‎apps/starter-kit-expo/components/ui/badge/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ const BadgeIcon = React.forwardRef<
198198
size: parentSize,
199199
action: parentAction,
200200
},
201-
size,
201+
size: size as any,
202202
class: className,
203203
})}
204204
{...props}

‎apps/starter-kit-expo/components/ui/button/index.tsx‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,14 @@ const ButtonText = React.forwardRef<
326326
size: parentSize,
327327
action: parentAction,
328328
},
329-
variant,
330-
size,
331-
action,
329+
variant: variant as 'link' | 'outline' | 'solid' | undefined,
330+
size: size as any,
331+
action: action as
332+
| 'primary'
333+
| 'secondary'
334+
| 'positive'
335+
| 'negative'
336+
| undefined,
332337
class: className,
333338
})}
334339
/>
@@ -385,7 +390,7 @@ const ButtonIcon = React.forwardRef<
385390
variant: parentVariant,
386391
action: parentAction,
387392
},
388-
size,
393+
size: size as any,
389394
class: className,
390395
})}
391396
ref={ref}
@@ -414,9 +419,9 @@ const ButtonGroup = React.forwardRef<
414419
<UIButton.Group
415420
className={buttonGroupStyle({
416421
class: className,
417-
space,
418-
isAttached,
419-
flexDirection,
422+
space: space as any,
423+
isAttached: isAttached as boolean,
424+
flexDirection: flexDirection as any,
420425
})}
421426
{...props}
422427
ref={ref}

‎apps/starter-kit-expo/components/ui/checkbox/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use client';
2-
import React from 'react';
3-
import { createCheckbox } from '@gluestack-ui-nightly/core/checkbox/creator';
2+
import React from 'react';
3+
import { createCheckbox } from '@gluestack-ui-nightly/core/checkbox/creator';
44
import { View, Pressable, Text, Platform } from 'react-native';
55
import type { TextProps, ViewProps } from 'react-native';
66
import { tva } from '@gluestack-ui-nightly/utils/nativewind-utils';
@@ -219,8 +219,8 @@ const CheckboxIcon = React.forwardRef<
219219
parentVariants: {
220220
size: parentSize,
221221
},
222+
size: size as any,
222223
class: className,
223-
size,
224224
})}
225225
{...props}
226226
ref={ref}

‎apps/starter-kit-expo/components/ui/fab/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ const FabIcon = React.forwardRef<
210210
parentVariants: {
211211
size: parentSize,
212212
},
213-
size,
213+
size: size as any,
214214
class: className,
215215
})}
216216
/>

‎apps/starter-kit-expo/components/ui/form-control/index.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ const FormControlErrorText = React.forwardRef<
305305
<UIFormControl.Error.Text
306306
className={formControlErrorTextStyle({
307307
parentVariants: { size: parentSize },
308-
size,
308+
size: size as any,
309309
class: className,
310310
})}
311311
ref={ref}
@@ -353,7 +353,7 @@ const FormControlErrorIcon = React.forwardRef<
353353
<UIFormControl.Error.Icon
354354
className={formControlErrorIconStyle({
355355
parentVariants: { size: parentSize },
356-
size,
356+
size: size as any,
357357
class: className,
358358
})}
359359
{...props}
@@ -392,7 +392,7 @@ const FormControlLabelText = React.forwardRef<
392392
<UIFormControl.Label.Text
393393
className={formControlLabelTextStyle({
394394
parentVariants: { size: parentSize },
395-
size,
395+
size: size as any,
396396
class: className,
397397
})}
398398
ref={ref}
@@ -436,7 +436,7 @@ const FormControlHelperText = React.forwardRef<
436436
<UIFormControl.Helper.Text
437437
className={formControlHelperTextStyle({
438438
parentVariants: { size: parentSize },
439-
size,
439+
size: size as any,
440440
class: className,
441441
})}
442442
ref={ref}

‎apps/starter-kit-expo/components/ui/heading/index.tsx‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ const MappedHeading = memo(
4040
return (
4141
<H1
4242
className={headingStyle({
43-
size,
44-
isTruncated,
45-
bold,
46-
underline,
47-
strikeThrough,
48-
sub,
49-
italic,
50-
highlight,
43+
size: size as any,
44+
isTruncated: isTruncated as boolean,
45+
bold: bold as boolean,
46+
underline: underline as boolean,
47+
strikeThrough: strikeThrough as boolean,
48+
sub: sub as boolean,
49+
italic: italic as boolean,
50+
highlight: highlight as boolean,
5151
class: className,
5252
})}
5353
{...props}
@@ -59,14 +59,14 @@ const MappedHeading = memo(
5959
return (
6060
<H2
6161
className={headingStyle({
62-
size,
63-
isTruncated,
64-
bold,
65-
underline,
66-
strikeThrough,
67-
sub,
68-
italic,
69-
highlight,
62+
size: size as any,
63+
isTruncated: isTruncated as boolean,
64+
bold: bold as boolean,
65+
underline: underline as boolean,
66+
strikeThrough: strikeThrough as boolean,
67+
sub: sub as boolean,
68+
italic: italic as boolean,
69+
highlight: highlight as boolean,
7070
class: className,
7171
})}
7272
{...props}
@@ -78,14 +78,14 @@ const MappedHeading = memo(
7878
return (
7979
<H3
8080
className={headingStyle({
81-
size,
82-
isTruncated,
83-
bold,
84-
underline,
85-
strikeThrough,
86-
sub,
87-
italic,
88-
highlight,
81+
size: size as any,
82+
isTruncated: isTruncated as boolean,
83+
bold: bold as boolean,
84+
underline: underline as boolean,
85+
strikeThrough: strikeThrough as boolean,
86+
sub: sub as boolean,
87+
italic: italic as boolean,
88+
highlight: highlight as boolean,
8989
class: className,
9090
})}
9191
{...props}
@@ -97,14 +97,14 @@ const MappedHeading = memo(
9797
return (
9898
<H4
9999
className={headingStyle({
100-
size,
101-
isTruncated,
102-
bold,
103-
underline,
104-
strikeThrough,
105-
sub,
106-
italic,
107-
highlight,
100+
size: size as any,
101+
isTruncated: isTruncated as boolean,
102+
bold: bold as boolean,
103+
underline: underline as boolean,
104+
strikeThrough: strikeThrough as boolean,
105+
sub: sub as boolean,
106+
italic: italic as boolean,
107+
highlight: highlight as boolean,
108108
class: className,
109109
})}
110110
{...props}
@@ -116,14 +116,14 @@ const MappedHeading = memo(
116116
return (
117117
<H5
118118
className={headingStyle({
119-
size,
120-
isTruncated,
121-
bold,
122-
underline,
123-
strikeThrough,
124-
sub,
125-
italic,
126-
highlight,
119+
size: size as any,
120+
isTruncated: isTruncated as boolean,
121+
bold: bold as boolean,
122+
underline: underline as boolean,
123+
strikeThrough: strikeThrough as boolean,
124+
sub: sub as boolean,
125+
italic: italic as boolean,
126+
highlight: highlight as boolean,
127127
class: className,
128128
})}
129129
{...props}
@@ -136,14 +136,14 @@ const MappedHeading = memo(
136136
return (
137137
<H6
138138
className={headingStyle({
139-
size,
140-
isTruncated,
141-
bold,
142-
underline,
143-
strikeThrough,
144-
sub,
145-
italic,
146-
highlight,
139+
size: size as any,
140+
isTruncated: isTruncated as boolean,
141+
bold: bold as boolean,
142+
underline: underline as boolean,
143+
strikeThrough: strikeThrough as boolean,
144+
sub: sub as boolean,
145+
italic: italic as boolean,
146+
highlight: highlight as boolean,
147147
class: className,
148148
})}
149149
{...props}
@@ -155,14 +155,14 @@ const MappedHeading = memo(
155155
return (
156156
<H4
157157
className={headingStyle({
158-
size,
159-
isTruncated,
160-
bold,
161-
underline,
162-
strikeThrough,
163-
sub,
164-
italic,
165-
highlight,
158+
size: size as any,
159+
isTruncated: isTruncated as boolean,
160+
bold: bold as boolean,
161+
underline: underline as boolean,
162+
strikeThrough: strikeThrough as boolean,
163+
sub: sub as boolean,
164+
italic: italic as boolean,
165+
highlight: highlight as boolean,
166166
class: className,
167167
})}
168168
{...props}
@@ -194,14 +194,14 @@ const Heading = memo(
194194
return (
195195
<AsComp
196196
className={headingStyle({
197-
size,
198-
isTruncated,
199-
bold,
200-
underline,
201-
strikeThrough,
202-
sub,
203-
italic,
204-
highlight,
197+
size: size as any,
198+
isTruncated: isTruncated as boolean,
199+
bold: bold as boolean,
200+
underline: underline as boolean,
201+
strikeThrough: strikeThrough as boolean,
202+
sub: sub as boolean,
203+
italic: italic as boolean,
204+
highlight: highlight as boolean,
205205
class: className,
206206
})}
207207
{...props}

0 commit comments

Comments
 (0)