Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport staging] Update @vector-im/compound-design-tokens in package.json #12340

Merged
merged 1 commit into from Mar 14, 2024

Conversation

RiotRobot
Copy link
Contributor

Backport e3ba643 from #12339.

@RiotRobot RiotRobot requested a review from a team as a code owner March 14, 2024 13:29
@RiotRobot RiotRobot added X-Release-Blocker This affects the current release cycle and must be solved for a release to happen T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems labels Mar 14, 2024
@RiotRobot RiotRobot requested review from florianduros and removed request for a team March 14, 2024 13:29
@github-actions github-actions bot added the Z-Community-PR Issue is solved by a community member's PR label Mar 14, 2024
@florianduros florianduros enabled auto-merge (squash) March 14, 2024 14:37
@florianduros florianduros merged commit d139d66 into staging Mar 14, 2024
26 of 30 checks passed
@florianduros florianduros deleted the backport-12339-to-staging branch March 14, 2024 14:59
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>
bmwiedemann pushed a commit to bmwiedemann/openSUSE that referenced this pull request Mar 15, 2024
https://build.opensuse.org/request/show/1158107
by user dheidler + anag+factory
- Version 1.11.61
  * No changes
  ## 🐛 Bug Fixes
  * Update `@vector-im/compound-design-tokens` in package.json (matrix-org/matrix-react-sdk#12340).
bmwiedemann pushed a commit to bmwiedemann/openSUSE that referenced this pull request Mar 15, 2024
https://build.opensuse.org/request/show/1158108
by user dheidler + anag+factory
- Version 1.11.61
  * No changes
  ## 🐛 Bug Fixes
  * Update `@vector-im/compound-design-tokens` in package.json (matrix-org/matrix-react-sdk#12340).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems X-Release-Blocker This affects the current release cycle and must be solved for a release to happen Z-Community-PR Issue is solved by a community member's PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants