@ossy/app 3.24.0 → 3.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "3.24.0",
+  "version": "3.25.0",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -50,21 +50,21 @@
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
     "@ossy/authentication": "^3.11.1",
-    "@ossy/design-system": "^3.24.0",
+    "@ossy/design-system": "^3.25.0",
     "@ossy/locale": "^3.4.0",
     "@ossy/manifest": "^3.24.0",
-    "@ossy/package-catalog": "^3.20.1",
+    "@ossy/package-catalog": "^3.25.0",
     "@ossy/pages": "^3.0.9",
-    "@ossy/platform": "^3.24.0",
-    "@ossy/resources": "^3.24.0",
-    "@ossy/router": "^3.0.9",
+    "@ossy/platform": "^3.25.0",
+    "@ossy/resources": "^3.25.0",
+    "@ossy/router": "^3.25.0",
     "@ossy/router-react": "^3.18.0",
     "@ossy/schema": "^3.24.0",
     "@ossy/sdk": "^3.24.0",
     "@ossy/sdk-react": "^3.12.0",
-    "@ossy/themes": "^3.22.0",
-    "@ossy/users": "^3.24.0",
-    "@ossy/workspaces": "^3.24.0",
+    "@ossy/themes": "^3.25.0",
+    "@ossy/users": "^3.24.1",
+    "@ossy/workspaces": "^3.25.0",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "^7.1.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -98,5 +98,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "bd8186b5123999b338ce09aa04cd75d7deb0427a"
+  "gitHead": "00dd4b51a94de7e0399c9dfa59380a53e58c8523"
 }

package/src/shell/sidebarChrome.js

