kasy-cli 1.31.14 → 1.32.0

package/lib/scaffold/shared/generator-utils.js

@@ -616,7 +616,7 @@ async function writeRouter(projectDir, modules, packageName, defaultPaywall = 'b
  * @param {object} [answers={}] - moduleAnswers (rcTestKey, stripe keys, etc.)
  * @param {string} [language='en'] - User's CLI language (en, pt, es)
  */
-async function writeFeaturesConfig(projectDir, modules, answers = {}, language = 'en') {
+async function writeFeaturesConfig(projectDir, modules, answers = {}, language = 'en', backend = 'firebase') {
   const withOnboarding = modules.includes('onboarding');
   const withAiChat   = modules.includes('ai_chat');
   const withFeedback            = modules.includes('feedback');
@@ -624,6 +624,10 @@ async function writeFeaturesConfig(projectDir, modules, answers = {}, language =
   const withStripe              = modules.includes('stripe');
   const withLocalReminders  = modules.includes('local_reminders');
   const withWeb                 = modules.includes('web');
+  // Apple sign-in on web only works on Firebase (signInWithPopup). Supabase/API
+  // throw on web (no Service ID + token exchange), so they must ship this false
+  // and hide the Apple button on web. Native always shows it.
+  const withAppleWebSignin = backend === 'firebase';
 
   const f = getStrings(language).features;
   const content = `${f.comment1}
@@ -635,7 +639,14 @@ const bool withFeedback            = ${withFeedback};
 const bool withRevenuecat          = ${withRevenuecat};
 // Stripe web subscriptions module (independent from RevenueCat mobile IAP).
 const bool withStripe              = ${withStripe};
+// When true, Stripe Checkout shows a promo-code / coupon field.
+const bool withStripePromoCodes = true;
+// When true, the Stripe Customer Portal lets subscribers switch plans (upgrade / downgrade).
+const bool withStripePlanSwitching = true;
 const bool withLocalReminders  = ${withLocalReminders};
+// Apple sign-in on web: Firebase supports it (signInWithPopup); Supabase/API throw
+// on web, so they ship false. Native always shows the Apple button.
+const bool withAppleWebSignin = ${withAppleWebSignin};
 ${f.comment3}
 ${f.comment4}
 ${f.comment5}
@@ -1347,10 +1358,18 @@ async function removeFacebookSigninFromAuthPages(projectDir) {
   for (const p of pages) {
     if (!(await fs.pathExists(p))) continue;
     let content = await fs.readFile(p, 'utf8');
-    // Remove import line
+    // Legacy: remove the standalone FacebookSigninComponent + its import, if present.
     content = content.replace(/^import 'package:[^']+\/features\/authentication\/ui\/components\/facebook_signin\.dart';\n/m, '');
-    // Remove component line (any leading whitespace)
     content = content.replace(/[ \t]*const FacebookSigninComponent\(\),\n/g, '');
+    // Current UI: the Facebook button is an inline _SocialSigninTile/_SocialSignupTile
+    // in the social row (label: t.auth.signin.facebook ... signinWithFacebook()). Strip
+    // the whole tile plus the SizedBox spacer that precedes it, anchored on the facebook
+    // label so the Google/Apple tiles are never touched. Runs before dartFix/format, so
+    // it matches the kit's raw formatting verbatim.
+    content = content.replace(
+      /\n[ \t]*const SizedBox\(width: KasySpacing\.sm\),\n[ \t]*Expanded\(\n[ \t]*child: _Social(?:Signin|Signup)Tile\(\n[ \t]*label: t\.auth\.signin\.facebook,[\s\S]*?\.signinWithFacebook\(\),\n[ \t]*\),\n[ \t]*\),/,
+      '',
+    );
     await fs.writeFile(p, content, 'utf8');
   }
 }

package/lib/utils/i18n/messages-en.js

@@ -740,6 +740,7 @@ module.exports = {
     'new.success.featuresInstalled': 'Features enabled:',
     'new.success.bundleId': 'App identifier (bundle ID)',
     'new.success.bundleId.hint': "Your app's unique identifier on Android, iOS and Firebase (push).",
+    'new.success.api.serverContracts': 'API backend: you must implement the server contracts (delete account, AI chat and push). See patch/README.md',
     'new.success.nextSteps': 'Next steps:',
     'new.success.step.cd': 'Go to your project folder:',
     'new.success.step.deploy': 'Push the server to Firebase (DB + functions):',
@@ -754,6 +755,7 @@ module.exports = {
     'new.google.manualHint': 'Google Sign-In: enable manually in the Console (Google provider):',
     'new.google.manualHint.noEmail': 'Google Sign-In: could not detect a support email (gcloud has no account). Enable manually in the Console:',
     'new.google.supabaseManual': 'Google Sign-In: client created, but the secret was not available yet. Enable it later in the Supabase dashboard (Authentication > Providers > Google).',
+    'new.google.localhostDomainWarn': 'Google sign-in on web: could not authorize localhost in the Firebase authorized domains automatically. If the Google popup fails with "unauthorized-domain", add localhost in Firebase Console > Authentication > Settings > Authorized domains.',
     'new.fcm.ok': 'generated automatically',
     'new.fcm.failSupabase': 'not generated (GCP permission still propagating); set FIREBASE_SERVICE_ACCOUNT_JSON in your Supabase secrets',
     'new.fcm.failApi': 'not generated (GCP permission still propagating); run the command again in a few minutes',

package/lib/utils/i18n/messages-es.js

@@ -740,6 +740,7 @@ module.exports = {
     'new.success.featuresInstalled': 'Recursos activados:',
     'new.success.bundleId': 'Identificador de la app (bundle ID)',
     'new.success.bundleId.hint': 'Identificador único de tu app en Android, iOS y Firebase (push).',
+    'new.success.api.serverContracts': 'Backend API: debes implementar los contratos del servidor (eliminar cuenta, IA chat y push). Consulta patch/README.md',
     'new.success.nextSteps': 'Próximos pasos:',
     'new.success.step.cd': 'Ve a la carpeta del proyecto:',
     'new.success.step.deploy': 'Sube el servidor a Firebase (DB + funciones):',
@@ -754,6 +755,7 @@ module.exports = {
     'new.google.manualHint': 'Inicio de sesión con Google: actívalo manualmente en la consola (proveedor Google):',
     'new.google.manualHint.noEmail': 'Inicio de sesión con Google: no detecté un email de soporte (gcloud sin cuenta). Actívalo manualmente en la consola:',
     'new.google.supabaseManual': 'Inicio de sesión con Google: cliente creado, pero el secret aún no estaba disponible. Actívalo luego en el panel de Supabase (Authentication > Providers > Google).',
+    'new.google.localhostDomainWarn': 'Inicio de sesión con Google en web: no se pudo autorizar localhost en los dominios de Firebase automáticamente. Si el popup de Google falla con "unauthorized-domain", agrega localhost en Firebase Console > Authentication > Settings > Authorized domains.',
     'new.fcm.ok': 'generada automáticamente',
     'new.fcm.failSupabase': 'no generada (permiso de GCP aún propagando); define FIREBASE_SERVICE_ACCOUNT_JSON en los secrets de Supabase',
     'new.fcm.failApi': 'no generada (permiso de GCP aún propagando); ejecuta el comando de nuevo en unos minutos',

package/lib/utils/i18n/messages-pt.js

@@ -740,6 +740,7 @@ module.exports = {
     'new.success.featuresInstalled': 'Recursos ativados:',
     'new.success.bundleId': 'Identificador do app (bundle ID)',
     'new.success.bundleId.hint': 'Identificador único do seu app no Android, iOS e Firebase (push).',
+    'new.success.api.serverContracts': 'Backend API: você precisa implementar os contratos do servidor (excluir conta, IA chat e push). Veja patch/README.md',
     'new.success.nextSteps': 'Próximos passos:',
     'new.success.step.cd': 'Entre na pasta do projeto:',
     'new.success.step.deploy': 'Suba o servidor pro Firebase (banco + funções):',
@@ -754,6 +755,7 @@ module.exports = {
     'new.google.manualHint': 'Login com Google: ative manualmente no Console (provedor Google):',
     'new.google.manualHint.noEmail': 'Login com Google: não consegui detectar um e-mail de suporte (gcloud sem conta). Ative manualmente no Console:',
     'new.google.supabaseManual': 'Login com Google: client criado, mas o secret ainda não estava disponível. Ative depois no painel do Supabase (Authentication > Providers > Google).',
+    'new.google.localhostDomainWarn': 'Login com Google na web: não consegui autorizar o localhost nos domínios do Firebase automaticamente. Se o popup do Google falhar com "unauthorized-domain", adicione localhost em Firebase Console > Authentication > Settings > Authorized domains.',
     'new.fcm.ok': 'gerada automaticamente',
     'new.fcm.failSupabase': 'não gerada (permissão do GCP ainda propagando); defina FIREBASE_SERVICE_ACCOUNT_JSON nos secrets do Supabase',
     'new.fcm.failApi': 'não gerada (permissão do GCP ainda propagando); rode o comando de novo em alguns minutos',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasy-cli",
-  "version": "1.31.14",
+  "version": "1.32.0",
   "description": "CLI for scaffolding production-ready Flutter SaaS apps with Firebase, Supabase, or API REST backends.",
   "bin": {
     "kasy": "./bin/kasy.js"
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "scripts": {
-    "prepack": "node scripts/check-feature-patches.js && node scripts/bundle-template.js && node test/generated-matches-kit.test.js && node test/supabase-verify-jwt.test.js && node test/supabase-cors.test.js && node test/supabase-google-web.test.js && node test/backend-pubspec-local-reminders.test.js",
+    "prepack": "node scripts/check-feature-patches.js && node scripts/bundle-template.js && node test/generated-matches-kit.test.js && node test/supabase-verify-jwt.test.js && node test/supabase-cors.test.js && node test/supabase-google-web.test.js && node test/backend-pubspec-local-reminders.test.js && node test/stripe-webhook-orphan-guard.test.js && node test/facebook-strip.test.js && node test/path-provider-pin.test.js && node test/features-flags-parity.test.js",
     "start": "node ./bin/kasy.js",
     "setup": "node ./bin/kasy.js setup",
     "doctor": "node ./bin/kasy.js doctor",

package/templates/firebase/docs/auth-setup.en.md

@@ -69,7 +69,13 @@ Requires an [Apple Developer](https://developer.apple.com) account (paid).
 1. Open `ios/Runner.xcworkspace` in Xcode
 2. Target **Runner** → **Signing & Capabilities** → **+ Capability** → add **Sign In with Apple**
 
-> **Android and Web**: no additional setup needed. The Firebase SDK handles the flow on Android. For Web, the Services ID (Step 3) already covers the redirect flow via `firebaseapp.com`.
+> **iOS / macOS**: the Apple button shows automatically once the steps above are done.
+>
+> **Android**: the Apple button is hidden by design (it needs the paid Services ID web flow and adds little on Android for a SaaS). Leave it hidden.
+>
+> **Web (Firebase)**: works after Steps 1-4 above (`withAppleWebSignin` already ships `true`). The Services ID Return URL (`firebaseapp.com/__/auth/handler`) covers the popup flow.
+>
+> **Web (Supabase)**: the CLI ships `withAppleWebSignin = false` (native iOS works; web needs more). To enable it: in Supabase → Authentication → Providers → Apple, add the **client secret** (a JWT signed with your `.p8` key + Services ID), then set `withAppleWebSignin = true` in `lib/core/config/features.dart`.
 
 ---
 

package/templates/firebase/docs/auth-setup.es.md

@@ -69,7 +69,13 @@ Requiere cuenta de [Apple Developer](https://developer.apple.com) (de pago).
 1. Abre `ios/Runner.xcworkspace` en Xcode
 2. Target **Runner** → **Signing & Capabilities** → **+ Capability** → agrega **Sign In with Apple**
 
-> **Android y Web**: no se necesita configuración adicional. El SDK de Firebase gestiona el flujo en Android. Para Web, el Services ID (Paso 3) ya cubre el flujo de redirect vía `firebaseapp.com`.
+> **iOS / macOS**: el botón Apple aparece automáticamente tras los pasos anteriores.
+>
+> **Android**: el botón Apple queda oculto por defecto (necesita el flujo del Services ID de pago y aporta poco en Android para un SaaS). Déjalo oculto.
+>
+> **Web (Firebase)**: funciona tras los Pasos 1 a 4 anteriores (`withAppleWebSignin` ya viene `true`). La Return URL del Services ID (`firebaseapp.com/__/auth/handler`) cubre el flujo de popup.
+>
+> **Web (Supabase)**: la CLI genera `withAppleWebSignin = false` (iOS nativo funciona; la web necesita más). Para habilitar: en Supabase → Authentication → Providers → Apple, agrega el **client secret** (un JWT firmado con la clave `.p8` + Services ID) y luego define `withAppleWebSignin = true` en `lib/core/config/features.dart`.
 
 ---
 

package/templates/firebase/docs/auth-setup.pt.md

@@ -69,7 +69,13 @@ Requer conta [Apple Developer](https://developer.apple.com) (paga).
 1. Abra `ios/Runner.xcworkspace` no Xcode
 2. Target **Runner** → **Signing & Capabilities** → **+ Capability** → adicione **Sign In with Apple**
 
-> **Android e Web**: não precisam de configuração adicional. O Firebase SDK gerencia o fluxo no Android. Para Web, o Services ID (Passo 3) já cobre o fluxo de redirect via `firebaseapp.com`.
+> **iOS / macOS**: o botão Apple aparece automaticamente depois dos passos acima.
+>
+> **Android**: o botão Apple fica escondido por padrão (exige o fluxo do Services ID pago e agrega pouco no Android para um SaaS). Deixe escondido.
+>
+> **Web (Firebase)**: funciona depois dos Passos 1 a 4 acima (`withAppleWebSignin` já vem `true`). A Return URL do Services ID (`firebaseapp.com/__/auth/handler`) cobre o fluxo de popup.
+>
+> **Web (Supabase)**: a CLI gera `withAppleWebSignin = false` (iOS nativo funciona; web precisa de mais). Para habilitar: em Supabase → Authentication → Providers → Apple, adicione o **client secret** (um JWT assinado com a chave `.p8` + Services ID) e depois defina `withAppleWebSignin = true` em `lib/core/config/features.dart`.
 
 ---
 

package/templates/firebase/functions/src/subscriptions/stripe_functions.ts

@@ -125,6 +125,8 @@ export const createCheckoutSession = onCall(
     const price = await stripe.prices.retrieve(priceId, {expand: ["product"]});
     const trialDays = trialDaysFor(price, price.product as Stripe.Product);
 
+    const allowPromoCodes = request.data?.allowPromoCodes as boolean | undefined;
+
     const session = await stripe.checkout.sessions.create({
       mode: "subscription",
       customer: customerId,
@@ -136,13 +138,70 @@ export const createCheckoutSession = onCall(
         metadata: {firebaseUID: uid},
         ...(trialDays ? {trial_period_days: trialDays} : {}),
       },
+      ...(allowPromoCodes ? {allow_promotion_codes: true} : {}),
     });
     return {url: session.url};
   },
 );
 
 // ---------------------------------------------------------------------------
-// createPortalSession — Stripe Customer Portal (manage / cancel).
+// getOrCreatePortalConfig — creates (once) a Customer Portal configuration
+// with subscription_update (plan switching) enabled and caches its ID in
+// Firestore so we don't recreate it on every portal open. Falls back to
+// undefined (default portal) if there are no prices to switch between.
+// ---------------------------------------------------------------------------
+async function getOrCreatePortalConfig(stripe: Stripe): Promise<string | undefined> {
+  const db = admin.firestore();
+  const configRef = db.doc("_config/stripe_portal");
+  const snap = await configRef.get();
+  const cachedId = snap.data()?.configId as string | undefined;
+  if (cachedId) {
+    try {
+      const cfg = await stripe.billingPortal.configurations.retrieve(cachedId);
+      if (cfg.active) return cachedId;
+    } catch {
+      // Cached config was deleted on Stripe — recreate below
+    }
+  }
+
+  // Build allowed-prices list grouped by product. STRIPE_PRODUCT_ID narrows the
+  // query to a single product; if it's not set we use all active recurring prices.
+  const productId = stripeProductId.value();
+  const priceParams: Stripe.PriceListParams = {active: true, type: "recurring", limit: 100};
+  if (productId) priceParams.product = productId;
+  const {data: prices} = await stripe.prices.list(priceParams);
+
+  if (prices.length === 0) return undefined;
+
+  const byProduct: Record<string, string[]> = {};
+  for (const p of prices) {
+    const pid = typeof p.product === "string" ? p.product : p.product.id;
+    if (!byProduct[pid]) byProduct[pid] = [];
+    byProduct[pid].push(p.id);
+  }
+  const products = Object.entries(byProduct).map(([prod, priceIds]) => ({
+    product: prod,
+    prices: priceIds,
+  }));
+
+  const config = await stripe.billingPortal.configurations.create({
+    features: {
+      subscription_update: {
+        enabled: true,
+        default_allowed_updates: ["price"],
+        products,
+      },
+      subscription_cancel: {enabled: true, mode: "at_period_end"},
+      payment_method_update: {enabled: true},
+    },
+  });
+
+  await configRef.set({configId: config.id}, {merge: true});
+  return config.id;
+}
+
+// ---------------------------------------------------------------------------
+// createPortalSession — Stripe Customer Portal (manage / cancel / switch plan).
 // ---------------------------------------------------------------------------
 export const createPortalSession = onCall(
   {secrets: [stripeSecretKey]},
@@ -150,6 +209,7 @@ export const createPortalSession = onCall(
     const uid = request.auth?.uid;
     if (!uid) throw new HttpsError("unauthenticated", "Sign in required");
     const returnUrl = (request.data?.returnUrl as string | undefined) ?? "";
+    const planSwitching = request.data?.planSwitching as boolean | undefined;
 
     const stripe = stripeClient();
     const snap = await admin
@@ -161,9 +221,16 @@ export const createPortalSession = onCall(
     if (!customerId) {
       throw new HttpsError("failed-precondition", "No Stripe customer for user");
     }
+
+    // When plan switching is requested, resolve (or create) a portal configuration
+    // that has subscription_update enabled. This removes the need for any manual
+    // setup in the Stripe dashboard.
+    const configId = planSwitching ? await getOrCreatePortalConfig(stripe) : undefined;
+
     const session = await stripe.billingPortal.sessions.create({
       customer: customerId,
       return_url: returnUrl,
+      ...(configId ? {configuration: configId} : {}),
     });
     return {url: session.url};
   },
@@ -189,11 +256,18 @@ async function upsertFromStripeSubscription(sub: Stripe.Subscription): Promise<v
     console.log("[stripe-webhook] subscription without firebaseUID metadata, skipping");
     return;
   }
+  // Skip if the user no longer exists. Deleting an account cancels the Stripe
+  // customer, which fires customer.subscription.deleted AFTER deleteUserAccount
+  // already removed subscriptions/{uid} — without this guard the webhook would
+  // re-create an orphan doc for a user that is gone. (The Supabase webhook does
+  // the same check.) The lookup also gives us the email to denormalize below.
+  const user = await usersRepository.getFromId(uid);
+  if (!user) {
+    console.log(`[stripe-webhook] user ${uid} not found (likely deleted), skipping`);
+    return;
+  }
   const now = Timestamp.now();
   const existing = await subscriptionsRepository.getFromUserId(uid);
-  // Denormalize the subscriber's email onto the Firestore subscription doc (see
-  // SubscriptionData.email) so a subscribers list reads it without a second hop.
-  const user = await usersRepository.getFromId(uid);
   // In Stripe API v18 the billing period lives on each subscription item.
   const item = sub.items.data[0];
   const priceId = item?.price?.id ?? "";
@@ -211,7 +285,7 @@ async function upsertFromStripeSubscription(sub: Stripe.Subscription): Promise<v
       expirationDate: expiration,
       store: Stores.STRIPE,
       productId: priceId,
-      email: user?.email,
+      email: user.email,
     },
     subscriptionsRepository,
   );

package/templates/firebase/lib/components/kasy_accordion.dart

@@ -366,7 +366,7 @@ class _TrailingChevron extends StatelessWidget {
         duration: const Duration(milliseconds: 200),
         child: Icon(
           KasyIcons.chevronDown,
-          size: 18.5,
+          size: KasyIconSize.md,
           color: context.colors.muted,
         ),
       );
@@ -376,7 +376,7 @@ class _TrailingChevron extends StatelessWidget {
       duration: const Duration(milliseconds: 200),
       child: Icon(
         KasyIcons.chevronRight,
-        size: 18.5,
+        size: KasyIconSize.md,
         color: context.colors.muted,
       ),
     );

package/templates/firebase/lib/components/kasy_alert.dart

@@ -232,7 +232,7 @@ class KasyAlertCircleButton extends StatelessWidget {
           height: 36,
           child: Icon(
             icon,
-            size: 19,
+            size: KasyIconSize.md,
             color: context.colors.onSurface.withValues(alpha: 0.58),
           ),
         ),

package/templates/firebase/lib/components/kasy_app_bar.dart

@@ -292,7 +292,7 @@ class KasyAppBar extends StatelessWidget {
       ),
       _ => KasyChromeOrbIconButton(
         icon: KasyIcons.arrowBackIos,
-        iconSize: 18,
+        iconSize: KasyIconSize.md,
         foregroundColor: orbFg,
         fillColor: orbFill,
         onPressed: handleBack,
@@ -404,7 +404,7 @@ class KasyAppBar extends StatelessWidget {
       case KasyAppBarStyle.subpage:
         return KasyChromeOrbIconButton(
           icon: isDark ? KasyIcons.lightMode : KasyIcons.darkMode,
-          iconSize: 20,
+          iconSize: KasyIconSize.lg,
           foregroundColor: iconFg,
           fillColor: orbFill,
           onPressed: () {
@@ -421,7 +421,7 @@ class KasyAppBar extends StatelessWidget {
         if (trailing != null) return trailing!;
         return KasyChromeOrbIconButton(
           icon: isDark ? KasyIcons.lightMode : KasyIcons.darkMode,
-          iconSize: 20,
+          iconSize: KasyIconSize.lg,
           foregroundColor: iconFg,
           fillColor: orbFill,
           onPressed: () {

package/templates/firebase/lib/components/kasy_bottom_sheet.dart

@@ -298,7 +298,7 @@ class _IconBubble extends StatelessWidget {
       width: 72,
       height: 72,
       decoration: BoxDecoration(color: p.background, shape: BoxShape.circle),
-      child: Icon(icon, size: 30, color: p.foreground),
+      child: Icon(icon, size: KasyIconSize.xxl, color: p.foreground),
     );
   }
 

package/templates/firebase/lib/components/kasy_button.dart

@@ -417,17 +417,17 @@ class KasyButton extends StatelessWidget {
         iconOnlyExtent: 40,
         horizontalPadding: EdgeInsets.symmetric(horizontal: 16),
         labelFontSize: 13,
-        iconSize: 16,
-        iconOnlyGlyphSize: 12,
+        iconSize: KasyIconSize.sm,
+        iconOnlyGlyphSize: KasyIconSize.xxs,
         loadingSpinnerExtent: 13,
       ),
       KasyButtonSize.medium => const _KasyButtonMetrics(
-        height: 47,
-        iconOnlyExtent: 47,
+        height: 45,
+        iconOnlyExtent: 45,
         horizontalPadding: EdgeInsets.symmetric(horizontal: 18),
         labelFontSize: 14,
-        iconSize: 18,
-        iconOnlyGlyphSize: 14,
+        iconSize: KasyIconSize.md,
+        iconOnlyGlyphSize: KasyIconSize.xs,
         loadingSpinnerExtent: 14,
       ),
       KasyButtonSize.large => const _KasyButtonMetrics(
@@ -435,8 +435,8 @@ class KasyButton extends StatelessWidget {
         iconOnlyExtent: 54,
         horizontalPadding: EdgeInsets.symmetric(horizontal: 22),
         labelFontSize: 15,
-        iconSize: 19,
-        iconOnlyGlyphSize: 18,
+        iconSize: KasyIconSize.md,
+        iconOnlyGlyphSize: KasyIconSize.md,
         loadingSpinnerExtent: 15,
       ),
     };

package/templates/firebase/lib/components/kasy_chip.dart

@@ -36,7 +36,7 @@ class KasyChip extends StatelessWidget {
     final KasyColors c = context.colors;
     final Widget? avatar = icon == null
         ? null
-        : Icon(icon, size: 18, color: enabled ? c.primary : c.muted);
+        : Icon(icon, size: KasyIconSize.md, color: enabled ? c.primary : c.muted);
     final OutlinedBorder chipShape = RoundedRectangleBorder(
       borderRadius: BorderRadius.circular(KasyRadius.full),
       side: BorderSide(color: c.outline.withValues(alpha: 0.45)),

package/templates/firebase/lib/components/kasy_date_picker.dart

@@ -552,11 +552,13 @@ class _KasyDatePickerState extends State<KasyDatePicker>
   // Key on the trigger field — used to measure its width when opening the popover.
   final GlobalKey _fieldKey = GlobalKey();
 
-  // Focus node owned by the trigger field. We want focus so the
-  // KasyTextField paints its focus border while the calendar is open — but
-  // the underlying TextField runs in readOnly mode, so no soft keyboard
-  // appears even when focused.
-  final FocusNode _fieldFocusNode = FocusNode();
+  // Drives the trigger's "active" (focused-look) border while the calendar or
+  // overlay is open. We deliberately do NOT focus the field for this: real
+  // focus would (a) light the wrapping KasyFocusRing's keyboard ring on a mouse
+  // click — a second outline — and (b) get stolen by the overlay after a
+  // moment, dropping the border. KasyTextField.forceFocusBorder paints it from
+  // this flag instead, so it stays put for as long as the calendar is open.
+  bool _triggerActive = false;
 
   // Controller backing the trigger KasyTextField — text mirrors the formatted
   // date (or stays empty so the hint renders).
@@ -639,7 +641,6 @@ class _KasyDatePickerState extends State<KasyDatePicker>
   @override
   void dispose() {
     _displayController.dispose();
-    _fieldFocusNode.dispose();
     _animCtrl.dispose();
     super.dispose();
   }
@@ -741,11 +742,12 @@ class _KasyDatePickerState extends State<KasyDatePicker>
 
     _portalController.show();
     _animCtrl.forward();
-    // Focus so the trigger field paints its focus border while the calendar
-    // is open (only when focusBorder is enabled — otherwise we skip to avoid
-    // the field announcing focus to assistive tech for no visual reason).
-    if (widget.focusBorder) _fieldFocusNode.requestFocus();
-    setState(() => _isOpen = true);
+    // Paint the trigger's "active" border while the calendar is open — driven
+    // by state, not real focus (see _triggerActive).
+    setState(() {
+      _isOpen = true;
+      _triggerActive = true;
+    });
   }
 
   void _close() {
@@ -765,7 +767,7 @@ class _KasyDatePickerState extends State<KasyDatePicker>
         _pendingPopoverRange = null;
         widget.onRangeChanged?.call(pendingRange);
       }
-      _fieldFocusNode.unfocus();
+      setState(() => _triggerActive = false);
     });
     setState(() => _isOpen = false);
   }
@@ -830,7 +832,7 @@ class _KasyDatePickerState extends State<KasyDatePicker>
     // endpoint right away).
     DateTime dialogViewMonth = _viewMonth;
     KasyDateRange? dialogRange = _effectiveRange;
-    if (widget.focusBorder) _fieldFocusNode.requestFocus();
+    setState(() => _triggerActive = true);
 
     showKasyDialog<void>(
       context: context,
@@ -904,12 +906,12 @@ class _KasyDatePickerState extends State<KasyDatePicker>
         },
       ),
     ).whenComplete(() {
-      if (mounted) _fieldFocusNode.unfocus();
+      if (mounted) setState(() => _triggerActive = false);
     });
   }
 
   void _openBottomSheet() {
-    if (widget.focusBorder) _fieldFocusNode.requestFocus();
+    setState(() => _triggerActive = true);
     showKasyBottomSheet<void>(
       context: context,
       isScrollControlled: true,
@@ -925,7 +927,7 @@ class _KasyDatePickerState extends State<KasyDatePicker>
         monthsToShow: widget.monthsToShow,
       ),
     ).whenComplete(() {
-      if (mounted) _fieldFocusNode.unfocus();
+      if (mounted) setState(() => _triggerActive = false);
     });
   }
 
@@ -1050,15 +1052,18 @@ class _KasyDatePickerState extends State<KasyDatePicker>
                   child: KasyTextField(
                     key: _fieldKey,
                     controller: _displayController,
-                    focusNode: _fieldFocusNode,
                     readOnly: true,
                     enabled: widget.enabled,
                     hint: _resolvedPlaceholder,
                     isInvalid: hasInvalidState,
                     variant: widget.variant,
                     focusBorder: widget.focusBorder,
-                    // No caret, no selection handles, no "blue text" when the
-                    // trigger is focused while the calendar is open — keeps the
+                    // "Active" border while the calendar is open — painted from
+                    // state, not real focus, so it never doubles the wrapping
+                    // KasyFocusRing's keyboard ring on click and never gets
+                    // dropped when the overlay steals focus.
+                    forceFocusBorder: widget.focusBorder && _triggerActive,
+                    // No caret, no selection handles, no "blue text" — keeps the
                     // field reading as a button, not an editable input.
                     enableInteractiveSelection: false,
                     suffix: widget.showSuffix
@@ -1691,7 +1696,7 @@ class _CalendarNavRow extends StatelessWidget {
             viewMode == _CalendarViewMode.month
                 ? KasyIcons.chevronRight
                 : KasyIcons.chevronDown,
-            size: 18,
+            size: KasyIconSize.md,
             weight: 700,
             color: c.primary,
           ),
@@ -1766,7 +1771,7 @@ class _NavArrowButton extends StatelessWidget {
       child: Center(
         child: Icon(
           icon,
-          size: 20,
+          size: KasyIconSize.lg,
           weight: 700,
           color: disabled ? c.muted.withValues(alpha: 0.45) : c.primary,
         ),

package/templates/firebase/lib/components/kasy_dialog.dart

@@ -144,7 +144,7 @@ class KasyDialog extends StatelessWidget {
                 padding: const EdgeInsets.all(6),
                 minimumSize: const Size(40, 40),
               ),
-              icon: const Icon(KasyIcons.close, size: 19),
+              icon: const Icon(KasyIcons.close, size: KasyIconSize.md),
             ),
           );
       }
@@ -449,7 +449,7 @@ class _DialogIconBubble extends StatelessWidget {
       width: _size,
       height: _size,
       decoration: BoxDecoration(color: p.background, shape: BoxShape.circle),
-      child: Icon(icon, size: 20, color: p.foreground),
+      child: Icon(icon, size: KasyIconSize.lg, color: p.foreground),
     );
   }
 

package/templates/firebase/lib/components/kasy_sidebar.dart

@@ -1227,7 +1227,7 @@ class _ProHoverPopupIconState extends State<_ProHoverPopupIcon> {
                 color: widget.iconBg,
                 borderRadius: BorderRadius.circular(_kItemRadius),
               ),
-              child: Icon(widget.icon, size: 20, color: widget.iconColor),
+              child: Icon(widget.icon, size: KasyIconSize.lg, color: widget.iconColor),
             ),
           ),
         ),
@@ -1365,7 +1365,7 @@ class _ProTooltipIconState extends State<_ProTooltipIcon> {
                 color: widget.iconBg,
                 borderRadius: BorderRadius.circular(_kItemRadius),
               ),
-              child: Icon(widget.icon, size: 20, color: widget.iconColor),
+              child: Icon(widget.icon, size: KasyIconSize.lg, color: widget.iconColor),
             ),
           ),
         ),

package/templates/firebase/lib/components/kasy_tabs.dart

@@ -486,7 +486,7 @@ class _PrimaryTabState extends State<_PrimaryTab> {
             opacity: disabled ? 0.4 : 1.0,
             child: Icon(
               item.icon,
-              size: 16,
+              size: KasyIconSize.sm,
               color: fg,
             ),
           )
@@ -628,7 +628,7 @@ class _SecondaryTabState extends State<_SecondaryTab> {
                   opacity: disabled ? 0.4 : 1.0,
                   child: Icon(
                     item.icon,
-                    size: 16,
+                    size: KasyIconSize.sm,
                     color: fg,
                   ),
                 ),