fix Invalid layout total size

This commit is contained in:
pa
2026-01-06 23:37:35 +09:00
committed by Natsumi
parent 7f639f0040
commit a1a9f756c8
2 changed files with 11 additions and 7 deletions
@@ -63,6 +63,13 @@ export function useAuthenticatedLayoutResizable() {
); );
const asideMaxSize = computed(() => pxToPercent(asideMaxPx, undefined, 0)); const asideMaxSize = computed(() => pxToPercent(asideMaxPx, undefined, 0));
const mainDefaultSize = computed(
() =>
100 -
navDefaultSize.value -
(isSideBarTabShow.value ? asideDefaultSize.value : 0)
);
const handleLayout = (sizes) => { const handleLayout = (sizes) => {
if (!Array.isArray(sizes) || sizes.length < 2) { if (!Array.isArray(sizes) || sizes.length < 2) {
return; return;
@@ -129,6 +136,7 @@ export function useAuthenticatedLayoutResizable() {
navMaxSize, navMaxSize,
asideDefaultSize, asideDefaultSize,
asideMaxSize, asideMaxSize,
mainDefaultSize,
handleLayout, handleLayout,
isAsideCollapsed, isAsideCollapsed,
isNavCollapsed, isNavCollapsed,
+3 -7
View File
@@ -6,16 +6,11 @@
class="group/main-layout flex-1 h-full min-w-0" class="group/main-layout flex-1 h-full min-w-0"
@layout="handleLayout"> @layout="handleLayout">
<template #default="{ layout }"> <template #default="{ layout }">
<ResizablePanel <ResizablePanel ref="navPanelRef" :min-size="navMinSize" :max-size="navMaxSize" :order="1">
ref="navPanelRef"
:default-size="navDefaultSize"
:min-size="navMinSize"
:max-size="navMaxSize"
:order="1">
<NavMenu></NavMenu> <NavMenu></NavMenu>
</ResizablePanel> </ResizablePanel>
<ResizableHandle :disabled="isNavCollapsed" class="opacity-0"></ResizableHandle> <ResizableHandle :disabled="isNavCollapsed" class="opacity-0"></ResizableHandle>
<ResizablePanel :order="2"> <ResizablePanel :default-size="mainDefaultSize" :order="2">
<RouterView v-slot="{ Component }"> <RouterView v-slot="{ Component }">
<KeepAlive include="Feed,GameLog,PlayerList"> <KeepAlive include="Feed,GameLog,PlayerList">
<component :is="Component" /> <component :is="Component" />
@@ -120,6 +115,7 @@
navMaxSize, navMaxSize,
asideDefaultSize, asideDefaultSize,
asideMaxSize, asideMaxSize,
mainDefaultSize,
handleLayout, handleLayout,
isAsideCollapsed, isAsideCollapsed,
isNavCollapsed, isNavCollapsed,