@apps-in-toss/framework 1.2.0 → 1.2.1

package/dist/index.js

@@ -848,18 +848,18 @@ import {
 import * as appsInTossAsyncBridges from "@apps-in-toss/native-modules/async-bridges";
 import * as appsInTossConstantBridges from "@apps-in-toss/native-modules/constant-bridges";
 import * as appsInTossEventBridges from "@apps-in-toss/native-modules/event-bridges";
-import { getSchemeUri as getSchemeUri6, useGraniteEvent } from "@granite-js/react-native";
+import { getSchemeUri as getSchemeUri6 } from "@granite-js/react-native";
 import { ExternalWebViewScreen, tdsEvent } from "@toss/tds-react-native";
 import { useSafeAreaBottom, useSafeAreaTop as useSafeAreaTop2, useTopNavigation } from "@toss/tds-react-native/private";
-import { useMemo as useMemo4, useState as useState5 } from "react";
-import { Platform as Platform4 } from "react-native";
+import { useEffect as useEffect11, useMemo as useMemo5, useRef as useRef6, useState as useState5 } from "react";
+import { BackHandler as BackHandler2, Platform as Platform4 } from "react-native";
 
 // src/components/GameWebView.tsx
 import { setIosSwipeGestureEnabled as setIosSwipeGestureEnabled2, appsInTossEvent as appsInTossEvent2, getOperationalEnvironment as getOperationalEnvironment2 } from "@apps-in-toss/native-modules";
 import {
   WebView as PlainWebView
 } from "@granite-js/native/react-native-webview";
-import { forwardRef, useEffect as useEffect10, useState as useState3 } from "react";
+import { forwardRef, useEffect as useEffect9, useState as useState3 } from "react";
 import { Platform as Platform3 } from "react-native";
 
 // src/components/GameProfile.tsx
@@ -1181,8 +1181,8 @@ import { closeView as closeView3 } from "@granite-js/react-native";
 import { PageNavbar, useDialog as useDialog5 } from "@toss/tds-react-native";
 import { NavigationRightContent, useSafeAreaTop } from "@toss/tds-react-native/private";
 import { josa as josa3 } from "es-hangul";
-import { useCallback as useCallback5, useEffect as useEffect9 } from "react";
-import { BackHandler as BackHandler2, Platform as Platform2, View as View2 } from "react-native";
+import { useCallback as useCallback5 } from "react";
+import { Platform as Platform2, View as View2 } from "react-native";
 import { Fragment as Fragment6, jsx as jsx9, jsxs as jsxs4 } from "react/jsx-runtime";
 function GameWebviewNavigationBar() {
   const safeAreaTop = useSafeAreaTop();
@@ -1194,6 +1194,7 @@ function GameWebviewNavigationBar() {
   const parsedNavigationBar = global2.navigationBar != null ? safeParseNavigationBar(global2.navigationBar) : null;
   const initialAccessoryButton = parsedNavigationBar?.initialAccessoryButton;
   const handleGameWebviewClose = useCallback5(async () => {
+    logging.closeButtonClick();
     const isConfirmed = await openConfirm({
       title: `${josa3(global2.brandDisplayName, "\uC744/\uB97C")} \uC885\uB8CC\uD560\uAE4C\uC694?`,
       leftButton: "\uCDE8\uC18C",
@@ -1207,14 +1208,6 @@ function GameWebviewNavigationBar() {
       closeView3();
     }
   }, [captureExitLog, global2.brandDisplayName, logging, openConfirm]);
-  useEffect9(() => {
-    const handleAndroidBackEvent = () => {
-      handleGameWebviewClose();
-      return true;
-    };
-    BackHandler2.addEventListener("hardwareBackPress", handleAndroidBackEvent);
-    return () => BackHandler2.removeEventListener("hardwareBackPress", handleAndroidBackEvent);
-  }, [handleGameWebviewClose]);
   return /* @__PURE__ */ jsxs4(Fragment6, { children: [
     /* @__PURE__ */ jsx9(PageNavbar, { preference: { type: "none" } }),
     /* @__PURE__ */ jsx9(
@@ -1239,7 +1232,6 @@ function GameWebviewNavigationBar() {
             fixedRightButton: initialAccessoryButton,
             onPressDots: openMoreButtonBottomSheet,
             onPressClose: () => {
-              logging.closeButtonClick();
               handleGameWebviewClose();
             },
             theme: "dark"
@@ -1254,7 +1246,7 @@ function GameWebviewNavigationBar() {
 import { Fragment as Fragment7, jsx as jsx10, jsxs as jsxs5 } from "react/jsx-runtime";
 var GameWebView = forwardRef(function GameWebView2(props, ref) {
   const [isEntryMessageExited, setIsEntryMessageExited] = useState3(false);
-  useEffect10(() => {
+  useEffect9(() => {
     if (Platform3.OS === "ios") {
       setIosSwipeGestureEnabled2({ isEnabled: false });
       return () => {
@@ -1263,7 +1255,7 @@ var GameWebView = forwardRef(function GameWebView2(props, ref) {
     }
     return;
   }, []);
-  useEffect10(() => {
+  useEffect9(() => {
     appsInTossEvent2.addEventListener("entryMessageExited", {
       onEvent: () => {
         setIsEntryMessageExited(true);
@@ -1277,12 +1269,10 @@ var GameWebView = forwardRef(function GameWebView2(props, ref) {
 });
 
 // src/components/PartnerWebView.tsx
-import { closeView as closeView5 } from "@apps-in-toss/native-modules";
 import {
   WebView as PlainWebView2
 } from "@granite-js/native/react-native-webview";
-import { forwardRef as forwardRef2, useCallback as useCallback8, useEffect as useEffect11, useRef as useRef4 } from "react";
-import { BackHandler as BackHandler3 } from "react-native";
+import { forwardRef as forwardRef2 } from "react";
 
 // src/components/NavigationBar/PartnerWebviewNavigationBar.tsx
 import { closeView as closeView4 } from "@granite-js/react-native";
@@ -1291,7 +1281,7 @@ import { NavigationBackButton as NavigationBackButton2, NavigationLeft as Naviga
 import { josa as josa4 } from "es-hangul";
 import { useCallback as useCallback6 } from "react";
 import { jsx as jsx11 } from "react/jsx-runtime";
-function PartnerWebviewNavigationBar({ handleBackEvent, handleHomeIconButtonClick }) {
+function PartnerWebviewNavigationBar({ onBackButtonClick, onHomeButtonClick }) {
   const globals = getAppsInTossGlobals();
   const { captureExitLog } = useCaptureExitLog();
   const logging = useNavigationBarLogging();
@@ -1301,10 +1291,6 @@ function PartnerWebviewNavigationBar({ handleBackEvent, handleHomeIconButtonClic
   const withHomeButton = parsedNavigationBar?.withHomeButton ?? false;
   const withBackButton = parsedNavigationBar?.withBackButton ?? true;
   const initialAccessoryButton = parsedNavigationBar?.initialAccessoryButton;
-  const handlePressTitle = useCallback6(() => {
-    logging.homeButtonClick();
-    handleHomeIconButtonClick();
-  }, [handleHomeIconButtonClick, logging]);
   const handleClose = useCallback6(async () => {
     logging.closeButtonClick();
     const isConfirmed = await openConfirm({
@@ -1327,200 +1313,26 @@ function PartnerWebviewNavigationBar({ handleBackEvent, handleHomeIconButtonClic
       icon: toIcon(globals.brandIcon),
       onPressDots: openMoreButtonBottomSheet,
       contentVisible: true,
-      onPressTitle: withHomeButton ? handlePressTitle : void 0,
+      onPressTitle: withHomeButton ? onHomeButtonClick : void 0,
       onPressClose: handleClose,
       withHome: withHomeButton,
       fixedRightButton: initialAccessoryButton,
-      children: /* @__PURE__ */ jsx11(NavigationLeft2, { visible: withBackButton, children: /* @__PURE__ */ jsx11(NavigationBackButton2, { onPress: handleBackEvent, canGoBack: false }) })
+      children: /* @__PURE__ */ jsx11(NavigationLeft2, { visible: withBackButton, children: /* @__PURE__ */ jsx11(NavigationBackButton2, { onPress: onBackButtonClick, canGoBack: false }) })
     }
   ) });
 }
 
-// src/core/utils/mergeRefs.ts
-function mergeRefs(...refs) {
-  return (value) => {
-    refs.forEach((ref) => {
-      if (typeof ref === "function") {
-        ref(value);
-      } else if (ref != null) {
-        ref.current = value;
-      }
-    });
-  };
-}
-
-// src/hooks/useWebviewHistoryStack.tsx
-import { useCallback as useCallback7, useMemo as useMemo2, useReducer } from "react";
-var INITIAL_STATE = { stack: [], index: -1 };
-function reducer(state, action) {
-  switch (action.type) {
-    case "NAVIGATION_CHANGE": {
-      const { url, canGoForward } = action;
-      if (state.stack.length === 0) {
-        return { stack: [url], index: 0 };
-      }
-      const { stack, index } = state;
-      const cur = stack[index];
-      if (url === cur) {
-        return state;
-      }
-      const prev = index > 0 ? stack[index - 1] : void 0;
-      const next = index < stack.length - 1 ? stack[index + 1] : void 0;
-      if (prev && url === prev && canGoForward) {
-        return { ...state, index: index - 1 };
-      }
-      if (next && url === next) {
-        return { ...state, index: index + 1 };
-      }
-      const base = stack.slice(0, index + 1);
-      const nextStack = [...base, url];
-      return { stack: nextStack, index: nextStack.length - 1 };
-    }
-    default:
-      return state;
-  }
-}
-function useWebViewHistory() {
-  const [state, dispatch] = useReducer(reducer, INITIAL_STATE);
-  const onNavigationStateChange = useCallback7(({ url, canGoForward: canGoForward2 }) => {
-    dispatch({ type: "NAVIGATION_CHANGE", url, canGoForward: canGoForward2 });
-  }, []);
-  const { canGoBack, canGoForward } = useMemo2(() => {
-    const canBack = state.index > 0;
-    const canFwd = state.index >= 0 && state.index < state.stack.length - 1;
-    return { canGoBack: canBack, canGoForward: canFwd };
-  }, [state.index, state.stack.length]);
-  return { onNavigationStateChange, canGoBack, canGoForward };
-}
-
-// src/utils/log.ts
-import { eventLog as eventLogNative } from "@apps-in-toss/native-modules";
-import { getSchemeUri as getSchemeUri5 } from "@granite-js/react-native";
-
-// src/utils/extractDateFromUUIDv7.ts
-var extractDateFromUUIDv7 = (uuid) => {
-  const timestampHex = uuid.split("-").join("").slice(0, 12);
-  const timestamp = Number.parseInt(timestampHex, 16);
-  return new Date(timestamp);
-};
-
-// src/utils/log.ts
-var getGroupId = (url) => {
-  try {
-    const urlObject = new URL(url);
-    return {
-      groupId: urlObject.pathname,
-      search: urlObject.search.startsWith("?") ? urlObject.search.substring(1) : urlObject.search
-    };
-  } catch {
-    return {
-      groupId: "unknown",
-      search: "unknown"
-    };
-  }
-};
-var getReferrer = () => {
-  try {
-    const referrer = new URL(getSchemeUri5());
-    return referrer.searchParams.get("referrer");
-  } catch {
-    return "";
-  }
-};
-var trackScreen = (url) => {
-  const { groupId, search } = getGroupId(url);
-  const log = {
-    log_type: "screen",
-    log_name: `${groupId}::screen`,
-    params: {
-      search,
-      referrer: getReferrer(),
-      deployment_id: env.getDeploymentId(),
-      deployment_timestamp: extractDateFromUUIDv7(env.getDeploymentId()).getTime()
-    }
-  };
-  return eventLogNative(log);
-};
-
 // src/components/PartnerWebView.tsx
 import { Fragment as Fragment8, jsx as jsx12, jsxs as jsxs6 } from "react/jsx-runtime";
-var PartnerWebView = forwardRef2(
-  function PartnerWebViewScreen(webViewProps, ref) {
-    const webViewRef = useRef4(null);
-    const refs = mergeRefs(ref, webViewRef);
-    const { captureExitLog } = useCaptureExitLog();
-    const { canGoBack, onNavigationStateChange } = useWebViewHistory();
-    const historyBackScript = `
-      (function() {
-        window.history.back();
-        true;
-      })();
-    `;
-    const historyHomeScript = `
-      (function() {
-        window.location.href = '/';
-        true;
-      })();
-    `;
-    const handleBackEvent = useCallback8(() => {
-      if (canGoBack) {
-        webViewRef.current?.injectJavaScript(historyBackScript);
-      } else {
-        captureExitLog(Date.now());
-        closeView5();
-      }
-    }, [canGoBack, captureExitLog, historyBackScript]);
-    useEffect11(() => {
-      const handleAndroidBackEvent = () => {
-        if (canGoBack) {
-          webViewRef.current?.injectJavaScript(historyBackScript);
-          return true;
-        } else {
-          captureExitLog(Date.now());
-          return false;
-        }
-      };
-      BackHandler3.addEventListener("hardwareBackPress", handleAndroidBackEvent);
-      return () => BackHandler3.removeEventListener("hardwareBackPress", handleAndroidBackEvent);
-    }, [canGoBack, captureExitLog, historyBackScript]);
-    const handleHomeIconButtonClick = useCallback8(() => {
-      webViewRef.current?.injectJavaScript(historyHomeScript);
-    }, [historyHomeScript]);
-    const handleNavigationStateChange = useCallback8(
-      (event) => {
-        if (event.url) {
-          trackScreen(event.url);
-        }
-        onNavigationStateChange(event);
-      },
-      [onNavigationStateChange]
-    );
-    return /* @__PURE__ */ jsxs6(Fragment8, { children: [
-      /* @__PURE__ */ jsx12(
-        PartnerWebviewNavigationBar,
-        {
-          handleBackEvent,
-          handleHomeIconButtonClick
-        }
-      ),
-      /* @__PURE__ */ jsx12(
-        PlainWebView2,
-        {
-          ref: refs,
-          ...webViewProps,
-          style: { flex: 1 },
-          onNavigationStateChange: (event) => {
-            webViewProps?.onNavigationStateChange?.(event);
-            handleNavigationStateChange(event);
-          }
-        }
-      )
-    ] });
-  }
-);
+var PartnerWebView = forwardRef2(function PartnerWebViewScreen({ onBackButtonClick, onHomeButtonClick, ...webViewProps }, ref) {
+  return /* @__PURE__ */ jsxs6(Fragment8, { children: [
+    /* @__PURE__ */ jsx12(PartnerWebviewNavigationBar, { onBackButtonClick, onHomeButtonClick }),
+    /* @__PURE__ */ jsx12(PlainWebView2, { ref, ...webViewProps, style: { flex: 1 } })
+  ] });
+});
 
 // src/bridge-handler/useBridgeHandler.tsx
-import { useCallback as useCallback9, useMemo as useMemo3, useRef as useRef5 } from "react";
+import { useCallback as useCallback7, useMemo as useMemo2, useRef as useRef4 } from "react";
 function serializeError(error) {
   return JSON.stringify(error, (_, value) => {
     if (value instanceof Error) {
@@ -1573,8 +1385,8 @@ function useBridgeHandler({
   eventListenerMap,
   injectedJavaScript: originalInjectedJavaScript
 }) {
-  const ref = useRef5(null);
-  const injectedJavaScript = useMemo3(
+  const ref = useRef4(null);
+  const injectedJavaScript = useMemo2(
     () => [
       `window.__CONSTANT_HANDLER_MAP = ${JSON.stringify(
         Object.entries(constantHandlerMap).reduce(
@@ -1601,7 +1413,7 @@ function useBridgeHandler({
       window.__GRANITE_NATIVE_EMITTER.emit('${functionName}/onError/${eventId}', ${serializedError});
     `);
   };
-  const $onMessage = useCallback9(
+  const $onMessage = useCallback7(
     async (e) => {
       onMessage?.(e);
       const data = JSON.parse(e.nativeEvent.data);
@@ -1651,6 +1463,155 @@ function useBridgeHandler({
   };
 }
 
+// src/core/hooks/useWebBackHandler.tsx
+import { closeView as closeView5, useBackEventState } from "@granite-js/react-native";
+import { useDialog as useDialog7 } from "@toss/tds-react-native";
+import { josa as josa5 } from "es-hangul";
+import { useCallback as useCallback9, useMemo as useMemo4 } from "react";
+
+// src/hooks/useWebviewHistoryStack.tsx
+import { useCallback as useCallback8, useMemo as useMemo3, useReducer } from "react";
+var INITIAL_STATE = { stack: [], index: -1 };
+function reducer(state, action) {
+  switch (action.type) {
+    case "NAVIGATION_CHANGE": {
+      const { url, canGoForward } = action;
+      if (state.stack.length === 0) {
+        return { stack: [url], index: 0 };
+      }
+      const { stack, index } = state;
+      const cur = stack[index];
+      if (url === cur) {
+        return state;
+      }
+      const prev = index > 0 ? stack[index - 1] : void 0;
+      const next = index < stack.length - 1 ? stack[index + 1] : void 0;
+      if (prev && url === prev && canGoForward) {
+        return { ...state, index: index - 1 };
+      }
+      if (next && url === next) {
+        return { ...state, index: index + 1 };
+      }
+      const base = stack.slice(0, index + 1);
+      const nextStack = [...base, url];
+      return { stack: nextStack, index: nextStack.length - 1 };
+    }
+    default:
+      return state;
+  }
+}
+function useWebViewHistory() {
+  const [state, dispatch] = useReducer(reducer, INITIAL_STATE);
+  const onNavigationStateChange = useCallback8(({ url, canGoForward: canGoForward2 }) => {
+    dispatch({ type: "NAVIGATION_CHANGE", url, canGoForward: canGoForward2 });
+  }, []);
+  const { canGoBack, canGoForward } = useMemo3(() => {
+    const canBack = state.index > 0;
+    const canFwd = state.index >= 0 && state.index < state.stack.length - 1;
+    return { canGoBack: canBack, canGoForward: canFwd };
+  }, [state.index, state.stack.length]);
+  return { onNavigationStateChange, hasHistory: canGoBack, canGoForward };
+}
+
+// src/core/hooks/useWebBackHandler.tsx
+var HISTORY_BACK_SCRIPT = `
+(function() {
+  window.history.back();
+  true;
+})();
+`;
+var HISTORY_HOME_SCRIPT = `
+  (function() {
+    window.location.href = '/';
+    true;
+  })();
+`;
+function useWebBackHandler(webViewRef) {
+  const { captureExitLog } = useCaptureExitLog();
+  const { hasHistory, onNavigationStateChange } = useWebViewHistory();
+  const {
+    handlersRef: webBackHandlersRef,
+    hasBackEvent: hasWebBackEvent,
+    addEventListener: addWebBackEventListener,
+    removeEventListener: removeWebBackEventListener
+  } = useBackEventState();
+  const logging = useNavigationBarLogging();
+  const { openConfirm } = useDialog7();
+  const global2 = getAppsInTossGlobals();
+  const addEventListener = useCallback9(
+    (handler) => {
+      addWebBackEventListener(handler);
+    },
+    [addWebBackEventListener]
+  );
+  const removeEventListener = useCallback9(
+    (handler) => {
+      removeWebBackEventListener(handler);
+    },
+    [removeWebBackEventListener]
+  );
+  const handleWebBack = useCallback9(async () => {
+    if (hasWebBackEvent) {
+      for (const handler of webBackHandlersRef) {
+        handler();
+      }
+      return;
+    }
+    if (hasHistory) {
+      webViewRef.current?.injectJavaScript(HISTORY_BACK_SCRIPT);
+    } else {
+      const isConfirmed = await openConfirm({
+        title: `${josa5(global2.brandDisplayName, "\uC744/\uB97C")} \uC885\uB8CC\uD560\uAE4C\uC694?`,
+        leftButton: "\uCDE8\uC18C",
+        rightButton: "\uC885\uB8CC\uD558\uAE30",
+        closeOnDimmerClick: true,
+        onEntered: logging.closePopupShow
+      });
+      logging.closePopupCtaClick(isConfirmed);
+      if (isConfirmed) {
+        captureExitLog(Date.now());
+        closeView5();
+      }
+    }
+  }, [
+    captureExitLog,
+    global2.brandDisplayName,
+    hasHistory,
+    hasWebBackEvent,
+    webBackHandlersRef,
+    logging,
+    openConfirm,
+    webViewRef
+  ]);
+  const handleWebHome = useCallback9(() => {
+    logging.homeButtonClick();
+    if (hasWebBackEvent) {
+      for (const handler of webBackHandlersRef) {
+        handler();
+      }
+      return;
+    }
+    webViewRef.current?.injectJavaScript(HISTORY_HOME_SCRIPT);
+  }, [hasWebBackEvent, webBackHandlersRef, logging, webViewRef]);
+  return useMemo4(
+    () => ({ addEventListener, removeEventListener, handleWebBack, handleWebHome, onNavigationStateChange }),
+    [addEventListener, removeEventListener, handleWebBack, handleWebHome, onNavigationStateChange]
+  );
+}
+
+// src/core/utils/mergeRefs.ts
+function mergeRefs(...refs) {
+  return (value) => {
+    refs.forEach((ref) => {
+      if (typeof ref === "function") {
+        ref(value);
+      } else if (ref != null) {
+        ref.current = value;
+      }
+    });
+  };
+}
+
 // src/hooks/useCreateUserAgent.ts
 import { getPlatformOS, getTossAppVersion } from "@apps-in-toss/native-modules";
 import { useWindowDimensions } from "react-native";
@@ -1810,11 +1771,11 @@ function useCreateUserAgent({
 // src/hooks/useGeolocation.ts
 import { startUpdateLocation } from "@apps-in-toss/native-modules";
 import { useVisibility as useVisibility3 } from "@granite-js/react-native";
-import { useEffect as useEffect12, useState as useState4 } from "react";
+import { useEffect as useEffect10, useState as useState4 } from "react";
 function useGeolocation({ accuracy, distanceInterval, timeInterval }) {
   const isVisible = useVisibility3();
   const [location, setLocation] = useState4(null);
-  useEffect12(() => {
+  useEffect10(() => {
     if (!isVisible) {
       return;
     }
@@ -1831,6 +1792,85 @@ function useGeolocation({ accuracy, distanceInterval, timeInterval }) {
   return location;
 }
 
+// src/hooks/useWaitForReturnNavigator.tsx
+import { useNavigation as useNavigation2, useVisibilityChange } from "@granite-js/react-native";
+import { useCallback as useCallback10, useRef as useRef5 } from "react";
+function useWaitForReturnNavigator() {
+  const callbacks = useRef5([]).current;
+  const navigation = useNavigation2();
+  const startNavigating = useCallback10(
+    (route, params) => {
+      return new Promise((resolve) => {
+        callbacks.push(resolve);
+        navigation.navigate(route, params);
+      });
+    },
+    [callbacks, navigation]
+  );
+  const handleVisibilityChange = useCallback10(
+    (state) => {
+      if (state === "visible" && callbacks.length > 0) {
+        for (const callback of callbacks) {
+          callback();
+        }
+        callbacks.splice(0, callbacks.length);
+      }
+    },
+    [callbacks]
+  );
+  useVisibilityChange(handleVisibilityChange);
+  return startNavigating;
+}
+
+// src/utils/log.ts
+import { eventLog as eventLogNative } from "@apps-in-toss/native-modules";
+import { getSchemeUri as getSchemeUri5 } from "@granite-js/react-native";
+
+// src/utils/extractDateFromUUIDv7.ts
+var extractDateFromUUIDv7 = (uuid) => {
+  const timestampHex = uuid.split("-").join("").slice(0, 12);
+  const timestamp = Number.parseInt(timestampHex, 16);
+  return new Date(timestamp);
+};
+
+// src/utils/log.ts
+var getGroupId = (url) => {
+  try {
+    const urlObject = new URL(url);
+    return {
+      groupId: urlObject.pathname,
+      search: urlObject.search.startsWith("?") ? urlObject.search.substring(1) : urlObject.search
+    };
+  } catch {
+    return {
+      groupId: "unknown",
+      search: "unknown"
+    };
+  }
+};
+var getReferrer = () => {
+  try {
+    const referrer = new URL(getSchemeUri5());
+    return referrer.searchParams.get("referrer");
+  } catch {
+    return "";
+  }
+};
+var trackScreen = (url) => {
+  const { groupId, search } = getGroupId(url);
+  const log = {
+    log_type: "screen",
+    log_name: `${groupId}::screen`,
+    params: {
+      search,
+      referrer: getReferrer(),
+      deployment_id: env.getDeploymentId(),
+      deployment_timestamp: extractDateFromUUIDv7(env.getDeploymentId()).getTime()
+    }
+  };
+  return eventLogNative(log);
+};
+
 // src/components/WebView.tsx
 import { jsx as jsx13 } from "react/jsx-runtime";
 var operationalEnvironment = appsInTossConstantBridges.getOperationalEnvironment();
@@ -1866,8 +1906,9 @@ function WebView({ type, local, onMessage, ...props }) {
   if (!TYPES.includes(type)) {
     throw new Error(`Invalid WebView type: '${type}'`);
   }
-  const graniteEvent = useGraniteEvent();
-  const uri = useMemo4(() => getWebViewUri(local), [local]);
+  const webViewRef = useRef6(null);
+  const webBackHandler = useWebBackHandler(webViewRef);
+  const uri = useMemo5(() => getWebViewUri(local), [local]);
   const top = useSafeAreaTop2();
   const bottom = useSafeAreaBottom();
   const global2 = getAppsInTossGlobals();
@@ -1889,7 +1930,12 @@ function WebView({ type, local, onMessage, ...props }) {
     eventListenerMap: {
       ...appsInTossEventBridges,
       navigationAccessoryEvent: ({ onEvent, onError }) => tdsEvent.addEventListener("navigationAccessoryEvent", { onEvent, onError }),
-      backEvent: ({ onEvent, onError, options }) => graniteEvent.addEventListener("backEvent", { onEvent, onError, options }),
+      backEvent: ({ onEvent }) => {
+        webBackHandler.addEventListener(onEvent);
+        return () => {
+          webBackHandler.removeEventListener(onEvent);
+        };
+      },
       entryMessageExited: ({ onEvent, onError }) => appsInTossEvent3.addEventListener("entryMessageExited", { onEvent, onError }),
       updateLocationEvent: ({ onEvent, onError, options }) => appsInTossEvent3.addEventListener("updateLocationEvent", { onEvent, onError, options }),
       /** @internal */
@@ -1953,7 +1999,7 @@ function WebView({ type, local, onMessage, ...props }) {
       getCompletedOrRefundedOrders: IAP.getCompletedOrRefundedOrders
     }
   });
-  const headerPropForExternalWebView = useMemo4(() => {
+  const headerPropForExternalWebView = useMemo5(() => {
     const parsedNavigationBar = global2.navigationBar != null ? safeParseNavigationBar(global2.navigationBar) : null;
     const initialAccessoryButton = parsedNavigationBar?.initialAccessoryButton;
     const withBackButton = parsedNavigationBar?.withBackButton ?? true;
@@ -1973,10 +2019,19 @@ function WebView({ type, local, onMessage, ...props }) {
   const userAgent = useCreateUserAgent({
     colorPreference: "light"
   });
+  const refs = mergeRefs(handler.ref, webViewRef);
+  useEffect11(() => {
+    const callback = () => {
+      webBackHandler.handleWebBack();
+      return true;
+    };
+    BackHandler2.addEventListener("hardwareBackPress", callback);
+    return () => BackHandler2.removeEventListener("hardwareBackPress", callback);
+  }, [webBackHandler]);
   return /* @__PURE__ */ jsx13(
     BaseWebView,
     {
-      ref: handler.ref,
+      ref: refs,
       ...props,
       ...headerPropForExternalWebView,
       source: {
@@ -1986,6 +2041,15 @@ function WebView({ type, local, onMessage, ...props }) {
           "User-Agent": userAgent
         }
       },
+      onHomeButtonClick: webBackHandler.handleWebHome,
+      onBackButtonClick: webBackHandler.handleWebBack,
+      onNavigationStateChange: (event) => {
+        if (event.url) {
+          trackScreen(event.url);
+        }
+        props.onNavigationStateChange?.(event);
+        webBackHandler.onNavigationStateChange(event);
+      },
       userAgent: Platform4.OS === "ios" ? userAgent : void 0,
       sharedCookiesEnabled: true,
       webviewDebuggingEnabled: webViewDebuggingEnabled,
@@ -2001,7 +2065,7 @@ function WebView({ type, local, onMessage, ...props }) {
 
 // src/index.ts
 export * from "@apps-in-toss/analytics";
-import { useTopNavigation as useTopNavigation2 } from "@toss/tds-react-native/private";
+import { useTopNavigation as useTopNavigation2, useOverlay as useOverlay3, OverlayProvider } from "@toss/tds-react-native/private";
 export * from "@apps-in-toss/native-modules";
 export * from "@apps-in-toss/types";
 var Analytics2 = {
@@ -2014,9 +2078,12 @@ export {
   Analytics2 as Analytics,
   AppsInToss,
   INTERNAL__onVisibilityChangedByTransparentServiceWeb,
+  OverlayProvider,
   WebView,
   env,
   useCreateUserAgent,
   useGeolocation,
-  useTopNavigation2 as useTopNavigation
+  useOverlay3 as useOverlay,
+  useTopNavigation2 as useTopNavigation,
+  useWaitForReturnNavigator
 };