@allbluecn/web-app 0.22.3 → 0.22.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allbluecn/web-app",
-  "version": "0.22.3",
+  "version": "0.22.4",
   "license": "AGPL-3.0-or-later",
   "type": "module",
   "files": [

package/src/components/layout/sidebar-03/app-sidebar.tsx

@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+import { useEffect, useState } from "react";
 import {
   Sidebar,
   SidebarContent,
@@ -37,7 +38,8 @@ import { PresenceAvatarStack } from "@/components/layout/sidebar-03/presence-ava
 import { SidebarSearchTrigger } from "@/components/layout/sidebar-03/nav-search-trigger"
 import { NavSecondary } from "@/components/layout/sidebar-03/nav-secondary"
 import { PluginNavItems } from '@/components/plugin-slots/plugin-nav-items'
-import { isDesktopEdition } from "@/lib/edition-desktop"
+import { isDesktopEdition } from "@/lib/edition-desktop";
+import { getDesktopBridge } from "@/lib/desktop-bridge-types";
 
 // presence 渲染工厂（§8.2 消费者两文件之一）：nav-main 按 route.id 查
 // MODULE_ROUTES 得 module key 后回调；module 级单例 map，identity 稳定。
@@ -53,21 +55,33 @@ export function DashboardSidebar() {
   // 「第一行红绿灯让位 + 右侧按钮组（整行可拖动窗口）、第二行 logo」。
   // web/云端 SaaS 布局不变（isDesktopEdition 为构建期常量，死分支消除）。
   const isDesktop = isDesktopEdition();
+  // macOS 全屏兼容：全屏时系统隐藏红绿灯，布局回退 SaaS/OSS 原形态
+  // （logo 上移填充原红绿灯行），退出全屏恢复红绿灯双行布局。
+  // 旧壳无 onFullscreenChange API 时恒 false（保持桌面布局）。
+  const [isFullscreen, setIsFullscreen] = useState(false);
+  useEffect(() => {
+    if (!isDesktop) return;
+    const bridge = getDesktopBridge();
+    if (!bridge?.onFullscreenChange) return;
+    return bridge.onFullscreenChange(setIsFullscreen);
+  }, [isDesktop]);
+  const showTrafficLightRow = isDesktop && !isFullscreen;
 
   return (
     <Sidebar variant="floating" collapsible="icon">
       <SidebarHeader
         className={cn(
           "flex flex-col items-center justify-center gap-2 py-2",
-          !isCollapsed && !isDesktop && "flex-row justify-between py-2 md:pt-3.5",
-          // 桌面展开态：整块 header 为拖动区（第二行 logo 左对齐），按钮逐个 no-drag
-          !isCollapsed && isDesktop && "app-region-drag w-full items-stretch justify-start gap-0 py-1",
-          isCollapsed && isDesktop && "app-region-drag pt-8",
+          !isCollapsed && !showTrafficLightRow && "flex-row justify-between py-2 md:pt-3.5",
+          // 桌面展开态：整块 header 为拖动区（第二行 logo 左对齐），按钮逐个 no-drag；
+          // gap-2 拉开红绿灯行与 logo 行间距（用户调校 2026-10-31）
+          !isCollapsed && showTrafficLightRow && "app-region-drag w-full items-stretch justify-start gap-2 py-1",
+          isCollapsed && isDesktop && !isFullscreen && "app-region-drag pt-8",
         )}
       >
         {isCollapsed ? (
           <div className="flex flex-col items-center gap-2">
-            <div className={cn("flex flex-col items-center gap-2", isDesktop && "app-region-no-drag")}>
+            <div className={cn("flex flex-col items-center gap-2", showTrafficLightRow && "app-region-no-drag")}>
               <img
                 src="/logo/allblue-logo-dark.svg"
                 alt="AllBlue"
@@ -79,12 +93,12 @@ export function DashboardSidebar() {
                 className="hidden h-6 w-6 dark:block"
               />
             </div>
-            <div className={cn("flex flex-col-reverse items-center gap-1", isDesktop && "app-region-no-drag")}>
+            <div className={cn("flex flex-col-reverse items-center gap-1", showTrafficLightRow && "app-region-no-drag")}>
               <NotificationsBell />
               <SidebarTrigger />
             </div>
           </div>
-        ) : isDesktop ? (
+        ) : showTrafficLightRow ? (
           <>
             {/* 第一行：左侧让位 macOS 红绿灯（hiddenInset + trafficLightPosition
                 y=18 → 圆心 24px，与 h-8 行中心 8+16=24 对齐），右侧按钮组；

package/src/lib/changelog/sdk-versions.ts

@@ -120,7 +120,7 @@ export const SDK_GROUPS: SdkGroup[] = [
     "items": [
       {
         "name": "@allbluecn/web-app",
-        "version": "v0.22.3",
+        "version": "v0.22.4",
         "lastUpdate": "Oct 31, 2026",
         "source": "apps/web/package.json",
         "docsUrl": "https://github.com/allbluecn/allblue"

package/src/lib/desktop-bridge-types.ts

@@ -16,6 +16,8 @@ export interface DesktopBridgeApi {
   onOnlineChanged: (cb: (online: boolean) => void) => () => void
   onSyncState: (cb: (state: unknown) => void) => () => void
   onRenamed: (cb: (info: { table: string; from: string; to: string }) => void) => () => void
+  /** macOS 全屏态切换（enter/leave-full-screen）；旧壳无此 API 时 undefined */
+  onFullscreenChange?: (cb: (fullscreen: boolean) => void) => () => void
 }
 
 declare global {