Skip to content

fix(dock): collapse panel size when no content is displayed #362

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

Closed
SaKaNa-Y wants to merge 1 commit into from
Closed

fix(dock): collapse panel size when no content is displayed #362

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
1 change: 1 addition & 0 deletions devframe
Open in desktop
Submodule devframe added at 1efe91
58 changes: 30 additions & 28 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 @@ -22,6 +22,11 @@ const isVertical = computed(() => store.position === 'left' || store.position ==

const groupedEntries = computed(() => context.docks.groupedEntries)
const selectedEntry = computed(() => context.docks.selected)
const hasPanelContent = computed(() => {
return context.panel.store.open
&& selectedEntry.value
&& selectedEntry.value.type !== 'action'
})

const positions = ['top', 'right', 'bottom', 'left'] as const
const positionIcons: Record<string, string> = {
Expand Down Expand Up @@ -114,33 +119,41 @@ const panelStyle = computed<CSSProperties>(() => {
style.left = '0'
style.right = '0'
style.bottom = '0'
style.height = `${store.height}vh`
style.minHeight = '150px'
style.borderRadius = '8px 8px 0 0'
if (hasPanelContent.value) {
style.height = `${store.height}vh`
style.minHeight = '150px'
}
break
case 'top':
style.left = '0'
style.right = '0'
style.top = '0'
style.height = `${store.height}vh`
style.minHeight = '150px'
style.borderRadius = '0 0 8px 8px'
if (hasPanelContent.value) {
style.height = `${store.height}vh`
style.minHeight = '150px'
}
break
case 'left':
style.top = '0'
style.bottom = '0'
style.left = '0'
style.width = `${store.width}vw`
style.minWidth = '200px'
style.borderRadius = '0 8px 8px 0'
if (hasPanelContent.value) {
style.width = `${store.width}vw`
style.minWidth = '200px'
}
break
case 'right':
style.top = '0'
style.bottom = '0'
style.right = '0'
style.width = `${store.width}vw`
style.minWidth = '200px'
style.borderRadius = '8px 0 0 8px'
if (hasPanelContent.value) {
style.width = `${store.width}vw`
style.minWidth = '200px'
}
break
}

Expand All @@ -167,7 +180,7 @@ const contentClass = computed(() => {
:class="`flex ${isVertical ? 'flex-row' : 'flex-col'}`"
:style="panelStyle"
>
<DockPanelResizer :panel="context.panel" edge-mode />
<DockPanelResizer v-if="hasPanelContent" :panel="context.panel" edge-mode />

<!-- Toolbar -->
<div class="flex items-center shrink-0 select-none py1" :class="toolbarClass">
Expand Down Expand Up @@ -214,25 +227,14 @@ const contentClass = computed(() => {
</div>

<!-- Content -->
<div class="relative" :class="contentClass">
<template v-if="selectedEntry && selectedEntry.type !== 'action'">
<ViewEntry
v-if="viewsContainer"
:key="selectedEntry.id"
:context
:entry="selectedEntry"
:persisted-doms="persistedDoms"
/>
</template>
<div
v-else
class="absolute inset-0 flex items-center justify-center op40 select-none"
>
<div class="flex flex-col items-center gap-2">
<div class="i-ph-layout-duotone w-8 h-8" />
<span class="text-sm">{{ selectedEntry ? 'Action executed' : 'Select a dock entry' }}</span>
</div>
</div>
<div v-if="hasPanelContent" class="relative" :class="contentClass">
<ViewEntry
v-if="viewsContainer && selectedEntry"
:key="selectedEntry.id"
:context
:entry="selectedEntry"
:persisted-doms="persistedDoms"
/>
<div
id="vite-devtools-views-container"
ref="viewsContainer"
Expand Down
Loading