Skip to content

Commit 46e37bf

Browse files
tassoevantassoevan
authored
chore(fuselage): Remove references to deprecated Grid.Item component (#36879)
1 parent 3484c1f commit 46e37bf

File tree

6 files changed

+37
-37
lines changed

6 files changed

+37
-37
lines changed

‎apps/meteor/client/components/dataView/CounterSet.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Grid } from '@rocket.chat/fuselage';
1+
import { Grid, GridItem } from '@rocket.chat/fuselage';
22
import type { ReactElement, ReactNode } from 'react';
33

44
import Counter from './Counter';
@@ -14,9 +14,9 @@ type CounterSetProps = {
1414
const CounterSet = ({ counters = [] }: CounterSetProps): ReactElement => (
1515
<Grid>
1616
{counters.map(({ count, variation, description }, i) => (
17-
<Grid.Item key={i}>
17+
<GridItem key={i}>
1818
<Counter count={count} variation={variation} description={description} />
19-
</Grid.Item>
19+
</GridItem>
2020
))}
2121
</Grid>
2222
);

‎apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Accordion, AccordionItem, Box, Button, ButtonGroup, Callout, Grid } from '@rocket.chat/fuselage';
1+
import { Accordion, AccordionItem, Box, Button, ButtonGroup, Callout, Grid, GridItem } from '@rocket.chat/fuselage';
22
import { useDebouncedValue, useSessionStorage } from '@rocket.chat/fuselage-hooks';
33
import { useSearchParameter, useRouter } from '@rocket.chat/ui-contexts';
44
import { t } from 'i18next';
@@ -138,49 +138,49 @@ const SubscriptionPage = () => {
138138
)}
139139
<Box marginBlock='none' marginInline='auto' width='full' color='default'>
140140
<Grid m={0}>
141-
<Grid.Item lg={4} xs={4} p={8} minHeight={260}>
141+
<GridItem lg={4} xs={4} p={8} minHeight={260}>
142142
{license && <PlanCard licenseInformation={license.information} licenseLimits={{ activeUsers: seatsLimit }} />}
143143
{!license && <PlanCardCommunity />}
144-
</Grid.Item>
144+
</GridItem>
145145

146-
<Grid.Item lg={8} xs={4} p={8} minHeight={260}>
146+
<GridItem lg={8} xs={4} p={8} minHeight={260}>
147147
<FeaturesCard activeModules={activeModules} isEnterprise={isEnterprise} />
148-
</Grid.Item>
148+
</GridItem>
149149

150150
{seatsLimit.value !== undefined && (
151-
<Grid.Item lg={6} xs={4} p={8} minHeight={260}>
151+
<GridItem lg={6} xs={4} p={8} minHeight={260}>
152152
{seatsLimit.max !== Infinity ? (
153153
<SeatsCard value={seatsLimit.value} max={seatsLimit.max} hideManageSubscription={licensesData?.trial} />
154154
) : (
155155
<CountSeatsCard activeUsers={seatsLimit?.value} />
156156
)}
157-
</Grid.Item>
157+
</GridItem>
158158
)}
159159

160160
{macLimit.value !== undefined && (
161-
<Grid.Item lg={6} xs={4} p={8} minHeight={260}>
161+
<GridItem lg={6} xs={4} p={8} minHeight={260}>
162162
{macLimit.max !== Infinity ? (
163163
<MACCard max={macLimit.max} value={macLimit.value} hideManageSubscription={licensesData?.trial} />
164164
) : (
165165
<CountMACCard macsCount={macLimit.value} />
166166
)}
167-
</Grid.Item>
167+
</GridItem>
168168
)}
169169

170170
{!license && (
171171
<>
172172
{limits?.marketplaceApps !== undefined && (
173-
<Grid.Item lg={4} xs={4} p={8} minHeight={260}>
173+
<GridItem lg={4} xs={4} p={8} minHeight={260}>
174174
<AppsUsageCard privateAppsLimit={limits?.privateApps} marketplaceAppsLimit={limits.marketplaceApps} />
175-
</Grid.Item>
175+
</GridItem>
176176
)}
177177

178-
<Grid.Item lg={4} xs={4} p={8} minHeight={260}>
178+
<GridItem lg={4} xs={4} p={8} minHeight={260}>
179179
<ActiveSessionsCard />
180-
</Grid.Item>
181-
<Grid.Item lg={4} xs={4} p={8} minHeight={260}>
180+
</GridItem>
181+
<GridItem lg={4} xs={4} p={8} minHeight={260}>
182182
<ActiveSessionsPeakCard />
183-
</Grid.Item>
183+
</GridItem>
184184
</>
185185
)}
186186
</Grid>

‎apps/meteor/client/views/admin/subscription/SubscriptionPageSkeleton.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import { Box, Grid, Skeleton } from '@rocket.chat/fuselage';
1+
import { Box, Grid, GridItem, Skeleton } from '@rocket.chat/fuselage';
22
import { memo } from 'react';
33

44
const SubscriptionPageSkeleton = () => (
55
<Box marginBlock='none' marginInline='auto' width='full' color='default'>
66
<Grid m={0}>
7-
<Grid.Item lg={4} xs={4} p={8}>
7+
<GridItem lg={4} xs={4} p={8}>
88
<Skeleton variant='rect' width='full' height={240} />
9-
</Grid.Item>
10-
<Grid.Item lg={8} xs={4} p={8}>
9+
</GridItem>
10+
<GridItem lg={8} xs={4} p={8}>
1111
<Skeleton variant='rect' width='full' height={240} />
12-
</Grid.Item>
13-
<Grid.Item lg={6} xs={4} p={8}>
12+
</GridItem>
13+
<GridItem lg={6} xs={4} p={8}>
1414
<Skeleton variant='rect' width='full' height={240} />
15-
</Grid.Item>
16-
<Grid.Item lg={6} xs={4} p={8}>
15+
</GridItem>
16+
<GridItem lg={6} xs={4} p={8}>
1717
<Skeleton variant='rect' width='full' height={240} />
18-
</Grid.Item>
18+
</GridItem>
1919
</Grid>
2020
</Box>
2121
);

‎apps/meteor/client/views/home/HomepageGridItem.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Grid } from '@rocket.chat/fuselage';
1+
import { GridItem } from '@rocket.chat/fuselage';
22
import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
33
import type { ReactNode, ReactElement } from 'react';
44

@@ -8,9 +8,9 @@ const HomepageGridItem = ({ children }: { children: ReactNode }): ReactElement =
88
const isMedium = !breakpoints.includes('lg');
99

1010
return (
11-
<Grid.Item xs={4} sm={4} md={4} lg={6} xl={4} p={8} maxWidth={isMedium ? '100%' : '50%'} flexGrow={1}>
11+
<GridItem xs={4} sm={4} md={4} lg={6} xl={4} p={8} maxWidth={isMedium ? '100%' : '50%'} flexGrow={1}>
1212
{children}
13-
</Grid.Item>
13+
</GridItem>
1414
);
1515
};
1616

‎packages/fuselage-ui-kit/src/blocks/SectionBlock.Fields.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Grid } from '@rocket.chat/fuselage';
1+
import { Grid, GridItem } from '@rocket.chat/fuselage';
22
import * as UiKit from '@rocket.chat/ui-kit';
33
import type { ReactElement } from 'react';
44

@@ -18,9 +18,9 @@ type FieldsProps = {
1818
const Fields = ({ fields, surfaceRenderer }: FieldsProps): ReactElement => (
1919
<Grid>
2020
{fields.map((field, i) => (
21-
<Grid.Item key={i} {...breakpoints}>
21+
<GridItem key={i} {...breakpoints}>
2222
{surfaceRenderer.renderTextObject(field, 0, UiKit.BlockContext.NONE)}
23-
</Grid.Item>
23+
</GridItem>
2424
))}
2525
</Grid>
2626
);

‎packages/fuselage-ui-kit/src/blocks/SectionBlock.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Box, Flex, Grid } from '@rocket.chat/fuselage';
1+
import { Box, Flex, Grid, GridItem } from '@rocket.chat/fuselage';
22
import type * as UiKit from '@rocket.chat/ui-kit';
33
import type { ReactElement } from 'react';
44
import { memo, useMemo } from 'react';
@@ -25,17 +25,17 @@ const SectionBlock = ({ className, block, surfaceRenderer }: SectionBlockProps):
2525

2626
return (
2727
<Grid className={className}>
28-
<Grid.Item>
28+
<GridItem>
2929
{text && (
3030
<Box is='span' fontScale='p2' color='default'>
3131
{surfaceRenderer.text(text)}
3232
</Box>
3333
)}
3434
{fields && <Fields fields={fields} surfaceRenderer={surfaceRenderer} />}
35-
</Grid.Item>
35+
</GridItem>
3636
{block.accessory && (
3737
<Flex.Item grow={0}>
38-
<Grid.Item>{accessoryElement ? surfaceRenderer.renderSectionAccessoryBlockElement(accessoryElement, 0) : null}</Grid.Item>
38+
<GridItem>{accessoryElement ? surfaceRenderer.renderSectionAccessoryBlockElement(accessoryElement, 0) : null}</GridItem>
3939
</Flex.Item>
4040
)}
4141
</Grid>

0 commit comments

Comments
 (0)