Skip to content

Commit

Permalink
Merge branch 'develop' into feat/new-user-panel-all
Browse files Browse the repository at this point in the history
  • Loading branch information
@kodiakhq
kodiakhq[bot] authored May 6, 2024
2 parents 063c633 + 7d5bdde commit ba02acb
Show file tree
Hide file tree
Showing 18 changed files with 70 additions and 58 deletions.
5 changes: 5 additions & 0 deletions .changeset/warm-squids-deliver.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Changes the scrollbar color in order to improve the contrast and accessibility compliance
5 changes: 5 additions & 0 deletions .changeset/young-yaks-suffer.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

bump fuselage adding `AttachmentAuthorName` missing color token
3 changes: 2 additions & 1 deletion apps/meteor/client/components/CustomScrollbars/CustomScrollbars.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Palette } from '@rocket.chat/fuselage';
import type { ScrollValues } from 'rc-scrollbars';
import { Scrollbars } from 'rc-scrollbars';
import type { MutableRefObject, CSSProperties, ReactNode, ReactElement } from 'react';
Expand Down Expand Up @@ -43,7 +44,7 @@ const CustomScrollbars = forwardRef<HTMLElement, CustomScrollbarsProps>(function
overflowX ? undefined : (props): ReactElement => <div {...props} className='track-horizontal' style={{ display: 'none' }} />
}
renderThumbVertical={({ style, ...props }): JSX.Element => (
<div {...props} style={{ ...style, backgroundColor: 'rgba(0, 0, 0, 0.5)', borderRadius: '7px' }} />
<div {...props} style={{ ...style, backgroundColor: Palette.stroke['stroke-dark'].toString(), borderRadius: '4px' }} />
)}
children={children}
ref={refSetter}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/services/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"ws": "^8.8.1"
},
"devDependencies": {
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/icons": "^0.35.0",
"@types/cookie": "^0.5.3",
"@types/cookie-parser": "^1.4.5",
"@types/ejson": "^2.2.1",
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.53.4",
"@rocket.chat/fuselage": "^0.53.6",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-toastbar": "^0.31.26",
"@rocket.chat/fuselage-tokens": "^0.33.1",
"@rocket.chat/fuselage-ui-kit": "workspace:^",
"@rocket.chat/gazzodown": "workspace:^",
"@rocket.chat/i18n": "workspace:^",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/icons": "^0.35.0",
"@rocket.chat/instance-status": "workspace:^",
"@rocket.chat/jwt": "workspace:^",
"@rocket.chat/layout": "~0.31.26",
Expand Down
2 changes: 2 additions & 0 deletions apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-tab-communication.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ test.describe('OC - Livechat - Cross Tab Communication', () => {
test.afterAll(async () => {
await poHomeOmnichannel.page?.close();
await agent.delete();
await pageLivechat1.page.close();
await pageLivechat2.page.close();
});

test('OC - Livechat - Send messages, close chat and start again 2 tabs', async () => {
Expand Down
4 changes: 2 additions & 2 deletions ee/packages/ui-theming/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"private": true,
"devDependencies": {
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/fuselage": "^0.53.4",
"@rocket.chat/fuselage": "^0.53.6",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/icons": "^0.35.0",
"@rocket.chat/ui-contexts": "workspace:~",
"@storybook/addon-actions": "~6.5.16",
"@storybook/addon-docs": "~6.5.16",
Expand Down
2 changes: 1 addition & 1 deletion packages/core-services/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dependencies": {
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/icons": "^0.35.0",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/core-typings/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
],
"dependencies": {
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/icons": "^0.35.0",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/fuselage-ui-kit/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
"@babel/preset-typescript": "~7.22.15",
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "^0.53.4",
"@rocket.chat/fuselage": "^0.53.6",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/icons": "^0.35.0",
"@rocket.chat/prettier-config": "~0.31.25",
"@rocket.chat/styled": "~0.31.25",
"@rocket.chat/ui-avatar": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/gazzodown/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.53.4",
"@rocket.chat/fuselage": "^0.53.6",
"@rocket.chat/fuselage-tokens": "^0.33.1",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/styled": "~0.31.25",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"/dist"
],
"type": "module",

"volta": {
"extends": "../../package.json"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-avatar/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"devDependencies": {
"@babel/core": "~7.22.20",
"@rocket.chat/fuselage": "^0.53.4",
"@rocket.chat/fuselage": "^0.53.6",
"@rocket.chat/ui-contexts": "workspace:^",
"@types/babel__core": "~7.20.3",
"@types/react": "~17.0.69",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.53.4",
"@rocket.chat/fuselage": "^0.53.6",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/icons": "^0.35.0",
"@rocket.chat/mock-providers": "workspace:^",
"@rocket.chat/ui-contexts": "workspace:~",
"@storybook/addon-actions": "~6.5.16",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-composer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.53.4",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/fuselage": "^0.53.6",
"@rocket.chat/icons": "^0.35.0",
"@storybook/addon-actions": "~6.5.16",
"@storybook/addon-docs": "~6.5.16",
"@storybook/addon-essentials": "~6.5.16",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-video-conf/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.53.4",
"@rocket.chat/fuselage": "^0.53.6",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/icons": "^0.35.0",
"@rocket.chat/styled": "~0.31.25",
"@rocket.chat/ui-avatar": "workspace:^",
"@rocket.chat/ui-contexts": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/uikit-playground/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.53.4",
"@rocket.chat/fuselage": "^0.53.6",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-toastbar": "^0.31.26",
"@rocket.chat/fuselage-tokens": "^0.33.1",
"@rocket.chat/fuselage-ui-kit": "workspace:~",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/icons": "^0.35.0",
"@rocket.chat/logo": "^0.31.30",
"@rocket.chat/styled": "~0.31.25",
"@rocket.chat/ui-avatar": "workspace:^",
Expand Down
Loading

0 comments on commit ba02acb

Please sign in to comment.