@knocklabs/expo 0.4.2 → 0.4.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @knocklabs/expo
 
+## 0.4.3
+
+### Patch Changes
+
+- e154ed9: Fix Android push notification channel registration issue and add customization options. The `KnockExpoPushNotificationProvider` had a race condition where the push token was not being properly registered with Knock's channel data on Android (and potentially iOS). This was caused by checking the state value immediately after setting it, before React had a chance to update the state. Additionally, added proper Android notification channel setup using `setNotificationChannelAsync`, which is required for Android push notifications to work correctly. Apps can now customize the Android notification channel setup by providing a `setupAndroidNotificationChannel` prop.
+- Updated dependencies [01d07af]
+  - @knocklabs/client@0.20.1
+  - @knocklabs/react-core@0.12.1
+  - @knocklabs/react-native@0.7.3
+
 ## 0.4.2
 
 ### Patch Changes

package/dist/cjs/modules/push/KnockExpoPushNotificationProvider.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("react/jsx-runtime"),b=require("@knocklabs/react-core"),x=require("@knocklabs/react-native"),T=require("expo-constants"),j=require("expo-device"),_=require("expo-notifications"),i=require("react"),q=t=>t&&typeof t=="object"&&"default"in t?t:{default:t};function v(t){if(t&&typeof t=="object"&&"default"in t)return t;const s=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const c in t)if(c!=="default"){const a=Object.getOwnPropertyDescriptor(t,c);Object.defineProperty(s,c,a.get?a:{enumerable:!0,get:()=>t[c]})}}return s.default=t,Object.freeze(s)}const d=q(T),R=v(j),r=v(_);r.setNotificationHandler({handleNotification:async()=>({shouldShowAlert:!0,shouldPlaySound:!0,shouldSetBadge:!0,shouldShowBanner:!0,shouldShowList:!0})});const D=async t=>({shouldShowAlert:!0,shouldPlaySound:!0,shouldSetBadge:!0,shouldShowBanner:!0,shouldShowList:!0}),S=i.createContext(void 0);async function A(){const{status:t}=await r.getPermissionsAsync();if(t!=="granted"){const{status:s}=await r.requestPermissionsAsync();return s}return t}async function H(){try{return!d.default.expoConfig||!d.default.expoConfig.extra||!d.default.expoConfig.extra.eas?(console.error("[Knock] Expo Project ID is not defined in the app configuration."),null):await r.getExpoPushTokenAsync({projectId:d.default.expoConfig.extra.eas.projectId})}catch(t){return console.error("[Knock] Error getting Expo push token:",t),null}}async function O(){return R.isDevice?await A()!=="granted"?(console.warn("[Knock] Push notification permission not granted"),null):H():(console.warn("[Knock] Must use physical device for Push Notifications"),null)}const I=({knockExpoChannelId:t,customNotificationHandler:s,children:c,autoRegister:a=!0})=>{const{registerPushTokenToChannel:p,unregisterPushTokenFromChannel:K}=x.usePushNotifications(),[u,m]=i.useState(null),n=b.useKnockClient(),[g,y]=i.useState(()=>()=>{}),[k,C]=i.useState(()=>()=>{}),E=i.useCallback(e=>{y(()=>e)},[]),w=i.useCallback(e=>{C(()=>e)},[]),l=i.useCallback(async()=>{try{n.log("[Knock] Registering for push notifications");const e=await O();n.log(`[Knock] Token received: ${e==null?void 0:e.data}`),e!=null&&e.data&&(n.log(`[Knock] Setting push token: ${e.data}`),m(e.data))}catch(e){console.error("[Knock] Error registering for push notifications:",e)}},[n]),P=i.useCallback(async(e,f)=>{var N;const o=(N=e.request.content.data)==null?void 0:N.knock_message_id;if(!o){n.log("[Knock] Skipping status update for non-Knock notification");return}return n.messages.updateStatus(o,f)},[n]);return i.useEffect(()=>{r.setNotificationHandler({handleNotification:s??D}),a&&l().then(()=>{u&&p(u,t).then(o=>{n.log("[Knock] setChannelData success")}).catch(o=>{console.error("[Knock] Error in setting push token or channel data",o)})}).catch(o=>{console.error("[Knock] Error in setting push token or channel data",o)});const e=r.addNotificationReceivedListener(o=>{n.log("[Knock] Expo Push Notification received in foreground:"),P(o,"interacted"),g(o)}),f=r.addNotificationResponseReceivedListener(o=>{n.log("[Knock] Expo Push Notification was interacted with"),P(o.notification,"interacted"),k(o)});return()=>{e.remove(),f.remove()}},[l,g,k,s,a,u,t,n]),h.jsx(S.Provider,{value:{expoPushToken:u,registerForPushNotifications:l,registerPushTokenToChannel:p,unregisterPushTokenFromChannel:K,onNotificationReceived:E,onNotificationTapped:w},children:c})},B=t=>h.jsx(x.KnockPushNotificationProvider,{children:h.jsx(I,{...t})}),L=()=>{const t=i.useContext(S);if(t===void 0)throw new Error("[Knock] useExpoPushNotifications must be used within a KnockExpoPushNotificationProvider");return t};exports.KnockExpoPushNotificationProvider=B;exports.useExpoPushNotifications=L;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("react/jsx-runtime"),j=require("@knocklabs/react-core"),x=require("@knocklabs/react-native"),_=require("expo-constants"),q=require("expo-device"),A=require("expo-notifications"),i=require("react"),R=t=>t&&typeof t=="object"&&"default"in t?t:{default:t};function v(t){if(t&&typeof t=="object"&&"default"in t)return t;const r=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const a in t)if(a!=="default"){const u=Object.getOwnPropertyDescriptor(t,a);Object.defineProperty(r,a,u.get?u:{enumerable:!0,get:()=>t[a]})}}return r.default=t,Object.freeze(r)}const d=R(_),m=v(q),s=v(A);s.setNotificationHandler({handleNotification:async()=>({shouldShowAlert:!0,shouldPlaySound:!0,shouldSetBadge:!0,shouldShowBanner:!0,shouldShowList:!0})});const D=async t=>({shouldShowAlert:!0,shouldPlaySound:!0,shouldSetBadge:!0,shouldShowBanner:!0,shouldShowList:!0}),S=i.createContext(void 0);async function F(){const{status:t}=await s.getPermissionsAsync();if(t!=="granted"){const{status:r}=await s.requestPermissionsAsync();return r}return t}async function H(){try{return!d.default.expoConfig||!d.default.expoConfig.extra||!d.default.expoConfig.extra.eas?(console.error("[Knock] Expo Project ID is not defined in the app configuration."),null):await s.getExpoPushTokenAsync({projectId:d.default.expoConfig.extra.eas.projectId})}catch(t){return console.error("[Knock] Error getting Expo push token:",t),null}}async function I(){m.osName==="Android"&&await s.setNotificationChannelAsync("default",{name:"Default",importance:s.AndroidImportance.MAX,vibrationPattern:[0,250,250,250],lightColor:"#FF231F7C"})}async function O(t){return m.isDevice?(await t(),await F()!=="granted"?(console.warn("[Knock] Push notification permission not granted"),null):H()):(console.warn("[Knock] Must use physical device for Push Notifications"),null)}const M=({knockExpoChannelId:t,customNotificationHandler:r,setupAndroidNotificationChannel:a=I,children:u,autoRegister:p=!0})=>{const{registerPushTokenToChannel:g,unregisterPushTokenFromChannel:y}=x.usePushNotifications(),[K,C]=i.useState(null),n=j.useKnockClient(),[k,w]=i.useState(()=>()=>{}),[P,E]=i.useState(()=>()=>{}),b=i.useCallback(e=>{w(()=>e)},[]),T=i.useCallback(e=>{E(()=>e)},[]),l=i.useCallback(async()=>{try{n.log("[Knock] Registering for push notifications");const e=await O(a);return n.log(`[Knock] Token received: ${e==null?void 0:e.data}`),e!=null&&e.data?(n.log(`[Knock] Setting push token: ${e.data}`),C(e.data),e.data):null}catch(e){return console.error("[Knock] Error registering for push notifications:",e),null}},[n,a]),N=i.useCallback(async(e,f)=>{var c;const o=(c=e.request.content.data)==null?void 0:c.knock_message_id;if(!o){n.log("[Knock] Skipping status update for non-Knock notification");return}return n.messages.updateStatus(o,f)},[n]);return i.useEffect(()=>{s.setNotificationHandler({handleNotification:r??D}),p&&l().then(o=>{o&&g(o,t).then(c=>{n.log("[Knock] setChannelData success")}).catch(c=>{console.error("[Knock] Error in setting push token or channel data",c)})}).catch(o=>{console.error("[Knock] Error in setting push token or channel data",o)});const e=s.addNotificationReceivedListener(o=>{n.log("[Knock] Expo Push Notification received in foreground:"),N(o,"interacted"),k(o)}),f=s.addNotificationResponseReceivedListener(o=>{n.log("[Knock] Expo Push Notification was interacted with"),N(o.notification,"interacted"),P(o)});return()=>{e.remove(),f.remove()}},[l,k,P,r,p,t,n]),h.jsx(S.Provider,{value:{expoPushToken:K,registerForPushNotifications:l,registerPushTokenToChannel:g,unregisterPushTokenFromChannel:y,onNotificationReceived:b,onNotificationTapped:T},children:u})},B=t=>h.jsx(x.KnockPushNotificationProvider,{children:h.jsx(M,{...t})}),L=()=>{const t=i.useContext(S);if(t===void 0)throw new Error("[Knock] useExpoPushNotifications must be used within a KnockExpoPushNotificationProvider");return t};exports.KnockExpoPushNotificationProvider=B;exports.useExpoPushNotifications=L;
 //# sourceMappingURL=KnockExpoPushNotificationProvider.js.map

