From 5ecfd6f0bbadc256fdbdc1d164068be3d525cbd1 Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Mon, 18 Mar 2024 14:46:15 -0300 Subject: [PATCH] chore: `Contextualbar` as `dialog` instead of `aside` (#31978) --- .../Contextualbar/Contextualbar.tsx | 17 ----- .../Contextualbar/ContextualbarDialog.tsx | 42 ++++++++++++ .../Contextualbar/ContextualbarTitle.tsx | 9 +++ .../client/components/Contextualbar/index.ts | 6 +- .../client/components/UserInfo/UserInfo.tsx | 2 +- .../views/admin/users/AdminUsersPage.tsx | 2 +- .../VideoConfList/VideoConfList.tsx | 30 +++++---- .../client/views/room/layout/RoomLayout.tsx | 6 +- apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 6 +- .../tests/e2e/channel-management.spec.ts | 6 +- .../page-objects/fragments/home-content.ts | 12 ++-- .../fragments/home-flextab-room.ts | 8 +-- .../page-objects/fragments/home-content.ts | 8 +-- .../fragments/home-flextab-members.ts | 2 +- .../fragments/home-flextab-room.ts | 8 +-- apps/meteor/tests/e2e/team-management.spec.ts | 2 +- apps/meteor/tests/e2e/threads.spec.ts | 6 +- ee/packages/ui-theming/package.json | 4 +- packages/core-services/package.json | 2 +- packages/core-typings/package.json | 2 +- packages/fuselage-ui-kit/package.json | 4 +- packages/gazzodown/package.json | 2 +- packages/ui-avatar/package.json | 2 +- packages/ui-client/package.json | 4 +- packages/ui-composer/package.json | 4 +- packages/ui-video-conf/package.json | 4 +- packages/uikit-playground/package.json | 6 +- yarn.lock | 66 +++++++++---------- 29 files changed, 158 insertions(+), 116 deletions(-) delete mode 100644 apps/meteor/client/components/Contextualbar/Contextualbar.tsx create mode 100644 apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx create mode 100644 apps/meteor/client/components/Contextualbar/ContextualbarTitle.tsx diff --git a/apps/meteor/client/components/Contextualbar/Contextualbar.tsx b/apps/meteor/client/components/Contextualbar/Contextualbar.tsx deleted file mode 100644 index 9908ce2cdfa..00000000000 --- a/apps/meteor/client/components/Contextualbar/Contextualbar.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { Contextualbar as ContextualbarComponent } from '@rocket.chat/fuselage'; -import { useLayoutSizes, useLayoutContextualBarPosition } from '@rocket.chat/ui-contexts'; -import type { FC, ComponentProps } from 'react'; -import React, { memo } from 'react'; - -const Contextualbar: FC> = ({ children, bg = 'room', ...props }) => { - const sizes = useLayoutSizes(); - const position = useLayoutContextualBarPosition(); - - return ( - - {children} - - ); -}; - -export default memo(Contextualbar); diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx new file mode 100644 index 00000000000..1a98965c6c6 --- /dev/null +++ b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx @@ -0,0 +1,42 @@ +import { Contextualbar } from '@rocket.chat/fuselage'; +import { useLayoutSizes, useLayoutContextualBarPosition } from '@rocket.chat/ui-contexts'; +import type { ComponentProps, KeyboardEvent } from 'react'; +import React, { useCallback, useRef } from 'react'; +import type { AriaDialogProps } from 'react-aria'; +import { FocusScope, useDialog } from 'react-aria'; + +import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext'; + +type ContextualbarDialogProps = AriaDialogProps & ComponentProps; + +const ContextualbarDialog = (props: ContextualbarDialogProps) => { + const ref = useRef(null); + const { dialogProps } = useDialog({ 'aria-labelledby': 'contextualbarTitle', ...props }, ref); + const sizes = useLayoutSizes(); + const position = useLayoutContextualBarPosition(); + const { closeTab } = useRoomToolbox(); + + const callbackRef = useCallback( + (node) => { + if (!node) { + return; + } + + ref.current = node; + node.addEventListener('keydown', (e: KeyboardEvent) => { + if (e.key === 'Escape') { + closeTab(); + } + }); + }, + [closeTab], + ); + + return ( + + + + ); +}; + +export default ContextualbarDialog; diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarTitle.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarTitle.tsx new file mode 100644 index 00000000000..506be155ce1 --- /dev/null +++ b/apps/meteor/client/components/Contextualbar/ContextualbarTitle.tsx @@ -0,0 +1,9 @@ +import { ContextualbarTitle as ContextualbarTitleComponent } from '@rocket.chat/fuselage'; +import type { ComponentProps } from 'react'; +import React from 'react'; + +const ContextualbarTitle = (props: ComponentProps) => ( + +); + +export default ContextualbarTitle; diff --git a/apps/meteor/client/components/Contextualbar/index.ts b/apps/meteor/client/components/Contextualbar/index.ts index b9413335775..c370b7f790f 100644 --- a/apps/meteor/client/components/Contextualbar/index.ts +++ b/apps/meteor/client/components/Contextualbar/index.ts @@ -1,23 +1,25 @@ import { + Contextualbar, ContextualbarAction, ContextualbarActions, ContextualbarContent, ContextualbarSkeleton, ContextualbarIcon, ContextualbarFooter, - ContextualbarTitle, ContextualbarEmptyContent, } from '@rocket.chat/fuselage'; -import Contextualbar from './Contextualbar'; import ContextualbarBack from './ContextualbarBack'; import ContextualbarClose from './ContextualbarClose'; +import ContextualbarDialog from './ContextualbarDialog'; import ContextualbarHeader from './ContextualbarHeader'; import ContextualbarInnerContent from './ContextualbarInnerContent'; import ContextualbarScrollableContent from './ContextualbarScrollableContent'; +import ContextualbarTitle from './ContextualbarTitle'; export { Contextualbar, + ContextualbarDialog, ContextualbarHeader, ContextualbarAction, ContextualbarActions, diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx index 72722e8e915..025889edc7c 100644 --- a/apps/meteor/client/components/UserInfo/UserInfo.tsx +++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx @@ -75,7 +75,7 @@ const UserInfo = ({ )} - {actions && {actions}} + {actions && {actions}} {userDisplayName && } diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx index a54f2cf6f6f..a98e33e71fb 100644 --- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx +++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx @@ -63,7 +63,7 @@ const UsersPage = (): ReactElement => { {context && ( - + {context === 'upgrade' && } diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx index 33f60b24752..372a06b05a0 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx @@ -1,5 +1,5 @@ import type { IGroupVideoConference } from '@rocket.chat/core-typings'; -import { Box, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage'; +import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, Throbber } from '@rocket.chat/fuselage'; import { useResizeObserver } from '@rocket.chat/fuselage-hooks'; import { useTranslation } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; @@ -7,7 +7,6 @@ import React from 'react'; import { Virtuoso } from 'react-virtuoso'; import { - ContextualbarSkeleton, ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, @@ -36,10 +35,6 @@ const VideoConfList = ({ onClose, total, videoConfs, loading, error, reload, loa debounceDelay: 200, }); - if (loading) { - return ; - } - return ( <> @@ -49,6 +44,11 @@ const VideoConfList = ({ onClose, total, videoConfs, loading, error, reload, loa + {loading && ( + + + + )} {(total === 0 || error) && ( {error && ( @@ -58,7 +58,7 @@ const VideoConfList = ({ onClose, total, videoConfs, loading, error, reload, loa {getErrorMessage(error)} )} - {!error && total === 0 && ( + {!loading && total === 0 && ( )} - {videoConfs.length > 0 && ( - + + {videoConfs.length > 0 && ( loadMoreItems(start, Math.min(50, total - start))} + endReached={ + loading + ? (): void => undefined + : (start) => { + loadMoreItems(start, Math.min(50, total - start)); + } + } overscan={25} data={videoConfs} components={{ Scroller: VirtuosoScrollbars }} itemContent={(_index, data): ReactElement => } /> - - )} + )} + ); diff --git a/apps/meteor/client/views/room/layout/RoomLayout.tsx b/apps/meteor/client/views/room/layout/RoomLayout.tsx index 20a3f81db98..e7e8b1c4f0d 100644 --- a/apps/meteor/client/views/room/layout/RoomLayout.tsx +++ b/apps/meteor/client/views/room/layout/RoomLayout.tsx @@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage'; import type { ComponentProps, ReactElement, ReactNode } from 'react'; import React, { Suspense } from 'react'; -import { Contextualbar } from '../../../components/Contextualbar'; +import { ContextualbarDialog } from '../../../components/Contextualbar'; import HeaderSkeleton from '../Header/HeaderSkeleton'; type RoomLayoutProps = { @@ -23,9 +23,9 @@ const RoomLayout = ({ header, body, footer, aside, ...props }: RoomLayoutProps): {footer && {footer}} {aside && ( - + {aside} - + )} diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index ea3b95b7252..074c997669a 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -50,7 +50,7 @@ "ws": "^8.8.1" }, "devDependencies": { - "@rocket.chat/icons": "^0.33.0", + "@rocket.chat/icons": "^0.34.0", "@types/cookie": "^0.5.3", "@types/cookie-parser": "^1.4.5", "@types/ejson": "^2.2.1", diff --git a/apps/meteor/package.json b/apps/meteor/package.json index eb42db72a9c..b11d4a8b99e 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -242,15 +242,15 @@ "@rocket.chat/favicon": "workspace:^", "@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2", "@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3", - "@rocket.chat/fuselage": "^0.50.1", + "@rocket.chat/fuselage": "^0.51.1", "@rocket.chat/fuselage-hooks": "^0.33.0", "@rocket.chat/fuselage-polyfills": "~0.31.25", - "@rocket.chat/fuselage-toastbar": "~0.31.25", + "@rocket.chat/fuselage-toastbar": "^0.31.26", "@rocket.chat/fuselage-tokens": "^0.33.0", "@rocket.chat/fuselage-ui-kit": "workspace:^", "@rocket.chat/gazzodown": "workspace:^", "@rocket.chat/i18n": "workspace:^", - "@rocket.chat/icons": "^0.33.0", + "@rocket.chat/icons": "^0.34.0", "@rocket.chat/instance-status": "workspace:^", "@rocket.chat/jwt": "workspace:^", "@rocket.chat/layout": "~0.31.26", diff --git a/apps/meteor/tests/e2e/channel-management.spec.ts b/apps/meteor/tests/e2e/channel-management.spec.ts index f7675208577..0586598a5dd 100644 --- a/apps/meteor/tests/e2e/channel-management.spec.ts +++ b/apps/meteor/tests/e2e/channel-management.spec.ts @@ -122,7 +122,7 @@ test.describe.serial('channel-management', () => { await poHomeChannel.tabs.room.btnSave.click(); }); - test('should edit name of "targetChannel"', async ({ page }) => { + test('should edit name of targetChannel', async ({ page }) => { await poHomeChannel.sidenav.openChat(targetChannel); await poHomeChannel.tabs.btnRoomInfo.click(); await poHomeChannel.tabs.room.btnEdit.click(); @@ -152,9 +152,9 @@ test.describe.serial('channel-management', () => { await poHomeChannel.sidenav.openChat(targetChannel); await page.getByRole('button', { name: targetChannel }).first().focus(); await page.keyboard.press('Space'); - await page.getByRole('complementary').waitFor(); + await page.getByRole('dialog').waitFor(); - await expect(page.getByRole('complementary')).toBeVisible(); + await expect(page.getByRole('dialog')).toBeVisible(); }); test('should create a discussion using the message composer', async ({ page }) => { diff --git a/apps/meteor/tests/e2e/federation/page-objects/fragments/home-content.ts b/apps/meteor/tests/e2e/federation/page-objects/fragments/home-content.ts index e1096b15185..2534bf817a3 100644 --- a/apps/meteor/tests/e2e/federation/page-objects/fragments/home-content.ts +++ b/apps/meteor/tests/e2e/federation/page-objects/fragments/home-content.ts @@ -232,7 +232,7 @@ export class FederationHomeContent { } get threadInputMessage(): Locator { - return this.page.locator('//main//aside >> [name="msg"]').last(); + return this.page.getByRole('dialog').locator('[name="msg"]').last(); } async sendFileMessage(fileName: string): Promise { @@ -240,7 +240,7 @@ export class FederationHomeContent { } async sendThreadMessage(message: string): Promise { - await this.page.locator('//main//aside >> [name="msg"]').last().fill(message); + await this.page.getByRole('dialog').locator('[name="msg"]').last().fill(message); await this.page.keyboard.press('Enter'); } @@ -251,7 +251,7 @@ export class FederationHomeContent { } threadSendToChannelAlso(): Locator { - return this.page.locator('//main//aside >> [name="alsoSendThreadToChannel"]'); + return this.page.getByRole('dialog').locator('label', { hasText: 'Also send to channel' }); } async quoteMessage(message: string): Promise { @@ -262,14 +262,14 @@ export class FederationHomeContent { } async openLastThreadMessageMenu(): Promise { - await this.page.locator('//main//aside >> [data-qa-type="message"]').last().hover(); + await this.page.getByRole('dialog').locator('[data-qa-type="message"]').last().hover(); await this.page - .locator('//main//aside >> [data-qa-type="message"]') + .getByRole('dialog').locator('[data-qa-type="message"]') .last() .locator('[data-qa-type="message-action-menu"][data-qa-id="menu"]') .waitFor(); await this.page - .locator('//main//aside >> [data-qa-type="message"]') + .getByRole('dialog').locator('[data-qa-type="message"]') .last() .locator('[data-qa-type="message-action-menu"][data-qa-id="menu"]') .click(); diff --git a/apps/meteor/tests/e2e/federation/page-objects/fragments/home-flextab-room.ts b/apps/meteor/tests/e2e/federation/page-objects/fragments/home-flextab-room.ts index b08565368f7..e7ea13e513a 100644 --- a/apps/meteor/tests/e2e/federation/page-objects/fragments/home-flextab-room.ts +++ b/apps/meteor/tests/e2e/federation/page-objects/fragments/home-flextab-room.ts @@ -20,19 +20,19 @@ export class FederationHomeFlextabRoom { } get inputName(): Locator { - return this.page.locator('//aside//label[contains(text(), "Name")]/..//input'); + return this.page.getByRole('dialog').getByRole('textbox', { name: 'Name' }); } get inputTopic(): Locator { - return this.page.locator('//main//aside//label[contains(text(), "Topic")]/..//textarea'); + return this.page.getByRole('dialog').getByRole('textbox', { name: 'Topic' }); } get inputAnnouncement(): Locator { - return this.page.locator('//main//aside//label[contains(text(), "Announcement")]/..//textarea'); + return this.page.getByRole('dialog').getByRole('textbox', { name: 'Announcement' }); } get inputDescription(): Locator { - return this.page.locator('//main//aside//label[contains(text(), "Description")]/..//textarea'); + return this.page.getByRole('dialog').getByRole('textbox', { name: 'Description' }); } get checkboxReadOnly(): Locator { diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts index d5783a47f69..9fd067c407b 100644 --- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts +++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts @@ -240,13 +240,13 @@ export class HomeContent { } async openLastThreadMessageMenu(): Promise { - await this.page.locator('//main//aside >> [data-qa-type="message"]').last().hover(); - await this.page.locator('//main//aside >> [data-qa-type="message"]').last().locator('role=button[name="More"]').waitFor(); - await this.page.locator('//main//aside >> [data-qa-type="message"]').last().locator('role=button[name="More"]').click(); + await this.page.getByRole('dialog').locator('[data-qa-type="message"]').last().hover(); + await this.page.getByRole('dialog').locator('[data-qa-type="message"]').last().locator('role=button[name="More"]').waitFor(); + await this.page.getByRole('dialog').locator('[data-qa-type="message"]').last().locator('role=button[name="More"]').click(); } async toggleAlsoSendThreadToChannel(isChecked: boolean): Promise { - await this.page.locator('//main//aside >> [name="alsoSendThreadToChannel"]').setChecked(isChecked); + await this.page.getByRole('dialog').locator('[name="alsoSendThreadToChannel"]').setChecked(isChecked); } get lastSystemMessageBody(): Locator { diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-members.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-members.ts index e9dbc0a186a..d5b9532d1e4 100644 --- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-members.ts +++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-members.ts @@ -23,7 +23,7 @@ export class HomeFlextabMembers { await this.page.locator('role=button[name="More"]').click(); await this.page.locator('role=menuitem[name="Mute user"]').click(); await this.page.locator('.rcx-modal .rcx-button--danger').click(); - await this.page.locator('(//main//aside/h3//button)[1]').click(); + await this.page.getByRole('dialog').getByRole('button').first().click(); } async setUserAsModerator(username: string) { diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts index 9973f72532b..c711d6bcdc3 100644 --- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts +++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts @@ -12,19 +12,19 @@ export class HomeFlextabRoom { } get inputName(): Locator { - return this.page.locator('//aside//label[contains(text(), "Name")]/..//input'); + return this.page.getByRole('dialog').getByRole('textbox', { name: 'Name' }); } get inputTopic(): Locator { - return this.page.locator('//main//aside//label[contains(text(), "Topic")]/..//textarea'); + return this.page.getByRole('dialog').getByRole('textbox', { name: 'Topic' }); } get inputAnnouncement(): Locator { - return this.page.locator('//main//aside//label[contains(text(), "Announcement")]/..//textarea'); + return this.page.getByRole('dialog').getByRole('textbox', { name: 'Announcement' }); } get inputDescription(): Locator { - return this.page.locator('//main//aside//label[contains(text(), "Description")]/..//textarea'); + return this.page.getByRole('dialog').getByRole('textbox', { name: 'Description' }); } get checkboxReadOnly(): Locator { diff --git a/apps/meteor/tests/e2e/team-management.spec.ts b/apps/meteor/tests/e2e/team-management.spec.ts index 11609ec51ed..9542b8a81a7 100644 --- a/apps/meteor/tests/e2e/team-management.spec.ts +++ b/apps/meteor/tests/e2e/team-management.spec.ts @@ -87,7 +87,7 @@ test.describe.serial('teams-management', () => { await poHomeTeam.tabs.channels.inputChannels.type(targetChannel, { delay: 100 }); await page.locator(`.rcx-option__content:has-text("${targetChannel}")`).click(); await poHomeTeam.tabs.channels.btnAdd.click(); - await expect(page.locator('//main//aside >> li')).toContainText(targetChannel); + await expect(page.getByRole('dialog').getByRole('listitem')).toContainText(targetChannel); }); test('should access team channel through "targetTeam" header', async ({ page }) => { diff --git a/apps/meteor/tests/e2e/threads.spec.ts b/apps/meteor/tests/e2e/threads.spec.ts index 0fcaff6fd03..99dad85131f 100644 --- a/apps/meteor/tests/e2e/threads.spec.ts +++ b/apps/meteor/tests/e2e/threads.spec.ts @@ -24,7 +24,7 @@ test.describe.serial('Threads', () => { await expect(page).toHaveURL(/.*thread/); await poHomeChannel.content.toggleAlsoSendThreadToChannel(true); - await page.locator('//main//aside >> [name="msg"]').last().fill('This is a thread message also sent in channel'); + await page.getByRole('dialog').locator('[name="msg"]').last().fill('This is a thread message also sent in channel'); await page.keyboard.press('Enter'); await expect(poHomeChannel.content.lastThreadMessageText).toContainText('This is a thread message also sent in channel'); await expect(poHomeChannel.content.lastUserMessage).toContainText('This is a thread message also sent in channel'); @@ -108,7 +108,7 @@ test.describe.serial('Threads', () => { }); test('expect quote the thread message', async ({ page }) => { - await page.locator('//main//aside >> [data-qa-type="message"]').last().hover(); + await page.getByRole('dialog').locator('[data-qa-type="message"]').last().hover(); await page.locator('role=button[name="Quote"]').click(); await page.locator('[name="msg"]').last().fill('this is a quote message'); await page.keyboard.press('Enter'); @@ -144,7 +144,7 @@ test.describe.serial('Threads', () => { test('expect close thread if has only one message and user press escape', async ({ page }) => { await expect(page).toHaveURL(/.*thread/); - await expect(page.locator('//main//aside >> [data-qa-type="message"]')).toBeVisible(); + await expect(page.getByRole('dialog').locator('[data-qa-type="message"]')).toBeVisible(); await expect(page.locator('[name="msg"]').last()).toBeFocused(); await page.keyboard.press('Escape'); await expect(page).not.toHaveURL(/.*thread/); diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json index 34819cb2b00..e4b2908ff0a 100644 --- a/ee/packages/ui-theming/package.json +++ b/ee/packages/ui-theming/package.json @@ -4,9 +4,9 @@ "private": true, "devDependencies": { "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.50.1", + "@rocket.chat/fuselage": "^0.51.1", "@rocket.chat/fuselage-hooks": "^0.33.0", - "@rocket.chat/icons": "^0.33.0", + "@rocket.chat/icons": "^0.34.0", "@rocket.chat/ui-contexts": "workspace:~", "@storybook/addon-actions": "~6.5.16", "@storybook/addon-docs": "~6.5.16", diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 6de74f5e0b6..78dc5777027 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -36,7 +36,7 @@ "dependencies": { "@rocket.chat/apps-engine": "1.42.0-alpha.619", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/icons": "^0.33.0", + "@rocket.chat/icons": "^0.34.0", "@rocket.chat/message-parser": "workspace:^", "@rocket.chat/models": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 4ac6bd6b350..f5ca5e231fa 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -24,7 +24,7 @@ ], "dependencies": { "@rocket.chat/apps-engine": "1.42.0-alpha.619", - "@rocket.chat/icons": "^0.33.0", + "@rocket.chat/icons": "^0.34.0", "@rocket.chat/message-parser": "workspace:^", "@rocket.chat/ui-kit": "workspace:~" }, diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 450e74df174..4bf94062d48 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -63,10 +63,10 @@ "@babel/preset-typescript": "~7.22.15", "@rocket.chat/apps-engine": "1.42.0-alpha.619", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.50.1", + "@rocket.chat/fuselage": "^0.51.1", "@rocket.chat/fuselage-hooks": "^0.33.0", "@rocket.chat/fuselage-polyfills": "~0.31.25", - "@rocket.chat/icons": "^0.33.0", + "@rocket.chat/icons": "^0.34.0", "@rocket.chat/prettier-config": "~0.31.25", "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-avatar": "workspace:^", diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 678a81d7f03..494df3362b6 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -6,7 +6,7 @@ "@babel/core": "~7.22.20", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.50.1", + "@rocket.chat/fuselage": "^0.51.1", "@rocket.chat/fuselage-tokens": "^0.33.0", "@rocket.chat/message-parser": "workspace:^", "@rocket.chat/styled": "~0.31.25", diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index d78f1e86cd5..30a7eda16e6 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -4,7 +4,7 @@ "private": true, "devDependencies": { "@babel/core": "~7.22.20", - "@rocket.chat/fuselage": "^0.50.1", + "@rocket.chat/fuselage": "^0.51.1", "@rocket.chat/ui-contexts": "workspace:^", "@types/babel__core": "~7.20.3", "@types/react": "~17.0.69", diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 91ec801c63c..b2020a182fa 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -6,9 +6,9 @@ "@babel/core": "~7.22.20", "@react-aria/toolbar": "^3.0.0-beta.1", "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.50.1", + "@rocket.chat/fuselage": "^0.51.1", "@rocket.chat/fuselage-hooks": "^0.33.0", - "@rocket.chat/icons": "^0.33.0", + "@rocket.chat/icons": "^0.34.0", "@rocket.chat/mock-providers": "workspace:^", "@rocket.chat/ui-contexts": "workspace:~", "@storybook/addon-actions": "~6.5.16", diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json index 98120fed104..37599b373dd 100644 --- a/packages/ui-composer/package.json +++ b/packages/ui-composer/package.json @@ -6,8 +6,8 @@ "@babel/core": "~7.22.20", "@react-aria/toolbar": "^3.0.0-beta.1", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.50.1", - "@rocket.chat/icons": "^0.33.0", + "@rocket.chat/fuselage": "^0.51.1", + "@rocket.chat/icons": "^0.34.0", "@storybook/addon-actions": "~6.5.16", "@storybook/addon-docs": "~6.5.16", "@storybook/addon-essentials": "~6.5.16", diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index a122988fc1f..109b310d5b1 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -6,9 +6,9 @@ "@babel/core": "~7.22.20", "@rocket.chat/css-in-js": "~0.31.25", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.50.1", + "@rocket.chat/fuselage": "^0.51.1", "@rocket.chat/fuselage-hooks": "^0.33.0", - "@rocket.chat/icons": "^0.33.0", + "@rocket.chat/icons": "^0.34.0", "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-avatar": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^", diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index d014f3372dd..3b570b140c0 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -15,13 +15,13 @@ "@codemirror/tooltip": "^0.19.16", "@lezer/highlight": "^1.1.6", "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.50.1", + "@rocket.chat/fuselage": "^0.51.1", "@rocket.chat/fuselage-hooks": "^0.33.0", "@rocket.chat/fuselage-polyfills": "~0.31.25", - "@rocket.chat/fuselage-toastbar": "^0.31.25", + "@rocket.chat/fuselage-toastbar": "^0.31.26", "@rocket.chat/fuselage-tokens": "^0.33.0", "@rocket.chat/fuselage-ui-kit": "workspace:~", - "@rocket.chat/icons": "^0.33.0", + "@rocket.chat/icons": "^0.34.0", "@rocket.chat/logo": "^0.31.29", "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-avatar": "workspace:^", diff --git a/yarn.lock b/yarn.lock index 533dcf80e1c..e5829556e2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8435,7 +8435,7 @@ __metadata: "@rocket.chat/apps-engine": 1.42.0-alpha.619 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/icons": ^0.33.0 + "@rocket.chat/icons": ^0.34.0 "@rocket.chat/message-parser": "workspace:^" "@rocket.chat/models": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" @@ -8460,7 +8460,7 @@ __metadata: dependencies: "@rocket.chat/apps-engine": 1.42.0-alpha.619 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/icons": ^0.33.0 + "@rocket.chat/icons": ^0.34.0 "@rocket.chat/message-parser": "workspace:^" "@rocket.chat/ui-kit": "workspace:~" eslint: ~8.45.0 @@ -8701,9 +8701,9 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage-toastbar@npm:^0.31.25, @rocket.chat/fuselage-toastbar@npm:~0.31.25": - version: 0.31.25 - resolution: "@rocket.chat/fuselage-toastbar@npm:0.31.25" +"@rocket.chat/fuselage-toastbar@npm:^0.31.26": + version: 0.31.26 + resolution: "@rocket.chat/fuselage-toastbar@npm:0.31.26" peerDependencies: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" @@ -8711,7 +8711,7 @@ __metadata: "@rocket.chat/styled": "*" react: ^17.0.2 react-dom: ^17.0.2 - checksum: 0dcc6e38c45594efefefe5763ef5bf98296cdf2f9b189f2f0c062d1d9bedf460b10508ccaaa689e2a656876f224eb9c9ac74e48fcd6acacb794c6fab3e8d4c33 + checksum: 92b80ee312b03cfd36f3fbbceafaf81f57ce1c7bbe3232cf93ea1aeb26f73ec034f4eded9b57e1fc85e3141609af02af3ffcaa15f82c57163e398eef22fc1467 languageName: node linkType: hard @@ -8732,11 +8732,11 @@ __metadata: "@babel/preset-typescript": ~7.22.15 "@rocket.chat/apps-engine": 1.42.0-alpha.619 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.50.1 + "@rocket.chat/fuselage": ^0.51.1 "@rocket.chat/fuselage-hooks": ^0.33.0 "@rocket.chat/fuselage-polyfills": ~0.31.25 "@rocket.chat/gazzodown": "workspace:^" - "@rocket.chat/icons": ^0.33.0 + "@rocket.chat/icons": ^0.34.0 "@rocket.chat/prettier-config": ~0.31.25 "@rocket.chat/styled": ~0.31.25 "@rocket.chat/ui-avatar": "workspace:^" @@ -8787,9 +8787,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/fuselage@npm:^0.50.1": - version: 0.50.1 - resolution: "@rocket.chat/fuselage@npm:0.50.1" +"@rocket.chat/fuselage@npm:^0.51.1": + version: 0.51.1 + resolution: "@rocket.chat/fuselage@npm:0.51.1" dependencies: "@rocket.chat/css-in-js": ^0.31.25 "@rocket.chat/css-supports": ^0.31.25 @@ -8807,7 +8807,7 @@ __metadata: react: ^17.0.2 react-dom: ^17.0.2 react-virtuoso: 1.2.4 - checksum: 56a8599e1220a504da99ae7b8157933fce704e3b0fcbf4e834385d19ff09c3a3f01ff3aec535e32a5523b5768bfeefbb318af2a3e48fea4b502c867acb2bea52 + checksum: f7f49a59d67a485a4aff8aa2684fb0bb290c73b643763c867da23ed00c19994b24b994c554d2bd63d48657ca7fdfbff9bf34bbe2436376972809b56cb15ee456 languageName: node linkType: hard @@ -8818,7 +8818,7 @@ __metadata: "@babel/core": ~7.22.20 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/css-in-js": ~0.31.25 - "@rocket.chat/fuselage": ^0.50.1 + "@rocket.chat/fuselage": ^0.51.1 "@rocket.chat/fuselage-tokens": ^0.33.0 "@rocket.chat/message-parser": "workspace:^" "@rocket.chat/styled": ~0.31.25 @@ -8891,10 +8891,10 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/icons@npm:^0.33.0": - version: 0.33.0 - resolution: "@rocket.chat/icons@npm:0.33.0" - checksum: 83dcc3fe1ad8faa21168216bd3822316bb760cee0da2e51b61e99519aa6cd9426a425304cbb2ff85b6ef0c16e448885964ec89bd37478b66aeb9671521ed4857 +"@rocket.chat/icons@npm:^0.34.0": + version: 0.34.0 + resolution: "@rocket.chat/icons@npm:0.34.0" + checksum: d84af3174b3ba75639be8ebbe31a4bb5ca6467a9d2a3db6e4d38589dfa378f0fdb118fd337dd938dfb0f8fd493352e53102956e96f310b6dbcb69d3b72a3266c languageName: node linkType: hard @@ -9178,15 +9178,15 @@ __metadata: "@rocket.chat/favicon": "workspace:^" "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2 "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3 - "@rocket.chat/fuselage": ^0.50.1 + "@rocket.chat/fuselage": ^0.51.1 "@rocket.chat/fuselage-hooks": ^0.33.0 "@rocket.chat/fuselage-polyfills": ~0.31.25 - "@rocket.chat/fuselage-toastbar": ~0.31.25 + "@rocket.chat/fuselage-toastbar": ^0.31.26 "@rocket.chat/fuselage-tokens": ^0.33.0 "@rocket.chat/fuselage-ui-kit": "workspace:^" "@rocket.chat/gazzodown": "workspace:^" "@rocket.chat/i18n": "workspace:^" - "@rocket.chat/icons": ^0.33.0 + "@rocket.chat/icons": ^0.34.0 "@rocket.chat/instance-status": "workspace:^" "@rocket.chat/jwt": "workspace:^" "@rocket.chat/layout": ~0.31.26 @@ -10058,7 +10058,7 @@ __metadata: resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar" dependencies: "@babel/core": ~7.22.20 - "@rocket.chat/fuselage": ^0.50.1 + "@rocket.chat/fuselage": ^0.51.1 "@rocket.chat/ui-contexts": "workspace:^" "@types/babel__core": ~7.20.3 "@types/react": ~17.0.69 @@ -10084,9 +10084,9 @@ __metadata: "@babel/core": ~7.22.20 "@react-aria/toolbar": ^3.0.0-beta.1 "@rocket.chat/css-in-js": ~0.31.25 - "@rocket.chat/fuselage": ^0.50.1 + "@rocket.chat/fuselage": ^0.51.1 "@rocket.chat/fuselage-hooks": ^0.33.0 - "@rocket.chat/icons": ^0.33.0 + "@rocket.chat/icons": ^0.34.0 "@rocket.chat/mock-providers": "workspace:^" "@rocket.chat/ui-contexts": "workspace:~" "@storybook/addon-actions": ~6.5.16 @@ -10137,8 +10137,8 @@ __metadata: "@babel/core": ~7.22.20 "@react-aria/toolbar": ^3.0.0-beta.1 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.50.1 - "@rocket.chat/icons": ^0.33.0 + "@rocket.chat/fuselage": ^0.51.1 + "@rocket.chat/icons": ^0.34.0 "@storybook/addon-actions": ~6.5.16 "@storybook/addon-docs": ~6.5.16 "@storybook/addon-essentials": ~6.5.16 @@ -10229,9 +10229,9 @@ __metadata: resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming" dependencies: "@rocket.chat/css-in-js": ~0.31.25 - "@rocket.chat/fuselage": ^0.50.1 + "@rocket.chat/fuselage": ^0.51.1 "@rocket.chat/fuselage-hooks": ^0.33.0 - "@rocket.chat/icons": ^0.33.0 + "@rocket.chat/icons": ^0.34.0 "@rocket.chat/ui-contexts": "workspace:~" "@storybook/addon-actions": ~6.5.16 "@storybook/addon-docs": ~6.5.16 @@ -10272,9 +10272,9 @@ __metadata: "@rocket.chat/css-in-js": ~0.31.25 "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.50.1 + "@rocket.chat/fuselage": ^0.51.1 "@rocket.chat/fuselage-hooks": ^0.33.0 - "@rocket.chat/icons": ^0.33.0 + "@rocket.chat/icons": ^0.34.0 "@rocket.chat/styled": ~0.31.25 "@rocket.chat/ui-avatar": "workspace:^" "@rocket.chat/ui-contexts": "workspace:^" @@ -10317,13 +10317,13 @@ __metadata: "@codemirror/tooltip": ^0.19.16 "@lezer/highlight": ^1.1.6 "@rocket.chat/css-in-js": ~0.31.25 - "@rocket.chat/fuselage": ^0.50.1 + "@rocket.chat/fuselage": ^0.51.1 "@rocket.chat/fuselage-hooks": ^0.33.0 "@rocket.chat/fuselage-polyfills": ~0.31.25 - "@rocket.chat/fuselage-toastbar": ^0.31.25 + "@rocket.chat/fuselage-toastbar": ^0.31.26 "@rocket.chat/fuselage-tokens": ^0.33.0 "@rocket.chat/fuselage-ui-kit": "workspace:~" - "@rocket.chat/icons": ^0.33.0 + "@rocket.chat/icons": ^0.34.0 "@rocket.chat/logo": ^0.31.29 "@rocket.chat/styled": ~0.31.25 "@rocket.chat/ui-avatar": "workspace:^" @@ -36184,7 +36184,7 @@ __metadata: "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": ~0.31.25 - "@rocket.chat/icons": ^0.33.0 + "@rocket.chat/icons": ^0.34.0 "@rocket.chat/message-parser": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^"