@wasto/cms-components 1.5.14 → 1.5.16

package/dist/index.d.mts

@@ -133,15 +133,20 @@ type HeaderProps = {
         canGoBack: () => boolean;
         goBack: () => void;
     };
-    /** Flotte au-dessus du contenu (ex. carte) : fond transparent. */
+    /** Flotte au-dessus du contenu (ex. carte) : fond transparent + safe-area top. */
     readonly overlay?: boolean;
     /**
      * Config layout (`header.elements`) — logo / actions.
      * Si fournie (même vide), le fallback titre d’écran ne s’applique pas.
      */
     readonly headerConfig?: AppHeaderConfig | null;
+    /**
+     * Force le padding safe-area top. Par défaut : uniquement en `overlay`
+     * (le header React Navigation est déjà placé sous la status bar).
+     */
+    readonly safeTop?: boolean;
 };
-declare function Header({ options, route, navigation, overlay, headerConfig, }: HeaderProps): ReactNode;
+declare function Header({ options, route, navigation, overlay, headerConfig, safeTop, }: HeaderProps): ReactNode;
 
 type LocationsMapProps = {
     fullScreen?: boolean;
@@ -484,6 +489,8 @@ declare function useOptionalAppData(): AppDataContextType | null;
 type RegisterExpoPushTokenOptions = {
     deviceId: string;
     registerPushToken: (deviceId: string, token: string) => Promise<unknown>;
+    /** Called when registration is skipped or fails (not only thrown errors). */
+    onSkip?: (reason: string, detail?: Record<string, unknown>) => void;
 };
 /**
  * Request OS permission, fetch Expo push token, register it on the API.

package/dist/index.d.ts

@@ -133,15 +133,20 @@ type HeaderProps = {
         canGoBack: () => boolean;
         goBack: () => void;
     };
-    /** Flotte au-dessus du contenu (ex. carte) : fond transparent. */
+    /** Flotte au-dessus du contenu (ex. carte) : fond transparent + safe-area top. */
     readonly overlay?: boolean;
     /**
      * Config layout (`header.elements`) — logo / actions.
      * Si fournie (même vide), le fallback titre d’écran ne s’applique pas.
      */
     readonly headerConfig?: AppHeaderConfig | null;
+    /**
+     * Force le padding safe-area top. Par défaut : uniquement en `overlay`
+     * (le header React Navigation est déjà placé sous la status bar).
+     */
+    readonly safeTop?: boolean;
 };
