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
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
import { NavBarSection, NavBarGroup, NavBarDivider } from '@rocket.chat/fuselage';
import { NavBarSection, NavBarGroup } from '@rocket.chat/fuselage';
import { useUser, useLayout } from '@rocket.chat/ui-contexts';
import { useMediaCallAction } from '@rocket.chat/ui-voip';
import { useTranslation } from 'react-i18next';

import NavBarControlsWithData from './NavBarControlsWithData';
import { useOmnichannelEnabled } from '../../views/omnichannel/hooks/useOmnichannelEnabled';
import NavBarOmnichannelGroup from '../NavBarOmnichannelGroup';
import { NavBarItemLoginPage, NavBarItemAdministrationMenu, UserMenu } from '../NavBarSettingsToolbar';
import NavBarVoipGroup from '../NavBarVoipGroup';

const NavBarControlsSection = () => {
const { t } = useTranslation();
const user = useUser();

const { isMobile } = useLayout();

const showOmnichannel = useOmnichannelEnabled();
const callAction = useMediaCallAction();

if (isMobile) {
return (
<NavBarSection>
<NavBarControlsWithData />
<NavBarDivider />
{(showOmnichannel || callAction) && <NavBarControlsWithData />}
<NavBarGroup aria-label={t('Workspace_and_user_preferences')}>
<NavBarItemAdministrationMenu />
{user ? <UserMenu user={user} /> : <NavBarItemLoginPage />}
Expand All @@ -28,8 +31,8 @@ const NavBarControlsSection = () => {

return (
<NavBarSection>
<NavBarVoipGroup />
<NavBarOmnichannelGroup />
{callAction && <NavBarVoipGroup />}
{showOmnichannel && <NavBarOmnichannelGroup />}
<NavBarGroup aria-label={t('Workspace_and_user_preferences')}>
<NavBarItemAdministrationMenu />
{user ? <UserMenu user={user} /> : <NavBarItemLoginPage />}
Expand Down
10 changes: 6 additions & 4 deletions apps/meteor/client/NavBarV2/NavBarNavigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ const NavbarNavigation = () => {
<NavBarSearch />
</FocusScope>
{!isMobile && (
<NavBarGroup aria-label={t('History_navigation')}>
<NavBarItem title={t('Back_in_history')} onClick={() => navigate(-1)} icon='chevron-right' small />
<NavBarItem title={t('Forward_in_history')} onClick={() => navigate(1)} icon='chevron-left' small />
</NavBarGroup>
<Box mie={8}>
<NavBarGroup aria-label={t('History_navigation')}>
<NavBarItem title={t('Back_in_history')} onClick={() => navigate(-1)} icon='chevron-right' small />
<NavBarItem title={t('Forward_in_history')} onClick={() => navigate(1)} icon='chevron-left' small />
</NavBarGroup>
</Box>
)}
</Box>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NavBarDivider, NavBarGroup } from '@rocket.chat/fuselage';
import { NavBarGroup } from '@rocket.chat/fuselage';
import { useTranslation } from 'react-i18next';

import NavBarItemOmniChannelCallDialPad from './NavBarItemOmniChannelCallDialPad';
Expand All @@ -7,30 +7,21 @@ import NavBarItemOmnichannelContact from './NavBarItemOmnichannelContact';
import NavBarItemOmnichannelLivechatToggle from './NavBarItemOmnichannelLivechatToggle';
import NavBarItemOmnichannelQueue from './NavBarItemOmnichannelQueue';
import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext';
import { useOmnichannelEnabled } from '../../views/omnichannel/hooks/useOmnichannelEnabled';

const NavBarOmnichannelGroup = () => {
const { t } = useTranslation();
const showOmnichannel = useOmnichannelEnabled();

const isCallEnabled = useIsCallEnabled();
const isCallReady = useIsCallReady();

if (!showOmnichannel) {
return null;
}

return (
<>
<NavBarGroup aria-label={t('Omnichannel')}>
<NavBarItemOmnichannelQueue />
{isCallReady && <NavBarItemOmniChannelCallDialPad />}
<NavBarItemOmnichannelContact />
{isCallEnabled && <NavBarItemOmnichannelCallToggle />}
<NavBarItemOmnichannelLivechatToggle />
</NavBarGroup>
<NavBarDivider />
</>
<NavBarGroup aria-label={t('Omnichannel')}>
<NavBarItemOmnichannelQueue />
{isCallReady && <NavBarItemOmniChannelCallDialPad />}
<NavBarItemOmnichannelContact />
{isCallEnabled && <NavBarItemOmnichannelCallToggle />}
<NavBarItemOmnichannelLivechatToggle />
</NavBarGroup>
);
};

Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/client/NavBarV2/NavBarPagesSection.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NavBarDivider, NavBarGroup, NavBarSection } from '@rocket.chat/fuselage';
import { NavBarGroup, NavBarSection } from '@rocket.chat/fuselage';
import { useLayout } from '@rocket.chat/ui-contexts';

import NavBarPagesGroup from './NavBarPagesGroup';
Expand All @@ -14,7 +14,6 @@ const NavBarPagesSection = () => {
<NavBarGroup>
<SidebarTogglerV2 />
</NavBarGroup>
<NavBarDivider />
</>
)}
<NavBarPagesGroup />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NavBarDivider, NavBarGroup, NavBarItem } from '@rocket.chat/fuselage';
import { NavBarGroup, NavBarItem } from '@rocket.chat/fuselage';
import { useMediaCallAction } from '@rocket.chat/ui-voip';
import { useTranslation } from 'react-i18next';

Expand All @@ -11,12 +11,9 @@ const NavBarVoipGroup = () => {
}

return (
<>
<NavBarGroup aria-label={t('Voice_Call')}>
<NavBarItem title={callAction.title} icon={callAction.icon} onClick={() => callAction.action()} />;
</NavBarGroup>
<NavBarDivider />
</>
<NavBarGroup aria-label={t('Voice_Call')}>
<NavBarItem title={callAction.title} icon={callAction.icon} onClick={() => callAction.action()} />
</NavBarGroup>
);
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { CheckOption, Option, PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
import type { ComponentProps, ReactElement } from 'react';
import type { ComponentProps, ComponentPropsWithoutRef, ReactElement } from 'react';
import { memo, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';

Expand Down Expand Up @@ -53,7 +53,7 @@ const AutoCompleteDepartmentMultiple = ({
return [...departmentsItems, ...pending];
}, [departmentsItems, value]);

const renderItem = ({ label, value, ...props }: ComponentProps<typeof Option>): ReactElement => {
const renderItem = ({ label, value, ...props }: ComponentPropsWithoutRef<typeof Option>): ReactElement => {
if (withCheckbox) {
return (
<CheckOption
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Option } from '@rocket.chat/fuselage';
import { CheckOption, PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
import type { ComponentProps, ReactElement } from 'react';
import type { ComponentProps, ComponentPropsWithoutRef, ReactElement } from 'react';
import { memo, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';

Expand Down Expand Up @@ -31,7 +32,7 @@ const AutoCompleteMonitors = ({ value = [], onBlur, onChange, ...props }: AutoCo
endReached={() => fetchNextPage()}
onBlur={onBlur}
onChange={onChange}
renderItem={({ label, value, ...props }) => (
renderItem={({ label, value, ...props }: ComponentPropsWithoutRef<typeof Option>) => (
<CheckOption {...props} label={label} selected={value ? selectedValues.has(value) : false} />
)}
/>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"ws": "~8.18.3"
},
"devDependencies": {
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@types/cookie": "^0.5.4",
"@types/cookie-parser": "^1.4.9",
"@types/ejson": "^2.2.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
"@rocket.chat/federation-matrix": "workspace:^",
"@rocket.chat/federation-sdk": "0.3.0",
"@rocket.chat/freeswitch": "workspace:^",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-forms": "~0.1.0",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
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,13 +18,13 @@
"@lezer/highlight": "^1.2.1",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-toastbar": "^0.35.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/fuselage-ui-kit": "workspace:~",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/logo": "~0.32.3",
"@rocket.chat/styled": "~0.32.0",
"@rocket.chat/ui-avatar": "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 @@ -5,11 +5,11 @@
"devDependencies": {
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/ui-contexts": "workspace:~",
"@types/react": "~18.3.24",
"@types/react-dom": "~18.3.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/core-services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/federation-sdk": "0.3.0",
"@rocket.chat/http-router": "workspace:^",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/media-signaling": "workspace:^",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/models": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/core-typings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"/dist"
],
"dependencies": {
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~",
"typia": "~9.7.2"
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 @@ -53,11 +53,11 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/mock-providers": "workspace:^",
"@rocket.chat/styled": "~0.32.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/gazzodown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/styled": "~0.32.0",
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 @@ -22,8 +22,8 @@
},
"devDependencies": {
"@rocket.chat/eslint-config": "workspace:~",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/tsconfig": "workspace:*",
"@storybook/react": "^8.6.14",
"eslint": "~8.45.0",
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 @@ -6,11 +6,11 @@
"@babel/core": "~7.28.4",
"@rocket.chat/core-typings": "workspace:~",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/ui-contexts": "workspace:^",
"@types/react": "~18.3.24",
"@types/react-dom": "~18.3.7",
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 @@ -23,11 +23,11 @@
"@rocket.chat/core-typings": "workspace:~",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/mock-providers": "workspace:^",
"@rocket.chat/storybook-config": "workspace:~",
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 @@ -24,11 +24,11 @@
"@react-aria/toolbar": "^3.0.0-nightly.5042",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/tsconfig": "workspace:*",
"@storybook/addon-a11y": "^8.6.14",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@babel/plugin-transform-runtime": "~7.28.3",
"@babel/preset-env": "~7.28.3",
"@rocket.chat/eslint-config": "workspace:~",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/tsconfig": "workspace:*",
"@types/jest": "~30.0.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 @@ -24,11 +24,11 @@
"@babel/core": "~7.28.4",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/styled": "~0.32.0",
"@rocket.chat/tsconfig": "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 @@ -32,11 +32,11 @@
"@react-spectrum/test-utils": "~1.0.0-alpha.8",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/mock-providers": "workspace:~",
"@rocket.chat/styled": "~0.32.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 @@ -24,12 +24,12 @@
"@rocket.chat/core-typings": "workspace:~",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage": "~0.66.4",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/i18n": "workspace:~",
"@rocket.chat/icons": "~0.44.0",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/layout": "^0.33.1",
"@rocket.chat/mock-providers": "workspace:~",
"@rocket.chat/rest-typings": "workspace:~",
Expand Down
Loading
Loading