package/dist/cjs/modules/push/KnockExpoPushNotificationProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"KnockExpoPushNotificationProvider.js","sources":["../../../../src/modules/push/KnockExpoPushNotificationProvider.tsx"],"sourcesContent":["import { Message, MessageEngagementStatus } from \"@knocklabs/client\";\nimport { useKnockClient } from \"@knocklabs/react-core\";\nimport {\n  type KnockPushNotificationContextType,\n  KnockPushNotificationProvider,\n  usePushNotifications,\n} from \"@knocklabs/react-native\";\nimport Constants from \"expo-constants\";\nimport * as Device from \"expo-device\";\nimport * as Notifications from \"expo-notifications\";\nimport React, {\n  createContext,\n  useCallback,\n  useContext,\n  useEffect,\n  useState,\n} from \"react\";\n\nexport interface KnockExpoPushNotificationContextType\n  extends KnockPushNotificationContextType {\n  expoPushToken: string | null;\n  registerForPushNotifications: () => Promise<void>;\n  onNotificationReceived: (\n    handler: (notification: Notifications.Notification) => void,\n  ) => void;\n  onNotificationTapped: (\n    handler: (response: Notifications.NotificationResponse) => void,\n  ) => void;\n}\n\nNotifications.setNotificationHandler({\n  handleNotification: async () => {\n    return {\n      shouldShowAlert: true,\n      shouldPlaySound: true,\n      shouldSetBadge: true,\n      shouldShowBanner: true,\n      shouldShowList: true,\n    };\n  },\n});\n\nconst defaultNotificationHandler = async (\n  _notification: Notifications.Notification,\n): Promise<Notifications.NotificationBehavior> => {\n  return {\n    shouldShowAlert: true,\n    shouldPlaySound: true,\n    shouldSetBadge: true,\n    shouldShowBanner: true,\n    shouldShowList: true,\n  };\n};\n\nconst KnockExpoPushNotificationContext = createContext<\n  KnockExpoPushNotificationContextType | undefined\n>(undefined);\n\nexport interface KnockExpoPushNotificationProviderProps {\n  knockExpoChannelId: string;\n  customNotificationHandler?: (\n    notification: Notifications.Notification,\n  ) => Promise<Notifications.NotificationBehavior>;\n  children?: React.ReactElement;\n  autoRegister?: boolean;\n}\n\nasync function requestPushPermissionIfNeeded(): Promise<string> {\n  const { status: existingStatus } = await Notifications.getPermissionsAsync();\n\n  if (existingStatus !== \"granted\") {\n    const { status } = await Notifications.requestPermissionsAsync();\n    return status;\n  }\n\n  return existingStatus;\n}\n\nasync function getExpoPushToken(): Promise<Notifications.ExpoPushToken | null> {\n  try {\n    if (\n      !Constants.expoConfig ||\n      !Constants.expoConfig.extra ||\n      !Constants.expoConfig.extra.eas\n    ) {\n      console.error(\n        \"[Knock] Expo Project ID is not defined in the app configuration.\",\n      );\n      return null;\n    }\n    const token = await Notifications.getExpoPushTokenAsync({\n      projectId: Constants.expoConfig.extra.eas.projectId,\n    });\n    return token;\n  } catch (error) {\n    console.error(\"[Knock] Error getting Expo push token:\", error);\n    return null;\n  }\n}\n\nasync function requestPermissionAndGetPushToken(): Promise<Notifications.ExpoPushToken | null> {\n  // Check for device support\n  if (!Device.isDevice) {\n    console.warn(\"[Knock] Must use physical device for Push Notifications\");\n    return null;\n  }\n\n  const permissionStatus = await requestPushPermissionIfNeeded();\n\n  if (permissionStatus !== \"granted\") {\n    console.warn(\"[Knock] Push notification permission not granted\");\n    return null;\n  }\n\n  return getExpoPushToken();\n}\n\nconst InternalKnockExpoPushNotificationProvider: React.FC<\n  KnockExpoPushNotificationProviderProps\n> = ({\n  knockExpoChannelId,\n  customNotificationHandler,\n  children,\n  autoRegister = true,\n}) => {\n  const { registerPushTokenToChannel, unregisterPushTokenFromChannel } =\n    usePushNotifications();\n  const [expoPushToken, setExpoPushToken] = useState<string | null>(null);\n  const knockClient = useKnockClient();\n\n  const [notificationReceivedHandler, setNotificationReceivedHandler] =\n    useState<(notification: Notifications.Notification) => void>(\n      () => () => {},\n    );\n\n  const [notificationTappedHandler, setNotificationTappedHandler] = useState<\n    (response: Notifications.NotificationResponse) => void\n  >(() => () => {});\n\n  const handleNotificationReceived = useCallback(\n    (handler: (notification: Notifications.Notification) => void) => {\n      setNotificationReceivedHandler(() => handler);\n    },\n    [],\n  );\n\n  const handleNotificationTapped = useCallback(\n    (handler: (response: Notifications.NotificationResponse) => void) => {\n      setNotificationTappedHandler(() => handler);\n    },\n    [],\n  );\n\n  const registerForPushNotifications = useCallback(async (): Promise<void> => {\n    try {\n      knockClient.log(`[Knock] Registering for push notifications`);\n      const token = await requestPermissionAndGetPushToken();\n      knockClient.log(`[Knock] Token received: ${token?.data}`);\n      if (token?.data) {\n        knockClient.log(`[Knock] Setting push token: ${token.data}`);\n        setExpoPushToken(token.data);\n      }\n    } catch (error) {\n      console.error(`[Knock] Error registering for push notifications:`, error);\n    }\n  }, [knockClient]);\n\n  const updateKnockMessageStatusFromNotification = useCallback(\n    async (\n      notification: Notifications.Notification,\n      status: MessageEngagementStatus,\n    ): Promise<Message | void> => {\n      const messageId = notification.request.content.data?.[\n        \"knock_message_id\"\n      ] as string | undefined;\n\n      // Skip status update if this isn't a Knock notification\n      // Fixes issue: https://github.com/knocklabs/javascript/issues/589\n      if (!messageId) {\n        knockClient.log(\n          \"[Knock] Skipping status update for non-Knock notification\",\n        );\n        return;\n      }\n\n      return knockClient.messages.updateStatus(messageId, status);\n    },\n    [knockClient],\n  );\n\n  useEffect(() => {\n    Notifications.setNotificationHandler({\n      handleNotification:\n        customNotificationHandler ?? defaultNotificationHandler,\n    });\n\n    if (autoRegister) {\n      registerForPushNotifications()\n        .then(() => {\n          if (expoPushToken) {\n            registerPushTokenToChannel(expoPushToken, knockExpoChannelId)\n              .then((_result) => {\n                knockClient.log(\"[Knock] setChannelData success\");\n              })\n              .catch((_error) => {\n                console.error(\n                  \"[Knock] Error in setting push token or channel data\",\n                  _error,\n                );\n              });\n          }\n        })\n        .catch((_error) => {\n          console.error(\n            \"[Knock] Error in setting push token or channel data\",\n            _error,\n          );\n        });\n    }\n\n    const notificationReceivedSubscription =\n      Notifications.addNotificationReceivedListener((notification) => {\n        knockClient.log(\n          \"[Knock] Expo Push Notification received in foreground:\",\n        );\n        updateKnockMessageStatusFromNotification(notification, \"interacted\");\n        notificationReceivedHandler(notification);\n      });\n\n    const notificationResponseSubscription =\n      Notifications.addNotificationResponseReceivedListener((response) => {\n        knockClient.log(\"[Knock] Expo Push Notification was interacted with\");\n        updateKnockMessageStatusFromNotification(\n          response.notification,\n          \"interacted\",\n        );\n        notificationTappedHandler(response);\n      });\n\n    return () => {\n      notificationReceivedSubscription.remove();\n      notificationResponseSubscription.remove();\n    };\n\n    // TODO: Remove when possible and ensure dependency array is correct\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [\n    registerForPushNotifications,\n    notificationReceivedHandler,\n    notificationTappedHandler,\n    customNotificationHandler,\n    autoRegister,\n    expoPushToken,\n    knockExpoChannelId,\n    knockClient,\n  ]);\n\n  return (\n    <KnockExpoPushNotificationContext.Provider\n      value={{\n        expoPushToken,\n        registerForPushNotifications,\n        registerPushTokenToChannel,\n        unregisterPushTokenFromChannel,\n        onNotificationReceived: handleNotificationReceived,\n        onNotificationTapped: handleNotificationTapped,\n      }}\n    >\n      {children}\n    </KnockExpoPushNotificationContext.Provider>\n  );\n};\n\nexport const KnockExpoPushNotificationProvider: React.FC<\n  KnockExpoPushNotificationProviderProps\n> = (props) => {\n  return (\n    <KnockPushNotificationProvider>\n      <InternalKnockExpoPushNotificationProvider {...props} />\n    </KnockPushNotificationProvider>\n  );\n};\n\nexport const useExpoPushNotifications =\n  (): KnockExpoPushNotificationContextType => {\n    const context = useContext(KnockExpoPushNotificationContext);\n    if (context === undefined) {\n      throw new Error(\n        \"[Knock] useExpoPushNotifications must be used within a KnockExpoPushNotificationProvider\",\n      );\n    }\n    return context;\n  };\n"],"names":["Notifications","defaultNotificationHandler","_notification","KnockExpoPushNotificationContext","createContext","requestPushPermissionIfNeeded","existingStatus","status","getExpoPushToken","Constants","error","requestPermissionAndGetPushToken","Device","InternalKnockExpoPushNotificationProvider","knockExpoChannelId","customNotificationHandler","children","autoRegister","registerPushTokenToChannel","unregisterPushTokenFromChannel","usePushNotifications","expoPushToken","setExpoPushToken","useState","knockClient","useKnockClient","notificationReceivedHandler","setNotificationReceivedHandler","notificationTappedHandler","setNotificationTappedHandler","handleNotificationReceived","useCallback","handler","handleNotificationTapped","registerForPushNotifications","token","updateKnockMessageStatusFromNotification","notification","messageId","_a","useEffect","_result","_error","notificationReceivedSubscription","notificationResponseSubscription","response","jsx","KnockExpoPushNotificationProvider","props","KnockPushNotificationProvider","useExpoPushNotifications","context","useContext"],"mappings":"srBA8BAA,EAAc,uBAAuB,CACnC,mBAAoB,UACX,CACL,gBAAiB,GACjB,gBAAiB,GACjB,eAAgB,GAChB,iBAAkB,GAClB,eAAgB,EAClB,EAEJ,CAAC,EAED,MAAMC,EAA6B,MACjCC,IAEO,CACL,gBAAiB,GACjB,gBAAiB,GACjB,eAAgB,GAChB,iBAAkB,GAClB,eAAgB,EAClB,GAGIC,EAAmCC,gBAEvC,MAAS,EAWX,eAAeC,GAAiD,CAC9D,KAAM,CAAE,OAAQC,CAAmB,EAAA,MAAMN,EAAc,oBAAoB,EAE3E,GAAIM,IAAmB,UAAW,CAChC,KAAM,CAAE,OAAAC,CAAA,EAAW,MAAMP,EAAc,wBAAwB,EACxD,OAAAO,CAAA,CAGF,OAAAD,CACT,CAEA,eAAeE,GAAgE,CACzE,GAAA,CAEA,MAAA,CAACC,EAAU,QAAA,YACX,CAACA,UAAU,WAAW,OACtB,CAACA,EAAA,QAAU,WAAW,MAAM,KAEpB,QAAA,MACN,kEACF,EACO,MAEK,MAAMT,EAAc,sBAAsB,CACtD,UAAWS,EAAA,QAAU,WAAW,MAAM,IAAI,SAAA,CAC3C,QAEMC,EAAO,CACN,eAAA,MAAM,yCAA0CA,CAAK,EACtD,IAAA,CAEX,CAEA,eAAeC,GAAgF,CAEzF,OAACC,EAAO,SAKa,MAAMP,EAA8B,IAEpC,WACvB,QAAQ,KAAK,kDAAkD,EACxD,MAGFG,EAAiB,GAXtB,QAAQ,KAAK,yDAAyD,EAC/D,KAWX,CAEA,MAAMK,EAEF,CAAC,CACH,mBAAAC,EACA,0BAAAC,EACA,SAAAC,EACA,aAAAC,EAAe,EACjB,IAAM,CACJ,KAAM,CAAE,2BAAAC,EAA4B,+BAAAC,CAA+B,EACjEC,uBAAqB,EACjB,CAACC,EAAeC,CAAgB,EAAIC,EAAAA,SAAwB,IAAI,EAChEC,EAAcC,EAAAA,eAAe,EAE7B,CAACC,EAA6BC,CAA8B,EAChEJ,EAAA,SACE,IAAM,IAAM,CAAA,CACd,EAEI,CAACK,EAA2BC,CAA4B,EAAIN,EAAAA,SAEhE,IAAM,IAAM,CAAA,CAAE,EAEVO,EAA6BC,EAAA,YAChCC,GAAgE,CAC/DL,EAA+B,IAAMK,CAAO,CAC9C,EACA,CAAA,CACF,EAEMC,EAA2BF,EAAA,YAC9BC,GAAoE,CACnEH,EAA6B,IAAMG,CAAO,CAC5C,EACA,CAAA,CACF,EAEME,EAA+BH,EAAAA,YAAY,SAA2B,CACtE,GAAA,CACFP,EAAY,IAAI,4CAA4C,EACtD,MAAAW,EAAQ,MAAMxB,EAAiC,EACrDa,EAAY,IAAI,2BAA2BW,GAAA,YAAAA,EAAO,IAAI,EAAE,EACpDA,GAAA,MAAAA,EAAO,OACTX,EAAY,IAAI,+BAA+BW,EAAM,IAAI,EAAE,EAC3Db,EAAiBa,EAAM,IAAI,SAEtBzB,EAAO,CACN,QAAA,MAAM,oDAAqDA,CAAK,CAAA,CAC1E,EACC,CAACc,CAAW,CAAC,EAEVY,EAA2CL,EAAA,YAC/C,MACEM,EACA9B,IAC4B,OAC5B,MAAM+B,GAAYC,EAAAF,EAAa,QAAQ,QAAQ,OAA7B,YAAAE,EAChB,iBAKF,GAAI,CAACD,EAAW,CACFd,EAAA,IACV,2DACF,EACA,MAAA,CAGF,OAAOA,EAAY,SAAS,aAAac,EAAW/B,CAAM,CAC5D,EACA,CAACiB,CAAW,CACd,EAEAgB,OAAAA,EAAAA,UAAU,IAAM,CACdxC,EAAc,uBAAuB,CACnC,mBACEe,GAA6Bd,CAAA,CAChC,EAEGgB,GAC2BiB,EAAA,EAC1B,KAAK,IAAM,CACNb,GACFH,EAA2BG,EAAeP,CAAkB,EACzD,KAAM2B,GAAY,CACjBjB,EAAY,IAAI,gCAAgC,CAAA,CACjD,EACA,MAAOkB,GAAW,CACT,QAAA,MACN,sDACAA,CACF,CAAA,CACD,CACL,CACD,EACA,MAAOA,GAAW,CACT,QAAA,MACN,sDACAA,CACF,CAAA,CACD,EAGL,MAAMC,EACJ3C,EAAc,gCAAiCqC,GAAiB,CAClDb,EAAA,IACV,wDACF,EACAY,EAAyCC,EAAc,YAAY,EACnEX,EAA4BW,CAAY,CAAA,CACzC,EAEGO,EACJ5C,EAAc,wCAAyC6C,GAAa,CAClErB,EAAY,IAAI,oDAAoD,EACpEY,EACES,EAAS,aACT,YACF,EACAjB,EAA0BiB,CAAQ,CAAA,CACnC,EAEH,MAAO,IAAM,CACXF,EAAiC,OAAO,EACxCC,EAAiC,OAAO,CAC1C,CAAA,EAIC,CACDV,EACAR,EACAE,EACAb,EACAE,EACAI,EACAP,EACAU,CAAA,CACD,EAGCsB,EAAA,IAAC3C,EAAiC,SAAjC,CACC,MAAO,CACL,cAAAkB,EACA,6BAAAa,EACA,2BAAAhB,EACA,+BAAAC,EACA,uBAAwBW,EACxB,qBAAsBG,CACxB,EAEC,SAAAjB,CAAA,CACH,CAEJ,EAEa+B,EAERC,SAEAC,gCACC,CAAA,SAAAH,EAAAA,IAACjC,EAA2C,CAAA,GAAGmC,CAAO,CAAA,EACxD,EAISE,EACX,IAA4C,CACpC,MAAAC,EAAUC,aAAWjD,CAAgC,EAC3D,GAAIgD,IAAY,OACd,MAAM,IAAI,MACR,0FACF,EAEK,OAAAA,CACT"}
+{"version":3,"file":"KnockExpoPushNotificationProvider.js","sources":["../../../../src/modules/push/KnockExpoPushNotificationProvider.tsx"],"sourcesContent":["import { Message, MessageEngagementStatus } from \"@knocklabs/client\";\nimport { useKnockClient } from \"@knocklabs/react-core\";\nimport {\n  type KnockPushNotificationContextType,\n  KnockPushNotificationProvider,\n  usePushNotifications,\n} from \"@knocklabs/react-native\";\nimport Constants from \"expo-constants\";\nimport * as Device from \"expo-device\";\nimport * as Notifications from \"expo-notifications\";\nimport React, {\n  createContext,\n  useCallback,\n  useContext,\n  useEffect,\n  useState,\n} from \"react\";\n\nexport interface KnockExpoPushNotificationContextType\n  extends KnockPushNotificationContextType {\n  expoPushToken: string | null;\n  registerForPushNotifications: () => Promise<string | null>;\n  onNotificationReceived: (\n    handler: (notification: Notifications.Notification) => void,\n  ) => void;\n  onNotificationTapped: (\n    handler: (response: Notifications.NotificationResponse) => void,\n  ) => void;\n}\n\nNotifications.setNotificationHandler({\n  handleNotification: async () => {\n    return {\n      shouldShowAlert: true,\n      shouldPlaySound: true,\n      shouldSetBadge: true,\n      shouldShowBanner: true,\n      shouldShowList: true,\n    };\n  },\n});\n\nconst defaultNotificationHandler = async (\n  _notification: Notifications.Notification,\n): Promise<Notifications.NotificationBehavior> => {\n  return {\n    shouldShowAlert: true,\n    shouldPlaySound: true,\n    shouldSetBadge: true,\n    shouldShowBanner: true,\n    shouldShowList: true,\n  };\n};\n\nconst KnockExpoPushNotificationContext = createContext<\n  KnockExpoPushNotificationContextType | undefined\n>(undefined);\n\nexport interface KnockExpoPushNotificationProviderProps {\n  knockExpoChannelId: string;\n  customNotificationHandler?: (\n    notification: Notifications.Notification,\n  ) => Promise<Notifications.NotificationBehavior>;\n  setupAndroidNotificationChannel?: () => Promise<void>;\n  children?: React.ReactElement;\n  autoRegister?: boolean;\n}\n\nasync function requestPushPermissionIfNeeded(): Promise<string> {\n  const { status: existingStatus } = await Notifications.getPermissionsAsync();\n\n  if (existingStatus !== \"granted\") {\n    const { status } = await Notifications.requestPermissionsAsync();\n    return status;\n  }\n\n  return existingStatus;\n}\n\nasync function getExpoPushToken(): Promise<Notifications.ExpoPushToken | null> {\n  try {\n    if (\n      !Constants.expoConfig ||\n      !Constants.expoConfig.extra ||\n      !Constants.expoConfig.extra.eas\n    ) {\n      console.error(\n        \"[Knock] Expo Project ID is not defined in the app configuration.\",\n      );\n      return null;\n    }\n    const token = await Notifications.getExpoPushTokenAsync({\n      projectId: Constants.expoConfig.extra.eas.projectId,\n    });\n    return token;\n  } catch (error) {\n    console.error(\"[Knock] Error getting Expo push token:\", error);\n    return null;\n  }\n}\n\nasync function defaultSetupAndroidNotificationChannel(): Promise<void> {\n  if (Device.osName === \"Android\") {\n    await Notifications.setNotificationChannelAsync(\"default\", {\n      name: \"Default\",\n      importance: Notifications.AndroidImportance.MAX,\n      vibrationPattern: [0, 250, 250, 250],\n      lightColor: \"#FF231F7C\",\n    });\n  }\n}\n\nasync function requestPermissionAndGetPushToken(\n  setupAndroidChannel: () => Promise<void>,\n): Promise<Notifications.ExpoPushToken | null> {\n  // Check for device support\n  if (!Device.isDevice) {\n    console.warn(\"[Knock] Must use physical device for Push Notifications\");\n    return null;\n  }\n\n  // Setup Android notification channel before requesting permissions\n  await setupAndroidChannel();\n\n  const permissionStatus = await requestPushPermissionIfNeeded();\n\n  if (permissionStatus !== \"granted\") {\n    console.warn(\"[Knock] Push notification permission not granted\");\n    return null;\n  }\n\n  return getExpoPushToken();\n}\n\nconst InternalKnockExpoPushNotificationProvider: React.FC<\n  KnockExpoPushNotificationProviderProps\n> = ({\n  knockExpoChannelId,\n  customNotificationHandler,\n  setupAndroidNotificationChannel = defaultSetupAndroidNotificationChannel,\n  children,\n  autoRegister = true,\n}) => {\n  const { registerPushTokenToChannel, unregisterPushTokenFromChannel } =\n    usePushNotifications();\n  const [expoPushToken, setExpoPushToken] = useState<string | null>(null);\n  const knockClient = useKnockClient();\n\n  const [notificationReceivedHandler, setNotificationReceivedHandler] =\n    useState<(notification: Notifications.Notification) => void>(\n      () => () => {},\n    );\n\n  const [notificationTappedHandler, setNotificationTappedHandler] = useState<\n    (response: Notifications.NotificationResponse) => void\n  >(() => () => {});\n\n  const handleNotificationReceived = useCallback(\n    (handler: (notification: Notifications.Notification) => void) => {\n      setNotificationReceivedHandler(() => handler);\n    },\n    [],\n  );\n\n  const handleNotificationTapped = useCallback(\n    (handler: (response: Notifications.NotificationResponse) => void) => {\n      setNotificationTappedHandler(() => handler);\n    },\n    [],\n  );\n\n  const registerForPushNotifications = useCallback(async (): Promise<\n    string | null\n  > => {\n    try {\n      knockClient.log(`[Knock] Registering for push notifications`);\n      const token = await requestPermissionAndGetPushToken(\n        setupAndroidNotificationChannel,\n      );\n      knockClient.log(`[Knock] Token received: ${token?.data}`);\n      if (token?.data) {\n        knockClient.log(`[Knock] Setting push token: ${token.data}`);\n        setExpoPushToken(token.data);\n        return token.data;\n      }\n      return null;\n    } catch (error) {\n      console.error(`[Knock] Error registering for push notifications:`, error);\n      return null;\n    }\n  }, [knockClient, setupAndroidNotificationChannel]);\n\n  const updateKnockMessageStatusFromNotification = useCallback(\n    async (\n      notification: Notifications.Notification,\n      status: MessageEngagementStatus,\n    ): Promise<Message | void> => {\n      const messageId = notification.request.content.data?.[\n        \"knock_message_id\"\n      ] as string | undefined;\n\n      // Skip status update if this isn't a Knock notification\n      // Fixes issue: https://github.com/knocklabs/javascript/issues/589\n      if (!messageId) {\n        knockClient.log(\n          \"[Knock] Skipping status update for non-Knock notification\",\n        );\n        return;\n      }\n\n      return knockClient.messages.updateStatus(messageId, status);\n    },\n    [knockClient],\n  );\n\n  useEffect(() => {\n    Notifications.setNotificationHandler({\n      handleNotification:\n        customNotificationHandler ?? defaultNotificationHandler,\n    });\n\n    if (autoRegister) {\n      registerForPushNotifications()\n        .then((token) => {\n          if (token) {\n            registerPushTokenToChannel(token, knockExpoChannelId)\n              .then((_result) => {\n                knockClient.log(\"[Knock] setChannelData success\");\n              })\n              .catch((_error) => {\n                console.error(\n                  \"[Knock] Error in setting push token or channel data\",\n                  _error,\n                );\n              });\n          }\n        })\n        .catch((_error) => {\n          console.error(\n            \"[Knock] Error in setting push token or channel data\",\n            _error,\n          );\n        });\n    }\n\n    const notificationReceivedSubscription =\n      Notifications.addNotificationReceivedListener((notification) => {\n        knockClient.log(\n          \"[Knock] Expo Push Notification received in foreground:\",\n        );\n        updateKnockMessageStatusFromNotification(notification, \"interacted\");\n        notificationReceivedHandler(notification);\n      });\n\n    const notificationResponseSubscription =\n      Notifications.addNotificationResponseReceivedListener((response) => {\n        knockClient.log(\"[Knock] Expo Push Notification was interacted with\");\n        updateKnockMessageStatusFromNotification(\n          response.notification,\n          \"interacted\",\n        );\n        notificationTappedHandler(response);\n      });\n\n    return () => {\n      notificationReceivedSubscription.remove();\n      notificationResponseSubscription.remove();\n    };\n\n    // TODO: Remove when possible and ensure dependency array is correct\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [\n    registerForPushNotifications,\n    notificationReceivedHandler,\n    notificationTappedHandler,\n    customNotificationHandler,\n    autoRegister,\n    knockExpoChannelId,\n    knockClient,\n  ]);\n\n  return (\n    <KnockExpoPushNotificationContext.Provider\n      value={{\n        expoPushToken,\n        registerForPushNotifications,\n        registerPushTokenToChannel,\n        unregisterPushTokenFromChannel,\n        onNotificationReceived: handleNotificationReceived,\n        onNotificationTapped: handleNotificationTapped,\n      }}\n    >\n      {children}\n    </KnockExpoPushNotificationContext.Provider>\n  );\n};\n\nexport const KnockExpoPushNotificationProvider: React.FC<\n  KnockExpoPushNotificationProviderProps\n> = (props) => {\n  return (\n    <KnockPushNotificationProvider>\n      <InternalKnockExpoPushNotificationProvider {...props} />\n    </KnockPushNotificationProvider>\n  );\n};\n\nexport const useExpoPushNotifications =\n  (): KnockExpoPushNotificationContextType => {\n    const context = useContext(KnockExpoPushNotificationContext);\n    if (context === undefined) {\n      throw new Error(\n        \"[Knock] useExpoPushNotifications must be used within a KnockExpoPushNotificationProvider\",\n      );\n    }\n    return context;\n  };\n"],"names":["Notifications","defaultNotificationHandler","_notification","KnockExpoPushNotificationContext","createContext","requestPushPermissionIfNeeded","existingStatus","status","getExpoPushToken","Constants","error","defaultSetupAndroidNotificationChannel","Device","requestPermissionAndGetPushToken","setupAndroidChannel","InternalKnockExpoPushNotificationProvider","knockExpoChannelId","customNotificationHandler","setupAndroidNotificationChannel","children","autoRegister","registerPushTokenToChannel","unregisterPushTokenFromChannel","usePushNotifications","expoPushToken","setExpoPushToken","useState","knockClient","useKnockClient","notificationReceivedHandler","setNotificationReceivedHandler","notificationTappedHandler","setNotificationTappedHandler","handleNotificationReceived","useCallback","handler","handleNotificationTapped","registerForPushNotifications","token","updateKnockMessageStatusFromNotification","notification","messageId","_a","useEffect","_result","_error","notificationReceivedSubscription","notificationResponseSubscription","response","jsx","KnockExpoPushNotificationProvider","props","KnockPushNotificationProvider","useExpoPushNotifications","context","useContext"],"mappings":"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"}

package/dist/esm/modules/push/KnockExpoPushNotificationProvider.mjs

@@ -1,10 +1,10 @@
-import { jsx as h } from "react/jsx-runtime";
-import { useKnockClient as C } from "@knocklabs/react-core";
-import { KnockPushNotificationProvider as T, usePushNotifications as R } from "@knocklabs/react-native";
-import c from "expo-constants";
-import * as A from "expo-device";
+import { jsx as l } from "react/jsx-runtime";
+import { useKnockClient as A } from "@knocklabs/react-core";
+import { KnockPushNotificationProvider as R, usePushNotifications as F } from "@knocklabs/react-native";
+import a from "expo-constants";
+import * as N from "expo-device";
 import * as i from "expo-notifications";
-import { createContext as H, useContext as I, useState as f, useCallback as a, useEffect as b } from "react";
+import { createContext as H, useContext as I, useState as f, useCallback as c, useEffect as b } from "react";
 i.setNotificationHandler({
   handleNotification: async () => ({
     shouldShowAlert: !0,
@@ -14,14 +14,14 @@ i.setNotificationHandler({
     shouldShowList: !0
   })
 });
-const j = async (t) => ({
+const D = async (t) => ({
   shouldShowAlert: !0,
   shouldPlaySound: !0,
   shouldSetBadge: !0,
   shouldShowBanner: !0,
   shouldShowList: !0
 }), x = H(void 0);
-async function q() {
+async function j() {
   const { status: t } = await i.getPermissionsAsync();
   if (t !== "granted") {
     const { status: r } = await i.requestPermissionsAsync();
@@ -29,117 +29,127 @@ async function q() {
   }
   return t;
 }
-async function B() {
+async function q() {
   try {
-    return !c.expoConfig || !c.expoConfig.extra || !c.expoConfig.extra.eas ? (console.error(
+    return !a.expoConfig || !a.expoConfig.extra || !a.expoConfig.extra.eas ? (console.error(
       "[Knock] Expo Project ID is not defined in the app configuration."
     ), null) : await i.getExpoPushTokenAsync({
-      projectId: c.expoConfig.extra.eas.projectId
+      projectId: a.expoConfig.extra.eas.projectId
     });
   } catch (t) {
     return console.error("[Knock] Error getting Expo push token:", t), null;
   }
 }
-async function D() {
-  return A.isDevice ? await q() !== "granted" ? (console.warn("[Knock] Push notification permission not granted"), null) : B() : (console.warn("[Knock] Must use physical device for Push Notifications"), null);
+async function B() {
+  N.osName === "Android" && await i.setNotificationChannelAsync("default", {
+    name: "Default",
+    importance: i.AndroidImportance.MAX,
+    vibrationPattern: [0, 250, 250, 250],
+    lightColor: "#FF231F7C"
+  });
+}
+async function L(t) {
+  return N.isDevice ? (await t(), await j() !== "granted" ? (console.warn("[Knock] Push notification permission not granted"), null) : q()) : (console.warn("[Knock] Must use physical device for Push Notifications"), null);
 }
-const L = ({
+const _ = ({
   knockExpoChannelId: t,
   customNotificationHandler: r,
-  children: N,
-  autoRegister: l = !0
+  setupAndroidNotificationChannel: h = B,
+  children: v,
+  autoRegister: p = !0
 }) => {
-  const { registerPushTokenToChannel: p, unregisterPushTokenFromChannel: K } = R(), [s, v] = f(null), n = C(), [g, S] = f(
+  const { registerPushTokenToChannel: g, unregisterPushTokenFromChannel: K } = F(), [S, w] = f(null), e = A(), [k, E] = f(
     () => () => {
     }
-  ), [k, w] = f(() => () => {
-  }), E = a(
+  ), [P, y] = f(() => () => {
+  }), C = c(
     (o) => {
-      S(() => o);
+      E(() => o);
     },
     []
-  ), y = a(
+  ), T = c(
     (o) => {
-      w(() => o);
+      y(() => o);
     },
     []
-  ), u = a(async () => {
+  ), u = c(async () => {
     try {
-      n.log("[Knock] Registering for push notifications");
-      const o = await D();
-      n.log(`[Knock] Token received: ${o == null ? void 0 : o.data}`), o != null && o.data && (n.log(`[Knock] Setting push token: ${o.data}`), v(o.data));
+      e.log("[Knock] Registering for push notifications");
+      const o = await L(
+        h
+      );
+      return e.log(`[Knock] Token received: ${o == null ? void 0 : o.data}`), o != null && o.data ? (e.log(`[Knock] Setting push token: ${o.data}`), w(o.data), o.data) : null;
     } catch (o) {
-      console.error("[Knock] Error registering for push notifications:", o);
+      return console.error("[Knock] Error registering for push notifications:", o), null;
     }
-  }, [n]), P = a(
+  }, [e, h]), m = c(
     async (o, d) => {
-      var m;
-      const e = (m = o.request.content.data) == null ? void 0 : m.knock_message_id;
-      if (!e) {
-        n.log(
+      var s;
+      const n = (s = o.request.content.data) == null ? void 0 : s.knock_message_id;
+      if (!n) {
+        e.log(
           "[Knock] Skipping status update for non-Knock notification"
         );
         return;
       }
-      return n.messages.updateStatus(e, d);
+      return e.messages.updateStatus(n, d);
     },
-    [n]
+    [e]
   );
   return b(() => {
     i.setNotificationHandler({
-      handleNotification: r ?? j
-    }), l && u().then(() => {
-      s && p(s, t).then((e) => {
-        n.log("[Knock] setChannelData success");
-      }).catch((e) => {
+      handleNotification: r ?? D
+    }), p && u().then((n) => {
+      n && g(n, t).then((s) => {
+        e.log("[Knock] setChannelData success");
+      }).catch((s) => {
         console.error(
           "[Knock] Error in setting push token or channel data",
-          e
+          s
         );
       });
-    }).catch((e) => {
+    }).catch((n) => {
       console.error(
         "[Knock] Error in setting push token or channel data",
-        e
+        n
       );
     });
-    const o = i.addNotificationReceivedListener((e) => {
-      n.log(
+    const o = i.addNotificationReceivedListener((n) => {
+      e.log(
         "[Knock] Expo Push Notification received in foreground:"
-      ), P(e, "interacted"), g(e);
-    }), d = i.addNotificationResponseReceivedListener((e) => {
-      n.log("[Knock] Expo Push Notification was interacted with"), P(
-        e.notification,
+      ), m(n, "interacted"), k(n);
+    }), d = i.addNotificationResponseReceivedListener((n) => {
+      e.log("[Knock] Expo Push Notification was interacted with"), m(
+        n.notification,
         "interacted"
-      ), k(e);
+      ), P(n);
     });
     return () => {
       o.remove(), d.remove();
     };
   }, [
     u,
-    g,
     k,
+    P,
     r,
-    l,
-    s,
+    p,
     t,
-    n
-  ]), /* @__PURE__ */ h(
+    e
+  ]), /* @__PURE__ */ l(
     x.Provider,
     {
       value: {
-        expoPushToken: s,
+        expoPushToken: S,
         registerForPushNotifications: u,
-        registerPushTokenToChannel: p,
+        registerPushTokenToChannel: g,
         unregisterPushTokenFromChannel: K,
-        onNotificationReceived: E,
-        onNotificationTapped: y
+        onNotificationReceived: C,
+        onNotificationTapped: T
       },
-      children: N
+      children: v
     }
   );
-}, z = (t) => /* @__PURE__ */ h(T, { children: /* @__PURE__ */ h(L, { ...t }) }), J = () => {
+}, J = (t) => /* @__PURE__ */ l(R, { children: /* @__PURE__ */ l(_, { ...t }) }), O = () => {
   const t = I(x);
   if (t === void 0)
     throw new Error(
@@ -148,7 +158,7 @@ const L = ({
   return t;
 };
 export {
-  z as KnockExpoPushNotificationProvider,
-  J as useExpoPushNotifications
+  J as KnockExpoPushNotificationProvider,
+  O as useExpoPushNotifications
 };
 //# sourceMappingURL=KnockExpoPushNotificationProvider.mjs.map

package/dist/esm/modules/push/KnockExpoPushNotificationProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"KnockExpoPushNotificationProvider.mjs","sources":["../../../../src/modules/push/KnockExpoPushNotificationProvider.tsx"],"sourcesContent":["import { Message, MessageEngagementStatus } from \"@knocklabs/client\";\nimport { useKnockClient } from \"@knocklabs/react-core\";\nimport {\n  type KnockPushNotificationContextType,\n  KnockPushNotificationProvider,\n  usePushNotifications,\n} from \"@knocklabs/react-native\";\nimport Constants from \"expo-constants\";\nimport * as Device from \"expo-device\";\nimport * as Notifications from \"expo-notifications\";\nimport React, {\n  createContext,\n  useCallback,\n  useContext,\n  useEffect,\n  useState,\n} from \"react\";\n\nexport interface KnockExpoPushNotificationContextType\n  extends KnockPushNotificationContextType {\n  expoPushToken: string | null;\n  registerForPushNotifications: () => Promise<void>;\n  onNotificationReceived: (\n    handler: (notification: Notifications.Notification) => void,\n  ) => void;\n  onNotificationTapped: (\n    handler: (response: Notifications.NotificationResponse) => void,\n  ) => void;\n}\n\nNotifications.setNotificationHandler({\n  handleNotification: async () => {\n    return {\n      shouldShowAlert: true,\n      shouldPlaySound: true,\n      shouldSetBadge: true,\n      shouldShowBanner: true,\n      shouldShowList: true,\n    };\n  },\n});\n\nconst defaultNotificationHandler = async (\n  _notification: Notifications.Notification,\n): Promise<Notifications.NotificationBehavior> => {\n  return {\n    shouldShowAlert: true,\n    shouldPlaySound: true,\n    shouldSetBadge: true,\n    shouldShowBanner: true,\n    shouldShowList: true,\n  };\n};\n\nconst KnockExpoPushNotificationContext = createContext<\n  KnockExpoPushNotificationContextType | undefined\n>(undefined);\n\nexport interface KnockExpoPushNotificationProviderProps {\n  knockExpoChannelId: string;\n  customNotificationHandler?: (\n    notification: Notifications.Notification,\n  ) => Promise<Notifications.NotificationBehavior>;\n  children?: React.ReactElement;\n  autoRegister?: boolean;\n}\n\nasync function requestPushPermissionIfNeeded(): Promise<string> {\n  const { status: existingStatus } = await Notifications.getPermissionsAsync();\n\n  if (existingStatus !== \"granted\") {\n    const { status } = await Notifications.requestPermissionsAsync();\n    return status;\n  }\n\n  return existingStatus;\n}\n\nasync function getExpoPushToken(): Promise<Notifications.ExpoPushToken | null> {\n  try {\n    if (\n      !Constants.expoConfig ||\n      !Constants.expoConfig.extra ||\n      !Constants.expoConfig.extra.eas\n    ) {\n      console.error(\n        \"[Knock] Expo Project ID is not defined in the app configuration.\",\n      );\n      return null;\n    }\n    const token = await Notifications.getExpoPushTokenAsync({\n      projectId: Constants.expoConfig.extra.eas.projectId,\n    });\n    return token;\n  } catch (error) {\n    console.error(\"[Knock] Error getting Expo push token:\", error);\n    return null;\n  }\n}\n\nasync function requestPermissionAndGetPushToken(): Promise<Notifications.ExpoPushToken | null> {\n  // Check for device support\n  if (!Device.isDevice) {\n    console.warn(\"[Knock] Must use physical device for Push Notifications\");\n    return null;\n  }\n\n  const permissionStatus = await requestPushPermissionIfNeeded();\n\n  if (permissionStatus !== \"granted\") {\n    console.warn(\"[Knock] Push notification permission not granted\");\n    return null;\n  }\n\n  return getExpoPushToken();\n}\n\nconst InternalKnockExpoPushNotificationProvider: React.FC<\n  KnockExpoPushNotificationProviderProps\n> = ({\n  knockExpoChannelId,\n  customNotificationHandler,\n  children,\n  autoRegister = true,\n}) => {\n  const { registerPushTokenToChannel, unregisterPushTokenFromChannel } =\n    usePushNotifications();\n  const [expoPushToken, setExpoPushToken] = useState<string | null>(null);\n  const knockClient = useKnockClient();\n\n  const [notificationReceivedHandler, setNotificationReceivedHandler] =\n    useState<(notification: Notifications.Notification) => void>(\n      () => () => {},\n    );\n\n  const [notificationTappedHandler, setNotificationTappedHandler] = useState<\n    (response: Notifications.NotificationResponse) => void\n  >(() => () => {});\n\n  const handleNotificationReceived = useCallback(\n    (handler: (notification: Notifications.Notification) => void) => {\n      setNotificationReceivedHandler(() => handler);\n    },\n    [],\n  );\n\n  const handleNotificationTapped = useCallback(\n    (handler: (response: Notifications.NotificationResponse) => void) => {\n      setNotificationTappedHandler(() => handler);\n    },\n    [],\n  );\n\n  const registerForPushNotifications = useCallback(async (): Promise<void> => {\n    try {\n      knockClient.log(`[Knock] Registering for push notifications`);\n      const token = await requestPermissionAndGetPushToken();\n      knockClient.log(`[Knock] Token received: ${token?.data}`);\n      if (token?.data) {\n        knockClient.log(`[Knock] Setting push token: ${token.data}`);\n        setExpoPushToken(token.data);\n      }\n    } catch (error) {\n      console.error(`[Knock] Error registering for push notifications:`, error);\n    }\n  }, [knockClient]);\n\n  const updateKnockMessageStatusFromNotification = useCallback(\n    async (\n      notification: Notifications.Notification,\n      status: MessageEngagementStatus,\n    ): Promise<Message | void> => {\n      const messageId = notification.request.content.data?.[\n        \"knock_message_id\"\n      ] as string | undefined;\n\n      // Skip status update if this isn't a Knock notification\n      // Fixes issue: https://github.com/knocklabs/javascript/issues/589\n      if (!messageId) {\n        knockClient.log(\n          \"[Knock] Skipping status update for non-Knock notification\",\n        );\n        return;\n      }\n\n      return knockClient.messages.updateStatus(messageId, status);\n    },\n    [knockClient],\n  );\n\n  useEffect(() => {\n    Notifications.setNotificationHandler({\n      handleNotification:\n        customNotificationHandler ?? defaultNotificationHandler,\n    });\n\n    if (autoRegister) {\n      registerForPushNotifications()\n        .then(() => {\n          if (expoPushToken) {\n            registerPushTokenToChannel(expoPushToken, knockExpoChannelId)\n              .then((_result) => {\n                knockClient.log(\"[Knock] setChannelData success\");\n              })\n              .catch((_error) => {\n                console.error(\n                  \"[Knock] Error in setting push token or channel data\",\n                  _error,\n                );\n              });\n          }\n        })\n        .catch((_error) => {\n          console.error(\n            \"[Knock] Error in setting push token or channel data\",\n            _error,\n          );\n        });\n    }\n\n    const notificationReceivedSubscription =\n      Notifications.addNotificationReceivedListener((notification) => {\n        knockClient.log(\n          \"[Knock] Expo Push Notification received in foreground:\",\n        );\n        updateKnockMessageStatusFromNotification(notification, \"interacted\");\n        notificationReceivedHandler(notification);\n      });\n\n    const notificationResponseSubscription =\n      Notifications.addNotificationResponseReceivedListener((response) => {\n        knockClient.log(\"[Knock] Expo Push Notification was interacted with\");\n        updateKnockMessageStatusFromNotification(\n          response.notification,\n          \"interacted\",\n        );\n        notificationTappedHandler(response);\n      });\n\n    return () => {\n      notificationReceivedSubscription.remove();\n      notificationResponseSubscription.remove();\n    };\n\n    // TODO: Remove when possible and ensure dependency array is correct\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [\n    registerForPushNotifications,\n    notificationReceivedHandler,\n    notificationTappedHandler,\n    customNotificationHandler,\n    autoRegister,\n    expoPushToken,\n    knockExpoChannelId,\n    knockClient,\n  ]);\n\n  return (\n    <KnockExpoPushNotificationContext.Provider\n      value={{\n        expoPushToken,\n        registerForPushNotifications,\n        registerPushTokenToChannel,\n        unregisterPushTokenFromChannel,\n        onNotificationReceived: handleNotificationReceived,\n        onNotificationTapped: handleNotificationTapped,\n      }}\n    >\n      {children}\n    </KnockExpoPushNotificationContext.Provider>\n  );\n};\n\nexport const KnockExpoPushNotificationProvider: React.FC<\n  KnockExpoPushNotificationProviderProps\n> = (props) => {\n  return (\n    <KnockPushNotificationProvider>\n      <InternalKnockExpoPushNotificationProvider {...props} />\n    </KnockPushNotificationProvider>\n  );\n};\n\nexport const useExpoPushNotifications =\n  (): KnockExpoPushNotificationContextType => {\n    const context = useContext(KnockExpoPushNotificationContext);\n    if (context === undefined) {\n      throw new Error(\n        \"[Knock] useExpoPushNotifications must be used within a KnockExpoPushNotificationProvider\",\n      );\n    }\n    return context;\n  };\n"],"names":["Notifications","defaultNotificationHandler","_notification","KnockExpoPushNotificationContext","createContext","requestPushPermissionIfNeeded","existingStatus","status","getExpoPushToken","Constants","error","requestPermissionAndGetPushToken","Device","InternalKnockExpoPushNotificationProvider","knockExpoChannelId","customNotificationHandler","children","autoRegister","registerPushTokenToChannel","unregisterPushTokenFromChannel","usePushNotifications","expoPushToken","setExpoPushToken","useState","knockClient","useKnockClient","notificationReceivedHandler","setNotificationReceivedHandler","notificationTappedHandler","setNotificationTappedHandler","handleNotificationReceived","useCallback","handler","handleNotificationTapped","registerForPushNotifications","token","updateKnockMessageStatusFromNotification","notification","messageId","_a","useEffect","_result","_error","notificationReceivedSubscription","notificationResponseSubscription","response","jsx","KnockExpoPushNotificationProvider","props","KnockPushNotificationProvider","useExpoPushNotifications","context","useContext"],"mappings":";;;;;;;AA8BAA,EAAc,uBAAuB;AAAA,EACnC,oBAAoB,aACX;AAAA,IACL,iBAAiB;AAAA,IACjB,iBAAiB;AAAA,IACjB,gBAAgB;AAAA,IAChB,kBAAkB;AAAA,IAClB,gBAAgB;AAAA,EAClB;AAEJ,CAAC;AAED,MAAMC,IAA6B,OACjCC,OAEO;AAAA,EACL,iBAAiB;AAAA,EACjB,iBAAiB;AAAA,EACjB,gBAAgB;AAAA,EAChB,kBAAkB;AAAA,EAClB,gBAAgB;AAClB,IAGIC,IAAmCC,EAEvC,MAAS;AAWX,eAAeC,IAAiD;AAC9D,QAAM,EAAE,QAAQC,EAAmB,IAAA,MAAMN,EAAc,oBAAoB;AAE3E,MAAIM,MAAmB,WAAW;AAChC,UAAM,EAAE,QAAAC,EAAA,IAAW,MAAMP,EAAc,wBAAwB;AACxD,WAAAO;AAAA,EAAA;AAGF,SAAAD;AACT;AAEA,eAAeE,IAAgE;AACzE,MAAA;AAEA,WAAA,CAACC,EAAU,cACX,CAACA,EAAU,WAAW,SACtB,CAACA,EAAU,WAAW,MAAM,OAEpB,QAAA;AAAA,MACN;AAAA,IACF,GACO,QAEK,MAAMT,EAAc,sBAAsB;AAAA,MACtD,WAAWS,EAAU,WAAW,MAAM,IAAI;AAAA,IAAA,CAC3C;AAAA,WAEMC,GAAO;AACN,mBAAA,MAAM,0CAA0CA,CAAK,GACtD;AAAA,EAAA;AAEX;AAEA,eAAeC,IAAgF;AAEzF,SAACC,EAAO,WAKa,MAAMP,EAA8B,MAEpC,aACvB,QAAQ,KAAK,kDAAkD,GACxD,QAGFG,EAAiB,KAXtB,QAAQ,KAAK,yDAAyD,GAC/D;AAWX;AAEA,MAAMK,IAEF,CAAC;AAAA,EACH,oBAAAC;AAAA,EACA,2BAAAC;AAAA,EACA,UAAAC;AAAA,EACA,cAAAC,IAAe;AACjB,MAAM;AACJ,QAAM,EAAE,4BAAAC,GAA4B,gCAAAC,EAA+B,IACjEC,EAAqB,GACjB,CAACC,GAAeC,CAAgB,IAAIC,EAAwB,IAAI,GAChEC,IAAcC,EAAe,GAE7B,CAACC,GAA6BC,CAA8B,IAChEJ;AAAA,IACE,MAAM,MAAM;AAAA,IAAA;AAAA,EACd,GAEI,CAACK,GAA2BC,CAA4B,IAAIN,EAEhE,MAAM,MAAM;AAAA,EAAA,CAAE,GAEVO,IAA6BC;AAAA,IACjC,CAACC,MAAgE;AAC/D,MAAAL,EAA+B,MAAMK,CAAO;AAAA,IAC9C;AAAA,IACA,CAAA;AAAA,EACF,GAEMC,IAA2BF;AAAA,IAC/B,CAACC,MAAoE;AACnE,MAAAH,EAA6B,MAAMG,CAAO;AAAA,IAC5C;AAAA,IACA,CAAA;AAAA,EACF,GAEME,IAA+BH,EAAY,YAA2B;AACtE,QAAA;AACF,MAAAP,EAAY,IAAI,4CAA4C;AACtD,YAAAW,IAAQ,MAAMxB,EAAiC;AACrD,MAAAa,EAAY,IAAI,2BAA2BW,KAAA,gBAAAA,EAAO,IAAI,EAAE,GACpDA,KAAA,QAAAA,EAAO,SACTX,EAAY,IAAI,+BAA+BW,EAAM,IAAI,EAAE,GAC3Db,EAAiBa,EAAM,IAAI;AAAA,aAEtBzB,GAAO;AACN,cAAA,MAAM,qDAAqDA,CAAK;AAAA,IAAA;AAAA,EAC1E,GACC,CAACc,CAAW,CAAC,GAEVY,IAA2CL;AAAA,IAC/C,OACEM,GACA9B,MAC4B;;AAC5B,YAAM+B,KAAYC,IAAAF,EAAa,QAAQ,QAAQ,SAA7B,gBAAAE,EAChB;AAKF,UAAI,CAACD,GAAW;AACF,QAAAd,EAAA;AAAA,UACV;AAAA,QACF;AACA;AAAA,MAAA;AAGF,aAAOA,EAAY,SAAS,aAAac,GAAW/B,CAAM;AAAA,IAC5D;AAAA,IACA,CAACiB,CAAW;AAAA,EACd;AAEA,SAAAgB,EAAU,MAAM;AACd,IAAAxC,EAAc,uBAAuB;AAAA,MACnC,oBACEe,KAA6Bd;AAAA,IAAA,CAChC,GAEGgB,KAC2BiB,EAAA,EAC1B,KAAK,MAAM;AACV,MAAIb,KACFH,EAA2BG,GAAeP,CAAkB,EACzD,KAAK,CAAC2B,MAAY;AACjB,QAAAjB,EAAY,IAAI,gCAAgC;AAAA,MAAA,CACjD,EACA,MAAM,CAACkB,MAAW;AACT,gBAAA;AAAA,UACN;AAAA,UACAA;AAAA,QACF;AAAA,MAAA,CACD;AAAA,IACL,CACD,EACA,MAAM,CAACA,MAAW;AACT,cAAA;AAAA,QACN;AAAA,QACAA;AAAA,MACF;AAAA,IAAA,CACD;AAGL,UAAMC,IACJ3C,EAAc,gCAAgC,CAACqC,MAAiB;AAClD,MAAAb,EAAA;AAAA,QACV;AAAA,MACF,GACAY,EAAyCC,GAAc,YAAY,GACnEX,EAA4BW,CAAY;AAAA,IAAA,CACzC,GAEGO,IACJ5C,EAAc,wCAAwC,CAAC6C,MAAa;AAClE,MAAArB,EAAY,IAAI,oDAAoD,GACpEY;AAAA,QACES,EAAS;AAAA,QACT;AAAA,MACF,GACAjB,EAA0BiB,CAAQ;AAAA,IAAA,CACnC;AAEH,WAAO,MAAM;AACX,MAAAF,EAAiC,OAAO,GACxCC,EAAiC,OAAO;AAAA,IAC1C;AAAA,EAAA,GAIC;AAAA,IACDV;AAAA,IACAR;AAAA,IACAE;AAAA,IACAb;AAAA,IACAE;AAAA,IACAI;AAAA,IACAP;AAAA,IACAU;AAAA,EAAA,CACD,GAGC,gBAAAsB;AAAA,IAAC3C,EAAiC;AAAA,IAAjC;AAAA,MACC,OAAO;AAAA,QACL,eAAAkB;AAAA,QACA,8BAAAa;AAAA,QACA,4BAAAhB;AAAA,QACA,gCAAAC;AAAA,QACA,wBAAwBW;AAAA,QACxB,sBAAsBG;AAAA,MACxB;AAAA,MAEC,UAAAjB;AAAA,IAAA;AAAA,EACH;AAEJ,GAEa+B,IAET,CAACC,wBAEAC,GACC,EAAA,UAAA,gBAAAH,EAACjC,GAA2C,EAAA,GAAGmC,EAAO,CAAA,GACxD,GAISE,IACX,MAA4C;AACpC,QAAAC,IAAUC,EAAWjD,CAAgC;AAC3D,MAAIgD,MAAY;AACd,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAEK,SAAAA;AACT;"}
+{"version":3,"file":"KnockExpoPushNotificationProvider.mjs","sources":["../../../../src/modules/push/KnockExpoPushNotificationProvider.tsx"],"sourcesContent":["import { Message, MessageEngagementStatus } from \"@knocklabs/client\";\nimport { useKnockClient } from \"@knocklabs/react-core\";\nimport {\n  type KnockPushNotificationContextType,\n  KnockPushNotificationProvider,\n  usePushNotifications,\n} from \"@knocklabs/react-native\";\nimport Constants from \"expo-constants\";\nimport * as Device from \"expo-device\";\nimport * as Notifications from \"expo-notifications\";\nimport React, {\n  createContext,\n  useCallback,\n  useContext,\n  useEffect,\n  useState,\n} from \"react\";\n\nexport interface KnockExpoPushNotificationContextType\n  extends KnockPushNotificationContextType {\n  expoPushToken: string | null;\n  registerForPushNotifications: () => Promise<string | null>;\n  onNotificationReceived: (\n    handler: (notification: Notifications.Notification) => void,\n  ) => void;\n  onNotificationTapped: (\n    handler: (response: Notifications.NotificationResponse) => void,\n  ) => void;\n}\n\nNotifications.setNotificationHandler({\n  handleNotification: async () => {\n    return {\n      shouldShowAlert: true,\n      shouldPlaySound: true,\n      shouldSetBadge: true,\n      shouldShowBanner: true,\n      shouldShowList: true,\n    };\n  },\n});\n\nconst defaultNotificationHandler = async (\n  _notification: Notifications.Notification,\n): Promise<Notifications.NotificationBehavior> => {\n  return {\n    shouldShowAlert: true,\n    shouldPlaySound: true,\n    shouldSetBadge: true,\n    shouldShowBanner: true,\n    shouldShowList: true,\n  };\n};\n\nconst KnockExpoPushNotificationContext = createContext<\n  KnockExpoPushNotificationContextType | undefined\n>(undefined);\n\nexport interface KnockExpoPushNotificationProviderProps {\n  knockExpoChannelId: string;\n  customNotificationHandler?: (\n    notification: Notifications.Notification,\n  ) => Promise<Notifications.NotificationBehavior>;\n  setupAndroidNotificationChannel?: () => Promise<void>;\n  children?: React.ReactElement;\n  autoRegister?: boolean;\n}\n\nasync function requestPushPermissionIfNeeded(): Promise<string> {\n  const { status: existingStatus } = await Notifications.getPermissionsAsync();\n\n  if (existingStatus !== \"granted\") {\n    const { status } = await Notifications.requestPermissionsAsync();\n    return status;\n  }\n\n  return existingStatus;\n}\n\nasync function getExpoPushToken(): Promise<Notifications.ExpoPushToken | null> {\n  try {\n    if (\n      !Constants.expoConfig ||\n      !Constants.expoConfig.extra ||\n      !Constants.expoConfig.extra.eas\n    ) {\n      console.error(\n        \"[Knock] Expo Project ID is not defined in the app configuration.\",\n      );\n      return null;\n    }\n    const token = await Notifications.getExpoPushTokenAsync({\n      projectId: Constants.expoConfig.extra.eas.projectId,\n    });\n    return token;\n  } catch (error) {\n    console.error(\"[Knock] Error getting Expo push token:\", error);\n    return null;\n  }\n}\n\nasync function defaultSetupAndroidNotificationChannel(): Promise<void> {\n  if (Device.osName === \"Android\") {\n    await Notifications.setNotificationChannelAsync(\"default\", {\n      name: \"Default\",\n      importance: Notifications.AndroidImportance.MAX,\n      vibrationPattern: [0, 250, 250, 250],\n      lightColor: \"#FF231F7C\",\n    });\n  }\n}\n\nasync function requestPermissionAndGetPushToken(\n  setupAndroidChannel: () => Promise<void>,\n): Promise<Notifications.ExpoPushToken | null> {\n  // Check for device support\n  if (!Device.isDevice) {\n    console.warn(\"[Knock] Must use physical device for Push Notifications\");\n    return null;\n  }\n\n  // Setup Android notification channel before requesting permissions\n  await setupAndroidChannel();\n\n  const permissionStatus = await requestPushPermissionIfNeeded();\n\n  if (permissionStatus !== \"granted\") {\n    console.warn(\"[Knock] Push notification permission not granted\");\n    return null;\n  }\n\n  return getExpoPushToken();\n}\n\nconst InternalKnockExpoPushNotificationProvider: React.FC<\n  KnockExpoPushNotificationProviderProps\n> = ({\n  knockExpoChannelId,\n  customNotificationHandler,\n  setupAndroidNotificationChannel = defaultSetupAndroidNotificationChannel,\n  children,\n  autoRegister = true,\n}) => {\n  const { registerPushTokenToChannel, unregisterPushTokenFromChannel } =\n    usePushNotifications();\n  const [expoPushToken, setExpoPushToken] = useState<string | null>(null);\n  const knockClient = useKnockClient();\n\n  const [notificationReceivedHandler, setNotificationReceivedHandler] =\n    useState<(notification: Notifications.Notification) => void>(\n      () => () => {},\n    );\n\n  const [notificationTappedHandler, setNotificationTappedHandler] = useState<\n    (response: Notifications.NotificationResponse) => void\n  >(() => () => {});\n\n  const handleNotificationReceived = useCallback(\n    (handler: (notification: Notifications.Notification) => void) => {\n      setNotificationReceivedHandler(() => handler);\n    },\n    [],\n  );\n\n  const handleNotificationTapped = useCallback(\n    (handler: (response: Notifications.NotificationResponse) => void) => {\n      setNotificationTappedHandler(() => handler);\n    },\n    [],\n  );\n\n  const registerForPushNotifications = useCallback(async (): Promise<\n    string | null\n  > => {\n    try {\n      knockClient.log(`[Knock] Registering for push notifications`);\n      const token = await requestPermissionAndGetPushToken(\n        setupAndroidNotificationChannel,\n      );\n      knockClient.log(`[Knock] Token received: ${token?.data}`);\n      if (token?.data) {\n        knockClient.log(`[Knock] Setting push token: ${token.data}`);\n        setExpoPushToken(token.data);\n        return token.data;\n      }\n      return null;\n    } catch (error) {\n      console.error(`[Knock] Error registering for push notifications:`, error);\n      return null;\n    }\n  }, [knockClient, setupAndroidNotificationChannel]);\n\n  const updateKnockMessageStatusFromNotification = useCallback(\n    async (\n      notification: Notifications.Notification,\n      status: MessageEngagementStatus,\n    ): Promise<Message | void> => {\n      const messageId = notification.request.content.data?.[\n        \"knock_message_id\"\n      ] as string | undefined;\n\n      // Skip status update if this isn't a Knock notification\n      // Fixes issue: https://github.com/knocklabs/javascript/issues/589\n      if (!messageId) {\n        knockClient.log(\n          \"[Knock] Skipping status update for non-Knock notification\",\n        );\n        return;\n      }\n\n      return knockClient.messages.updateStatus(messageId, status);\n    },\n    [knockClient],\n  );\n\n  useEffect(() => {\n    Notifications.setNotificationHandler({\n      handleNotification:\n        customNotificationHandler ?? defaultNotificationHandler,\n    });\n\n    if (autoRegister) {\n      registerForPushNotifications()\n        .then((token) => {\n          if (token) {\n            registerPushTokenToChannel(token, knockExpoChannelId)\n              .then((_result) => {\n                knockClient.log(\"[Knock] setChannelData success\");\n              })\n              .catch((_error) => {\n                console.error(\n                  \"[Knock] Error in setting push token or channel data\",\n                  _error,\n                );\n              });\n          }\n        })\n        .catch((_error) => {\n          console.error(\n            \"[Knock] Error in setting push token or channel data\",\n            _error,\n          );\n        });\n    }\n\n    const notificationReceivedSubscription =\n      Notifications.addNotificationReceivedListener((notification) => {\n        knockClient.log(\n          \"[Knock] Expo Push Notification received in foreground:\",\n        );\n        updateKnockMessageStatusFromNotification(notification, \"interacted\");\n        notificationReceivedHandler(notification);\n      });\n\n    const notificationResponseSubscription =\n      Notifications.addNotificationResponseReceivedListener((response) => {\n        knockClient.log(\"[Knock] Expo Push Notification was interacted with\");\n        updateKnockMessageStatusFromNotification(\n          response.notification,\n          \"interacted\",\n        );\n        notificationTappedHandler(response);\n      });\n\n    return () => {\n      notificationReceivedSubscription.remove();\n      notificationResponseSubscription.remove();\n    };\n\n    // TODO: Remove when possible and ensure dependency array is correct\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [\n    registerForPushNotifications,\n    notificationReceivedHandler,\n    notificationTappedHandler,\n    customNotificationHandler,\n    autoRegister,\n    knockExpoChannelId,\n    knockClient,\n  ]);\n\n  return (\n    <KnockExpoPushNotificationContext.Provider\n      value={{\n        expoPushToken,\n        registerForPushNotifications,\n        registerPushTokenToChannel,\n        unregisterPushTokenFromChannel,\n        onNotificationReceived: handleNotificationReceived,\n        onNotificationTapped: handleNotificationTapped,\n      }}\n    >\n      {children}\n    </KnockExpoPushNotificationContext.Provider>\n  );\n};\n\nexport const KnockExpoPushNotificationProvider: React.FC<\n  KnockExpoPushNotificationProviderProps\n> = (props) => {\n  return (\n    <KnockPushNotificationProvider>\n      <InternalKnockExpoPushNotificationProvider {...props} />\n    </KnockPushNotificationProvider>\n  );\n};\n\nexport const useExpoPushNotifications =\n  (): KnockExpoPushNotificationContextType => {\n    const context = useContext(KnockExpoPushNotificationContext);\n    if (context === undefined) {\n      throw new Error(\n        \"[Knock] useExpoPushNotifications must be used within a KnockExpoPushNotificationProvider\",\n      );\n    }\n    return context;\n  };\n"],"names":["Notifications","defaultNotificationHandler","_notification","KnockExpoPushNotificationContext","createContext","requestPushPermissionIfNeeded","existingStatus","status","getExpoPushToken","Constants","error","defaultSetupAndroidNotificationChannel","Device","requestPermissionAndGetPushToken","setupAndroidChannel","InternalKnockExpoPushNotificationProvider","knockExpoChannelId","customNotificationHandler","setupAndroidNotificationChannel","children","autoRegister","registerPushTokenToChannel","unregisterPushTokenFromChannel","usePushNotifications","expoPushToken","setExpoPushToken","useState","knockClient","useKnockClient","notificationReceivedHandler","setNotificationReceivedHandler","notificationTappedHandler","setNotificationTappedHandler","handleNotificationReceived","useCallback","handler","handleNotificationTapped","registerForPushNotifications","token","updateKnockMessageStatusFromNotification","notification","messageId","_a","useEffect","_result","_error","notificationReceivedSubscription","notificationResponseSubscription","response","jsx","KnockExpoPushNotificationProvider","props","KnockPushNotificationProvider","useExpoPushNotifications","context","useContext"],"mappings":"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"}

package/dist/types/modules/push/KnockExpoPushNotificationProvider.d.ts

@@ -3,13 +3,14 @@ import { default as React } from 'react';
 import * as Notifications from "expo-notifications";
 export interface KnockExpoPushNotificationContextType extends KnockPushNotificationContextType {
     expoPushToken: string | null;
-    registerForPushNotifications: () => Promise<void>;
+    registerForPushNotifications: () => Promise<string | null>;
     onNotificationReceived: (handler: (notification: Notifications.Notification) => void) => void;
     onNotificationTapped: (handler: (response: Notifications.NotificationResponse) => void) => void;
 }
 export interface KnockExpoPushNotificationProviderProps {
     knockExpoChannelId: string;
     customNotificationHandler?: (notification: Notifications.Notification) => Promise<Notifications.NotificationBehavior>;
+    setupAndroidNotificationChannel?: () => Promise<void>;
     children?: React.ReactElement;
     autoRegister?: boolean;
 }

package/dist/types/modules/push/KnockExpoPushNotificationProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KnockExpoPushNotificationProvider.d.ts","sourceRoot":"","sources":["../../../../src/modules/push/KnockExpoPushNotificationProvider.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,gCAAgC,EAGtC,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,MAAM,WAAW,oCACf,SAAQ,gCAAgC;IACxC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,4BAA4B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,sBAAsB,EAAE,CACtB,OAAO,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,KAAK,IAAI,KACxD,IAAI,CAAC;IACV,oBAAoB,EAAE,CACpB,OAAO,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,oBAAoB,KAAK,IAAI,KAC5D,IAAI,CAAC;CACX;AA8BD,MAAM,WAAW,sCAAsC;IACrD,kBAAkB,EAAE,MAAM,CAAC;IAC3B,yBAAyB,CAAC,EAAE,CAC1B,YAAY,EAAE,aAAa,CAAC,YAAY,KACrC,OAAO,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;IACjD,QAAQ,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAgND,eAAO,MAAM,iCAAiC,EAAE,KAAK,CAAC,EAAE,CACtD,sCAAsC,CAOvC,CAAC;AAEF,eAAO,MAAM,wBAAwB,QAC/B,oCAQH,CAAC"}
+{"version":3,"file":"KnockExpoPushNotificationProvider.d.ts","sourceRoot":"","sources":["../../../../src/modules/push/KnockExpoPushNotificationProvider.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,gCAAgC,EAGtC,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,MAAM,WAAW,oCACf,SAAQ,gCAAgC;IACxC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,4BAA4B,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3D,sBAAsB,EAAE,CACtB,OAAO,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,KAAK,IAAI,KACxD,IAAI,CAAC;IACV,oBAAoB,EAAE,CACpB,OAAO,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,oBAAoB,KAAK,IAAI,KAC5D,IAAI,CAAC;CACX;AA8BD,MAAM,WAAW,sCAAsC;IACrD,kBAAkB,EAAE,MAAM,CAAC;IAC3B,yBAAyB,CAAC,EAAE,CAC1B,YAAY,EAAE,aAAa,CAAC,YAAY,KACrC,OAAO,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;IACjD,+BAA+B,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAuOD,eAAO,MAAM,iCAAiC,EAAE,KAAK,CAAC,EAAE,CACtD,sCAAsC,CAOvC,CAAC;AAEF,eAAO,MAAM,wBAAwB,QAC/B,oCAQH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knocklabs/expo",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "author": "@knocklabs",
   "license": "MIT",
   "main": "dist/cjs/index.js",
@@ -51,9 +51,9 @@
     "react-native": "*"
   },
   "dependencies": {
-    "@knocklabs/client": "^0.20.0",
-    "@knocklabs/react-core": "^0.12.0",
-    "@knocklabs/react-native": "^0.7.2",
+    "@knocklabs/client": "^0.20.1",
+    "@knocklabs/react-core": "^0.12.1",
+    "@knocklabs/react-native": "^0.7.3",
     "react-native-gesture-handler": "^2.27.1",
     "react-native-render-html": "^6.3.4",
     "react-native-svg": "^15.12.0"

package/src/modules/push/KnockExpoPushNotificationProvider.tsx

@@ -19,7 +19,7 @@ import React, {
 export interface KnockExpoPushNotificationContextType
   extends KnockPushNotificationContextType {
   expoPushToken: string | null;
-  registerForPushNotifications: () => Promise<void>;
+  registerForPushNotifications: () => Promise<string | null>;
   onNotificationReceived: (
     handler: (notification: Notifications.Notification) => void,
   ) => void;
@@ -61,6 +61,7 @@ export interface KnockExpoPushNotificationProviderProps {
   customNotificationHandler?: (
     notification: Notifications.Notification,
   ) => Promise<Notifications.NotificationBehavior>;
+  setupAndroidNotificationChannel?: () => Promise<void>;
   children?: React.ReactElement;
   autoRegister?: boolean;
 }
@@ -98,13 +99,29 @@ async function getExpoPushToken(): Promise<Notifications.ExpoPushToken | null> {
   }
 }
 
-async function requestPermissionAndGetPushToken(): Promise<Notifications.ExpoPushToken | null> {
+async function defaultSetupAndroidNotificationChannel(): Promise<void> {
+  if (Device.osName === "Android") {
+    await Notifications.setNotificationChannelAsync("default", {
+      name: "Default",
+      importance: Notifications.AndroidImportance.MAX,
+      vibrationPattern: [0, 250, 250, 250],
+      lightColor: "#FF231F7C",
+    });
+  }
+}
+
+async function requestPermissionAndGetPushToken(
+  setupAndroidChannel: () => Promise<void>,
+): Promise<Notifications.ExpoPushToken | null> {
   // Check for device support
   if (!Device.isDevice) {
     console.warn("[Knock] Must use physical device for Push Notifications");
     return null;
   }
 
+  // Setup Android notification channel before requesting permissions
+  await setupAndroidChannel();
+
   const permissionStatus = await requestPushPermissionIfNeeded();
 
   if (permissionStatus !== "granted") {
@@ -120,6 +137,7 @@ const InternalKnockExpoPushNotificationProvider: React.FC<
 > = ({
   knockExpoChannelId,
   customNotificationHandler,
+  setupAndroidNotificationChannel = defaultSetupAndroidNotificationChannel,
   children,
   autoRegister = true,
 }) => {
@@ -151,19 +169,26 @@ const InternalKnockExpoPushNotificationProvider: React.FC<
     [],
   );
 
-  const registerForPushNotifications = useCallback(async (): Promise<void> => {
+  const registerForPushNotifications = useCallback(async (): Promise<
+    string | null
+  > => {
     try {
       knockClient.log(`[Knock] Registering for push notifications`);
-      const token = await requestPermissionAndGetPushToken();
+      const token = await requestPermissionAndGetPushToken(
+        setupAndroidNotificationChannel,
+      );
       knockClient.log(`[Knock] Token received: ${token?.data}`);
       if (token?.data) {
         knockClient.log(`[Knock] Setting push token: ${token.data}`);
         setExpoPushToken(token.data);
+        return token.data;
       }
+      return null;
     } catch (error) {
       console.error(`[Knock] Error registering for push notifications:`, error);
+      return null;
     }
-  }, [knockClient]);
+  }, [knockClient, setupAndroidNotificationChannel]);
 
   const updateKnockMessageStatusFromNotification = useCallback(
     async (
@@ -196,9 +221,9 @@ const InternalKnockExpoPushNotificationProvider: React.FC<
 
     if (autoRegister) {
       registerForPushNotifications()
-        .then(() => {
-          if (expoPushToken) {
-            registerPushTokenToChannel(expoPushToken, knockExpoChannelId)
+        .then((token) => {
+          if (token) {
+            registerPushTokenToChannel(token, knockExpoChannelId)
               .then((_result) => {
                 knockClient.log("[Knock] setChannelData success");
               })
@@ -250,7 +275,6 @@ const InternalKnockExpoPushNotificationProvider: React.FC<
     notificationTappedHandler,
     customNotificationHandler,
     autoRegister,
-    expoPushToken,
     knockExpoChannelId,
     knockClient,
   ]);