Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Giridharan002 committed Apr 4, 2024
2 parents 23741d8 + 3fff1ae commit 4bfc923
Show file tree
Hide file tree
Showing 276 changed files with 5,756 additions and 12,922 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
- build-and-test
environment:
name: github-pages
url: "https://rocketchat.github.io/Rocket.Chat.Fuselage/fuselage/${{ needs.build-and-test.outputs.branch-name }}"
url: "https://rocketchat.github.io/fuselage/fuselage/${{ needs.build-and-test.outputs.branch-name }}"
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr-opened.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
name: storybooks
path: packages
- run: |
rm -rf "fuselage/${{ needs.download-artifact.outputs.pr-number }}" "layout/${{ needs.download-artifact.outputs.pr-number }}" "uikit-playground/${{ needs.download-artifact.outputs.pr-number }}" "fuselage-ui-kit/${{ needs.download-artifact.outputs.pr-number }}" "onboarding-ui/${{ needs.download-artifact.outputs.pr-number }}"
rm -rf "fuselage/${{ needs.download-artifact.outputs.pr-number }}" "layout/${{ needs.download-artifact.outputs.pr-number }}" "uikit-playground/${{ needs.download-artifact.outputs.pr-number }}" "onboarding-ui/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/fuselage/storybook-static "fuselage/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/onboarding-ui/storybook-static "onboarding-ui/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/layout/storybook-static "layout/${{ needs.download-artifact.outputs.pr-number }}"
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@
| 📦 [`@rocket.chat/string-helpers`](/packages/string-helpers) | Helper functions for string manipulation | [![npm](https://img.shields.io/npm/v/@rocket.chat/string-helpers?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/string-helpers) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/string-helpers?style=flat-square) |
| 📦 [`@rocket.chat/styled`](/packages/styled) | A simple styled API for React components | [![npm](https://img.shields.io/npm/v/@rocket.chat/styled?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/styled) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/styled?style=flat-square) |
| 📦 [`@rocket.chat/stylis-logical-props-middleware`](/packages/stylis-logical-props-middleware) | Stylis middleware to handle CSS Logical Properties and their fallbacks | [![npm](https://img.shields.io/npm/v/@rocket.chat/stylis-logical-props-middleware?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/stylis-logical-props-middleware) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/stylis-logical-props-middleware?style=flat-square) |
| 📦 [`@rocket.chat/ui-kit`](/packages/ui-kit) | Interactive UI elements for Rocket.Chat Apps | [![npm](https://img.shields.io/npm/v/@rocket.chat/ui-kit?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/ui-kit) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/ui-kit?style=flat-square) |
6 changes: 6 additions & 0 deletions packages/fuselage-hooks/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 0.33.1

### Patch Changes

- [#1334](https://github.com/RocketChat/fuselage/pull/1334) [`35155404b`](https://github.com/RocketChat/fuselage/commit/35155404baeb1e44aa1e4d767f431204d3ab2b53) Thanks [@dougfabris](https://github.com/dougfabris)! - fix(fuselage-hooks): increase usePosition zIndex

## 0.33.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/fuselage-hooks/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/fuselage-hooks",
"version": "0.33.0",
"version": "0.33.1",
"description": "React hooks for Fuselage, Rocket.Chat's design system and UI toolkit",
"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
"author": {
Expand Down
4 changes: 2 additions & 2 deletions packages/fuselage-hooks/src/usePosition/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export function getPositionStyle({
[positionKey]: point,
[variantKey]: variantPoint,
position: 'fixed',
zIndex: 9999,
zIndex: 999999,
opacity: 1,
},
placement: `${keysToPlacementMap[placementAttempt]}-${keysToPlacementMap[v]}`,
Expand Down Expand Up @@ -166,11 +166,11 @@ export function getPositionStyle({
top: point,
left: variantPoint,
position: 'fixed',
zIndex: 999999,
...(bottom < targetRect.height + point && {
bottom: margin,
overflowY: 'auto',
}),
...({ zIndex: '9999' } as any),
},
placement: `${keysToPlacementMap[placementAttempt]}-${
keysToPlacementMap[variantsAttempts[0]]
Expand Down
7 changes: 7 additions & 0 deletions packages/fuselage-toastbar/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# @rocket.chat/fuselage-toastbar

## 0.31.26

### Patch Changes

- [#1323](https://github.com/RocketChat/fuselage/pull/1323) [`9ccc4e79f`](https://github.com/RocketChat/fuselage/commit/9ccc4e79f76c1ef2b182065883bd66a91860bc96) Thanks [@dougfabris](https://github.com/dougfabris)! - feat(icons): New circle-unfilled
2 changes: 1 addition & 1 deletion packages/fuselage-toastbar/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/fuselage-toastbar",
"version": "0.31.25",
"version": "0.31.26",
"description": "Fuselage ToastBar component",
"keywords": [
"rocketchat",
Expand Down
6 changes: 6 additions & 0 deletions packages/fuselage-tokens/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 0.33.0

### Minor Changes

- [#1289](https://github.com/RocketChat/fuselage/pull/1289) [`a40d471bd`](https://github.com/RocketChat/fuselage/commit/a40d471bdf71babf652f5df3108a05d92f08d975) Thanks [@juliajforesti](https://github.com/juliajforesti)! - feat(fuselage): new `PaletteStyleTag` component

## 0.32.0

### Minor Changes
Expand Down
6 changes: 5 additions & 1 deletion packages/fuselage-tokens/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,15 @@ StyleDictionary.registerFormat({
const exp = /[a-z]+\/([a-z]+)\/[a-z]+.json/i;
const [, group] = dictionary.allTokens[0].filePath.match(exp);
const newPaletteGroup = [
'badge',
'background',
'surface',
'stroke',
'shadow',
'button',
'text',
'font',
'status',
'statusBullet',
];

if (newPaletteGroup.includes(group)) {
Expand Down
4 changes: 3 additions & 1 deletion packages/fuselage-tokens/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ module.exports = {
tokenCategory === 'breakpoints' || tokenCategory === 'colors'
? customFormat
: 'json/nested',
filter: (token) => token.filePath.includes(tokenCategory),
filter: (token) =>
// console.log(token.filePath.includes(tokenCategory), tokenCategory);
token.filePath.includes(tokenCategory),
};
}),
},
Expand Down
2 changes: 1 addition & 1 deletion packages/fuselage-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/fuselage-tokens",
"version": "0.32.0",
"version": "0.33.0",
"description": "Design tokens for Fuselage, Rocket.Chat's design system",
"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
"author": {
Expand Down
25 changes: 25 additions & 0 deletions packages/fuselage-tokens/src/badge/base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"badge": {
"light": {
"level-0": { "value": "{colors.n400}" },
"level-1": { "value": "{colors.n700}" },
"level-2": { "value": "{colors.b500}" },
"level-3": { "value": "{colors.o500}" },
"level-4": { "value": "{colors.r500}" }
},
"high-contrast": {
"level-0": { "value": "{colors.n400}" },
"level-1": { "value": "{colors.n800}" },
"level-2": { "value": "{colors.b700}" },
"level-3": { "value": "{colors.o900}" },
"level-4": { "value": "{colors.r800}" }
},
"dark": {
"level-0": { "value": "#404754" },
"level-1": { "value": "#484C51" },
"level-2": { "value": "#2C65BA" },
"level-3": { "value": "#955828" },
"level-4": { "value": "#B43C4C" }
}
}
}
195 changes: 130 additions & 65 deletions packages/fuselage-tokens/src/button/base.json
Original file line number Diff line number Diff line change
@@ -1,77 +1,142 @@
{
"button": {
"backgroundPrimaryDefault": { "value": "{colors.b500}" },
"backgroundPrimaryHover": { "value": "{colors.b600}" },
"backgroundPrimaryPress": { "value": "{colors.b700}" },
"backgroundPrimaryFocus": { "value": "{colors.b500}" },
"backgroundPrimaryKeyfocus": { "value": "{colors.b500}" },
"backgroundPrimaryDisabled": { "value": "{colors.b200}" },
"fontOnPrimary": { "value": "{colors.white}" },
"fontOnPrimaryDisabled": { "value": "{colors.white}" },
"light": {
"backgroundPrimaryDefault": { "value": "{colors.b500}" },
"backgroundPrimaryHover": { "value": "{colors.b600}" },
"backgroundPrimaryPress": { "value": "{colors.b700}" },
"backgroundPrimaryFocus": { "value": "{colors.b500}" },
"backgroundPrimaryKeyfocus": { "value": "{colors.b500}" },
"backgroundPrimaryDisabled": { "value": "{colors.b200}" },
"fontOnPrimary": { "value": "{colors.white}" },
"fontOnPrimaryDisabled": { "value": "{colors.white}" },

"backgroundSecondaryDefault": { "value": "{colors.n400}" },
"backgroundSecondaryHover": { "value": "{colors.n500}" },
"backgroundSecondaryPress": { "value": "{colors.n600}" },
"backgroundSecondaryFocus": { "value": "{colors.n400}" },
"backgroundSecondaryKeyfocus": { "value": "{colors.n400}" },
"backgroundSecondaryDisabled": { "value": "{colors.n300}" },
"fontOnSecondary": { "value": "{colors.n900}" },
"fontOnSecondaryDisabled": { "value": "{colors.n500}" },
"backgroundSecondaryDefault": { "value": "{colors.n400}" },
"backgroundSecondaryHover": { "value": "{colors.n500}" },
"backgroundSecondaryPress": { "value": "{colors.n600}" },
"backgroundSecondaryFocus": { "value": "{colors.n400}" },
"backgroundSecondaryKeyfocus": { "value": "{colors.n400}" },
"backgroundSecondaryDisabled": { "value": "{colors.n300}" },
"fontOnSecondary": { "value": "{colors.n900}" },
"fontOnSecondaryDisabled": { "value": "{colors.n500}" },

"backgroundSecondaryDangerDefault": { "value": "{colors.n400}" },
"backgroundSecondaryDangerHover": { "value": "{colors.n500}" },
"backgroundSecondaryDangerPress": { "value": "{colors.n600}" },
"backgroundSecondaryDangerFocus": { "value": "{colors.n400}" },
"backgroundSecondaryDangerKeyfocus": { "value": "{colors.n400}" },
"backgroundSecondaryDangerDisabled": { "value": "{colors.n300}" },
"fontOnSecondaryDanger": { "value": "{colors.r700}" },
"onSecondaryDangerDisabled": { "value": "{colors.r300}" },
"backgroundSecondaryDangerDefault": { "value": "{colors.n400}" },
"backgroundSecondaryDangerHover": { "value": "{colors.n500}" },
"backgroundSecondaryDangerPress": { "value": "{colors.n600}" },
"backgroundSecondaryDangerFocus": { "value": "{colors.n400}" },
"backgroundSecondaryDangerKeyfocus": { "value": "{colors.n400}" },
"backgroundSecondaryDangerDisabled": { "value": "{colors.n300}" },
"fontOnSecondaryDanger": { "value": "{colors.r700}" },
"onSecondaryDangerDisabled": { "value": "{colors.r300}" },

"backgroundDangerDefault": { "value": "{colors.r500}" },
"backgroundDangerHover": { "value": "{colors.r600}" },
"backgroundDangerPress": { "value": "{colors.r700}" },
"backgroundDangerFocus": { "value": "{colors.r500}" },
"backgroundDangerKeyfocus": { "value": "{colors.r500}" },
"backgroundDangerDisabled": { "value": "{colors.r200}" },
"fontOnDanger": { "value": "{colors.white}" },
"fontOnDangerDisabled": { "value": "{colors.white}" },
"backgroundDangerDefault": { "value": "{colors.r500}" },
"backgroundDangerHover": { "value": "{colors.r600}" },
"backgroundDangerPress": { "value": "{colors.r700}" },
"backgroundDangerFocus": { "value": "{colors.r500}" },
"backgroundDangerKeyfocus": { "value": "{colors.r500}" },
"backgroundDangerDisabled": { "value": "{colors.r200}" },
"fontOnDanger": { "value": "{colors.white}" },
"fontOnDangerDisabled": { "value": "{colors.white}" },

"backgroundWarningDefault": { "value": "{colors.y400}" },
"backgroundWarningHover": { "value": "{colors.y500}" },
"backgroundWarningPress": { "value": "{colors.y600}" },
"backgroundWarningFocus": { "value": "{colors.y400}" },
"backgroundWarningKeyfocus": { "value": "{colors.y400}" },
"backgroundWarningDisabled": { "value": "{colors.y200}" },
"fontOnWarning": { "value": "{colors.n900}" },
"fontOnWarningDisabled": { "value": "{colors.n600}" },
"backgroundSuccessDefault": { "value": "{colors.g500}" },
"backgroundSuccessHover": { "value": "{colors.g600}" },
"backgroundSuccessPress": { "value": "{colors.g700}" },
"backgroundSuccessFocus": { "value": "{colors.g500}" },
"backgroundSuccessKeyfocus": { "value": "{colors.g500}" },
"backgroundSuccessDisabled": { "value": "{colors.g200}" },
"fontOnSuccess": { "value": "{colors.n900}" },
"fontOnSuccessDisabled": { "value": "{colors.white}" }
},
"high-contrast": {
"backgroundPrimaryDefault": { "value": "{colors.b700}" },
"backgroundPrimaryHover": { "value": "{colors.b800}" },
"backgroundPrimaryPress": { "value": "{colors.b900}" },
"backgroundPrimaryFocus": { "value": "{colors.b700}" },
"backgroundPrimaryKeyfocus": { "value": "{colors.b700}" },
"backgroundPrimaryDisabled": { "value": "{colors.b200}" },
"fontOnPrimary": { "value": "{colors.white}" },
"fontOnPrimaryDisabled": { "value": "{colors.white}" },

"backgroundSecondaryWarningDefault": { "value": "{colors.n400}" },
"backgroundSecondaryWarningHover": { "value": "{colors.n500}" },
"backgroundSecondaryWarningPress": { "value": "{colors.n600}" },
"backgroundSecondaryWarningFocus": { "value": "{colors.n400}" },
"backgroundSecondaryWarningKeyfocus": { "value": "{colors.n400}" },
"backgroundSecondaryWarningDisabled": { "value": "{colors.n300}" },
"fontOnSecondaryWarning": { "value": "{colors.y900}" },
"fontOnSecondaryWarningDisabled": { "value": "{colors.y600}" },
"backgroundSecondaryDefault": { "value": "{colors.n400}" },
"backgroundSecondaryHover": { "value": "{colors.n500}" },
"backgroundSecondaryPress": { "value": "{colors.n600}" },
"backgroundSecondaryFocus": { "value": "{colors.n400}" },
"backgroundSecondaryKeyfocus": { "value": "{colors.n400}" },
"backgroundSecondaryDisabled": { "value": "{colors.n300}" },
"fontOnSecondary": { "value": "{colors.n900}" },
"fontOnSecondaryDisabled": { "value": "{colors.n500}" },

"backgroundSuccessDefault": { "value": "{colors.g500}" },
"backgroundSuccessHover": { "value": "{colors.g600}" },
"backgroundSuccessPress": { "value": "{colors.g700}" },
"backgroundSuccessFocus": { "value": "{colors.g500}" },
"backgroundSuccessKeyfocus": { "value": "{colors.g500}" },
"backgroundSuccessDisabled": { "value": "{colors.g200}" },
"fontOnSuccess": { "value": "{colors.n900}" },
"fontOnSuccessDisabled": { "value": "{colors.white}" },
"backgroundSecondaryDangerDefault": { "value": "{colors.n400}" },
"backgroundSecondaryDangerHover": { "value": "{colors.n500}" },
"backgroundSecondaryDangerPress": { "value": "{colors.n600}" },
"backgroundSecondaryDangerFocus": { "value": "{colors.n400}" },
"backgroundSecondaryDangerKeyfocus": { "value": "{colors.n400}" },
"backgroundSecondaryDangerDisabled": { "value": "{colors.n300}" },
"fontOnSecondaryDanger": { "value": "{colors.r900}" },
"onSecondaryDangerDisabled": { "value": "{colors.r300}" },

"backgroundSecondarySuccessDefault": { "value": "{colors.n400}" },
"backgroundSecondarySuccessHover": { "value": "{colors.n500}" },
"backgroundSecondarySuccessPress": { "value": "{colors.n600}" },
"backgroundSecondarySuccessFocus": { "value": "{colors.n400}" },
"backgroundSecondarySuccessKeyfocus": { "value": "{colors.n400}" },
"backgroundSecondarySuccessDisabled": { "value": "{colors.n300}" },
"fontOnSecondarySuccess": { "value": "{colors.g900}" },
"fontOnSecondarySuccessDisabled": { "value": "{colors.g400}" },
"backgroundDangerDefault": { "value": "{colors.r800}" },
"backgroundDangerHover": { "value": "{colors.r900}" },
"backgroundDangerPress": { "value": "{colors.r900}" },
"backgroundDangerFocus": { "value": "{colors.r800}" },
"backgroundDangerKeyfocus": { "value": "{colors.r800}" },
"backgroundDangerDisabled": { "value": "{colors.r200}" },
"fontOnDanger": { "value": "{colors.white}" },
"fontOnDangerDisabled": { "value": "{colors.white}" },

"onDisabled": { "value": "{colors.n600}" }
"backgroundSuccessDefault": { "value": "{colors.g500}" },
"backgroundSuccessHover": { "value": "{colors.g600}" },
"backgroundSuccessPress": { "value": "{colors.g700}" },
"backgroundSuccessFocus": { "value": "{colors.g500}" },
"backgroundSuccessKeyfocus": { "value": "{colors.g500}" },
"backgroundSuccessDisabled": { "value": "{colors.g200}" },
"fontOnSuccess": { "value": "{colors.n900}" },
"fontOnSuccessDisabled": { "value": "{colors.white}" }
},
"dark": {
"backgroundPrimaryDefault": { "value": "#095AD2" },
"backgroundPrimaryHover": { "value": "#10529E" },
"backgroundPrimaryPress": { "value": "#01336B" },
"backgroundPrimaryFocus": { "value": "#095AD2" },
"backgroundPrimaryKeyfocus": { "value": "#095AD2" },
"backgroundPrimaryDisabled": { "value": "#012247" },
"fontOnPrimary": { "value": "#FFFFFF" },
"fontOnPrimaryDisabled": { "value": "#6C727A" },

"backgroundSecondaryDefault": { "value": "#353B45" },
"backgroundSecondaryHover": { "value": "#404754" },
"backgroundSecondaryPress": { "value": "#4C5362" },
"backgroundSecondaryFocus": { "value": "#353B45" },
"backgroundSecondaryKeyfocus": { "value": "#353B45" },
"backgroundSecondaryDisabled": { "value": "#353B45" },
"fontOnSecondary": { "value": "#E4E7EA" },
"fontOnSecondaryDisabled": { "value": "#6C727A" },

"backgroundSecondaryDangerDefault": { "value": "#353B45" },
"backgroundSecondaryDangerHover": { "value": "#404754" },
"backgroundSecondaryDangerPress": { "value": "#4C5362" },
"backgroundSecondaryDangerFocus": { "value": "#353B45" },
"backgroundSecondaryDangerKeyfocus": { "value": "#353B45" },
"backgroundSecondaryDangerDisabled": { "value": "#353B45" },
"fontOnSecondaryDanger": { "value": "#FFC1C9" },
"onSecondaryDangerDisabled": { "value": "#6B0513" },

"backgroundDangerDefault": { "value": "#BB3E4E" },
"backgroundDangerHover": { "value": "#95323F" },
"backgroundDangerPress": { "value": "#822C37" },
"backgroundDangerFocus": { "value": "#BB3E4E" },
"backgroundDangerKeyfocus": { "value": "#BB3E4E" },
"backgroundDangerDisabled": { "value": "#3D2126" },
"fontOnDanger": { "value": "#FFFFFF" },
"fontOnDangerDisabled": { "value": "#757575" },

"backgroundSuccessDefault": { "value": "#1D7256" },
"backgroundSuccessHover": { "value": "#175943" },
"backgroundSuccessPress": { "value": "#134937" },
"backgroundSuccessFocus": { "value": "#1D7256" },
"backgroundSuccessKeyfocus": { "value": "#1D7256" },
"backgroundSuccessDisabled": { "value": "#1E4B40" },
"fontOnSuccess": { "value": "#FFFFFF" },
"fontOnSuccessDisabled": { "value": "#757575" }
}
}
}

0 comments on commit 4bfc923

Please sign in to comment.