ywana-core8 0.2.6 → 0.2.9

package/src/desktop/WindowContext.js

@@ -44,9 +44,12 @@ export const WindowProvider = ({ children, desktopSize }) => {
 
     // Don't render until WindowManager is initialized
     if (!state || !windowManagerRef.current) {
+        console.log('WindowProvider not ready - state:', state, 'windowManager:', windowManagerRef.current)
         return null
     }
 
+    console.log('WindowProvider ready - providing context')
+
     const value = {
         // Current state
         windows: state.windows,

package/src/desktop/WindowManager.js

@@ -6,6 +6,7 @@ export class WindowManager {
         this.windows = new Map()
         this.activeWindowId = null
         this.nextZIndex = 1000
+        this.maxZIndex = 9999 // Maximum z-index for windows (ApplicationMenu is 10000)
         this.listeners = new Set()
         this.desktopSize = desktopSize
     }
@@ -77,7 +78,7 @@ export class WindowManager {
             size: size,
             minimized: false,
             maximized: false,
-            zIndex: this.nextZIndex++,
+            zIndex: Math.min(this.nextZIndex++, this.maxZIndex),
             ...config
         }
 
@@ -101,9 +102,9 @@ export class WindowManager {
         let x = baseX + (existingWindows.length * offsetStep)
         let y = baseY + (existingWindows.length * offsetStep)
 
-        // Check if it goes out of desktop bounds
+        // Check if it goes out of workspace bounds
         const maxX = this.desktopSize.width - windowSize.width - 20
-        const maxY = this.desktopSize.height - windowSize.height - 100 // Space for taskbar
+        const maxY = this.desktopSize.height - windowSize.height - 20 // Workspace boundaries
 
         // If out of bounds, restart cascade
         if (x > maxX || y > maxY) {
@@ -152,8 +153,11 @@ export class WindowManager {
             window.minimized = false
         }
 
-        // Bring to front
-        window.zIndex = this.nextZIndex++
+        // Bring to front (but never above ApplicationMenu)
+        if (this.nextZIndex >= this.maxZIndex) {
+            this.resetZIndexes()
+        }
+        window.zIndex = Math.min(this.nextZIndex++, this.maxZIndex)
         this.activeWindowId = windowId
 
         this.notifyListeners()
@@ -221,7 +225,7 @@ export class WindowManager {
         const minWidth = 200
         const minHeight = 150
         const maxWidth = this.desktopSize.width
-        const maxHeight = this.desktopSize.height - 50 // Space for taskbar
+        const maxHeight = this.desktopSize.height // Workspace boundaries
 
         const constrainedSize = {
             width: Math.max(minWidth, Math.min(size.width || window.size.width, maxWidth)),
@@ -264,7 +268,7 @@ export class WindowManager {
             if (window.maximized) return // Maximized windows don't need repositioning
 
             const maxX = this.desktopSize.width - window.size.width
-            const maxY = this.desktopSize.height - window.size.height - 50 // Space for taskbar
+            const maxY = this.desktopSize.height - window.size.height // Workspace boundaries
 
             // Adjust position if out of bounds
             if (window.position.x > maxX) {
@@ -306,7 +310,7 @@ export class WindowManager {
         const cols = Math.ceil(Math.sqrt(visibleWindows.length))
         const rows = Math.ceil(visibleWindows.length / cols)
         const windowWidth = Math.floor(this.desktopSize.width / cols)
-        const windowHeight = Math.floor((this.desktopSize.height - 80) / rows) // Space for taskbar
+        const windowHeight = Math.floor(this.desktopSize.height / rows) // Workspace boundaries
 
         visibleWindows.forEach((window, index) => {
             const col = index % cols
@@ -335,7 +339,7 @@ export class WindowManager {
 
         window.position = {
             x: (this.desktopSize.width - window.size.width) / 2,
-            y: (this.desktopSize.height - window.size.height - 50) / 2 // Space for taskbar
+            y: (this.desktopSize.height - window.size.height) / 2 // Workspace center
         }
 
         this.notifyListeners()
@@ -351,7 +355,7 @@ export class WindowManager {
 
         visibleWindows.forEach((window, index) => {
             const baseX = (this.desktopSize.width - window.size.width) / 2
-            const baseY = (this.desktopSize.height - window.size.height - 50) / 2
+            const baseY = (this.desktopSize.height - window.size.height) / 2
 
             window.position = {
                 x: baseX + (index * offsetStep),
@@ -375,4 +379,22 @@ export class WindowManager {
             desktopSize: this.desktopSize
         }
     }
+
+    /**
+     * Reset z-indexes when they reach the maximum
+     */
+    resetZIndexes() {
+        const windows = Array.from(this.windows.values())
+        // Sort windows by current z-index
+        windows.sort((a, b) => a.zIndex - b.zIndex)
+
+        // Reassign z-indexes starting from 1000
+        this.nextZIndex = 1000
+        windows.forEach((window, index) => {
+            window.zIndex = this.nextZIndex + index
+        })
+        this.nextZIndex = 1000 + windows.length
+
+        this.notifyListeners()
+    }
 }

package/src/desktop/desktop-linux.css

@@ -114,6 +114,61 @@
     border-color: rgba(53, 132, 228, 0.5);
 }
 
+/* Linux Start Button Styling (GNOME Activities) */
+.desktop--linux .toggle-button {
+    /* Reset selector styles and apply Linux button styling */
+    position: relative;
+    padding: 8px 16px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    overflow: hidden;
+    border: 1px solid rgba(255, 255, 255, 0.15);
+    outline: none;
+    transition: all 0.3s ease;
+    color: #ffffff;
+    background: linear-gradient(180deg, rgba(53, 132, 228, 0.9) 0%, rgba(26, 95, 180, 0.9) 100%);
+    min-height: 40px;
+    border-radius: 8px;
+    cursor: pointer;
+    font-family: 'Ubuntu', 'Cantarell', sans-serif;
+    font-weight: 500;
+    text-decoration: none;
+    white-space: nowrap;
+    list-style: none;
+    margin: 0;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+}
+
+.desktop--linux .toggle-button:hover:not(.toggle-button--disabled) {
+    background: linear-gradient(180deg, rgba(53, 132, 228, 1) 0%, rgba(26, 95, 180, 1) 100%);
+    border-color: rgba(255, 255, 255, 0.25);
+    transform: translateY(-1px);
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.25);
+}
+
+.desktop--linux .toggle-button.selected {
+    background: linear-gradient(180deg, rgba(26, 95, 180, 0.9) 0%, rgba(15, 70, 140, 0.9) 100%);
+    color: #ffffff;
+    border-color: rgba(255, 255, 255, 0.3);
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 2px 4px rgba(53, 132, 228, 0.4);
+}
+
+.desktop--linux .toggle-button:focus {
+    outline: 2px solid rgba(53, 132, 228, 0.6);
+    outline-offset: 2px;
+}
+
+.desktop--linux .toggle-button--disabled {
+    background: rgba(255, 255, 255, 0.1) !important;
+    color: rgba(255, 255, 255, 0.4) !important;
+    border-color: rgba(255, 255, 255, 0.05) !important;
+    cursor: not-allowed;
+    opacity: 1;
+    box-shadow: none;
+}
+
 /* Linux Application Menu (Activities Overview) */
 .desktop--linux .application-menu {
     background: rgba(36, 31, 49, 0.95);

package/src/desktop/desktop-macos.css

@@ -137,6 +137,63 @@
     color: #007aff;
 }
 
+/* macOS Start Button Styling (Dock-inspired) */
+.desktop--macos .toggle-button {
+    /* Reset selector styles and apply macOS button styling */
+    position: relative;
+    padding: 8px 16px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    overflow: hidden;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    outline: none;
+    transition: all 0.3s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    color: #1d1d1f;
+    background: linear-gradient(180deg, rgba(255, 255, 255, 0.9) 0%, rgba(248, 248, 248, 0.9) 100%);
+    min-height: 40px;
+    border-radius: 12px;
+    cursor: pointer;
+    font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Display', sans-serif;
+    font-weight: 500;
+    text-decoration: none;
+    white-space: nowrap;
+    list-style: none;
+    margin: 0;
+    backdrop-filter: blur(20px);
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.desktop--macos .toggle-button:hover:not(.toggle-button--disabled) {
+    background: linear-gradient(180deg, rgba(255, 255, 255, 0.95) 0%, rgba(245, 245, 245, 0.95) 100%);
+    border-color: rgba(0, 0, 0, 0.15);
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+}
+
+.desktop--macos .toggle-button.selected {
+    background: linear-gradient(180deg, rgba(0, 122, 255, 0.9) 0%, rgba(0, 100, 210, 0.9) 100%);
+    color: white;
+    border-color: rgba(0, 122, 255, 0.3);
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.2), 0 2px 8px rgba(0, 122, 255, 0.3);
+}
+
+.desktop--macos .toggle-button:focus {
+    outline: 2px solid rgba(0, 122, 255, 0.5);
+    outline-offset: 2px;
+}
+
+.desktop--macos .toggle-button--disabled {
+    background: rgba(248, 248, 248, 0.5) !important;
+    color: rgba(60, 60, 67, 0.3) !important;
+    border-color: rgba(0, 0, 0, 0.05) !important;
+    cursor: not-allowed;
+    opacity: 1;
+    box-shadow: none;
+    backdrop-filter: none;
+}
+
 /* macOS Application Menu (Launchpad-inspired) */
 .desktop--macos .application-menu {
     background: rgba(255, 255, 255, 0.9);

package/src/desktop/desktop-windows.css

@@ -104,6 +104,60 @@
     border-color: rgba(255, 255, 255, 0.4);
 }
 
+/* Windows Start Button Styling */
+.desktop--windows .toggle-button {
+    /* Reset selector styles and apply Windows button styling */
+    position: relative;
+    padding: 8px 16px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    overflow: hidden;
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    outline: none;
+    transition: all 0.2s ease;
+    color: white;
+    background: linear-gradient(180deg, #0078d4 0%, #106ebe 100%);
+    min-height: 40px;
+    border-radius: 4px;
+    cursor: pointer;
+    font-family: 'Segoe UI', sans-serif;
+    font-weight: 500;
+    text-decoration: none;
+    white-space: nowrap;
+    list-style: none;
+    margin: 0;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+}
+
+.desktop--windows .toggle-button:hover:not(.toggle-button--disabled) {
+    background: linear-gradient(180deg, #106ebe 0%, #005a9e 100%);
+    border-color: rgba(255, 255, 255, 0.3);
+    transform: none;
+}
+
+.desktop--windows .toggle-button.selected {
+    background: linear-gradient(180deg, #005a9e 0%, #004578 100%);
+    color: white;
+    border-color: rgba(255, 255, 255, 0.4);
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3);
+}
+
+.desktop--windows .toggle-button:focus {
+    outline: 2px solid rgba(255, 255, 255, 0.5);
+    outline-offset: 2px;
+}
+
+.desktop--windows .toggle-button--disabled {
+    background: rgba(200, 200, 200, 0.3) !important;
+    color: rgba(100, 100, 100, 0.5) !important;
+    border-color: rgba(255, 255, 255, 0.1) !important;
+    cursor: not-allowed;
+    opacity: 1;
+    box-shadow: none;
+}
+
 /* Windows Application Menu */
 .desktop--windows .application-menu {
     background: rgba(248, 248, 248, 0.95);
@@ -131,15 +185,12 @@
 
 .desktop--windows .application-menu__category {
     background: #ffffff;
-    border: 1px solid #e0e0e0;
-    border-radius: 16px;
     font-family: 'Segoe UI', sans-serif;
     font-size: 13px;
 }
 
 .desktop--windows .application-menu__category:hover {
     background: #f5f5f5;
-    border-color: #d0d0d0;
 }
 
 .desktop--windows .application-menu__category.active {

package/src/desktop/desktop.css

@@ -24,8 +24,38 @@
     width: 100%;
     height: 100%;
     z-index: 1;
+    display: flex;
+    flex-direction: column;
 }
 
+/* Workspace container - takes available space above taskbar */
+.desktop__workspace-container {
+    position: relative;
+    flex: 1;
+    overflow: hidden;
+    z-index: 1;
+}
+
+/* Workspace - container for windows with boundaries */
+.workspace {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+.desktop-taskbar {
+    
+    & .icon {
+        color: white;
+        & :hover {
+            color: #fff;
+            background-color: rgba(255, 255, 255, 0.1);
+        }
+    }
+}
+
+
 /* Desktop variants */
 .desktop--dark {
     color: white;