@multiplatform.one/components 7.83.1 → 7.84.0

package/dist/cjs/appShell/TabHost.native.js

@@ -29,8 +29,11 @@ __export(TabHost_native_exports, {
   itemsHaveNativeIcons: () => itemsHaveNativeIcons,
   nativeIconFor: () => nativeIconFor,
   nativeTabBarHeight: () => nativeTabBarHeight,
+  nativeTabsAccessoryComponent: () => nativeTabsAccessoryComponent,
+  nativeTabsAccessoryHeight: () => nativeTabsAccessoryHeight,
   nativeTabsComponents: () => nativeTabsComponents,
   nativeTabsPlatforms: () => nativeTabsPlatforms,
+  resolveNativeAccessory: () => resolveNativeAccessory,
   resolveNativeTabs: () => resolveNativeTabs
 });
 module.exports = __toCommonJS(TabHost_native_exports);
@@ -45,6 +48,8 @@ var import_TabBar = require("./TabBar.native.js");
 var import_MpoTabHost = require("./MpoTabHost.native.js");
 var nativeTabsComponents = ["RNSTabsHost", "RNSTabsScreen"];
 var nativeTabBarHeight = 49;
+var nativeTabsAccessoryComponent = "RNSTabsBottomAccessory";
+var nativeTabsAccessoryHeight = 56;
 var nativeTabsPlatforms = {
   ios: true,
   android: false
@@ -70,11 +75,26 @@ function resolveNativeTabs(sources, os) {
     return null;
   }
 }
+function resolveNativeAccessory(sources, os, version) {
+  if (os !== "ios" || Number.parseInt(String(version), 10) < 26) return false;
+  try {
+    return sources.hasComponent(nativeTabsAccessoryComponent);
+  } catch (unused) {
+    return false;
+  }
+}
 var cached;
+var cachedAccessory;
 function loadNativeTabs() {
   if (cached === void 0) cached = resolveNativeTabs(appSources, import_react_native.Platform.OS);
   return cached;
 }
+function loadNativeAccessory() {
+  if (cachedAccessory === void 0) {
+    cachedAccessory = resolveNativeAccessory(appSources, import_react_native.Platform.OS, import_react_native.Platform.Version);
+  }
+  return cachedAccessory;
+}
 function itemsHaveNativeIcons(items) {
   var os = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "ios";
   var glyph = function glyph2(item) {
@@ -106,20 +126,34 @@ function nativeIconFor(item) {
     } : {})
   };
 }
+function NativeAccessoryContent(param) {
+  var {
+    children
+  } = param;
+  return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.XStack, {
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+    paddingHorizontal: "$3",
+    "data-testid": "native-tab-accessory",
+    children
+  });
+}
 function NativeTabHost(param) {
   var {
     tabs,
     items,
     activeKey,
     onTabPress,
-    children
+    children,
+    hostsAccessory = false
   } = param;
   var _items_;
   var {
     Host,
     Screen
   } = tabs;
-  var accent = (0, import_theme.useIdentityInkOnSurface)();
+  var accent = (0, import_theme.useActiveTabInk)();
   var ink = (0, import_theme.useGlyphColor)(import_TabBar.tabBarInactiveInk);
   var surface = (0, import_theme.useGlyphColor)("$color2");
   var indicator = (0, import_theme.useAccentTintedSurface)();
@@ -130,12 +164,19 @@ function NativeTabHost(param) {
   var lastKey = (0, import_react.useRef)(activeKey !== null && activeKey !== void 0 ? activeKey : (_items_ = items[0]) === null || _items_ === void 0 ? void 0 : _items_.key);
   if (activeKey) lastKey.current = activeKey;
   var focusedKey = lastKey.current;
+  var hosting = hostsAccessory && Boolean(activeKey);
+  var pageAccessory = (0, import_bottomChrome.useBottomAccessory)();
+  var accessory = hosting ? pageAccessory : null;
+  (0, import_react.useEffect)(function () {
+    (0, import_bottomChrome.setBottomChromeInset)(id, activeKey ? nativeTabBarHeight + deviceInset + (accessory ? nativeTabsAccessoryHeight : 0) : null);
+  }, [activeKey, accessory, deviceInset, id]);
   (0, import_react.useEffect)(function () {
-    (0, import_bottomChrome.setBottomChromeInset)(id, activeKey ? nativeTabBarHeight + deviceInset : null);
-  }, [activeKey, deviceInset, id]);
+    (0, import_bottomChrome.setFloatingBarMounted)(id, hosting);
+  }, [hosting, id]);
   (0, import_react.useEffect)(function () {
     return function () {
-      return (0, import_bottomChrome.setBottomChromeInset)(id, null);
+      (0, import_bottomChrome.setBottomChromeInset)(id, null);
+      (0, import_bottomChrome.setFloatingBarMounted)(id, false);
     };
   }, [id]);
   return /* @__PURE__ */(0, import_jsx_runtime.jsx)(Host, {
@@ -148,6 +189,11 @@ function NativeTabHost(param) {
     tabBarBackgroundColor: surface,
     tabBarItemActiveIndicatorColor: indicator,
     experimentalControlNavigationStateInJS: true,
+    bottomAccessory: accessory ? function () {
+      return /* @__PURE__ */(0, import_jsx_runtime.jsx)(NativeAccessoryContent, {
+        children: accessory
+      });
+    } : void 0,
     onNativeFocusChange: function onNativeFocusChange(event) {
       var key = event.nativeEvent.tabKey;
       if (key !== activeKey) onTabPress(key);
@@ -183,6 +229,7 @@ function TabHost(props) {
   });
   return /* @__PURE__ */(0, import_jsx_runtime.jsx)(NativeTabHost, {
     tabs,
+    hostsAccessory: loadNativeAccessory(),
     ...props
   });
 }

package/dist/cjs/appShell/TabHost.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["TabHost_native_exports","__export","NativeTabHost","TabHost","itemsHaveNativeIcons","nativeIconFor","nativeTabBarHeight","nativeTabsComponents","nativeTabsPlatforms","resolveNativeTabs","module","exports","__toCommonJS","import_jsx_runtime","require","import_theme","import_react","import_react_native","import_tamagui","import_bottomChrome","import_bottomInset","import_TabBar","import_MpoTabHost","ios","android","appSources","hasComponent","name","UIManager","hasViewManagerConfig","screens","sources","os","platforms","arguments","length","every","tabs","Tabs","Host","Screen","unused","cached","loadNativeTabs","Platform","OS","items","glyph","glyph2","item","_item_nativeIcon","_item_nativeIcon1","nativeIcon","sfSymbol","Boolean","type","imageSource","param","activeKey","onTabPress","children","_items_","accent","useIdentityInkOnSurface","ink","useGlyphColor","tabBarInactiveInk","surface","indicator","useAccentTintedSurface","deviceInset","useBottomInset","id","useState","Symbol","lastKey","useRef","key","current","focusedKey","useEffect","setBottomChromeInset","jsx","tabBarHidden","tabBarTintColor","tabBarItemIconColor","tabBarItemIconColorActive","tabBarItemTitleFontColor","tabBarItemTitleFontColorActive","tabBarBackgroundColor","tabBarItemActiveIndicatorColor","experimentalControlNavigationStateInJS","onNativeFocusChange","event","nativeEvent","tabKey","map","title","label","isFocused","icon","selectedIcon","sfSymbolSelected","tabBarItemAccessibilityLabel","tabBarItemTestID","replace","overrideScrollViewContentInsetAdjustmentBehavior","YStack","flex","backgroundColor","props","MpoTabHost"],"sources":["../../../src/appShell/TabHost.native.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["TabHost_native_exports","__export","NativeTabHost","TabHost","itemsHaveNativeIcons","nativeIconFor","nativeTabBarHeight","nativeTabsAccessoryComponent","nativeTabsAccessoryHeight","nativeTabsComponents","nativeTabsPlatforms","resolveNativeAccessory","resolveNativeTabs","module","exports","__toCommonJS","import_jsx_runtime","require","import_theme","import_react","import_react_native","import_tamagui","import_bottomChrome","import_bottomInset","import_TabBar","import_MpoTabHost","ios","android","appSources","hasComponent","name","UIManager","hasViewManagerConfig","screens","sources","os","platforms","arguments","length","every","tabs","Tabs","Host","Screen","unused","version","Number","parseInt","String","cached","cachedAccessory","loadNativeTabs","Platform","OS","loadNativeAccessory","Version","items","glyph","glyph2","item","_item_nativeIcon","_item_nativeIcon1","nativeIcon","sfSymbol","Boolean","type","imageSource","NativeAccessoryContent","param","children","jsx","XStack","flex","alignItems","justifyContent","paddingHorizontal","activeKey","onTabPress","hostsAccessory","_items_","accent","useActiveTabInk","ink","useGlyphColor","tabBarInactiveInk","surface","indicator","useAccentTintedSurface","deviceInset","useBottomInset","id","useState","Symbol","lastKey","useRef","key","current","focusedKey","hosting","pageAccessory","useBottomAccessory","accessory","useEffect","setBottomChromeInset","setFloatingBarMounted","tabBarHidden","tabBarTintColor","tabBarItemIconColor","tabBarItemIconColorActive","tabBarItemTitleFontColor","tabBarItemTitleFontColorActive","tabBarBackgroundColor","tabBarItemActiveIndicatorColor","experimentalControlNavigationStateInJS","bottomAccessory","onNativeFocusChange","event","nativeEvent","tabKey","map","title","label","isFocused","icon","selectedIcon","sfSymbolSelected","tabBarItemAccessibilityLabel","tabBarItemTestID","replace","overrideScrollViewContentInsetAdjustmentBehavior","YStack","backgroundColor","props","MpoTabHost"],"sources":["../../../src/appShell/TabHost.native.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/layouts/PageTemplates.cjs

@@ -203,19 +203,22 @@ function DetailPageLayout({
   return (
     // LC-157: the toolbar is the Screen's pinned top bar, so it stays put
     // while the record scrolls and takes the title once the header scrolls away.
+    // LC-270: a detail page is pushed, so on a phone its title starts there.
     /* @__PURE__ */
-    (0, import_jsx_runtime.jsxs)(import_page.Screen, {
-      "data-canonical": "detail-page",
-      topBar: toolbar,
-      maxWidth: aside == null ? import_theme.DETAIL_READABLE_WIDTH : void 0,
-      ...rest,
-      children: [renderTemplateHeader({
-        title,
-        subtitle,
-        actions,
-        header,
-        nav
-      }), body]
+    (0, import_jsx_runtime.jsx)(import_page.PushedPage, {
+      children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_page.Screen, {
+        "data-canonical": "detail-page",
+        topBar: toolbar,
+        maxWidth: aside == null ? import_theme.DETAIL_READABLE_WIDTH : void 0,
+        ...rest,
+        children: [renderTemplateHeader({
+          title,
+          subtitle,
+          actions,
+          header,
+          nav
+        }), body]
+      })
     })
   );
 }

package/dist/cjs/layouts/PageTemplates.native.js

@@ -213,20 +213,23 @@ function DetailPageLayout(param) {
   return (
     // LC-157: the toolbar is the Screen's pinned top bar, so it stays put
     // while the record scrolls and takes the title once the header scrolls away.
+    // LC-270: a detail page is pushed, so on a phone its title starts there.
     /* @__PURE__ */
-    (0, import_jsx_runtime.jsxs)(import_page.Screen, {
-      "data-canonical": "detail-page",
-      topBar: toolbar,
-      // LC-263: one readable column; a supporting pane gets the full width.
-      maxWidth: aside == null ? import_theme.DETAIL_READABLE_WIDTH : void 0,
-      ...rest,
-      children: [renderTemplateHeader({
-        title,
-        subtitle,
-        actions,
-        header,
-        nav
-      }), body]
+    (0, import_jsx_runtime.jsx)(import_page.PushedPage, {
+      children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_page.Screen, {
+        "data-canonical": "detail-page",
+        topBar: toolbar,
+        // LC-263: one readable column; a supporting pane gets the full width.
+        maxWidth: aside == null ? import_theme.DETAIL_READABLE_WIDTH : void 0,
+        ...rest,
+        children: [renderTemplateHeader({
+          title,
+          subtitle,
+          actions,
+          header,
+          nav
+        }), body]
+      })
     })
   );
 }

package/dist/cjs/layouts/PageTemplates.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","PageTemplates_exports","__export","DensePageLayout","DetailPageLayout","ListPageLayout","SettingsPageLayout","module","exports","import_jsx_runtime","require","import_theme","import_react","import_tamagui","import_page","import_PaneScaffold","import_shellSidebarSlot","renderTemplateHeader","param","title","subtitle","actions","nav","header","jsx","PageHeader","toolbar","sidebar","sidebarWidth","sidebarLabel","children","rest","main","jsxs","Fragment","YStack","flex","minWidth","Screen","ListPageSidebar","scrollViewProps","knobProps","useResolvedKnobs","component","scrollHeight","setScrollHeight","useState","shellTookPanel","useShellSidebarPanel","content","onLayout","event","_scrollViewProps_onLayout","height","nativeEvent","layout","call","XStack","gapLg","alignItems","render","width","flexShrink","display","isWeb","style","position","top","maxHeight","overflowY","toolbarLeading","toolbarTrailing","aside","sizeClass","sizeClassProp","liveClass","useLayoutSizeClass","multi","defaultMaxPanes","gaps","useSemanticGaps","ScreenToolbar","leading","trailing","body","SupportingPaneLayout","supporting","betweenGroups","topBar","maxWidth","DETAIL_READABLE_WIDTH","layoutBreakpoints","expanded","status","measure","kind","gutter","compact","head","region","minHeight"],"sources":["../../../src/layouts/PageTemplates.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","PageTemplates_exports","__export","DensePageLayout","DetailPageLayout","ListPageLayout","SettingsPageLayout","module","exports","import_jsx_runtime","require","import_theme","import_react","import_tamagui","import_page","import_PaneScaffold","import_shellSidebarSlot","renderTemplateHeader","param","title","subtitle","actions","nav","header","jsx","PageHeader","toolbar","sidebar","sidebarWidth","sidebarLabel","children","rest","main","jsxs","Fragment","YStack","flex","minWidth","Screen","ListPageSidebar","scrollViewProps","knobProps","useResolvedKnobs","component","scrollHeight","setScrollHeight","useState","shellTookPanel","useShellSidebarPanel","content","onLayout","event","_scrollViewProps_onLayout","height","nativeEvent","layout","call","XStack","gapLg","alignItems","render","width","flexShrink","display","isWeb","style","position","top","maxHeight","overflowY","toolbarLeading","toolbarTrailing","aside","sizeClass","sizeClassProp","liveClass","useLayoutSizeClass","multi","defaultMaxPanes","gaps","useSemanticGaps","ScreenToolbar","leading","trailing","body","SupportingPaneLayout","supporting","betweenGroups","PushedPage","topBar","maxWidth","DETAIL_READABLE_WIDTH","layoutBreakpoints","expanded","status","measure","kind","gutter","compact","head","region","minHeight"],"sources":["../../../src/layouts/PageTemplates.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/layouts/bottomAccessory.cjs

@@ -26,6 +26,7 @@ __export(bottomAccessory_exports, {
   BottomAccessoryHost: () => BottomAccessoryHost,
   BottomAccessoryScope: () => BottomAccessoryScope,
   createBottomAccessoryStore: () => createBottomAccessoryStore,
+  useBottomAccessoryOccupied: () => useBottomAccessoryOccupied,
   useBottomAccessorySlot: () => useBottomAccessorySlot
 });
 module.exports = __toCommonJS(bottomAccessory_exports);
@@ -116,6 +117,9 @@ function BottomAccessory({
     children
   });
 }
+function useBottomAccessoryOccupied(store) {
+  return (0, import_react.useSyncExternalStore)(store.subscribe, () => store.getSnapshot().length > 0, () => false);
+}
 function BottomAccessoryHost({
   store,
   inset,
@@ -143,6 +147,20 @@ function BottomAccessoryBar({
   } = (0, import_theme.useResolvedKnobs)({
     component: "ScreenToolbar"
   });
+  const chromeInset = (0, import_bottomChrome.useBottomChromeInset)();
+  const lift = hosted && chromeInset > 0;
+  const controls = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
+    width: "100%",
+    ...(maxWidth ? {
+      maxWidth,
+      alignSelf: "center"
+    } : null),
+    alignItems: "center",
+    paddingHorizontal: inset ?? knobProps.panelPadding.padding,
+    paddingVertical: knobProps.gap.gap,
+    ...knobProps.gap,
+    children
+  });
   return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_theme.Surface, {
     bar: true,
     children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
@@ -154,19 +172,13 @@ function BottomAccessoryBar({
       ...import_theme.hairline.top,
       borderColor: import_componentColors.componentColors.divider,
       style: webSticky,
-      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_bottomSafeArea.BottomSafeArea, {
-        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
-          width: "100%",
-          ...(maxWidth ? {
-            maxWidth,
-            alignSelf: "center"
-          } : null),
-          alignItems: "center",
-          paddingHorizontal: inset ?? knobProps.panelPadding.padding,
-          paddingVertical: knobProps.gap.gap,
-          ...knobProps.gap,
-          children
-        })
+      children: lift ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
+        width: "100%",
+        paddingBottom: chromeInset,
+        "data-testid": "bottom-accessory-lift",
+        children: controls
+      }) : /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_bottomSafeArea.BottomSafeArea, {
+        children: controls
       })
     })
   });

package/dist/cjs/layouts/bottomAccessory.native.js

@@ -28,6 +28,7 @@ __export(bottomAccessory_exports, {
   BottomAccessoryHost: () => BottomAccessoryHost,
   BottomAccessoryScope: () => BottomAccessoryScope,
   createBottomAccessoryStore: () => createBottomAccessoryStore,
+  useBottomAccessoryOccupied: () => useBottomAccessoryOccupied,
   useBottomAccessorySlot: () => useBottomAccessorySlot
 });
 module.exports = __toCommonJS(bottomAccessory_exports);
@@ -161,6 +162,13 @@ function BottomAccessory(param) {
     children
   });
 }
+function useBottomAccessoryOccupied(store) {
+  return (0, import_react.useSyncExternalStore)(store.subscribe, function () {
+    return store.getSnapshot().length > 0;
+  }, function () {
+    return false;
+  });
+}
 function BottomAccessoryHost(param) {
   var {
     store,
@@ -194,6 +202,20 @@ function BottomAccessoryBar(param) {
   } = (0, import_theme.useResolvedKnobs)({
     component: "ScreenToolbar"
   });
+  var chromeInset = (0, import_bottomChrome.useBottomChromeInset)();
+  var lift = hosted && chromeInset > 0;
+  var controls = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
+    width: "100%",
+    ...(maxWidth ? {
+      maxWidth,
+      alignSelf: "center"
+    } : null),
+    alignItems: "center",
+    paddingHorizontal: inset !== null && inset !== void 0 ? inset : knobProps.panelPadding.padding,
+    paddingVertical: knobProps.gap.gap,
+    ...knobProps.gap,
+    children
+  });
   return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_theme.Surface, {
     bar: true,
     children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
@@ -205,19 +227,13 @@ function BottomAccessoryBar(param) {
       ...import_theme.hairline.top,
       borderColor: import_componentColors.componentColors.divider,
       style: webSticky,
-      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_bottomSafeArea.BottomSafeArea, {
-        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
-          width: "100%",
-          ...(maxWidth ? {
-            maxWidth,
-            alignSelf: "center"
-          } : null),
-          alignItems: "center",
-          paddingHorizontal: inset !== null && inset !== void 0 ? inset : knobProps.panelPadding.padding,
-          paddingVertical: knobProps.gap.gap,
-          ...knobProps.gap,
-          children
-        })
+      children: lift ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
+        width: "100%",
+        paddingBottom: chromeInset,
+        "data-testid": "bottom-accessory-lift",
+        children: controls
+      }) : /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_bottomSafeArea.BottomSafeArea, {
+        children: controls
       })
     })
   });

package/dist/cjs/layouts/bottomAccessory.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","bottomAccessory_exports","__export","BottomAccessory","BottomAccessoryHost","BottomAccessoryScope","createBottomAccessoryStore","useBottomAccessorySlot","module","exports","import_jsx_runtime","require","import_theme","import_react","import_tamagui","import_bottomChrome","import_componentColors","import_bottomSafeArea","useIsomorphicLayoutEffect","window","useEffect","useLayoutEffect","empty","webSticky","isWeb","position","bottom","entries","listeners","Set","emit","emit2","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","listener","err","return","set","id","node","at","findIndex","entry","map","remove","some","filter","subscribe","add","delete","getSnapshot","BottomAccessoryContext","createContext","param","store","children","jsx","Provider","useContext","nextId","floating","useFloatingBarMounted","slot","useRef","current","barId","useState","own"],"sources":["../../../src/layouts/bottomAccessory.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","bottomAccessory_exports","__export","BottomAccessory","BottomAccessoryHost","BottomAccessoryScope","createBottomAccessoryStore","useBottomAccessoryOccupied","useBottomAccessorySlot","module","exports","import_jsx_runtime","require","import_theme","import_react","import_tamagui","import_bottomChrome","import_componentColors","import_bottomSafeArea","useIsomorphicLayoutEffect","window","useEffect","useLayoutEffect","empty","webSticky","isWeb","position","bottom","entries","listeners","Set","emit","emit2","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","listener","err","return","set","id","node","at","findIndex","entry","map","remove","some","filter","subscribe","add","delete","getSnapshot","BottomAccessoryContext","createContext","param","store","children","jsx","Provider","useContext","nextId","floating","useFloatingBarMounted","slot","useRef","current","barId","useState","own","setBottomAccessory"],"sources":["../../../src/layouts/bottomAccessory.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/layouts/page.cjs

@@ -31,9 +31,11 @@ __export(page_exports, {
   PageHeader: () => PageHeader,
   PageMenuButton: () => PageMenuButton,
   PageSection: () => PageSection,
+  PushedPage: () => PushedPage,
   READABLE_MAX_WIDTH: () => READABLE_MAX_WIDTH,
   Screen: () => Screen,
-  ScreenToolbar: () => ScreenToolbar
+  ScreenToolbar: () => ScreenToolbar,
+  useInlinePageTitle: () => useInlinePageTitle
 });
 module.exports = __toCommonJS(page_exports);
 var import_theme = require("@multiplatform.one/theme");
@@ -200,7 +202,13 @@ function PageShell({
   const inner = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
     ref: scrollState.contentRoot,
     "data-testid": "screen",
-    flex: 1,
+    ...(scroll ? {
+      flexGrow: 1,
+      flexShrink: 0,
+      flexBasis: "auto"
+    } : {
+      flex: 1
+    }),
     width: "100%",
     ...(maxWidth && !bleed ? {
       maxWidth,
@@ -244,7 +252,8 @@ function PageShell({
       children: scoped
     });
   };
-  const chromeClearance = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_BottomChromeClearance.BottomChromeClearance, {
+  const accessoryOccupied = (0, import_bottomAccessory.useBottomAccessoryOccupied)(accessories);
+  const chromeClearance = accessoryOccupied ? null : /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_BottomChromeClearance.BottomChromeClearance, {
     testID: "screen-chrome-clearance"
   });
   if (!scroll) {
@@ -281,6 +290,21 @@ function PageShell({
     children: [bar, scroller, accessory]
   }));
 }
+const PushedPageContext = (0, import_react2.createContext)(null);
+function PushedPage({
+  hero = false,
+  children
+}) {
+  return /* @__PURE__ */(0, import_jsx_runtime.jsx)(PushedPageContext.Provider, {
+    value: hero ? "hero" : "inline",
+    children
+  });
+}
+function useInlinePageTitle() {
+  const pushed = (0, import_react2.useContext)(PushedPageContext);
+  const compact = (0, import_theme.useLayoutSizeClass)() === "compact";
+  return pushed === "inline" && compact;
+}
 function PageHeader({
   title,
   subtitle,
@@ -308,9 +332,14 @@ function PageHeader({
   });
   const TitleTag = PAGE_HEADING_TAGS[headingLevel];
   const largeTitle = (0, import_screenScroll.useLargeTitle)(title, headingLevel === 1 && !heading);
+  const inlineTitle = useInlinePageTitle() && headingLevel === 1;
+  const compact = (0, import_theme.useLayoutSizeClass)() === "compact";
   const titleSize = titleScale ? (0, import_theme.resolvePageTitleScale)(titleScale) : knobProps.pageTitle;
-  const titleNode = heading ?? (title ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(TitleTag, {
+  const titleNode = inlineTitle ? null : heading ?? (title ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(TitleTag, {
     margin: 0,
+    ...(compact ? {
+      numberOfLines: 1
+    } : null),
     ...largeTitle,
     ...titleSize,
     ...knobProps.heading,
@@ -319,6 +348,7 @@ function PageHeader({
     } : null),
     children: title
   }) : null);
+  if (inlineTitle && !subtitle && !status && !actions && !nav && !children) return null;
   const showHairline = Boolean(divider);
   const rule = {
     ...import_theme.hairline.bottom,
@@ -489,6 +519,10 @@ function useBarTitleSpan() {
     measureTitle: event => set("title", Math.ceil(extent(event).width))
   };
 }
+const pageTitleRole = {
+  role: "heading",
+  "aria-level": 1
+};
 function BarTitle({
   title,
   span,
@@ -567,6 +601,7 @@ function InlineToolbar({
     marginHorizontal: negateSpaceToken(insetToken)
   } : null;
   const oneRow = (0, import_theme.useLayoutSizeClass)() === "compact";
+  const pushedTitle = useInlinePageTitle();
   return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_theme.Surface, {
     bar: true,
     children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
@@ -608,7 +643,8 @@ function InlineToolbar({
       }), title ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(BarTitle, {
         title,
         span: titleSpan.span,
-        onTitleWidth: titleSpan.measureTitle
+        onTitleWidth: titleSpan.measureTitle,
+        ...(pushedTitle ? pageTitleRole : null)
       }) : null]
     })
   });
@@ -634,6 +670,7 @@ function PinnedTopBar({
   const titleSpan = useBarTitleSpan();
   const motion = (0, import_theme.transitionProps)(knobProps.motion.control);
   const title = inlineTitle ?? largeTitle;
+  const pushedTitle = useInlinePageTitle();
   return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_theme.Surface, {
     bar: true,
     children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
@@ -680,7 +717,8 @@ function PinnedTopBar({
           title,
           span: titleSpan.span,
           onTitleWidth: titleSpan.measureTitle,
-          shown: Boolean(inlineTitle) || collapsed,
+          shown: Boolean(inlineTitle) || collapsed || pushedTitle,
+          ...(pushedTitle ? pageTitleRole : null),
           ...motion
         }) : null]
       })