-declare function Header({ options, route, navigation, overlay, headerConfig, }: HeaderProps): ReactNode;
+declare function Header({ options, route, navigation, overlay, headerConfig, safeTop, }: HeaderProps): ReactNode;
 
 type LocationsMapProps = {
     fullScreen?: boolean;
@@ -484,6 +489,8 @@ declare function useOptionalAppData(): AppDataContextType | null;
 type RegisterExpoPushTokenOptions = {
     deviceId: string;
     registerPushToken: (deviceId: string, token: string) => Promise<unknown>;
+    /** Called when registration is skipped or fails (not only thrown errors). */
+    onSkip?: (reason: string, detail?: Record<string, unknown>) => void;
 };
 /**
  * Request OS permission, fetch Expo push token, register it on the API.

package/dist/index.js

@@ -2179,25 +2179,31 @@ function resolveEasProjectId() {
   return projectId || null;
 }
 async function registerExpoPushToken(options) {
-  if (import_react_native7.Platform.OS === "web") return null;
+  const skip = (reason, detail) => {
+    options.onSkip?.(reason, detail);
+    if (__DEV__) {
+      console.warn(`[wasto] push registration skipped: ${reason}`, detail ?? "");
+    }
+  };
+  if (import_react_native7.Platform.OS === "web") {
+    skip("web_platform");
+    return null;
+  }
   const deviceId = options.deviceId?.trim();
-  if (!deviceId) return null;
+  if (!deviceId) {
+    skip("missing_device_id");
+    return null;
+  }
   const Notifications = loadNotifications();
   if (!Notifications) {
-    if (__DEV__) {
-      console.warn(
-        "[wasto] expo-notifications is not installed; push registration skipped"
-      );
-    }
+    skip("expo_notifications_missing");
     return null;
   }
   const projectId = resolveEasProjectId();
   if (!projectId) {
-    if (__DEV__) {
-      console.warn(
-        "[wasto] EAS projectId missing (extra.eas.projectId or EXPO_PUBLIC_EAS_PROJECT_ID); push registration skipped"
-      );
-    }
+    skip("eas_project_id_missing", {
+      hint: "Set EXPO_PUBLIC_EAS_PROJECT_ID or extra.eas.projectId before EAS build"
+    });
     return null;
   }
   if (!handlerConfigured) {
@@ -2226,12 +2232,26 @@ async function registerExpoPushToken(options) {
     const { status } = await Notifications.requestPermissionsAsync();
     finalStatus = status;
   }
-  if (finalStatus !== "granted") return null;
-  const push = await Notifications.getExpoPushTokenAsync({ projectId });
-  const token = push?.data?.trim();
-  if (!token) return null;
-  await options.registerPushToken(deviceId, token);
-  return token;
+  if (finalStatus !== "granted") {
+    skip("permission_denied", { status: finalStatus });
+    return null;
+  }
+  try {
+    const push = await Notifications.getExpoPushTokenAsync({ projectId });
+    const token = push?.data?.trim();
+    if (!token) {
+      skip("empty_expo_push_token", { projectId });
+      return null;
+    }
+    await options.registerPushToken(deviceId, token);
+    return token;
+  } catch (error) {
+    skip("get_expo_push_token_failed", {
+      projectId,
+      message: error instanceof Error ? error.message : String(error)
+    });
+    throw error;
+  }
 }
 
 // src/components/push/PushTokenRegistrar.tsx
@@ -2256,7 +2276,15 @@ function PushTokenRegistrar() {
             token: pushToken,
             cityId: selectedCityId,
             wasteCollectionPlaceId: selectedPlaceId
-          })
+          }),
+          onSkip: (reason, detail) => {
+            reportError2(new Error(`push_skip:${reason}`), {
+              source: "push",
+              deviceId,
+              reason,
+              ...detail
+            });
+          }
         });
         if (!cancelled && token) {
           lastRegistered.current = registrationKey;
@@ -8292,12 +8320,14 @@ function Header({
   route,
   navigation,
   overlay = false,
-  headerConfig
+  headerConfig,
+  safeTop
 }) {
   const { theme } = useTheme();
   const t = resolveTheme(theme);
   const themedStyles = createThemedStyles14(theme);
-  const topInset = useSafeAreaPadding(["top"]);
+  const applyTopInset = safeTop ?? overlay;
+  const topInset = useSafeAreaPadding(applyTopInset ? ["top"] : []);
   const { hasUnread } = useAnnouncements();
   const { push } = useAppNavigation();
   const screenTitle = (0, import_react35.useMemo)(

package/dist/index.mjs

@@ -2169,25 +2169,31 @@ function resolveEasProjectId() {
   return projectId || null;
 }
 async function registerExpoPushToken(options) {
-  if (Platform4.OS === "web") return null;
+  const skip = (reason, detail) => {
+    options.onSkip?.(reason, detail);
+    if (__DEV__) {
+      console.warn(`[wasto] push registration skipped: ${reason}`, detail ?? "");
+    }
+  };
+  if (Platform4.OS === "web") {
+    skip("web_platform");
+    return null;
+  }
   const deviceId = options.deviceId?.trim();
-  if (!deviceId) return null;
+  if (!deviceId) {
+    skip("missing_device_id");
+    return null;
+  }
   const Notifications = loadNotifications();
   if (!Notifications) {
-    if (__DEV__) {
-      console.warn(
-        "[wasto] expo-notifications is not installed; push registration skipped"
-      );
-    }
+    skip("expo_notifications_missing");
     return null;
   }
   const projectId = resolveEasProjectId();
   if (!projectId) {
-    if (__DEV__) {
-      console.warn(
-        "[wasto] EAS projectId missing (extra.eas.projectId or EXPO_PUBLIC_EAS_PROJECT_ID); push registration skipped"
-      );
-    }
+    skip("eas_project_id_missing", {
+      hint: "Set EXPO_PUBLIC_EAS_PROJECT_ID or extra.eas.projectId before EAS build"
+    });
     return null;
   }
   if (!handlerConfigured) {
@@ -2216,12 +2222,26 @@ async function registerExpoPushToken(options) {
     const { status } = await Notifications.requestPermissionsAsync();
     finalStatus = status;
   }
-  if (finalStatus !== "granted") return null;
-  const push = await Notifications.getExpoPushTokenAsync({ projectId });
-  const token = push?.data?.trim();
-  if (!token) return null;
-  await options.registerPushToken(deviceId, token);
-  return token;
+  if (finalStatus !== "granted") {
+    skip("permission_denied", { status: finalStatus });
+    return null;
+  }
+  try {
+    const push = await Notifications.getExpoPushTokenAsync({ projectId });
+    const token = push?.data?.trim();
+    if (!token) {
+      skip("empty_expo_push_token", { projectId });
+      return null;
+    }
+    await options.registerPushToken(deviceId, token);
+    return token;
+  } catch (error) {
+    skip("get_expo_push_token_failed", {
+      projectId,
+      message: error instanceof Error ? error.message : String(error)
+    });
+    throw error;
+  }
 }
 
 // src/components/push/PushTokenRegistrar.tsx
@@ -2246,7 +2266,15 @@ function PushTokenRegistrar() {
             token: pushToken,
             cityId: selectedCityId,
             wasteCollectionPlaceId: selectedPlaceId
-          })
+          }),
+          onSkip: (reason, detail) => {
+            reportError2(new Error(`push_skip:${reason}`), {
+              source: "push",
+              deviceId,
+              reason,
+              ...detail
+            });
+          }
         });
         if (!cancelled && token) {
           lastRegistered.current = registrationKey;
@@ -8370,12 +8398,14 @@ function Header({
   route,
   navigation,
   overlay = false,
-  headerConfig
+  headerConfig,
+  safeTop
 }) {
   const { theme } = useTheme();
   const t = resolveTheme(theme);
   const themedStyles = createThemedStyles14(theme);
-  const topInset = useSafeAreaPadding(["top"]);
+  const applyTopInset = safeTop ?? overlay;
+  const topInset = useSafeAreaPadding(applyTopInset ? ["top"] : []);
   const { hasUnread } = useAnnouncements();
   const { push } = useAppNavigation();
   const screenTitle = useMemo20(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wasto/cms-components",
-  "version": "1.5.14",
+  "version": "1.5.16",
   "description": "Wast'O CMS React Native components",
   "main": "./src/index.ts",
   "module": "./src/index.ts",

package/src/components/header/Header.tsx

@@ -86,13 +86,18 @@ export type HeaderProps = {
         canGoBack: () => boolean;
         goBack: () => void;
     };
-    /** Flotte au-dessus du contenu (ex. carte) : fond transparent. */
+    /** Flotte au-dessus du contenu (ex. carte) : fond transparent + safe-area top. */
     readonly overlay?: boolean;
     /**
      * Config layout (`header.elements`) — logo / actions.
      * Si fournie (même vide), le fallback titre d’écran ne s’applique pas.
      */
     readonly headerConfig?: AppHeaderConfig | null;
+    /**
+     * Force le padding safe-area top. Par défaut : uniquement en `overlay`
+     * (le header React Navigation est déjà placé sous la status bar).
+     */
+    readonly safeTop?: boolean;
 };
 
 function resolveLogoUri(
@@ -172,11 +177,15 @@ export function Header({
     navigation,
     overlay = false,
     headerConfig,
+    safeTop,
 }: HeaderProps): ReactNode {
     const { theme } = useTheme();
     const t = resolveTheme(theme);
     const themedStyles = createThemedStyles(theme);
-    const topInset = useSafeAreaPadding(["top"]);
+    // Nav header : RN place déjà sous la status bar → pas de double inset.
+    // Overlay (carte) : on flotte sous le notch → inset requis.
+    const applyTopInset = safeTop ?? overlay;
+    const topInset = useSafeAreaPadding(applyTopInset ? ["top"] : []);
     const { hasUnread } = useAnnouncements();
     const { push } = useAppNavigation();
 

package/src/components/push/PushTokenRegistrar.tsx

@@ -38,6 +38,14 @@ export function PushTokenRegistrar(): ReactNode {
                             cityId: selectedCityId,
                             wasteCollectionPlaceId: selectedPlaceId,
                         }),
+                    onSkip: (reason, detail) => {
+                        reportError(new Error(`push_skip:${reason}`), {
+                            source: "push",
+                            deviceId,
+                            reason,
+                            ...detail,
+                        });
+                    },
                 });
                 if (!cancelled && token) {
                     lastRegistered.current = registrationKey;

package/src/push/registerExpoPushToken.ts

@@ -60,6 +60,8 @@ function resolveEasProjectId(): string | null {
 export type RegisterExpoPushTokenOptions = {
     deviceId: string;
     registerPushToken: (deviceId: string, token: string) => Promise<unknown>;
+    /** Called when registration is skipped or fails (not only thrown errors). */
+    onSkip?: (reason: string, detail?: Record<string, unknown>) => void;
 };
 
 /**
@@ -69,28 +71,35 @@ export type RegisterExpoPushTokenOptions = {
 export async function registerExpoPushToken(
     options: RegisterExpoPushTokenOptions,
 ): Promise<string | null> {
-    if (Platform.OS === "web") return null;
+    const skip = (reason: string, detail?: Record<string, unknown>) => {
+        options.onSkip?.(reason, detail);
+        if (__DEV__) {
+            console.warn(`[wasto] push registration skipped: ${reason}`, detail ?? "");
+        }
+    };
+
+    if (Platform.OS === "web") {
+        skip("web_platform");
+        return null;
+    }
 
     const deviceId = options.deviceId?.trim();
-    if (!deviceId) return null;
+    if (!deviceId) {
+        skip("missing_device_id");
+        return null;
+    }
 
     const Notifications = loadNotifications();
     if (!Notifications) {
-        if (__DEV__) {
-            console.warn(
-                "[wasto] expo-notifications is not installed; push registration skipped",
-            );
-        }
+        skip("expo_notifications_missing");
         return null;
     }
 
     const projectId = resolveEasProjectId();
     if (!projectId) {
-        if (__DEV__) {
-            console.warn(
-                "[wasto] EAS projectId missing (extra.eas.projectId or EXPO_PUBLIC_EAS_PROJECT_ID); push registration skipped",
-            );
-        }
+        skip("eas_project_id_missing", {
+            hint: "Set EXPO_PUBLIC_EAS_PROJECT_ID or extra.eas.projectId before EAS build",
+        });
         return null;
     }
 
@@ -122,12 +131,26 @@ export async function registerExpoPushToken(
         const { status } = await Notifications.requestPermissionsAsync();
         finalStatus = status;
     }
-    if (finalStatus !== "granted") return null;
+    if (finalStatus !== "granted") {
+        skip("permission_denied", { status: finalStatus });
+        return null;
+    }
 
-    const push = await Notifications.getExpoPushTokenAsync({ projectId });
-    const token = push?.data?.trim();
-    if (!token) return null;
+    try {
+        const push = await Notifications.getExpoPushTokenAsync({ projectId });
+        const token = push?.data?.trim();
+        if (!token) {
+            skip("empty_expo_push_token", { projectId });
+            return null;
+        }
 
-    await options.registerPushToken(deviceId, token);
-    return token;
+        await options.registerPushToken(deviceId, token);
+        return token;
+    } catch (error) {
+        skip("get_expo_push_token_failed", {
+            projectId,
+            message: error instanceof Error ? error.message : String(error),
+        });
+        throw error;
+    }
 }