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
1 change: 0 additions & 1 deletion apps/meteor/client/components/UserStatusMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ const UserStatusMenu = ({
}
ref.current.focus();
show();
ref.current.classList.add('focus-visible');
}, [show]);

const handleSelection = useCallback(
Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/client/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import './meteor/overrides';
import './meteor/startup';
import './serviceWorker';

import('@rocket.chat/fuselage-polyfills')
.then(() => import('./meteor/login'))
import('./meteor/login')
.then(() => import('./ecdh'))
.then(() => import('./importPackages'))
.then(() => import('./startup'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const useSidebarListNavigation = () => {
'blur',
(e) => {
if (
!(e.relatedTarget as HTMLElement)?.classList.contains('focus-visible') ||
!(e.relatedTarget as HTMLElement)?.matches(':focus-visible') ||
!(e.currentTarget instanceof HTMLElement && e.relatedTarget instanceof HTMLElement)
) {
return;
Expand All @@ -80,7 +80,7 @@ export const useSidebarListNavigation = () => {
node.addEventListener(
'focus',
(e) => {
const triggeredByKeyboard = (e.target as HTMLElement)?.classList.contains('focus-visible');
const triggeredByKeyboard = (e.target as HTMLElement)?.matches(':focus-visible');
if (!triggeredByKeyboard || !(e.currentTarget instanceof HTMLElement && e.relatedTarget instanceof HTMLElement)) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const useSidebarListNavigation = () => {
'blur',
(e) => {
if (
!(e.relatedTarget as HTMLElement)?.classList.contains('focus-visible') ||
!(e.relatedTarget as HTMLElement)?.matches(':focus-visible') ||
!(e.currentTarget instanceof HTMLElement && e.relatedTarget instanceof HTMLElement)
) {
return;
Expand All @@ -84,7 +84,7 @@ export const useSidebarListNavigation = () => {
node.addEventListener(
'focus',
(e) => {
const triggeredByKeyboard = (e.target as HTMLElement)?.classList.contains('focus-visible');
const triggeredByKeyboard = (e.target as HTMLElement)?.matches(':focus-visible');
if (!triggeredByKeyboard || !(e.currentTarget instanceof HTMLElement && e.relatedTarget instanceof HTMLElement)) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ const ToneSelector = ({ tone, setTone }: { tone: number; setTone: (tone: number)
}
ref.current.focus();
show();
ref.current.classList.add('focus-visible');
}, [show]);

const handleSelection = useCallback(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const useSidebarListNavigation = () => {
'blur',
(e) => {
if (
!(e.relatedTarget as HTMLElement)?.classList.contains('focus-visible') ||
!(e.relatedTarget as HTMLElement)?.matches(':focus-visible') ||
!(e.currentTarget instanceof HTMLElement && e.relatedTarget instanceof HTMLElement)
) {
return;
Expand All @@ -85,7 +85,7 @@ export const useSidebarListNavigation = () => {
node.addEventListener(
'focus',
(e) => {
const triggeredByKeyboard = (e.target as HTMLElement)?.classList.contains('focus-visible');
const triggeredByKeyboard = (e.target as HTMLElement)?.matches(':focus-visible');
if (!triggeredByKeyboard || !(e.currentTarget instanceof HTMLElement && e.relatedTarget instanceof HTMLElement)) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const useMessageListNavigation = (): { messageListRef: RefCallback<HTMLEl
'blur',
(e) => {
if (
!(e.relatedTarget as HTMLElement)?.classList.contains('focus-visible') ||
!(e.relatedTarget as HTMLElement)?.matches(':focus-visible') ||
!(e.currentTarget instanceof HTMLElement && e.relatedTarget instanceof HTMLElement)
) {
return;
Expand All @@ -89,7 +89,7 @@ export const useMessageListNavigation = (): { messageListRef: RefCallback<HTMLEl
node.addEventListener(
'focus',
(e) => {
const triggeredByKeyboard = (e.target as HTMLElement)?.classList.contains('focus-visible');
const triggeredByKeyboard = (e.target as HTMLElement)?.matches(':focus-visible');
if (!triggeredByKeyboard || !(e.currentTarget instanceof HTMLElement && e.relatedTarget instanceof HTMLElement)) {
return;
}
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.45.0",
"@rocket.chat/icons": "~0.45.0",
"@types/cookie": "^0.5.4",
"@types/cookie-parser": "^1.4.10",
"@types/ejson": "^2.2.2",
Expand Down
11 changes: 5 additions & 6 deletions apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,10 @@
"@rocket.chat/federation-matrix": "workspace:^",
"@rocket.chat/federation-sdk": "0.3.0",
"@rocket.chat/freeswitch": "workspace:^",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage": "~0.68.1",
"@rocket.chat/fuselage-forms": "~0.1.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-toastbar": "^0.35.1",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-toastbar": "~0.35.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/fuselage-ui-kit": "workspace:^",
"@rocket.chat/gazzodown": "workspace:^",
Expand All @@ -267,7 +266,7 @@
"@rocket.chat/icons": "~0.45.0",
"@rocket.chat/instance-status": "workspace:^",
"@rocket.chat/jwt": "workspace:^",
"@rocket.chat/layout": "^0.33.1",
"@rocket.chat/layout": "~0.34.0",
"@rocket.chat/license": "workspace:^",
"@rocket.chat/log-format": "workspace:^",
"@rocket.chat/logger": "workspace:^",
Expand All @@ -285,7 +284,7 @@
"@rocket.chat/omni-core": "workspace:^",
"@rocket.chat/omni-core-ee": "workspace:^",
"@rocket.chat/omnichannel-services": "workspace:^",
"@rocket.chat/onboarding-ui": "^0.35.2",
"@rocket.chat/onboarding-ui": "~0.36.0",
"@rocket.chat/password-policies": "workspace:^",
"@rocket.chat/patch-injection": "workspace:^",
"@rocket.chat/pdf-worker": "workspace:^",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,19 @@ test.describe.serial('settings-persistence-on-ui-navigation', () => {

test.afterAll(({ api }) => setSettingValueById(api, 'Hide_System_Messages', []));

test('expect settings to persist in ui when navigating back and forth', async ({ page }) => {
const settingInput = await page.locator('[data-qa-setting-id="Hide_System_Messages"] input');
test.skip('expect settings to persist in ui when navigating back and forth', async ({ page }) => {
const settingInput = page.locator('[data-qa-setting-id="Hide_System_Messages"] input');
await settingInput.pressSequentially('User joined');
await settingInput.press('Enter');

const responsePromise = page.waitForResponse(
(response) => response.url().includes('/api/v1/method.call/saveSettings') && response.status() === 200,
);

await page.locator('button:has-text("Save changes")').click();
await page.locator('button[title="Back"]').click();

await page.waitForResponse((response) => response.url().includes('/api/v1/method.call/saveSettings') && response.status() === 200);
await responsePromise;

await page.locator('a[href="/admin/settings/Message"] >> text=Open').click();

Expand Down
9 changes: 4 additions & 5 deletions apps/uikit-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@
"@lezer/highlight": "^1.2.3",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "~0.31.25",
"@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.1",
"@rocket.chat/fuselage": "~0.68.1",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-toastbar": "~0.35.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/fuselage-ui-kit": "workspace:~",
"@rocket.chat/icons": "^0.45.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
2 changes: 1 addition & 1 deletion ee/packages/federation-matrix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "^0.31.25",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/federation-sdk": "0.3.0",
"@rocket.chat/http-router": "workspace:^",
"@rocket.chat/license": "workspace:^",
Expand Down
7 changes: 3 additions & 4 deletions ee/packages/ui-theming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
"devDependencies": {
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage": "~0.68.1",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/icons": "~0.45.0",
"@rocket.chat/ui-contexts": "workspace:~",
"@types/react": "~18.3.26",
"@types/react-dom": "~18.3.7",
Expand Down
5 changes: 1 addition & 4 deletions fuselage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ if [[ $action == "next-all" || $action == "latest-all" ]]; then
fi

echo "📦 @rocket.chat/emitter [UPDATING to $targetVersion version...]
📦 @rocket.chat/fuselage-polyfills [UPDATING to $targetVersion version...]
📦 @rocket.chat/fuselage-toastbar [UPDATING to $targetVersion version...]
📦 @rocket.chat/fuselage-tokens [UPDATING to $targetVersion version...]
📦 @rocket.chat/css-in-js [UPDATING to $targetVersion version...]
Expand All @@ -91,13 +90,11 @@ echo "📦 @rocket.chat/emitter [UPDATING to $targetVersion version...]
📦 @rocket.chat/icons [UPDATING to $targetVersion version...]
📦 @rocket.chat/logo [UPDATING to $targetVersion version...]
📦 @rocket.chat/memo [UPDATING to $targetVersion version...]
📦 @rocket.chat/message-parser [UPDATING to $targetVersion version...]
📦 @rocket.chat/onboarding-ui [UPDATING to $targetVersion version...]
📦 @rocket.chat/string-helpers [UPDATING to $targetVersion version...]
📦 @rocket.chat/layout [UPDATING to $targetVersion version...]
📦 @rocket.chat/message-parser [UPDATING to $targetVersion version...]"

eval "yarn up @rocket.chat/emitter@$targetVersion @rocket.chat/fuselage-polyfills@$targetVersion @rocket.chat/fuselage-toastbar@$targetVersion @rocket.chat/fuselage-tokens@$targetVersion @rocket.chat/css-in-js@$targetVersion @rocket.chat/styled@$targetVersion @rocket.chat/fuselage@$targetVersion @rocket.chat/fuselage-hooks@$targetVersion @rocket.chat/icons@$targetVersion @rocket.chat/logo@$targetVersion @rocket.chat/memo@$targetVersion @rocket.chat/message-parser@$targetVersion @rocket.chat/onboarding-ui@$targetVersion @rocket.chat/string-helpers@$targetVersion @rocket.chat/layout@$targetVersion @rocket.chat/message-parser@$targetVersion"
eval "yarn up @rocket.chat/emitter@$targetVersion @rocket.chat/fuselage-toastbar@$targetVersion @rocket.chat/fuselage-tokens@$targetVersion @rocket.chat/css-in-js@$targetVersion @rocket.chat/styled@$targetVersion @rocket.chat/fuselage@$targetVersion @rocket.chat/fuselage-hooks@$targetVersion @rocket.chat/icons@$targetVersion @rocket.chat/logo@$targetVersion @rocket.chat/memo@$targetVersion @rocket.chat/onboarding-ui@$targetVersion @rocket.chat/string-helpers@$targetVersion @rocket.chat/layout@$targetVersion"
exit 1
fi

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.45.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.45.0",
"@rocket.chat/icons": "~0.45.0",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~",
"typia": "~9.7.2"
Expand Down
7 changes: 3 additions & 4 deletions packages/gazzodown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage": "~0.68.1",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "^0.45.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
2 changes: 1 addition & 1 deletion packages/livechat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/ddp-client": "workspace:^",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/logo": "~0.32.3",
"@rocket.chat/ui-contexts": "workspace:^",
Expand Down
7 changes: 3 additions & 4 deletions packages/storybook-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"private": true,
"dependencies": {
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@storybook/addon-a11y": "^8.6.14",
"@storybook/addon-essentials": "^8.6.14",
Expand All @@ -22,8 +21,8 @@
},
"devDependencies": {
"@rocket.chat/eslint-config": "workspace:~",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/icons": "^0.45.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
7 changes: 3 additions & 4 deletions packages/ui-avatar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
"@babel/core": "~7.28.5",
"@rocket.chat/core-typings": "workspace:~",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage": "~0.68.1",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/icons": "~0.45.0",
"@rocket.chat/ui-contexts": "workspace:^",
"@types/react": "~18.3.26",
"@types/react-dom": "~18.3.7",
Expand Down
7 changes: 3 additions & 4 deletions packages/ui-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@
"@rocket.chat/core-typings": "workspace:~",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage": "~0.68.1",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/icons": "~0.45.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/mock-providers": "workspace:^",
"@rocket.chat/storybook-config": "workspace:~",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const HeaderTitleButton = ({ className, ...props }: { className?: string } & Com
cursor: pointer;
background-color: ${Palette.surface['surface-hover']};
}
&:focus.focus-visible {
&:focus-visible {
outline: 0;
box-shadow: 0 0 0 2px ${Palette.stroke['stroke-extra-light-highlight']};
border-color: ${Palette.stroke['stroke-highlight']};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const HeaderTitleButton = ({ className, ...props }: HeaderTitleButtonProps) => {
cursor: pointer;
background-color: ${Palette.surface['surface-hover']};
}
&:focus.focus-visible {
&:focus-visible {
outline: 0;
box-shadow: 0 0 0 2px ${Palette.stroke['stroke-extra-light-highlight']};
border-color: ${Palette.stroke['stroke-highlight']};
Expand Down
7 changes: 3 additions & 4 deletions packages/ui-composer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@
"@react-aria/toolbar": "^3.0.0-nightly.5042",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage": "~0.68.1",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "^0.45.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-contexts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/ddp-client": "workspace:~",
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/i18n": "workspace:~",
"@rocket.chat/jest-presets": "workspace:~",
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.5",
"@babel/preset-env": "~7.28.5",
"@rocket.chat/eslint-config": "workspace:~",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/icons": "~0.45.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/tsconfig": "workspace:*",
"@types/jest": "~30.0.0",
Expand Down
7 changes: 3 additions & 4 deletions packages/ui-video-conf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@
"@babel/core": "~7.28.5",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "^0.68.1",
"@rocket.chat/fuselage-hooks": "~0.37.2",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage": "~0.68.1",
"@rocket.chat/fuselage-hooks": "~0.38.1",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "^0.45.0",
"@rocket.chat/icons": "~0.45.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/styled": "~0.32.0",
"@rocket.chat/tsconfig": "workspace:*",
Expand Down
Loading
Loading