Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(AppShell): preserve page content across mobile breakpoints (#7236)

zakelstorm83965ddf9b32
diff --git a/.changeset/appshell-preserve-breakpoint-state.md b/.changeset/appshell-preserve-breakpoint-state.md
new file mode 100644
index 0000000000..12d3c5ac59
--- /dev/null
+++ b/.changeset/appshell-preserve-breakpoint-state.md
@@ -0,0 +1,7 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] Preserve AppShell page content, local state, and input focus when the elevated layout crosses the mobile navigation breakpoint (#7235).
+
+@korkt-kim
diff --git a/packages/core/src/AppShell/AppShell.test.tsx b/packages/core/src/AppShell/AppShell.test.tsx
index 48e2218c9f..7f01171167 100644
--- a/packages/core/src/AppShell/AppShell.test.tsx
+++ b/packages/core/src/AppShell/AppShell.test.tsx
@@ -302,6 +302,30 @@ describe('AppShell', () => {
// Responsive breakpoint
// ===========================================================================
+ it('preserves input value and focus across mobile breakpoints.', async () => {
+ const user = userEvent.setup();
+ render(
+ <AppShell
+ variant="elevated"
+ topNav="Top navigation"
+ sideNav="Side navigation"
+ mobileNav={{breakpoint: 'md'}}>
+ <input aria-label="Page draft" />
+ </AppShell>,
+ );
+ await user.type(
+ screen.getByRole('textbox', {name: 'Page draft'}),
+ 'Keep this draft',
+ );
+
+ for (const isMobile of [true, false]) {
+ act(() => mockMql._setMatches(isMobile));
+ const input = screen.getByRole('textbox', {name: 'Page draft'});
+ expect(input).toHaveValue('Keep this draft');
+ expect(input).toHaveFocus();
+ }
+ });
+
it('uses the default named breakpoint with an exclusive upper edge', () => {
render(
<AppShell sideNav={<TestSideNav />} mobileNav={{breakpoint: 'md'}}>
diff --git a/packages/core/src/AppShell/AppShell.tsx b/packages/core/src/AppShell/AppShell.tsx
index 9c5e6006ea..5b6c33177f 100644
--- a/packages/core/src/AppShell/AppShell.tsx
+++ b/packages/core/src/AppShell/AppShell.tsx
@@ -360,6 +360,9 @@ const styles = stylex.create({
borderStartStartRadius: radiusVars['--radius-page'],
pointerEvents: 'none',
},
+ contentWrapper: {
+ display: 'contents',
+ },
elevatedContentWrapper: {
position: 'relative',
display: 'flex',
@@ -751,13 +754,20 @@ export function AppShell({
</LayoutContent>
);
- const mainContent = shouldElevateWithCorner ? (
- <div {...stylex.props(styles.elevatedContentWrapper)}>
- <div {...stylex.props(styles.elevatedBackdrop)} />
+ // Keep the parent and mainInner's position stable across breakpoints. Outside
+ // the elevated desktop layout, the wrapper generates no layout box.
+ const mainContent = (
+ <div
+ {...stylex.props(
+ shouldElevateWithCorner
+ ? styles.elevatedContentWrapper
+ : styles.contentWrapper,
+ )}>
+ {shouldElevateWithCorner && (
+ <div {...stylex.props(styles.elevatedBackdrop)} />
+ )}
{mainInner}
</div>
- ) : (
- mainInner
);
// =========================================================================