Skip to content

merge queue: checking main (12928ed) and #7206 together #7240

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 4 commits into from
Closed

merge queue: checking main (12928ed) and #7206 together #7240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6fbe6f
fix some ButtonLinks not being links
chyzman Aug 17, 2026
9f5008c
fix comboboxes not aligning correctly immediately
chyzman Aug 18, 2026
3a4ad3c
prepr
chyzman Aug 19, 2026
5c2501a
Merge of #7206
mergify[bot] Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions packages/ui/src/components/base/Combobox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ function setInitialFocus() {

function determineOpenDirection(
triggerRect: DOMRect,
dropdownRect: DOMRect,
dropdownRect: { width: number; height: number },
viewport: ViewportRect,
): 'up' | 'down' {
if (props.forceDirection) {
Expand All @@ -499,7 +499,7 @@ function determineOpenDirection(

function calculateVerticalPosition(
triggerRect: DOMRect,
dropdownRect: DOMRect,
dropdownRect: { width: number; height: number },
direction: 'up' | 'down',
viewport: ViewportRect,
): number {
Expand All @@ -513,7 +513,7 @@ function calculateVerticalPosition(

function calculateHorizontalPosition(
triggerRect: DOMRect,
dropdownRect: DOMRect,
dropdownRect: { width: number; height: number },
viewport: ViewportRect,
): number {
const minLeft = viewport.offsetLeft + DROPDOWN_VIEWPORT_MARGIN
Expand Down Expand Up @@ -556,7 +556,7 @@ async function updateDropdownPosition() {
await nextTick()

const triggerRect = effectiveTriggerEl.value.getBoundingClientRect()
const width = resolveDropdownWidth(triggerRect.width)
const width = resolveDropdownWidth(effectiveTriggerEl.value.offsetWidth)
const minWidth = resolveCssSize(props.dropdownMinWidth) ?? '0px'

dropdownStyle.value = {
Expand All @@ -567,7 +567,10 @@ async function updateDropdownPosition() {

await nextTick()

const dropdownRect = dropdownRef.value.getBoundingClientRect()
const dropdownRect = {
width: dropdownRef.value.offsetWidth,
height: dropdownRef.value.offsetHeight,
}
const viewport = getViewportRect()

const direction = determineOpenDirection(triggerRect, dropdownRect, viewport)
Expand Down
8 changes: 6 additions & 2 deletions packages/ui/src/components/base/buttons/ButtonLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ const resolvedRel = computed(() => {
return props.target === '_blank' ? 'noopener noreferrer' : undefined
})

// https://github.com/vuejs/vue-router/issues/2005 moment
const linkAttrs = computed(() =>
usesRouter.value ? { to: props.to } : !props.disabled ? { href: props.href } : {},
)

function handleClick(event: MouseEvent) {
if (!props.disabled) return
event.preventDefault()
Expand All @@ -52,8 +57,7 @@ function handleClick(event: MouseEvent) {
:color="props.color"
:size="props.size"
:interaction="props.interaction"
:to="usesRouter ? props.to : undefined"
:href="!usesRouter && !props.disabled ? props.href : undefined"
v-bind="linkAttrs"
:target="props.target"
:rel="resolvedRel"
:download="!props.disabled ? props.download : undefined"
Expand Down
Loading