Skip to content

chore: automatic sync v2->v2-develop#3344

Merged
github-actions[bot] merged 29 commits intov2-developfrom
v2
Dec 17, 2025
Merged

chore: automatic sync v2->v2-develop#3344
github-actions[bot] merged 29 commits intov2-developfrom
v2

Conversation

@github-actions
Copy link
Contributor

This Pull Request is generated automatically with changes pushed into v2 branch. v2 and v2-develop branches should be in-sync.

aniamusial and others added 29 commits June 29, 2023 10:56
* fix: changed paddings in sfselect

* chore: adjusted padding left

* chore: updated changelog

* Update .changeset/fresh-emus-care.md

Co-authored-by: Jakub Freisler <jakub@frsource.org>

---------

Co-authored-by: Jakub Freisler <jakub@frsource.org>
* BREAKING CHANGE: remove flex classes form wrapper slot in list item

* fix: lint fixes

* fix: lint fixes
#3008)

BREAKING CHANGE: remove deprecated useTrapFocus arrowKeysOn option
# Conflicts:
#	apps/docs/components/content/_hooks/useTrapFocus.md
#	packages/sfui/frameworks/react/components/SfListItem/SfListItem.tsx
#	packages/sfui/frameworks/vue/components/SfListItem/SfListItem.vue
#	packages/sfui/frameworks/vue/composables/useTrapFocus/useTrapFocus.ts
#	packages/tests/components/SfButton/SfButton.cy.tsx
# Conflicts:
#	.changeset/five-geese-serve.md
#	.changeset/flat-radios-do.md
#	.changeset/fresh-emus-care.md
#	.changeset/mighty-monkeys-occur.md
#	packages/sfui/frameworks/react/components/SfCheckbox/SfCheckbox.tsx
#	packages/sfui/frameworks/react/components/SfChip/SfChip.tsx
#	packages/sfui/frameworks/react/components/SfCounter/SfCounter.tsx
#	packages/sfui/frameworks/react/components/SfInput/SfInput.tsx
#	packages/sfui/frameworks/react/components/SfLink/SfLink.tsx
#	packages/sfui/frameworks/react/components/SfModal/SfModal.tsx
#	packages/sfui/frameworks/react/components/SfSelect/SfSelect.tsx
#	packages/sfui/frameworks/react/components/SfSwitch/SfSwitch.tsx
#	packages/sfui/frameworks/react/components/SfTextarea/SfTextarea.tsx
#	packages/sfui/frameworks/vue/components/SfAccordionItem/SfAccordionItem.vue
#	packages/sfui/frameworks/vue/components/SfCheckbox/SfCheckbox.vue
#	packages/sfui/frameworks/vue/components/SfChip/SfChip.vue
#	packages/sfui/frameworks/vue/components/SfCounter/SfCounter.vue
#	packages/sfui/frameworks/vue/components/SfInput/SfInput.vue
#	packages/sfui/frameworks/vue/components/SfLink/SfLink.vue
#	packages/sfui/frameworks/vue/components/SfListItem/SfListItem.vue
#	packages/sfui/frameworks/vue/components/SfModal/SfModal.vue
#	packages/sfui/frameworks/vue/components/SfSelect/SfSelect.vue
#	packages/sfui/frameworks/vue/components/SfSwitch/SfSwitch.vue
#	packages/sfui/frameworks/vue/components/SfTextarea/SfTextarea.vue
#	packages/sfui/frameworks/vue/composables/useTwMergeRoot/useTwMergeRoot.ts
#	yarn.lock
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This reverts commit 75eb3da.

# Conflicts:
#	yarn.lock
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the automerge DO NOT USE label Dec 17, 2025
@changeset-bot
Copy link

changeset-bot bot commented Dec 17, 2025

⚠️ No Changeset found

Latest commit: 0566ae3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@github-actions github-actions bot enabled auto-merge December 17, 2025 10:21
@github-actions github-actions bot merged commit 89bb381 into v2-develop Dec 17, 2025
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge DO NOT USE

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants