kasy-cli 1.19.1 → 1.20.0

package/templates/firebase/lib/core/bottom_menu/bottom_menu.dart

@@ -3,30 +3,31 @@ import 'package:bart/bart/bart_bottombar_actions.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:kasy_kit/components/kasy_sidebar_pro.dart';
 import 'package:kasy_kit/core/bottom_menu/bottom_router.dart';
 import 'package:kasy_kit/core/bottom_menu/kasy_bottom_bar_factory.dart';
-import 'package:kasy_kit/core/sidebar/kasy_sidebar.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/core/widgets/responsive_layout.dart';
 
 /// Bottom navigation host powered by Bart (https://pub.dev/packages/bart).
 ///
-/// Bart stores its bottom-bar visibility inside a [ValueNotifier] created in
-/// the [bart.BartScaffold] constructor. Because [ResponsiveLayout] recreates
-/// one of three [bart.BartScaffold]s on every rebuild (breakpoint change,
-/// theme toggle, device-preview resize), that notifier resets to its initial
-/// value and a previously-hidden bar can come back wrong — or, when returning
-/// from a native overlay (FaceID, photo picker, permission dialog), Bart's
-/// internal state ends up out of sync with the visible route.
+/// Bart's [bart.BartScaffold] owns a [ValueNotifier<bool>] for bottom-bar
+/// visibility, created in its constructor. Two issues fall out of that:
 ///
-/// This widget owns visibility end-to-end so feature pages never need to
-/// touch it. The rules are simple:
-///   * Bottom-bar tab (1 path segment) → bar visible.
-///   * Inner route (multi-segment, or [bart.BartMenuRoute.showBottomBar] =
-///     false) → bar hidden.
+///   1. [ResponsiveLayout] swaps between three [bart.BartScaffold]s (small /
+///      medium / large). Any rebuild (theme toggle, locale switch,
+///      device-preview resize) instantiates a fresh notifier with the initial
+///      value, dropping whatever visibility we had set.
+///   2. Bart's [bart.BartScaffold.onRouteChanged] only fires when the active
+///      *tab index* changes — pushing an inner route inside the same tab
+///      (e.g. `home → home/components`) is silent. We can't drive visibility
+///      from that callback alone.
 ///
-/// Sync points: [onRouteChanged], post-frame after every [build] (catches
-/// scaffold rebuilds), and [didChangeAppLifecycleState] on resume.
+/// We solve both by treating inner-route presence as the source of truth.
+/// [BottomBarVisibilityScope] exposes a counter; the [HomeInnerRoute] wrapper
+/// increments while mounted and decrements on dispose. This widget reacts to
+/// the counter (and to lifecycle resume + every rebuild) and re-asserts the
+/// matching [BottomBarIntent] on Bart.
 class BottomMenu extends StatefulWidget {
   final String? initialRoute;
 
@@ -38,17 +39,19 @@ class BottomMenu extends StatefulWidget {
 
 class _BottomMenuState extends State<BottomMenu>
     with WidgetsBindingObserver, BartNotifier {
-  String? _currentRoutePath;
+  final ValueNotifier<int> _innerRouteDepth = ValueNotifier<int>(0);
 
   @override
   void initState() {
     super.initState();
     WidgetsBinding.instance.addObserver(this);
-    _currentRoutePath = _resolveInitialRoute(widget.initialRoute);
+    _innerRouteDepth.addListener(_scheduleSync);
   }
 
   @override
   void dispose() {
+    _innerRouteDepth.removeListener(_scheduleSync);
+    _innerRouteDepth.dispose();
     WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }
@@ -61,77 +64,72 @@ class _BottomMenuState extends State<BottomMenu>
     }
   }
 
-  void _onRouteChanged(bart.BartMenuRoute route) {
-    _currentRoutePath = route.path;
-    _scheduleSync();
-  }
-
   void _scheduleSync() {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!mounted) return;
-      _applyVisibility();
+      if (_innerRouteDepth.value > 0) {
+        hideBottomBar(context);
+      } else {
+        showBottomBar(context);
+      }
     });
   }
 
-  void _applyVisibility() {
-    if (_shouldShowBottomBar(_currentRoutePath)) {
-      showBottomBar(context);
-    } else {
-      hideBottomBar(context);
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
-    // Re-assert visibility after every rebuild: the Bart scaffold underneath
+    // Re-assert visibility after every rebuild: the BartScaffold underneath
     // may have been freshly instantiated (see class doc).
     _scheduleSync();
 
     final String? resolvedInitialRoute = _resolveInitialRoute(
       widget.initialRoute,
     );
-    final bool showBottomBarOnStart = _shouldShowBottomBar(resolvedInitialRoute);
+    final bool showBottomBarOnStart = _shouldShowBottomBarOnStart(
+      resolvedInitialRoute,
+    );
     final scaffoldOptions = bart.ScaffoldOptions(
       backgroundColor: context.colors.background,
     );
 
-    return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: switch (Theme.brightnessOf(context)) {
-        Brightness.dark => SystemUiOverlayStyle.light,
-        Brightness.light => SystemUiOverlayStyle.dark,
-      },
-      child: ResponsiveLayout(
-        small: bart.BartScaffold(
-          routesBuilder: subRoutes,
-          bottomBar: kasyPaddedSurfaceBottomBar(),
-          initialRoute: resolvedInitialRoute,
-          showBottomBarOnStart: showBottomBarOnStart,
-          scaffoldOptions: scaffoldOptions,
-          onRouteChanged: _onRouteChanged,
-        ),
-        // medium (768–1024 px): icon-only collapsed rail
-        medium: bart.BartScaffold(
-          routesBuilder: subRoutes,
-          bottomBar: kasyPaddedSurfaceBottomBar(),
-          initialRoute: resolvedInitialRoute,
-          showBottomBarOnStart: showBottomBarOnStart,
-          scaffoldOptions: scaffoldOptions,
-          sideBarOptions: bart.CustomSideBarOptions(
-            sideBarBuilder: kasySidebarCollapsedBuilder,
+    return BottomBarVisibilityScope(
+      innerRouteDepth: _innerRouteDepth,
+      child: AnnotatedRegion<SystemUiOverlayStyle>(
+        value: switch (Theme.brightnessOf(context)) {
+          Brightness.dark => SystemUiOverlayStyle.light,
+          Brightness.light => SystemUiOverlayStyle.dark,
+        },
+        child: ResponsiveLayout(
+          small: bart.BartScaffold(
+            routesBuilder: subRoutes,
+            bottomBar: kasyPaddedSurfaceBottomBar(),
+            initialRoute: resolvedInitialRoute,
+            showBottomBarOnStart: showBottomBarOnStart,
+            scaffoldOptions: scaffoldOptions,
           ),
-          onRouteChanged: _onRouteChanged,
-        ),
-        // large (1024 px+): full expanded sidebar
-        large: bart.BartScaffold(
-          routesBuilder: subRoutes,
-          bottomBar: kasyPaddedSurfaceBottomBar(),
-          initialRoute: resolvedInitialRoute,
-          showBottomBarOnStart: showBottomBarOnStart,
-          scaffoldOptions: scaffoldOptions,
-          sideBarOptions: bart.CustomSideBarOptions(
-            sideBarBuilder: kasySidebarBuilder,
+          // medium (768–1024 px): KasySidebarPro auto-collapses at this width
+          medium: bart.BartScaffold(
+            routesBuilder: subRoutes,
+            bottomBar: kasyPaddedSurfaceBottomBar(),
+            initialRoute: resolvedInitialRoute,
+            showBottomBarOnStart: showBottomBarOnStart,
+            scaffoldOptions: scaffoldOptions,
+            sideBarOptions: bart.CustomSideBarOptions(
+              sideBarBuilder: (routes, onTap, current) =>
+                  const KasySidebarPro(),
+            ),
+          ),
+          // large (1024 px+): full expanded sidebar
+          large: bart.BartScaffold(
+            routesBuilder: subRoutes,
+            bottomBar: kasyPaddedSurfaceBottomBar(),
+            initialRoute: resolvedInitialRoute,
+            showBottomBarOnStart: showBottomBarOnStart,
+            scaffoldOptions: scaffoldOptions,
+            sideBarOptions: bart.CustomSideBarOptions(
+              sideBarBuilder: (routes, onTap, current) =>
+                  const KasySidebarPro(),
+            ),
           ),
-          onRouteChanged: _onRouteChanged,
         ),
       ),
     );
@@ -170,7 +168,7 @@ class _BottomMenuState extends State<BottomMenu>
     return path;
   }
 
-  bool _shouldShowBottomBar(String? route) {
+  bool _shouldShowBottomBarOnStart(String? route) {
     if (route == null) {
       return true;
     }
@@ -178,3 +176,26 @@ class _BottomMenuState extends State<BottomMenu>
     return segments.length < 2;
   }
 }
+
+/// Shared counter that inner home routes increment while mounted. The host
+/// [BottomMenu] observes it and toggles Bart's bottom-bar accordingly.
+class BottomBarVisibilityScope extends InheritedWidget {
+  final ValueNotifier<int> innerRouteDepth;
+
+  const BottomBarVisibilityScope({
+    super.key,
+    required this.innerRouteDepth,
+    required super.child,
+  });
+
+  static ValueNotifier<int>? maybeOf(BuildContext context) {
+    final scope = context
+        .getInheritedWidgetOfExactType<BottomBarVisibilityScope>();
+    return scope?.innerRouteDepth;
+  }
+
+  @override
+  bool updateShouldNotify(covariant BottomBarVisibilityScope oldWidget) {
+    return innerRouteDepth != oldWidget.innerRouteDepth;
+  }
+}

package/templates/firebase/lib/core/bottom_menu/bottom_router.dart

@@ -2,6 +2,7 @@ import 'package:bart/bart.dart';
 import 'package:flutter/material.dart';
 import 'package:kasy_kit/components/kasy_app_bar.dart';
 import 'package:kasy_kit/core/bottom_menu/bart_inner_paths.dart';
+import 'package:kasy_kit/core/bottom_menu/bottom_menu.dart';
 import 'package:kasy_kit/core/bottom_menu/notification_bottom_item.dart';
 import 'package:kasy_kit/core/navigation/kasy_navigation_config.dart';
 import 'package:kasy_kit/core/navigation/kasy_route_transition.dart';
@@ -109,18 +110,40 @@ List<BartMenuRoute> subRoutes() {
   ];
 }
 
-/// Marker wrapper for inner home routes. Visibility is owned by
-/// [BottomMenu] (see [BottomMenu._onRouteChanged] + [BartMenuRoute.innerRoute]
-/// `showBottomBar: false`); this widget exists for symmetry with the dashboard
-/// cards and to keep `HomeFeaturesPage` / `HomeComponentsPage` / etc. agnostic
-/// of how they were pushed.
-class _HomeInnerRoute extends StatelessWidget {
+/// Wrapper for inner home routes. While mounted, it bumps a shared counter
+/// exposed by [BottomBarVisibilityScope] so [BottomMenu] knows to hide the
+/// bottom bar — covering cases Bart's tab-only `onRouteChanged` misses (e.g.
+/// pushing inside the same tab) and surviving scaffold rebuilds.
+class _HomeInnerRoute extends StatefulWidget {
   final Widget child;
 
   const _HomeInnerRoute({required this.child});
 
   @override
-  Widget build(BuildContext context) => child;
+  State<_HomeInnerRoute> createState() => _HomeInnerRouteState();
+}
+
+class _HomeInnerRouteState extends State<_HomeInnerRoute> {
+  ValueNotifier<int>? _depth;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    final next = BottomBarVisibilityScope.maybeOf(context);
+    if (identical(_depth, next)) return;
+    _depth?.value -= 1;
+    _depth = next;
+    _depth?.value += 1;
+  }
+
+  @override
+  void dispose() {
+    _depth?.value -= 1;
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) => widget.child;
 }
 
 /// Placeholder page for the wishlist tab.

package/templates/firebase/lib/core/bottom_menu/kasy_bottom_bar_factory.dart

@@ -38,6 +38,13 @@ final class KasyPaddedSurfaceBottomBarFactory extends BartBottomBarFactory {
     required void Function(int) onTap,
     required int currentIndex,
   }) {
+    return TooltipVisibility(
+      visible: false,
+      child: _build(context),
+    );
+  }
+
+  Widget _build(BuildContext context) {
     final KasyColors colors = context.colors;
     final MenuRouter menuRouter = MenuRouter.of(context);
     final BorderSide topEdge = BorderSide(
@@ -72,7 +79,7 @@ final class KasyPaddedSurfaceBottomBarFactory extends BartBottomBarFactory {
             ),
           ),
           BartCupertinoBottomBar(
-            routes: routes,
+            routes: menuRouter.routesBuilder(),
             theme: CupertinoBottomBarTheme(
               bgColor: colors.surface,
               height: _kBottomBarHeightCupertino - kasyBottomBarTopPadding,