Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Update @vector-im/compound-design-tokens in package.json #12339

Merged
merged 1 commit into from
Mar 14, 2024

Conversation

florianduros
Copy link
Contributor

@florianduros florianduros commented Mar 14, 2024

Checklist

  • Tests written for new code (and old code if feasible).
  • New or updated public/exported symbols have accurate TSDoc documentation.
  • Linter and other CI checks pass.
  • Sign-off given on the changes (see CONTRIBUTING.md).

The version of compound-design-tokens is correct in the yarn.lock but the react-sdk needs at least the 1.2.0 to work properly (we are using new tokens introduced in 1.2.0).

The package.json should reflect this condition.

Related to element-hq/element-web#27166

@florianduros florianduros added the T-Task Refactoring, enabling or disabling functionality, other engineering tasks label Mar 14, 2024
@florianduros florianduros marked this pull request as ready for review March 14, 2024 10:00
@florianduros florianduros requested a review from a team as a code owner March 14, 2024 10:00
@florianduros florianduros requested a review from dbkr March 14, 2024 10:00
@t3chguy t3chguy added the backport staging Label to automatically backport PR to staging branch label Mar 14, 2024
@t3chguy
Copy link
Member

t3chguy commented Mar 14, 2024

This probably needs to not be a T-Task otherwise the changelog will be blank.

@florianduros florianduros added T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems and removed T-Task Refactoring, enabling or disabling functionality, other engineering tasks labels Mar 14, 2024
@florianduros florianduros enabled auto-merge March 14, 2024 13:06
@florianduros florianduros added this pull request to the merge queue Mar 14, 2024
Merged via the queue into develop with commit e3ba643 Mar 14, 2024
52 of 53 checks passed
@florianduros florianduros deleted the florianduros/update-design-tokens branch March 14, 2024 13:28
RiotRobot pushed a commit that referenced this pull request Mar 14, 2024
thoraj added a commit to verji/matrix-react-sdk that referenced this pull request Mar 15, 2024
* Update `@vector-im/compound-design-tokens` in package.json (matrix-org#12339)

* Change 'type' prop on badges to 'forceDot' (matrix-org#12327)

* Change 'type' prop on badges tio 'forceDot'

Which, hopefully, better represents what it actually does. Tidies
up some of the logic.

Split out from matrix-org#12254

* Missed a file

* More comments

* Oops, there is no count here.

* Back out the logic refactor of StatelessNotificationBadge

because it was also updating the logic for mark as unread badges and
rewriting the ternary to the previous logic would be quite complex.

* Fix doc comment

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

* Clarify doc on displaying the count

* Update doc for the forceDot param here too.

---------

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

* [Backport staging] Update `@vector-im/compound-design-tokens` in package.json (matrix-org#12340)

(cherry picked from commit e3ba643)

Co-authored-by: Florian Duros <florianduros@element.io>

* Fix the image view (matrix-org#12341)

* TAC: Fix hover state when expanded (matrix-org#12337)

* Fix TAC hover state

* Add playwright test

* Update playwright snapshot after last compound style changes

* v3.95.0-rc.0

* v3.95.0

* Reset matrix-js-sdk back to develop branch

* TAC: Order rooms by most recent after notification level (matrix-org#12329)

* Order room by thread timestamp

* Fix key errors in test

* Update jest snapshots

* Update snapshots

* Rename alpha/beta to numbers

* Add playwright test

* Replace forceCount prop with hideIfDot (matrix-org#12344)

This replaces the `forceCount` prop on room badge components with
`hideIfDot` which hopefully gives a better idea of what it does,
since forceCount did not really force a count. Also remove the
prop where it was just passing the default value anyway.

---------

Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: ElementRobot <releases@riot.im>
Co-authored-by: Robin <robin@robin.town>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport staging Label to automatically backport PR to staging branch T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants