Skip to content

Commit

Permalink
Merge branch 'main' into feat/surface-sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
juliajforesti authored Oct 20, 2023
2 parents e81bcc7 + b3802c2 commit 044a0e8
Show file tree
Hide file tree
Showing 11 changed files with 170 additions and 44 deletions.
5 changes: 0 additions & 5 deletions .changeset/nine-tomatoes-appear.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/odd-clocks-love.md

This file was deleted.

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.32.0

### Minor Changes

- [#1128](https://github.com/RocketChat/fuselage/pull/1128) [`6db5cb214`](https://github.com/RocketChat/fuselage/commit/6db5cb2141bf42c9622c5846701e5b26392a1ada) Thanks [@juliajforesti](https://github.com/juliajforesti)! - feat(fuselage, fuselage-tokens): Update primitive tokens

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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.31.25",
"version": "0.32.0",
"description": "Design tokens for Fuselage, Rocket.Chat's design system",
"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
"author": {
Expand Down
17 changes: 17 additions & 0 deletions packages/fuselage/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# Change Log

## 0.35.0

### Minor Changes

- [#1199](https://github.com/RocketChat/fuselage/pull/1199) [`2b4f0079c`](https://github.com/RocketChat/fuselage/commit/2b4f0079cae052e21a2000fb40922dc37e0aabdb) Thanks [@juliajforesti](https://github.com/juliajforesti)! - feat(fuselage): change `link:active` color

- [#1128](https://github.com/RocketChat/fuselage/pull/1128) [`6db5cb214`](https://github.com/RocketChat/fuselage/commit/6db5cb2141bf42c9622c5846701e5b26392a1ada) Thanks [@juliajforesti](https://github.com/juliajforesti)! - feat(fuselage, fuselage-tokens): Update primitive tokens

- [#1203](https://github.com/RocketChat/fuselage/pull/1203) [`da8cf6a97`](https://github.com/RocketChat/fuselage/commit/da8cf6a97c89263c020198e0c01aba27f57941d4) Thanks [@aleksandernsilva](https://github.com/aleksandernsilva)! - feat(fuselage): Add `renderItem` prop to the `PaginatedMultiSelect` component

### Patch Changes

- [#1202](https://github.com/RocketChat/fuselage/pull/1202) [`a7ec3d9d3`](https://github.com/RocketChat/fuselage/commit/a7ec3d9d301a4092f6524337d88857d0c3372009) Thanks [@juliajforesti](https://github.com/juliajforesti)! - fix(fuselage): `SidebarItem` margins

- Updated dependencies [[`6db5cb214`](https://github.com/RocketChat/fuselage/commit/6db5cb2141bf42c9622c5846701e5b26392a1ada)]:
- @rocket.chat/[email protected]

## 0.34.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/fuselage/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/fuselage",
"version": "0.34.0",
"version": "0.35.0",
"description": "Rocket.Chat's React Components Library",
"author": {
"name": "Rocket.Chat",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import Chip from '../Chip';
import Flex from '../Flex';
import { Icon } from '../Icon';
import Margins from '../Margins';
import Option from '../Option';
import { useVisible } from '../Options/useVisible';
import { OptionsPaginated } from '../OptionsPaginated';
import Position from '../Position';
Expand All @@ -41,6 +42,7 @@ type PaginatedMultiSelectProps = Omit<
renderOptions?: (
props: ComponentProps<typeof OptionsPaginated>
) => ReactElement | null;
renderItem?: (props: ComponentProps<typeof Option>) => ReactElement | null;
anchor?: any;
};

Expand All @@ -55,6 +57,7 @@ const PaginatedMultiSelect = ({
onChange = () => {},
placeholder,
renderOptions: OptionsComponent = OptionsPaginated,
renderItem = Option,
endReached,
...props
}: PaginatedMultiSelectProps) => {
Expand Down Expand Up @@ -191,6 +194,7 @@ const PaginatedMultiSelect = ({
options={options}
cursor={-1}
endReached={endReached}
renderItem={renderItem}
onSelect={([value]) => {
toggleOption(value);
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

&:active,
&.is-active {
color: colors.status-font(on-danger);
color: colors.font(info);
}

&:hover,
Expand Down
9 changes: 9 additions & 0 deletions packages/logo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

## 0.31.28

### Patch Changes

- [#1128](https://github.com/RocketChat/fuselage/pull/1128) [`6db5cb214`](https://github.com/RocketChat/fuselage/commit/6db5cb2141bf42c9622c5846701e5b26392a1ada) Thanks [@juliajforesti](https://github.com/juliajforesti)! - feat(fuselage, fuselage-tokens): Update primitive tokens

- Updated dependencies []:
- @rocket.chat/[email protected]

## 0.31.27

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/logo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/logo",
"version": "0.31.27",
"version": "0.31.28",
"description": "Rocket.Chat logo package",
"keywords": [
"rocketchat",
Expand Down
158 changes: 130 additions & 28 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ __metadata:
languageName: node
linkType: hard

"@babel/code-frame@npm:^7.22.13":
version: 7.22.13
resolution: "@babel/code-frame@npm:7.22.13"
dependencies:
"@babel/highlight": ^7.22.13
chalk: ^2.4.2
checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058
languageName: node
linkType: hard

"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.21.4":
version: 7.21.4
resolution: "@babel/compat-data@npm:7.21.4"
Expand Down Expand Up @@ -111,6 +121,18 @@ __metadata:
languageName: node
linkType: hard

"@babel/generator@npm:^7.23.0":
version: 7.23.0
resolution: "@babel/generator@npm:7.23.0"
dependencies:
"@babel/types": ^7.23.0
"@jridgewell/gen-mapping": ^0.3.2
"@jridgewell/trace-mapping": ^0.3.17
jsesc: ^2.5.1
checksum: 8efe24adad34300f1f8ea2add420b28171a646edc70f2a1b3e1683842f23b8b7ffa7e35ef0119294e1901f45bfea5b3dc70abe1f10a1917ccdfb41bed69be5f1
languageName: node
linkType: hard

"@babel/helper-annotate-as-pure@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/helper-annotate-as-pure@npm:7.18.6"
Expand Down Expand Up @@ -216,6 +238,13 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-environment-visitor@npm:^7.22.20":
version: 7.22.20
resolution: "@babel/helper-environment-visitor@npm:7.22.20"
checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
languageName: node
linkType: hard

"@babel/helper-explode-assignable-expression@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/helper-explode-assignable-expression@npm:7.18.6"
Expand All @@ -235,6 +264,16 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-function-name@npm:^7.23.0":
version: 7.23.0
resolution: "@babel/helper-function-name@npm:7.23.0"
dependencies:
"@babel/template": ^7.22.15
"@babel/types": ^7.23.0
checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10
languageName: node
linkType: hard

"@babel/helper-hoist-variables@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/helper-hoist-variables@npm:7.18.6"
Expand All @@ -244,6 +283,15 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-hoist-variables@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/helper-hoist-variables@npm:7.22.5"
dependencies:
"@babel/types": ^7.22.5
checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
languageName: node
linkType: hard

"@babel/helper-member-expression-to-functions@npm:^7.20.7, @babel/helper-member-expression-to-functions@npm:^7.21.0":
version: 7.21.0
resolution: "@babel/helper-member-expression-to-functions@npm:7.21.0"
Expand Down Expand Up @@ -356,20 +404,43 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-split-export-declaration@npm:^7.22.6":
version: 7.22.6
resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
dependencies:
"@babel/types": ^7.22.5
checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
languageName: node
linkType: hard

"@babel/helper-string-parser@npm:^7.19.4":
version: 7.19.4
resolution: "@babel/helper-string-parser@npm:7.19.4"
checksum: b2f8a3920b30dfac81ec282ac4ad9598ea170648f8254b10f475abe6d944808fb006aab325d3eb5a8ad3bea8dfa888cfa6ef471050dae5748497c110ec060943
languageName: node
linkType: hard

"@babel/helper-string-parser@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/helper-string-parser@npm:7.22.5"
checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467
languageName: node
linkType: hard

"@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1":
version: 7.19.1
resolution: "@babel/helper-validator-identifier@npm:7.19.1"
checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a
languageName: node
linkType: hard

"@babel/helper-validator-identifier@npm:^7.22.20":
version: 7.22.20
resolution: "@babel/helper-validator-identifier@npm:7.22.20"
checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc
languageName: node
linkType: hard

"@babel/helper-validator-option@npm:^7.18.6, @babel/helper-validator-option@npm:^7.21.0":
version: 7.21.0
resolution: "@babel/helper-validator-option@npm:7.21.0"
Expand Down Expand Up @@ -411,6 +482,17 @@ __metadata:
languageName: node
linkType: hard

"@babel/highlight@npm:^7.22.13":
version: 7.22.20
resolution: "@babel/highlight@npm:7.22.20"
dependencies:
"@babel/helper-validator-identifier": ^7.22.20
chalk: ^2.4.2
js-tokens: ^4.0.0
checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134
languageName: node
linkType: hard

"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.4":
version: 7.21.4
resolution: "@babel/parser@npm:7.21.4"
Expand All @@ -420,6 +502,15 @@ __metadata:
languageName: node
linkType: hard

"@babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0":
version: 7.23.0
resolution: "@babel/parser@npm:7.23.0"
bin:
parser: ./bin/babel-parser.js
checksum: 453fdf8b9e2c2b7d7b02139e0ce003d1af21947bbc03eb350fb248ee335c9b85e4ab41697ddbdd97079698de825a265e45a0846bb2ed47a2c7c1df833f42a354
languageName: node
linkType: hard

"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.18.6"
Expand Down Expand Up @@ -1617,21 +1708,32 @@ __metadata:
languageName: node
linkType: hard

"@babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.21.4, @babel/traverse@npm:^7.7.2":
version: 7.21.4
resolution: "@babel/traverse@npm:7.21.4"
"@babel/template@npm:^7.22.15":
version: 7.22.15
resolution: "@babel/template@npm:7.22.15"
dependencies:
"@babel/code-frame": ^7.21.4
"@babel/generator": ^7.21.4
"@babel/helper-environment-visitor": ^7.18.9
"@babel/helper-function-name": ^7.21.0
"@babel/helper-hoist-variables": ^7.18.6
"@babel/helper-split-export-declaration": ^7.18.6
"@babel/parser": ^7.21.4
"@babel/types": ^7.21.4
"@babel/code-frame": ^7.22.13
"@babel/parser": ^7.22.15
"@babel/types": ^7.22.15
checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd
languageName: node
linkType: hard

"@babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.21.4, @babel/traverse@npm:^7.7.2":
version: 7.23.2
resolution: "@babel/traverse@npm:7.23.2"
dependencies:
"@babel/code-frame": ^7.22.13
"@babel/generator": ^7.23.0
"@babel/helper-environment-visitor": ^7.22.20
"@babel/helper-function-name": ^7.23.0
"@babel/helper-hoist-variables": ^7.22.5
"@babel/helper-split-export-declaration": ^7.22.6
"@babel/parser": ^7.23.0
"@babel/types": ^7.23.0
debug: ^4.1.0
globals: ^11.1.0
checksum: f22f067c2d9b6497abf3d4e53ea71f3aa82a21f2ed434dd69b8c5767f11f2a4c24c8d2f517d2312c9e5248e5c69395fdca1c95a2b3286122c75f5783ddb6f53c
checksum: 26a1eea0dde41ab99dde8b9773a013a0dc50324e5110a049f5d634e721ff08afffd54940b3974a20308d7952085ac769689369e9127dea655f868c0f6e1ab35d
languageName: node
linkType: hard

Expand All @@ -1646,6 +1748,17 @@ __metadata:
languageName: node
linkType: hard

"@babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0":
version: 7.23.0
resolution: "@babel/types@npm:7.23.0"
dependencies:
"@babel/helper-string-parser": ^7.22.5
"@babel/helper-validator-identifier": ^7.22.20
to-fast-properties: ^2.0.0
checksum: 215fe04bd7feef79eeb4d33374b39909ce9cad1611c4135a4f7fdf41fe3280594105af6d7094354751514625ea92d0875aba355f53e86a92600f290e77b0e604
languageName: node
linkType: hard

"@base2/pretty-print-object@npm:1.0.1":
version: 1.0.1
resolution: "@base2/pretty-print-object@npm:1.0.1"
Expand Down Expand Up @@ -21807,7 +21920,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"nanoid@npm:^3.3.1, nanoid@npm:^3.3.4":
"nanoid@npm:^3.3.1":
version: 3.3.4
resolution: "nanoid@npm:3.3.4"
bin:
Expand Down Expand Up @@ -24036,25 +24149,14 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"postcss@npm:^8.2.14":
version: 8.4.27
resolution: "postcss@npm:8.4.27"
"postcss@npm:^8.2.14, postcss@npm:^8.2.15, postcss@npm:^8.4.19, postcss@npm:^8.4.21, postcss@npm:~8.4.21":
version: 8.4.31
resolution: "postcss@npm:8.4.31"
dependencies:
nanoid: ^3.3.6
picocolors: ^1.0.0
source-map-js: ^1.0.2
checksum: 1cdd0c298849df6cd65f7e646a3ba36870a37b65f55fd59d1a165539c263e9b4872a402bf4ed1ca1bc31f58b68b2835545e33ea1a23b161a1f8aa6d5ded81e78
languageName: node
linkType: hard

"postcss@npm:^8.2.15, postcss@npm:^8.4.19, postcss@npm:^8.4.21, postcss@npm:~8.4.21":
version: 8.4.21
resolution: "postcss@npm:8.4.21"
dependencies:
nanoid: ^3.3.4
picocolors: ^1.0.0
source-map-js: ^1.0.2
checksum: e39ac60ccd1542d4f9d93d894048aac0d686b3bb38e927d8386005718e6793dbbb46930f0a523fe382f1bbd843c6d980aaea791252bf5e176180e5a4336d9679
checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea
languageName: node
linkType: hard

Expand Down

0 comments on commit 044a0e8

Please sign in to comment.