@apps-in-toss/framework 1.1.0 → 1.1.1

package/dist/index.cjs

@@ -611,7 +611,6 @@ function BuiltinNavigationBar() {
   const isExternalWebView = globals.webViewType === "external";
   const isGameWebView = globals.webViewType === "game";
   const backEventContext = (0, import_react_native13.useBackEventContext)();
-  const overrideCanGoBack = !backEventContext.hasBackEvent;
   const handleBackOrClose = useBackOrCloseNavigation();
   const navigation = (0, import_react_native13.useNavigation)();
   const handlePressTitle = (0, import_react7.useCallback)(() => {
@@ -623,12 +622,16 @@ function BuiltinNavigationBar() {
     navigation.navigate("/");
   }, [logging, globals.webViewType, navigation]);
   const handleBack = (0, import_react7.useCallback)(() => {
-    if (!overrideCanGoBack) {
+    if (globals.webViewType != null) {
+      import_native_modules7.appsInTossEvent.emit("backButtonClickEvent", void 0);
+      return;
+    }
+    if (backEventContext.hasBackEvent) {
       backEventContext.onBack();
       return;
     }
     handleBackOrClose();
-  }, [overrideCanGoBack, handleBackOrClose, backEventContext]);
+  }, [globals.webViewType, backEventContext, handleBackOrClose]);
   const handleClose = (0, import_react7.useCallback)(async () => {
     logging.closeButtonClick();
     const isConfirmed = await openConfirm({
@@ -644,16 +647,16 @@ function BuiltinNavigationBar() {
       (0, import_react_native13.closeView)();
     }
   }, [captureExitLog, globals.brandDisplayName, logging, openConfirm]);
+  const handleBackEvent = (0, import_react7.useCallback)(() => {
+    handleBack();
+    return true;
+  }, [handleBack]);
   (0, import_react7.useEffect)(() => {
-    const backHandler = () => {
-      handleClose();
-      return true;
-    };
-    import_react_native15.BackHandler.addEventListener("hardwareBackPress", backHandler);
+    import_react_native15.BackHandler.addEventListener("hardwareBackPress", handleBackEvent);
     return () => {
-      import_react_native15.BackHandler.removeEventListener("hardwareBackPress", backHandler);
+      import_react_native15.BackHandler.removeEventListener("hardwareBackPress", handleBackEvent);
     };
-  }, [handleClose]);
+  }, [handleBackEvent]);
   if (isExternalWebView) {
     return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, {});
   }
@@ -678,10 +681,12 @@ function BuiltinNavigationBar() {
 }
 function useBackOrCloseNavigation() {
   const navigation = (0, import_react_native13.useNavigation)();
+  const { captureExitLog } = useCaptureExitLog();
   return (0, import_react7.useCallback)(() => {
     if (navigation.canGoBack()) {
       navigation.goBack();
     } else {
+      captureExitLog(Date.now());
       (0, import_react_native13.closeView)();
     }
   }, [navigation]);
@@ -801,6 +806,7 @@ var graniteAsyncBridges = __toESM(require("@granite-js/react-native/async-bridge
 var graniteConstantBridges = __toESM(require("@granite-js/react-native/constant-bridges"), 1);
 var import_react_native31 = require("@toss-design-system/react-native");
 var import_private5 = require("@toss-design-system/react-native/private");
+var import_es_hangul3 = require("es-hangul");
 var import_react15 = require("react");
 var import_react_native32 = require("react-native");
 
@@ -1566,6 +1572,8 @@ function WebView({ type, local, onMessage, ...props }) {
   if (!TYPES.includes(type)) {
     throw new Error(`Invalid WebView type: '${type}'`);
   }
+  const { openConfirm } = (0, import_react_native31.useDialog)();
+  const { captureExitLog } = useCaptureExitLog();
   const graniteEvent = (0, import_react_native30.useGraniteEvent)();
   const uri = (0, import_react15.useMemo)(() => getWebViewUri(local), [local]);
   const top = (0, import_private5.useSafeAreaTop)();
@@ -1679,14 +1687,30 @@ function WebView({ type, local, onMessage, ...props }) {
   const userAgent = useCreateUserAgent({
     colorPreference: "light"
   });
+  const handleGameWebviewClose = (0, import_react15.useCallback)(async () => {
+    const isConfirmed = await openConfirm({
+      title: `${(0, import_es_hangul3.josa)(global2.brandDisplayName, "\uC744/\uB97C")} \uC885\uB8CC\uD560\uAE4C\uC694?`,
+      leftButton: "\uCDE8\uC18C",
+      rightButton: "\uC885\uB8CC\uD558\uAE30",
+      closeOnDimmerClick: true
+    });
+    if (isConfirmed) {
+      captureExitLog(Date.now());
+      (0, import_react_native30.closeView)();
+    }
+  }, [captureExitLog, openConfirm, global2.brandDisplayName]);
   const handleBackEvent = (0, import_react15.useCallback)(() => {
+    if (type === "game") {
+      handleGameWebviewClose();
+      return true;
+    }
     if (canHistoryGoBack) {
       handler.ref.current?.goBack();
       return true;
     } else {
       return false;
     }
-  }, [canHistoryGoBack, handler]);
+  }, [canHistoryGoBack, handleGameWebviewClose, handler.ref, type]);
   (0, import_react15.useEffect)(() => {
     import_react_native32.BackHandler.addEventListener("hardwareBackPress", handleBackEvent);
     return () => import_react_native32.BackHandler.removeEventListener("hardwareBackPress", handleBackEvent);
@@ -1703,6 +1727,20 @@ function WebView({ type, local, onMessage, ...props }) {
       }
     });
   }, [handler.ref]);
+  (0, import_react15.useEffect)(() => {
+    return import_native_modules17.appsInTossEvent.addEventListener("backButtonClickEvent", {
+      onEvent: () => {
+        if (type === "game") {
+          handleGameWebviewClose();
+        } else if (canHistoryGoBack) {
+          handler.ref.current?.goBack();
+        } else {
+          captureExitLog(Date.now());
+          (0, import_react_native30.closeView)();
+        }
+      }
+    });
+  }, [handler.ref, canHistoryGoBack, handleGameWebviewClose, captureExitLog, type]);
   return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
     BaseWebView,
     {

package/dist/index.js

@@ -569,7 +569,6 @@ function BuiltinNavigationBar() {
   const isExternalWebView = globals.webViewType === "external";
   const isGameWebView = globals.webViewType === "game";
   const backEventContext = useBackEventContext();
-  const overrideCanGoBack = !backEventContext.hasBackEvent;
   const handleBackOrClose = useBackOrCloseNavigation();
   const navigation = useNavigation();
   const handlePressTitle = useCallback3(() => {
@@ -581,12 +580,16 @@ function BuiltinNavigationBar() {
     navigation.navigate("/");
   }, [logging, globals.webViewType, navigation]);
   const handleBack = useCallback3(() => {
-    if (!overrideCanGoBack) {
+    if (globals.webViewType != null) {
+      appsInTossEvent.emit("backButtonClickEvent", void 0);
+      return;
+    }
+    if (backEventContext.hasBackEvent) {
       backEventContext.onBack();
       return;
     }
     handleBackOrClose();
-  }, [overrideCanGoBack, handleBackOrClose, backEventContext]);
+  }, [globals.webViewType, backEventContext, handleBackOrClose]);
   const handleClose = useCallback3(async () => {
     logging.closeButtonClick();
     const isConfirmed = await openConfirm({
@@ -602,16 +605,16 @@ function BuiltinNavigationBar() {
       closeView();
     }
   }, [captureExitLog, globals.brandDisplayName, logging, openConfirm]);
+  const handleBackEvent = useCallback3(() => {
+    handleBack();
+    return true;
+  }, [handleBack]);
   useEffect5(() => {
-    const backHandler = () => {
-      handleClose();
-      return true;
-    };
-    BackHandler.addEventListener("hardwareBackPress", backHandler);
+    BackHandler.addEventListener("hardwareBackPress", handleBackEvent);
     return () => {
-      BackHandler.removeEventListener("hardwareBackPress", backHandler);
+      BackHandler.removeEventListener("hardwareBackPress", handleBackEvent);
     };
-  }, [handleClose]);
+  }, [handleBackEvent]);
   if (isExternalWebView) {
     return /* @__PURE__ */ jsx3(Fragment3, {});
   }
@@ -636,10 +639,12 @@ function BuiltinNavigationBar() {
 }
 function useBackOrCloseNavigation() {
   const navigation = useNavigation();
+  const { captureExitLog } = useCaptureExitLog();
   return useCallback3(() => {
     if (navigation.canGoBack()) {
       navigation.goBack();
     } else {
+      captureExitLog(Date.now());
       closeView();
     }
   }, [navigation]);
@@ -754,11 +759,16 @@ import { GoogleAdMob, IAP, Storage, AppsInTossModule, appsInTossEvent as appsInT
 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 getSchemeUri5, useGraniteEvent } from "@granite-js/react-native";
+import { closeView as closeView3, getSchemeUri as getSchemeUri5, useGraniteEvent } from "@granite-js/react-native";
 import * as graniteAsyncBridges from "@granite-js/react-native/async-bridges";
 import * as graniteConstantBridges from "@granite-js/react-native/constant-bridges";
-import { ExternalWebViewScreen, tdsEvent } from "@toss-design-system/react-native";
+import {
+  ExternalWebViewScreen,
+  tdsEvent,
+  useDialog as useDialog4
+} from "@toss-design-system/react-native";
 import { useSafeAreaBottom, useSafeAreaTop, useTopNavigation } from "@toss-design-system/react-native/private";
+import { josa as josa3 } from "es-hangul";
 import { useCallback as useCallback6, useEffect as useEffect10, useMemo as useMemo3, useState as useState5 } from "react";
 import { BackHandler as BackHandler2, Platform as Platform3 } from "react-native";
 
@@ -1528,6 +1538,8 @@ function WebView({ type, local, onMessage, ...props }) {
   if (!TYPES.includes(type)) {
     throw new Error(`Invalid WebView type: '${type}'`);
   }
+  const { openConfirm } = useDialog4();
+  const { captureExitLog } = useCaptureExitLog();
   const graniteEvent = useGraniteEvent();
   const uri = useMemo3(() => getWebViewUri(local), [local]);
   const top = useSafeAreaTop();
@@ -1641,14 +1653,30 @@ function WebView({ type, local, onMessage, ...props }) {
   const userAgent = useCreateUserAgent({
     colorPreference: "light"
   });
+  const handleGameWebviewClose = useCallback6(async () => {
+    const isConfirmed = await openConfirm({
+      title: `${josa3(global2.brandDisplayName, "\uC744/\uB97C")} \uC885\uB8CC\uD560\uAE4C\uC694?`,
+      leftButton: "\uCDE8\uC18C",
+      rightButton: "\uC885\uB8CC\uD558\uAE30",
+      closeOnDimmerClick: true
+    });
+    if (isConfirmed) {
+      captureExitLog(Date.now());
+      closeView3();
+    }
+  }, [captureExitLog, openConfirm, global2.brandDisplayName]);
   const handleBackEvent = useCallback6(() => {
+    if (type === "game") {
+      handleGameWebviewClose();
+      return true;
+    }
     if (canHistoryGoBack) {
       handler.ref.current?.goBack();
       return true;
     } else {
       return false;
     }
-  }, [canHistoryGoBack, handler]);
+  }, [canHistoryGoBack, handleGameWebviewClose, handler.ref, type]);
   useEffect10(() => {
     BackHandler2.addEventListener("hardwareBackPress", handleBackEvent);
     return () => BackHandler2.removeEventListener("hardwareBackPress", handleBackEvent);
@@ -1665,6 +1693,20 @@ function WebView({ type, local, onMessage, ...props }) {
       }
     });
   }, [handler.ref]);
+  useEffect10(() => {
+    return appsInTossEvent4.addEventListener("backButtonClickEvent", {
+      onEvent: () => {
+        if (type === "game") {
+          handleGameWebviewClose();
+        } else if (canHistoryGoBack) {
+          handler.ref.current?.goBack();
+        } else {
+          captureExitLog(Date.now());
+          closeView3();
+        }
+      }
+    });
+  }, [handler.ref, canHistoryGoBack, handleGameWebviewClose, captureExitLog, type]);
   return /* @__PURE__ */ jsx9(
     BaseWebView,
     {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@apps-in-toss/framework",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "The framework for Apps In Toss",
   "scripts": {
     "prepack": "yarn build",
@@ -56,20 +56,20 @@
     "ait": "./bin/ait.js"
   },
   "dependencies": {
-    "@apps-in-toss/analytics": "1.1.0",
-    "@apps-in-toss/cli": "1.1.0",
-    "@apps-in-toss/native-modules": "1.1.0",
-    "@apps-in-toss/plugins": "1.1.0",
-    "@apps-in-toss/types": "1.1.0",
+    "@apps-in-toss/analytics": "1.1.1",
+    "@apps-in-toss/cli": "1.1.1",
+    "@apps-in-toss/native-modules": "1.1.1",
+    "@apps-in-toss/plugins": "1.1.1",
+    "@apps-in-toss/types": "1.1.1",
     "es-hangul": "^2.3.2"
   },
   "devDependencies": {
     "@babel/runtime": "^7",
-    "@granite-js/mpack": "0.1.21",
-    "@granite-js/native": "0.1.21",
-    "@granite-js/plugin-core": "0.1.21",
-    "@granite-js/react-native": "0.1.21",
-    "@granite-js/utils": "0.1.21",
+    "@granite-js/mpack": "0.1.22",
+    "@granite-js/native": "0.1.22",
+    "@granite-js/plugin-core": "0.1.22",
+    "@granite-js/react-native": "0.1.22",
+    "@granite-js/utils": "0.1.22",
     "@toss-design-system/react-native": "1.1.0",
     "@types/kill-port": "^2.0.3",
     "@types/react": "18.3.3",
@@ -96,5 +96,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "614cfd1ee039b44cd6efeb94cefac18ed3c0e6c3"
+  "gitHead": "0e0af7d44ed8ad2615a237650b9682c68ab5861e"
 }

package/dist/types.cjs

@@ -1,24 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/types.ts
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
-__reExport(types_exports, require("@apps-in-toss/types"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ...require("@apps-in-toss/types")
-});

package/dist/types.d.cts

@@ -1 +0,0 @@
-export * from '@apps-in-toss/types';

package/dist/types.d.ts

@@ -1 +0,0 @@
-export * from '@apps-in-toss/types';

package/dist/types.js

@@ -1,2 +0,0 @@
-// src/types.ts
-export * from "@apps-in-toss/types";