From afbc3b4d598b91fa30b4e72b825af5d0d8fb0f3f Mon Sep 17 00:00:00 2001 From: Abhinav Kumar Date: Thu, 19 Dec 2024 00:12:23 +0530 Subject: [PATCH 1/9] chore: refine formatting toolbar tooltips for clarity (#34088) --- .../ui-message/client/messageBox/messageBoxFormatting.ts | 4 ++-- .../CannedResponsesComposer/CannedResponsesComposer.tsx | 2 +- .../FormattingToolbarDropdown.tsx | 4 ++-- packages/i18n/src/locales/de.i18n.json | 3 --- packages/i18n/src/locales/en.i18n.json | 6 +++--- packages/i18n/src/locales/fi.i18n.json | 3 --- packages/i18n/src/locales/hi-IN.i18n.json | 3 --- packages/i18n/src/locales/nn.i18n.json | 1 - packages/i18n/src/locales/no.i18n.json | 1 - packages/i18n/src/locales/se.i18n.json | 3 --- packages/i18n/src/locales/sv.i18n.json | 3 --- 11 files changed, 8 insertions(+), 25 deletions(-) diff --git a/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts b/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts index 3c35d0fee301..49391d94c4b6 100644 --- a/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts +++ b/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts @@ -44,7 +44,7 @@ export const formattingButtons: ReadonlyArray = [ command: 'i', }, { - label: 'Strike', + label: 'Strikethrough', icon: 'strike', pattern: '~{{text}}~', }, @@ -54,7 +54,7 @@ export const formattingButtons: ReadonlyArray = [ pattern: '`{{text}}`', }, { - label: 'Multi_line', + label: 'Multi_line_code', icon: 'multiline', pattern: '```\n{{text}}\n``` ', }, diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx index 43d2b14d0628..f786328c0766 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx @@ -98,7 +98,7 @@ const CannedResponsesComposer = ({ onChange, ...props }: ComponentProps - + - + ); }; diff --git a/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx index b90d577524ba..2fb77f997e34 100644 --- a/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx +++ b/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx @@ -1,6 +1,6 @@ import type { INotificationDesktop } from '@rocket.chat/core-typings'; import type { SelectOption } from '@rocket.chat/fuselage'; -import { Accordion, Field, FieldLabel, FieldRow, FieldHint, Select, FieldGroup, ToggleSwitch, Button } from '@rocket.chat/fuselage'; +import { AccordionItem, Field, FieldLabel, FieldRow, FieldHint, Select, FieldGroup, ToggleSwitch, Button } from '@rocket.chat/fuselage'; import { useUniqueId } from '@rocket.chat/fuselage-hooks'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; import { useUserPreference, useSetting } from '@rocket.chat/ui-contexts'; @@ -93,7 +93,7 @@ const PreferencesNotificationsSection = () => { const enableMobileRingingId = useUniqueId(); return ( - + {t('Desktop_Notifications')} @@ -231,7 +231,7 @@ const PreferencesNotificationsSection = () => { )} - + ); }; diff --git a/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx index d88ecaa99dbe..8e9979578ca7 100644 --- a/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx +++ b/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx @@ -1,5 +1,5 @@ import type { SelectOption } from '@rocket.chat/fuselage'; -import { Accordion, Field, FieldLabel, FieldRow, Select, FieldGroup, ToggleSwitch, FieldHint, Slider } from '@rocket.chat/fuselage'; +import { AccordionItem, Field, FieldLabel, FieldRow, Select, FieldGroup, ToggleSwitch, FieldHint, Slider } from '@rocket.chat/fuselage'; import { useUniqueId } from '@rocket.chat/fuselage-hooks'; import { useTranslation, useCustomSound } from '@rocket.chat/ui-contexts'; import React from 'react'; @@ -21,7 +21,7 @@ const PreferencesSoundSection = () => { const voipRingerVolumeId = useUniqueId(); return ( - + {t('Master_volume')} @@ -150,7 +150,7 @@ const PreferencesSoundSection = () => { - + ); }; diff --git a/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx index edfece178e52..39ee0dbc747a 100644 --- a/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx +++ b/apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx @@ -1,4 +1,4 @@ -import { Accordion, Field, FieldLabel, FieldRow, NumberInput, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage'; +import { AccordionItem, Field, FieldLabel, FieldRow, NumberInput, FieldGroup, ToggleSwitch } from '@rocket.chat/fuselage'; import { useUniqueId } from '@rocket.chat/fuselage-hooks'; import React from 'react'; import { Controller, useFormContext } from 'react-hook-form'; @@ -12,7 +12,7 @@ const PreferencesUserPresenceSection = () => { const idleTimeLimit = useUniqueId(); return ( - + @@ -33,7 +33,7 @@ const PreferencesUserPresenceSection = () => { - + ); }; diff --git a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx index 45b0e4c5eb3f..af617336f0b3 100644 --- a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx +++ b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx @@ -1,4 +1,4 @@ -import { Box, Accordion, ButtonGroup, Button } from '@rocket.chat/fuselage'; +import { Box, Accordion, AccordionItem, ButtonGroup, Button } from '@rocket.chat/fuselage'; import { useUniqueId } from '@rocket.chat/fuselage-hooks'; import { useSetting, useTranslation, useUser } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; @@ -47,28 +47,28 @@ const AccountSecurityPage = (): ReactElement => { {allowPasswordChange && ( - + - + )} {(twoFactorTOTP || showEmailTwoFactor) && twoFactorEnabled && ( - + {twoFactorTOTP && } {showEmailTwoFactor && } - + )} {e2eEnabled && ( - - + )} diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx index ab92971db5ba..b7f02c5c8260 100644 --- a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx +++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx @@ -1,6 +1,7 @@ import type { IEmailInboxPayload } from '@rocket.chat/core-typings'; import { Accordion, + AccordionItem, Button, ButtonGroup, TextInput, @@ -191,7 +192,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac - + @@ -304,8 +305,8 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac {t('Only_Members_Selected_Department_Can_View_Channel')} - - + + @@ -426,8 +427,8 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac - - + + @@ -575,7 +576,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac - + diff --git a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx index 615fd20cf5a6..d4adff4c2a70 100644 --- a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx +++ b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx @@ -4,6 +4,7 @@ import { Box, ToggleSwitch, Accordion, + AccordionItem, Field, FieldGroup, FieldLabel, @@ -86,7 +87,7 @@ const AdminFeaturePreviewPage = () => { {grouppedFeaturesPreview?.map(([group, features], index) => ( - + {features.map((feature) => ( @@ -107,7 +108,7 @@ const AdminFeaturePreviewPage = () => { ))} - + ))} diff --git a/apps/meteor/client/views/admin/import/NewImportPage.tsx b/apps/meteor/client/views/admin/import/NewImportPage.tsx index 54de54e095dd..34ba161de9a0 100644 --- a/apps/meteor/client/views/admin/import/NewImportPage.tsx +++ b/apps/meteor/client/views/admin/import/NewImportPage.tsx @@ -185,7 +185,7 @@ function NewImportPage() { undefined; return ( - + router.navigate('/admin/import')}> {importer && ( diff --git a/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryItem.tsx b/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryItem.tsx index e823172cba8a..319ab49600ad 100644 --- a/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryItem.tsx +++ b/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryItem.tsx @@ -1,5 +1,5 @@ import type { IIntegrationHistory, Serialized } from '@rocket.chat/core-typings'; -import { Button, Icon, Box, Accordion, Field, FieldGroup, FieldLabel, FieldRow } from '@rocket.chat/fuselage'; +import { Button, Icon, Box, AccordionItem, Field, FieldGroup, FieldLabel, FieldRow } from '@rocket.chat/fuselage'; import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import { useMethod } from '@rocket.chat/ui-contexts'; import React from 'react'; @@ -51,7 +51,7 @@ const HistoryItem = ({ data }: { data: Serialized }) => { const errorStackCode = useHighlightedCode('json', JSON.stringify(errorStack || '', null, 2)); return ( - @@ -200,7 +200,7 @@ const HistoryItem = ({ data }: { data: Serialized }) => { )} - + ); }; diff --git a/apps/meteor/client/views/admin/settings/Setting/Setting.stories.tsx b/apps/meteor/client/views/admin/settings/Setting/Setting.stories.tsx index 7705c223491a..17aef33ab60a 100644 --- a/apps/meteor/client/views/admin/settings/Setting/Setting.stories.tsx +++ b/apps/meteor/client/views/admin/settings/Setting/Setting.stories.tsx @@ -15,13 +15,6 @@ export default { argTypesRegex: '^on.*', }, }, - decorators: [ - (fn) => ( -
-
{fn()}
-
- ), - ], } satisfies Meta; export const Default: StoryFn = (args) => ; diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.stories.tsx index 231d3d1a42b3..8c149c246506 100644 --- a/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.stories.tsx +++ b/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.stories.tsx @@ -10,7 +10,7 @@ export default { decorators: [ (fn) => (
-
+
{fn()}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.tsx index 39604cd1146e..5475841a8940 100644 --- a/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.tsx +++ b/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.tsx @@ -1,4 +1,5 @@ -import { Box, Button, Field, FieldLabel, FieldRow, Icon } from '@rocket.chat/fuselage'; +import { css } from '@rocket.chat/css-in-js'; +import { Box, Button, Field, FieldLabel, FieldRow, Icon, Palette } from '@rocket.chat/fuselage'; import { Random } from '@rocket.chat/random'; import { useToastMessageDispatch, useEndpoint, useTranslation, useUpload } from '@rocket.chat/ui-contexts'; import type { ChangeEventHandler, DragEvent, ReactElement, SyntheticEvent } from 'react'; @@ -54,13 +55,52 @@ function AssetSettingInput({ _id, label, value, asset, required, disabled, fileC } }; + const settingsFilePreview = css` + display: flex; + align-items: center; + + & input[type='file'] { + position: absolute !important; + z-index: 10000; + top: 0; + left: 0; + width: 100%; + height: 100%; + cursor: pointer; + opacity: 0; + + & * { + cursor: pointer; + } + } + + & .preview { + overflow: hidden; + width: 100px; + height: 40px; + margin-right: 0.75rem; + border-width: 1px; + border-color: ${Palette.stroke['stroke-light']}; + border-radius: 4px; + background-repeat: no-repeat; + background-position: center center; + background-size: contain; + + &.no-file { + display: flex; + align-items: center; + justify-content: center; + } + } + `; + return ( {label} -
+ {value?.url ? (
{t('Select_file')} - + )}
-
+ ); diff --git a/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx b/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx index 662dd2d52c9f..54363a2df112 100644 --- a/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx @@ -152,7 +152,7 @@ const SettingsGroupPage = ({ )} - {children} + {children} )} diff --git a/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPageSkeleton.tsx b/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPageSkeleton.tsx index ad6f93390c1d..a5c2e022299d 100644 --- a/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPageSkeleton.tsx +++ b/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPageSkeleton.tsx @@ -14,7 +14,7 @@ const SettingsGroupPageSkeleton = () => ( - + diff --git a/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx b/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx index de575dbad302..f1dc393b07b2 100644 --- a/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx +++ b/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSection.tsx @@ -1,5 +1,5 @@ import { isSetting, isSettingColor } from '@rocket.chat/core-typings'; -import { Accordion, Box, Button, FieldGroup } from '@rocket.chat/fuselage'; +import { AccordionItem, Box, Button, FieldGroup } from '@rocket.chat/fuselage'; import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; import type { ReactElement, ReactNode } from 'react'; @@ -71,7 +71,7 @@ function SettingsSection({ groupId, hasReset = true, sectionName, currentTab, so }; return ( - )} - + ); } diff --git a/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSectionSkeleton.tsx b/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSectionSkeleton.tsx index 69466eba374f..c47dd339170c 100644 --- a/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSectionSkeleton.tsx +++ b/apps/meteor/client/views/admin/settings/SettingsSection/SettingsSectionSkeleton.tsx @@ -1,4 +1,4 @@ -import { Accordion, Box, FieldGroup, Skeleton } from '@rocket.chat/fuselage'; +import { AccordionItem, Box, FieldGroup, Skeleton } from '@rocket.chat/fuselage'; import type { ReactElement } from 'react'; import React from 'react'; @@ -6,7 +6,7 @@ import SettingSkeleton from '../Setting/SettingSkeleton'; function SettingsSectionSkeleton(): ReactElement { return ( - }> + }> @@ -16,7 +16,7 @@ function SettingsSectionSkeleton(): ReactElement { ))} - + ); } diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx index 249bdab99616..63ea3c1d7c2b 100644 --- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx @@ -57,7 +57,7 @@ function VoipGroupPage({ _id, onClickBack, ...group }: VoipGroupPageProps) { ) : ( - + {sections.map((sectionName) => ( ))} diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx index aaf4f984c89e..79a25574116d 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx @@ -1,4 +1,4 @@ -import { Accordion, Box, Button, ButtonGroup, Callout, Grid } from '@rocket.chat/fuselage'; +import { Accordion, AccordionItem, Box, Button, ButtonGroup, Callout, Grid } from '@rocket.chat/fuselage'; import { useDebouncedValue, useSessionStorage } from '@rocket.chat/fuselage-hooks'; import { useSearchParameter, useRouter } from '@rocket.chat/ui-contexts'; import { t } from 'i18next'; @@ -131,9 +131,9 @@ const SubscriptionPage = () => { <> {showLicense && ( - + 
{JSON.stringify(licensesData, null, 2)}
- + )} diff --git a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx index 69644eda53f9..4bc791c74300 100644 --- a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx +++ b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx @@ -1,4 +1,4 @@ -import { Accordion } from '@rocket.chat/fuselage'; +import { Accordion, AccordionItem } from '@rocket.chat/fuselage'; import type { IInstance } from '@rocket.chat/rest-typings'; import React from 'react'; import { useTranslation } from 'react-i18next'; @@ -21,7 +21,7 @@ const InstancesModal = ({ instances = [], onClose }: InstancesModalProps) => { {instances.map(({ address, broadcastAuth, currentStatus, instanceRecord }) => ( - + {address} {broadcastAuth ? 'true' : 'false'} @@ -81,7 +81,7 @@ const InstancesModal = ({ instances = [], onClose }: InstancesModalProps) => { {formatDateAndTime(instanceRecord?._updatedAt)} - + ))} diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx index d1d258006a12..dbc8090c5c3f 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogsItem.tsx @@ -1,5 +1,5 @@ import type { ILogEntry } from '@rocket.chat/core-typings'; -import { Box, Accordion } from '@rocket.chat/fuselage'; +import { Box, AccordionItem } from '@rocket.chat/fuselage'; import React from 'react'; import { useTranslation } from 'react-i18next'; @@ -15,7 +15,7 @@ const AppLogsItem = ({ entries, instanceId, title, ...props }: AppLogsItemProps) const { t } = useTranslation(); return ( - + {instanceId && ( {t('Instance')}: {instanceId} @@ -24,7 +24,7 @@ const AppLogsItem = ({ entries, instanceId, title, ...props }: AppLogsItemProps) {entries.map(({ severity, timestamp, caller, args }, i) => ( ))} - + ); }; diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx index 3269c1113d0d..0b32af78b605 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleasesItem.tsx @@ -1,4 +1,4 @@ -import { Accordion, Box } from '@rocket.chat/fuselage'; +import { AccordionItem, Box } from '@rocket.chat/fuselage'; import DOMPurify from 'dompurify'; import type { ReactElement } from 'react'; import React from 'react'; @@ -36,13 +36,13 @@ const AppReleasesItem = ({ release, ...props }: ReleaseItemProps): ReactElement ); return ( - + {release.detailedChangelog?.rendered ? ( ) : ( {t('No_release_information_provided')} )} - + ); }; diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx index 79ccadf99a00..745d6b4efac9 100644 --- a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx +++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx @@ -4,6 +4,7 @@ import { TextInput, ToggleSwitch, Accordion, + AccordionItem, FieldGroup, InputBox, TextAreaInput, @@ -56,7 +57,7 @@ const AppearanceForm = () => { return ( - + @@ -155,9 +156,9 @@ const AppearanceForm = () => { - + - + {t('Title')} @@ -232,9 +233,9 @@ const AppearanceForm = () => { - + - + @@ -309,9 +310,9 @@ const AppearanceForm = () => { - + - + @@ -362,9 +363,9 @@ const AppearanceForm = () => { - + - + @@ -393,7 +394,7 @@ const AppearanceForm = () => { - + ); }; diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.tsx index a0a7b56c2ef3..f741013f3c7f 100644 --- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.tsx +++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.tsx @@ -1,4 +1,4 @@ -import { Box, Accordion, Icon, FieldGroup } from '@rocket.chat/fuselage'; +import { Box, AccordionItem, Icon, FieldGroup } from '@rocket.chat/fuselage'; import type { Keys as IconName } from '@rocket.chat/icons'; import type { ReactElement, ReactNode } from 'react'; import React, { memo } from 'react'; @@ -10,7 +10,7 @@ type NotificationByDeviceProps = { }; const NotificationByDevice = ({ device, icon, children }: NotificationByDeviceProps): ReactElement => ( - @@ -22,7 +22,7 @@ const NotificationByDevice = ({ device, icon, children }: NotificationByDevicePr data-qa-id={`${device}-notifications`} > {children} - + ); export default memo(NotificationByDevice); diff --git a/apps/meteor/client/views/room/modals/E2EEModals/DisableE2EEModal.tsx b/apps/meteor/client/views/room/modals/E2EEModals/DisableE2EEModal.tsx index e3b231fa9476..19626d708dcb 100644 --- a/apps/meteor/client/views/room/modals/E2EEModals/DisableE2EEModal.tsx +++ b/apps/meteor/client/views/room/modals/E2EEModals/DisableE2EEModal.tsx @@ -1,4 +1,4 @@ -import { Accordion, Box, Button } from '@rocket.chat/fuselage'; +import { Accordion, AccordionItem, Box, Button } from '@rocket.chat/fuselage'; import type { ReactElement } from 'react'; import React from 'react'; import { Trans, useTranslation } from 'react-i18next'; @@ -36,14 +36,14 @@ const DisableE2EEModal = ({ onConfirm, onCancel, roomType, canResetRoomKey, onRe {t('E2E_disable_encryption_reset_keys_description')} - + {t('E2E_reset_encryption_keys_description')} - + )} diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 5da653e2fa75..6120cc43b351 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -247,8 +247,8 @@ "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/favicon": "workspace:^", "@rocket.chat/freeswitch": "workspace:^", - "@rocket.chat/fuselage": "^0.59.4", - "@rocket.chat/fuselage-hooks": "^0.33.1", + "@rocket.chat/fuselage": "^0.60.0", + "@rocket.chat/fuselage-hooks": "^0.34.0", "@rocket.chat/fuselage-polyfills": "~0.31.25", "@rocket.chat/fuselage-toastbar": "^0.33.0", "@rocket.chat/fuselage-tokens": "^0.33.2", @@ -262,12 +262,12 @@ "@rocket.chat/license": "workspace:^", "@rocket.chat/log-format": "workspace:^", "@rocket.chat/logger": "workspace:^", - "@rocket.chat/logo": "^0.31.30", + "@rocket.chat/logo": "^0.31.31", "@rocket.chat/memo": "~0.31.25", "@rocket.chat/message-parser": "workspace:^", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", - "@rocket.chat/mp3-encoder": "0.24.0", + "@rocket.chat/mp3-encoder": "^0.31.26", "@rocket.chat/network-broker": "workspace:^", "@rocket.chat/omnichannel-services": "workspace:^", "@rocket.chat/onboarding-ui": "~0.34.0", diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json index b70bf3040f9e..c78ea9a974cd 100644 --- a/apps/uikit-playground/package.json +++ b/apps/uikit-playground/package.json @@ -17,14 +17,14 @@ "@lezer/highlight": "^1.2.1", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.59.4", - "@rocket.chat/fuselage-hooks": "^0.33.1", + "@rocket.chat/fuselage": "^0.60.0", + "@rocket.chat/fuselage-hooks": "^0.34.0", "@rocket.chat/fuselage-polyfills": "~0.31.25", "@rocket.chat/fuselage-toastbar": "^0.33.0", "@rocket.chat/fuselage-tokens": "^0.33.2", "@rocket.chat/fuselage-ui-kit": "workspace:~", "@rocket.chat/icons": "~0.39.0", - "@rocket.chat/logo": "^0.31.30", + "@rocket.chat/logo": "^0.31.31", "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-avatar": "workspace:^", "@rocket.chat/ui-contexts": "workspace:~", diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json index efc29260f7f1..65aa842ba39c 100644 --- a/ee/packages/ui-theming/package.json +++ b/ee/packages/ui-theming/package.json @@ -4,8 +4,8 @@ "private": true, "devDependencies": { "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.59.4", - "@rocket.chat/fuselage-hooks": "^0.33.1", + "@rocket.chat/fuselage": "^0.60.0", + "@rocket.chat/fuselage-hooks": "^0.34.0", "@rocket.chat/icons": "~0.39.0", "@rocket.chat/ui-contexts": "workspace:~", "@types/react": "~17.0.80", diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index d3d5bc4e53fa..493e72dfbfb7 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -52,8 +52,8 @@ "@rocket.chat/apps-engine": "workspace:^", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.59.4", - "@rocket.chat/fuselage-hooks": "^0.33.1", + "@rocket.chat/fuselage": "^0.60.0", + "@rocket.chat/fuselage-hooks": "^0.34.0", "@rocket.chat/fuselage-polyfills": "~0.31.25", "@rocket.chat/icons": "~0.39.0", "@rocket.chat/jest-presets": "workspace:~", diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index d494a478ac8c..178966af54d2 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -29,7 +29,7 @@ "@babel/core": "~7.26.0", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.59.4", + "@rocket.chat/fuselage": "^0.60.0", "@rocket.chat/fuselage-tokens": "^0.33.2", "@rocket.chat/jest-presets": "workspace:~", "@rocket.chat/message-parser": "workspace:^", diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 96913f82c650..4e01bb5acb0e 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -30,9 +30,9 @@ "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/ddp-client": "workspace:^", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage-hooks": "^0.33.1", + "@rocket.chat/fuselage-hooks": "^0.34.0", "@rocket.chat/fuselage-tokens": "^0.33.2", - "@rocket.chat/logo": "^0.31.30", + "@rocket.chat/logo": "^0.31.31", "@rocket.chat/ui-contexts": "workspace:^", "@storybook/addon-essentials": "^8.4.4", "@storybook/addon-styling-webpack": "~1.0.1", diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index 642ea1391e8a..ba3a92ca4264 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -4,7 +4,7 @@ "private": true, "devDependencies": { "@babel/core": "~7.26.0", - "@rocket.chat/fuselage": "^0.59.4", + "@rocket.chat/fuselage": "^0.60.0", "@rocket.chat/ui-contexts": "workspace:^", "@types/react": "~17.0.80", "@types/react-dom": "~17.0.25", diff --git a/packages/ui-avatar/src/components/BaseAvatar.tsx b/packages/ui-avatar/src/components/BaseAvatar.tsx index 80329946fd4b..72845a42ce5a 100644 --- a/packages/ui-avatar/src/components/BaseAvatar.tsx +++ b/packages/ui-avatar/src/components/BaseAvatar.tsx @@ -6,7 +6,7 @@ import { useState } from 'react'; export type BaseAvatarProps = Omit; -const BaseAvatar = ({ url, onLoad, onError, ...props }: BaseAvatarProps) => { +const BaseAvatar = ({ url, onLoad, onError, size, ...props }: BaseAvatarProps) => { const [unloaded, setUnloaded] = useState(false); const prevUrl = usePrevious(url); @@ -21,10 +21,10 @@ const BaseAvatar = ({ url, onLoad, onError, ...props }: BaseAvatarProps) => { }); if (unloaded && url === prevUrl) { - return
diff --git a/packages/ui-video-conf/src/VideoConfPopup/__snapshots__/VideoConfPopup.spec.tsx.snap b/packages/ui-video-conf/src/VideoConfPopup/__snapshots__/VideoConfPopup.spec.tsx.snap index 358cec7d7f7d..91cb7ba7f91b 100644 --- a/packages/ui-video-conf/src/VideoConfPopup/__snapshots__/VideoConfPopup.spec.tsx.snap +++ b/packages/ui-video-conf/src/VideoConfPopup/__snapshots__/VideoConfPopup.spec.tsx.snap @@ -33,7 +33,7 @@ exports[`renders StartCall without crashing 1`] = `