Skip to content

fix(dock): open position dropdown inward based on dock edge #393

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SaKaNa-Y wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −1
Open

fix(dock): open position dropdown inward based on dock edge #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions packages/core/src/client/webcomponents/components/dock/DockEdge.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ const positionLabels: Record<string, string> = {
bottom: 'Bottom',
left: 'Left',
}
const positionDropdownPlacement: Record<string, 'top' | 'bottom' | 'left' | 'right'> = {
top: 'bottom',
bottom: 'top',
left: 'right',
right: 'left',
}

function switchPosition(pos: 'top' | 'right' | 'bottom' | 'left') {
store.position = pos
Expand Down Expand Up @@ -74,6 +80,7 @@ function togglePositionDropdown() {
setEdgePositionDropdown({
el: positionButton.value,
gap: 6,
placement: positionDropdownPlacement[store.position],
content: () => h('div', { class: 'flex flex-col gap-0.5 min-w-28' }, positions.map(pos =>
h('button', {
class: [
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/client/webcomponents/components/floating/FloatingPopover.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ const FloatingPopoverComponent = defineComponent({

const vw = window.innerWidth
const vh = window.innerHeight
if (rect.left < DETECT_MARGIN)
if (props.item?.placement)
align = props.item.placement
else if (rect.left < DETECT_MARGIN)
align = 'right'
else if (rect.left + rect.width > vw - DETECT_MARGIN)
align = 'left'
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/client/webcomponents/state/floating-tooltip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export interface FloatingPopoverProps {
el: HTMLElement
content: string | (() => VNode | undefined)
gap?: number
placement?: 'top' | 'bottom' | 'left' | 'right'
}

const tooltip = shallowRef<FloatingPopoverProps | null>(null)
Expand Down
Loading