Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/meteor/client/views/marketplace/AppMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { App } from '@rocket.chat/core-typings';
import { MenuItem, MenuItemContent, MenuSection, MenuV2, Skeleton } from '@rocket.chat/fuselage';
import { MenuItem, MenuItemContent, MenuSection, Menu, Skeleton } from '@rocket.chat/fuselage';
import { useHandleMenuAction } from '@rocket.chat/ui-client';
import { memo } from 'react';
import { useTranslation } from 'react-i18next';
Expand Down Expand Up @@ -31,7 +31,7 @@ const AppMenu = ({ app, isAppDetailsPage }: AppMenuProps) => {
}

return (
<MenuV2 title={t('More_options')} onAction={onAction} disabledKeys={disabledKeys} detached>
<Menu title={t('More_options')} onAction={onAction} disabledKeys={disabledKeys} detached>
{sections.map(({ items }, idx) => (
<MenuSection key={idx} items={items}>
{items.map((option) => (
Expand All @@ -41,7 +41,7 @@ const AppMenu = ({ app, isAppDetailsPage }: AppMenuProps) => {
))}
</MenuSection>
))}
</MenuV2>
</Menu>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ type DepartmentItemMenuProps = {
archived: boolean;
};

// TODO: Use MenuV2 instead of Menu
const DepartmentItemMenu = ({ department, archived }: DepartmentItemMenuProps): ReactElement => {
const { t } = useTranslation();
const queryClient = useQueryClient();
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@
"@rocket.chat/favicon": "workspace:^",
"@rocket.chat/federation-matrix": "workspace:^",
"@rocket.chat/federation-sdk": "0.3.9",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-forms": "^1.0.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-toastbar": "^0.35.2",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/fuselage-ui-kit": "workspace:^",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class ToastMessages {
waitForDisplay({ type, message }: { type: 'success' | 'error'; message?: string } = { type: 'success' }) {
if (message) {
return expect(
this.toastByType[type].last().locator('[role="alert"]', {
this.toastByType[type].last().locator(`[role=${type === 'error' ? '"alert"' : '"status"'}]`, {
hasText: message,
}),
).toBeVisible();
Expand Down
4 changes: 2 additions & 2 deletions apps/uikit-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@lezer/highlight": "^1.2.3",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-toastbar": "^0.35.2",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/fuselage-ui-kit": "workspace:~",
Expand Down
4 changes: 2 additions & 2 deletions ee/packages/ui-theming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"devDependencies": {
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "^0.32.0",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/ui-contexts": "workspace:~",
Expand Down
4 changes: 2 additions & 2 deletions packages/fuselage-ui-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"@rocket.chat/apps-engine": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "^0.32.0",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/jest-presets": "workspace:~",
Expand Down
4 changes: 2 additions & 2 deletions packages/gazzodown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "^0.32.0",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/jest-presets": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/livechat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@babel/preset-typescript": "~7.27.1",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/ddp-client": "workspace:^",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/logo": "^0.32.4",
"@rocket.chat/ui-contexts": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/storybook-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"dependencies": {
"@rocket.chat/emitter": "^0.32.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@storybook/addon-a11y": "^8.6.17",
"@storybook/addon-essentials": "^8.6.17",
Expand All @@ -36,7 +36,7 @@
"webpack": "~5.99.9"
},
"devDependencies": {
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/tsconfig": "workspace:*",
"@storybook/react": "^8.6.17",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-avatar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"devDependencies": {
"@rocket.chat/core-typings": "workspace:~",
"@rocket.chat/emitter": "^0.32.0",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/ui-contexts": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"@rocket.chat/core-typings": "workspace:~",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "^0.32.0",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/jest-presets": "workspace:~",
Expand Down
12 changes: 6 additions & 6 deletions packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IconButton, MenuItem, MenuSection, MenuV2 } from '@rocket.chat/fuselage';
import { IconButton, MenuItem, MenuSection, Menu } from '@rocket.chat/fuselage';
import { cloneElement, type ComponentProps, type ReactNode } from 'react';
import { useTranslation } from 'react-i18next';

Expand Down Expand Up @@ -28,7 +28,7 @@ type GenericMenuConditionalProps =
sections?: never;
};

type GenericMenuProps = GenericMenuCommonProps & GenericMenuConditionalProps & Omit<ComponentProps<typeof MenuV2>, 'children'>;
type GenericMenuProps = GenericMenuCommonProps & GenericMenuConditionalProps & Omit<ComponentProps<typeof Menu>, 'children'>;

const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction, button, className, ...props }: GenericMenuProps) => {
const { t, i18n } = useTranslation();
Expand Down Expand Up @@ -60,7 +60,7 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
return (
<>
{sections && (
<MenuV2
<Menu
icon={icon}
title={i18n.exists(title) ? t(title) : title}
onAction={onAction || handleAction}
Expand All @@ -82,10 +82,10 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
)}
</MenuSection>
))}
</MenuV2>
</Menu>
)}
{items && (
<MenuV2
<Menu
icon={icon}
title={i18n.exists(title) ? t(title) : title}
onAction={onAction || handleAction}
Expand All @@ -99,7 +99,7 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction,
<GenericMenuItem {...item} />
</MenuItem>
))}
</MenuV2>
</Menu>
)}
</>
);
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-composer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"devDependencies": {
"@react-aria/toolbar": "^3.0.0-nightly.5042",
"@rocket.chat/emitter": "^0.32.0",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/jest-presets": "workspace:~",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-contexts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/ddp-client": "workspace:~",
"@rocket.chat/emitter": "^0.32.0",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/i18n": "workspace:~",
"@rocket.chat/icons": "~0.46.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-video-conf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
},
"devDependencies": {
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/jest-presets": "workspace:~",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-voip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"@react-spectrum/test-utils": "~1.0.0-alpha.8",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/fuselage-ui-kit": "workspace:^",
"@rocket.chat/icons": "~0.46.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/web-ui-registration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@rocket.chat/core-typings": "workspace:~",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "^0.32.0",
"@rocket.chat/fuselage": "^0.71.0",
"@rocket.chat/fuselage-hooks": "^0.39.0",
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/i18n": "workspace:~",
"@rocket.chat/icons": "~0.46.0",
Expand Down
Loading
Loading