An open source design system that's fully customizable and agent ready
TypeScript
fix(AppShell): apply navAreaStyle to header wrapper in all height modes (#2464)
Ernest2fa219ebee28
diff --git a/apps/docsite/src/app/globals.css b/apps/docsite/src/app/globals.cssindex ec56700734..6c4987f7eb 100644--- a/apps/docsite/src/app/globals.css+++ b/apps/docsite/src/app/globals.css@@ -37,13 +37,26 @@ body:has([data-home-page]) #xds-app-shell-main {padding-top: 0;}-/* Translucent top nav — frosted glass effect */-.xds-layout-header,-:has(> .xds-layout-header) {+/* Translucent top nav — frosted glass effect.++ The :where(:not(.xds-app-shell .xds-app-shell *)) guard scopes every frost+ rule to the OUTERMOST AppShell only: any nav inside a *nested* AppShell+ (component examples, templates) matches `.xds-app-shell .xds-app-shell *`+ — it has two AppShell ancestors — and is therefore excluded, so it keeps+ its own solid navAreaStyle background and stays seamless with its sidenav.++ The guard lives inside :where() so it adds ZERO specificity. The frost+ subject stays at (0,1,0) — identical to a bare `.xds-top-nav` — so the+ home-page, nav-mode, and theme-preview overrides below keep winning exactly+ as they did before. (Putting the :not() on the outer shell instead, as in+ `.xds-app-shell:not(...) > .xds-layout .xds-top-nav`, does NOT work: the+ nested nav is still an unrestricted descendant of the outer layout.) */+.xds-layout-header:where(:not(.xds-app-shell .xds-app-shell *)),+:has(> .xds-layout-header):where(:not(.xds-app-shell .xds-app-shell *)) {background: transparent !important;}-.xds-top-nav {+.xds-top-nav:where(:not(.xds-app-shell .xds-app-shell *)) {background: color-mix(in srgb, var(--color-background-surface) 80%, transparent);backdrop-filter: blur(12px);transition: background 300ms ease;@@ -53,13 +66,13 @@ body:has([data-home-page]) #xds-app-shell-main {Use the solid body color (not a color-mix) so it matches perfectly evenwithout anything scrolled behind it. The backdrop-filter blur from the.xds-top-nav rule above is preserved. */-body:has([data-home-page]) .xds-top-nav {+body:has([data-home-page]) .xds-top-nav:where(:not(.xds-app-shell .xds-app-shell *)) {background: var(--color-background-body);}/* When the home page IntersectionObserver detects the theming showcase hasreached the top, switch the nav back to a surface-tinted frosted bar. */-body[data-nav-mode='surface'] .xds-top-nav {+body[data-nav-mode='surface'] .xds-top-nav:where(:not(.xds-app-shell .xds-app-shell *)) {background: color-mix(in srgb, var(--color-background-surface) 80%, transparent);}diff --git a/packages/core/src/AppShell/XDSAppShell.tsx b/packages/core/src/AppShell/XDSAppShell.tsxindex 978cb4b8c5..bd4f6180bf 100644--- a/packages/core/src/AppShell/XDSAppShell.tsx+++ b/packages/core/src/AppShell/XDSAppShell.tsx@@ -659,7 +659,7 @@ export function XDSAppShell({ref={headerRef}{...mergeProps(xdsClassName('app-shell-header', {variant}),- stylex.props(isAuto && styles.headerSticky, isAuto && stickyBgStyle),+ stylex.props(navAreaStyle, isAuto && styles.headerSticky),)}>{headerInner}</div>@@ -743,7 +743,7 @@ export function XDSAppShell({<div{...mergeProps(xdsClassName('app-shell-header', {variant}),- stylex.props(isAuto && styles.headerSticky, isAuto && stickyBgStyle),+ stylex.props(navAreaStyle, isAuto && styles.headerSticky),)}><XDSLayoutHeader padding={0} hasDivider={navHasDividers}><div