@@ -48,7 +48,8 @@ export function shouldShowSidebarCollapseControl ({
 }
 
 /**
- * Square panel in the drawer; rounded rail when in-grid.
+ * Square panel in the drawer. In the page grid every corner is an inner
+ * corner, so the rail uses one radius.
  *
  * @param {unknown} presentation
  * @returns {0 | string}
@@ -56,5 +57,5 @@ export function shouldShowSidebarCollapseControl ({
 export function resolveSidebarBorderRadius (presentation) {
   return isDrawerPresentation(presentation)
     ? 0
-    : 'var(--space-l) var(--space-s) var(--space-s) var(--space-l)'
+    : 'var(--space-s)'
 }

package/src/shell-registry/default.layout.jsx

@@ -57,7 +57,7 @@ export default function DefaultLayout ({
           )}
 
           <View
-            layout="sidebar"
+            layout="page"
             surface="primary"
             roundness="m"
             inset={compact ? 'none' : 's'}

package/src/shell-registry/header-default.component.jsx

@@ -1,5 +1,6 @@
 import React from 'react'
-import { AppHeader, View } from '@ossy/design-system'
+import { AppHeader, Slot, View } from '@ossy/design-system'
+import { useRouter } from '@ossy/router-react'
 import { useCompactShellLayout } from '../shell/useCompactShellLayout.js'
 import { HeaderAuthActions } from '../shell/HeaderAuthActions.jsx'
 import { LanguageSelect } from '../shell/LanguageSelect.jsx'
@@ -7,9 +8,28 @@ import { ThemeSelect } from '../shell/ThemeSelect.jsx'
 
 export const metadata = { id: '@ossy/app/component/header/default' }
 
-/** TL/TR/BR/BL — smallest corners except TR, which matches sidebar outer top-left (`--space-l`). */
+/** Top bar spans the shell. Both top corners are the outer edge. */
 const HEADER_BORDER_RADIUS =
-  'var(--space-xs) var(--space-l) var(--space-xs) var(--space-xs)'
+  'var(--space-l) var(--space-l) var(--space-xs) var(--space-xs)'
+
+function HeaderLogo () {
+  const router = useRouter()
+  const href = router.getHref?.('@home') || '/'
+  return (
+    <a
+      href={href}
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        flexShrink: 0,
+        color: 'inherit',
+        textDecoration: 'none',
+      }}
+    >
+      <Slot view="@ossy/app/component/logo/logotype" />
+    </a>
+  )
+}
 
 export default function DefaultHeader ({
   compact: compactProp,
@@ -31,6 +51,7 @@ export default function DefaultHeader ({
         ...style,
       }}
       {...rest}
+      near={<HeaderLogo />}
       far={(
         <View
           layout="row-wrap"

package/src/shell-registry/sidebar-default.component.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useMemo, useRef, useEffect, useCallback } from 'react'
-import { Button, View, Slot, useLocale } from '@ossy/design-system'
+import { Button, View, useLocale } from '@ossy/design-system'
 import { useRouter } from '@ossy/router-react'
 import { useApp, buildSidebarNav, patchUserAppSettings, useCompactShellLayout, useShellWorkspace } from '@ossy/app/shell'
 import {
@@ -11,12 +11,10 @@ import {
 
 export const metadata = { id: '@ossy/app/component/sidebar/default' }
 
-const SIDEBAR_LOGO_BLOCK_MIN_PX = 44
 const RAIL_EDGE_HIT_LEFT_PX = 14
 const RAIL_EDGE_HIT_RIGHT_PX = 18
 const RAIL_COLLAPSE_DELAY_MS = 220
 const RAIL_HOVER_OPEN_DELAY_MS = 1200
-const LOGO_FADE_MS = 180
 const RAIL_INNER_WIDTH_PX = 56
 const RAIL_EXPANDED_INNER_PX = 220
 
@@ -182,40 +180,6 @@ export default function DefaultSidebar ({
     clearHoverOpenTimer()
   }, [clearCollapseTimer, clearHoverOpenTimer])
 
-  const logoFadeStyle = {
-    transition: `opacity ${LOGO_FADE_MS}ms ease`,
-  }
-
-  const renderLogo = () => {
-    if (desktopHoverRail) {
-      return (
-        <div style={{ position: 'relative', height: 28, width: '100%', display: 'flex', justifyContent: 'center' }}>
-          <div style={{ ...logoFadeStyle, opacity: hoverRailExpanded ? 0 : 1 }}>
-            <Slot view="@ossy/app/component/logo/logomark" />
-          </div>
-          <div
-            style={{
-              position: 'absolute',
-              inset: 0,
-              display: 'flex',
-              justifyContent: 'center',
-              alignItems: 'center',
-              ...logoFadeStyle,
-              opacity: hoverRailExpanded ? 1 : 0,
-              pointerEvents: 'none',
-            }}
-          >
-            <Slot view="@ossy/app/component/logo/logotype" />
-          </div>
-        </div>
-      )
-    }
-
-    return (
-      <Slot view={showLabels ? '@ossy/app/component/logo/logotype' : '@ossy/app/component/logo/logomark'} />
-    )
-  }
-
   const renderButton = (item) => (
     <Button
       key={item.key ?? item.href}
@@ -255,19 +219,6 @@ export default function DefaultSidebar ({
         boxSizing: 'border-box',
       }}
     >
-      <View
-        layout="row"
-        style={{
-          justifyContent: 'center',
-          alignItems: 'center',
-          marginBottom: 'var(--space-m)',
-          minHeight: SIDEBAR_LOGO_BLOCK_MIN_PX,
-          flexShrink: 0,
-        }}
-      >
-        {renderLogo()}
-      </View>
-
       <View gap="s" style={{ flexGrow: 1, overflowY: 'auto', minHeight: 0 }} data-scroll>
         <View style={{ flexShrink: 0, height: 'var(--space-l)', minHeight: 'var(--space-l)' }} />
         {menuNear.map(renderButton)}

package/src/shell-registry/workspace.layout.jsx

@@ -60,7 +60,7 @@ export default function WorkspaceLayout ({
           )}
 
           <View
-            layout="sidebar"
+            layout="page"
             surface="primary"
             roundness="m"
             inset={compact ? 'none' : 's'}