Update

Scille · Feb 25, 2025 · 6894d93 · 6894d93
1 parent b7806cb
commit 6894d93
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/client/src/views/menu/MenuPage.vue b/client/src/views/menu/MenuPage.vue
@@ -5,9 +5,8 @@
     <sidebar-menu
       v-if="userInfo"
       :user-info="userInfo"
-      @sidebar-width="sidebarWidth"
+      @sidebar-width-changed="onSidebarWidthChanged"
     />
-    {{ sidebarWidth }}
     <tab-menu
       v-if="userInfo"
       v-show="menuMode === MenuMode.Tabs"
@@ -32,17 +31,23 @@ const sidebarWidth = ref<number>(0);
 const userInfo: Ref<ClientInfo | null> = ref(null);
 const menuMode = ref<MenuMode>(MenuMode.Sidebar);
 
+function onSidebarWidthChanged(value: number): void {
+  sidebarWidth.value = value;
+  setToastOffset(value);
+  console.log(value);
+}
+
 async function updateWindowWidth(): Promise<void> {
   if (window.innerWidth <= 768) {
     setToastOffset(0);
     menuMode.value = MenuMode.Tabs;
   } else {
-    setToastOffset(sidebarWidth.value);
     menuMode.value = MenuMode.Sidebar;
   }
 }
 
 onMounted(async () => {
+
   const infoResult = await parsecGetClientInfo();
 
   if (infoResult.ok) {

diff --git a/client/src/views/menu/SidebarMenu.vue b/client/src/views/menu/SidebarMenu.vue
@@ -403,8 +403,8 @@ defineProps<{
   userInfo: ClientInfo;
 }>();
 
-const emit = defineEmits<{
-  (event:'sidebarWidth', value: number): void;
+const emits = defineEmits<{
+  (event:'sidebarWidthChanged', value: number): void;
 }>();
 
 const isManagement = currentRouteIsOrganizationManagementRoute;
@@ -431,8 +431,6 @@ const MAX_WIDTH = 370;
 
 const watchSidebarWidthCancel = watch(computedWidth, async (value: number) => {
   sidebarWidthProperty.value = `${value}px`;
-  // set toast offset
-  setToastOffset(value);
 
   if (timeoutId !== undefined) {
     clearTimeout(timeoutId);
@@ -448,6 +446,8 @@ const watchSidebarWidthCancel = watch(computedWidth, async (value: number) => {
     );
     timeoutId = undefined;
   }, 2000);
+
+  emits('sidebarWidthChanged', value);
 });
 
 const currentWorkspace = computed(() => {
@@ -502,6 +502,7 @@ function onMove(detail: GestureDetail): void {
   } else {
     computedWidth.value = detail.currentX;
   }
+  emits('sidebarWidthChanged', computedWidth.value);
 }
 
 onMounted(async () => {
@@ -525,6 +526,7 @@ onMounted(async () => {
     computedWidth.value = savedSidebarData.width;
   }
   sidebarWidthProperty.value = `${computedWidth.value}px`;
+  emits('sidebarWidthChanged', computedWidth.value);
   menusVisible.value.favorites = savedSidebarData.favoritesVisible ?? true;
   menusVisible.value.recentWorkspaces = savedSidebarData.workspacesVisible ?? true;
   menusVisible.value.recentFiles = savedSidebarData.recentFilesVisible ?? true;
@@ -534,7 +536,6 @@ onMounted(async () => {
     isExpired.value = connInfo.isExpired;
   }
 
-  emit('sidebarWidth', computedWidth.value);
   await loadAll();
   if (divider.value) {
     const gesture = createGesture({
@@ -561,13 +562,8 @@ onUnmounted(async () => {
     clearTimeout(timeoutId);
   }
   watchSidebarWidthCancel();
-  setToastOffset(0);
 });
 
-function setToastOffset(width: number): void {
-  window.document.documentElement.style.setProperty('--ms-toast-offset', `${width}px`);
-}
-
 async function goToWorkspace(workspace: WorkspaceInfo): Promise<void> {
   recentDocumentManager.addWorkspace(workspace);
   await recentDocumentManager.saveToStorage(storageManager);