@apps-in-toss/framework 1.7.1 → 1.8.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @apps-in-toss/framework
 
+## 1.8.1
+
+### Patch Changes
+
+[[AIT-3844]: 외부 사이트에서 네비바 홈 버튼을 누르면 해당 사이트의 루트가 아닌 미니앱의 루트로 이동하도록 수정](https://github.toss.bz/toss/apps-in-toss-sdk/pull/22)
+
+외부 사이트에서 네비바 홈 버튼을 누르면 미니앱 루트 페이지로 이동하도록 수정합니다.
+
+## 1.8.0
+
+### Minor Changes
+
+[[AIT-3762]: GoogleAdMob 로딩 여부 확인하는 브릿지 추가](https://github.toss.bz/toss/apps-in-toss-sdk/pull/18)
+
+구글 광고가 로딩되었는지 확인하는 isAdMobLoaded를 추가합니다.
+
+### Patch Changes
+
+[[AP-2118] 토스애즈 integrated ad 최소 앱버전 5.244.1로 변경 - changeset 생성](https://github.toss.bz/toss/apps-in-toss-sdk/pull/21)
+
+토스애즈 integrated ad 최소 앱버전을 5.244.1로 변경
+
 ## 1.7.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -1700,8 +1700,8 @@ function postEventTracking(params) {
 
 // src/ads/integratedAd.ts
 var INTEGRATED_AD_SDK_VERSION = "0.0.0";
-var ANDROID_INTEGRATED_AD_SUPPORTED_VERSION = "5.241.0";
-var IOS_INTEGRATED_AD_SUPPORTED_VERSION = "5.241.0";
+var ANDROID_INTEGRATED_AD_SUPPORTED_VERSION = "5.244.1";
+var IOS_INTEGRATED_AD_SUPPORTED_VERSION = "5.244.1";
 var UNSUPPORTED_ERROR_MESSAGE2 = "This feature is not supported in the current environment";
 var INTG_AD_ADM_FALLBACK_RID_MAP = {};
 function integratedAdIsSupported() {
@@ -2155,19 +2155,7 @@ function useWebViewHistory() {
 }
 
 // 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) {
+function useWebBackHandler(webViewInitialURL, webViewRef) {
   const { captureExitLog } = useCaptureExitLog();
   const { hasHistory, onNavigationStateChange } = useWebViewHistory();
   const {
@@ -2199,7 +2187,7 @@ function useWebBackHandler(webViewRef) {
       return;
     }
     if (hasHistory) {
-      webViewRef.current?.injectJavaScript(HISTORY_BACK_SCRIPT);
+      webViewRef.current?.injectJavaScript("window.history.back();");
     } else {
       const isConfirmed = await openConfirm({
         title: `${(0, import_es_hangul5.josa)(global2.brandDisplayName, "\uC744/\uB97C")} \uC885\uB8CC\uD560\uAE4C\uC694?`,
@@ -2232,8 +2220,13 @@ function useWebBackHandler(webViewRef) {
       }
       return;
     }
-    webViewRef.current?.injectJavaScript(HISTORY_HOME_SCRIPT);
-  }, [hasWebBackEvent, webBackHandlersRef, logging, webViewRef]);
+    webViewRef.current?.injectJavaScript(`
+    (function() {
+      const webBundleOrigin = '${webViewInitialURL.origin}';
+      window.location.href = window.location.origin === webBundleOrigin ? '/' : webBundleOrigin;
+    })();
+    `);
+  }, [hasWebBackEvent, webBackHandlersRef, logging, webViewInitialURL, webViewRef]);
   return (0, import_react25.useMemo)(
     () => ({ addEventListener, removeEventListener, handleWebBack, handleWebHome, onNavigationStateChange }),
     [addEventListener, removeEventListener, handleWebBack, handleWebHome, onNavigationStateChange]
@@ -2576,10 +2569,10 @@ function mergeSchemeQueryParamsInto(url) {
   }
   return baseUrl;
 }
-function getWebViewUri(local) {
+function getWebViewURL(local) {
   if (__DEV__) {
     const devUrl = `http://${local.host}:${local.port}`;
-    return mergeSchemeQueryParamsInto(devUrl).toString();
+    return mergeSchemeQueryParamsInto(devUrl);
   }
   const { url: rawUrl } = import_native_modules23.AppsInTossModule.getWebBundleURL({});
   const url = mergeSchemeQueryParamsInto(rawUrl);
@@ -2587,15 +2580,15 @@ function getWebViewUri(local) {
   if (deploymentId) {
     url.searchParams.set("_deploymentId", deploymentId);
   }
-  return url.toString();
+  return url;
 }
 function WebView({ type, local, onMessage, ...props }) {
   if (!TYPES.includes(type)) {
     throw new Error(`Invalid WebView type: '${type}'`);
   }
   const webViewRef = (0, import_react28.useRef)(null);
-  const webBackHandler = useWebBackHandler(webViewRef);
-  const uri = (0, import_react28.useMemo)(() => getWebViewUri(local), [local]);
+  const url = (0, import_react28.useMemo)(() => getWebViewURL(local), [local]);
+  const webBackHandler = useWebBackHandler(url, webViewRef);
   const top = (0, import_private9.useSafeAreaTop)();
   const bottom = (0, import_private9.useSafeAreaBottom)();
   const insets = (0, import_react_native_safe_area_context4.useSafeAreaInsets)();
@@ -2649,6 +2642,7 @@ function WebView({ type, local, onMessage, ...props }) {
       /** AdMobV2 */
       loadAppsInTossAdMob_isSupported: import_native_modules23.GoogleAdMob.loadAppsInTossAdMob.isSupported,
       showAppsInTossAdMob_isSupported: import_native_modules23.GoogleAdMob.showAppsInTossAdMob.isSupported,
+      isAppsInTossAdMobLoaded_isSupported: import_native_modules23.GoogleAdMob.isAppsInTossAdMobLoaded.isSupported,
       /** IntegratedAd */
       loadFullScreenAd_isSupported: loadFullScreenAdForWeb.isSupported,
       showFullScreenAd_isSupported: showFullScreenAd.isSupported,
@@ -2687,6 +2681,8 @@ function WebView({ type, local, onMessage, ...props }) {
       getPendingOrders: import_native_modules23.IAP.getPendingOrders,
       getCompletedOrRefundedOrders: import_native_modules23.IAP.getCompletedOrRefundedOrders,
       completeProductGrant: import_native_modules23.IAP.completeProductGrant,
+      /** AdMobV2 */
+      isAppsInTossAdMobLoaded: import_native_modules23.GoogleAdMob.isAppsInTossAdMobLoaded,
       /** Toss Ads */
       tossAdEventLog,
       /** Private */
@@ -2731,7 +2727,7 @@ function WebView({ type, local, onMessage, ...props }) {
       ...props,
       ...headerPropForExternalWebView,
       source: {
-        uri,
+        uri: url.href,
         // NOTE: https://github.com/react-native-webview/react-native-webview/pull/3133
         headers: {
           "User-Agent": userAgent
@@ -2757,11 +2753,11 @@ function WebView({ type, local, onMessage, ...props }) {
       allowsBackForwardNavigationGestures,
       onShouldStartLoadWithRequest: (event) => {
         try {
-          const url = new URL(event.url);
-          if (["https:", "http:"].includes(url.protocol) || url.href === "about:blank") {
+          const url2 = new URL(event.url);
+          if (["https:", "http:"].includes(url2.protocol) || url2.href === "about:blank") {
             return true;
           } else {
-            import_react_native39.Linking.openURL(convertIntentURL(url) ?? url.href);
+            import_react_native39.Linking.openURL(convertIntentURL(url2) ?? url2.href);
             return false;
           }
         } catch (error) {

package/dist/index.js

@@ -1687,8 +1687,8 @@ function postEventTracking(params) {
 
 // src/ads/integratedAd.ts
 var INTEGRATED_AD_SDK_VERSION = "0.0.0";
-var ANDROID_INTEGRATED_AD_SUPPORTED_VERSION = "5.241.0";
-var IOS_INTEGRATED_AD_SUPPORTED_VERSION = "5.241.0";
+var ANDROID_INTEGRATED_AD_SUPPORTED_VERSION = "5.244.1";
+var IOS_INTEGRATED_AD_SUPPORTED_VERSION = "5.244.1";
 var UNSUPPORTED_ERROR_MESSAGE2 = "This feature is not supported in the current environment";
 var INTG_AD_ADM_FALLBACK_RID_MAP = {};
 function integratedAdIsSupported() {
@@ -2142,19 +2142,7 @@ function useWebViewHistory() {
 }
 
 // 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) {
+function useWebBackHandler(webViewInitialURL, webViewRef) {
   const { captureExitLog } = useCaptureExitLog();
   const { hasHistory, onNavigationStateChange } = useWebViewHistory();
   const {
@@ -2186,7 +2174,7 @@ function useWebBackHandler(webViewRef) {
       return;
     }
     if (hasHistory) {
-      webViewRef.current?.injectJavaScript(HISTORY_BACK_SCRIPT);
+      webViewRef.current?.injectJavaScript("window.history.back();");
     } else {
       const isConfirmed = await openConfirm({
         title: `${josa5(global2.brandDisplayName, "\uC744/\uB97C")} \uC885\uB8CC\uD560\uAE4C\uC694?`,
@@ -2219,8 +2207,13 @@ function useWebBackHandler(webViewRef) {
       }
       return;
     }
-    webViewRef.current?.injectJavaScript(HISTORY_HOME_SCRIPT);
-  }, [hasWebBackEvent, webBackHandlersRef, logging, webViewRef]);
+    webViewRef.current?.injectJavaScript(`
+    (function() {
+      const webBundleOrigin = '${webViewInitialURL.origin}';
+      window.location.href = window.location.origin === webBundleOrigin ? '/' : webBundleOrigin;
+    })();
+    `);
+  }, [hasWebBackEvent, webBackHandlersRef, logging, webViewInitialURL, webViewRef]);
   return useMemo6(
     () => ({ addEventListener, removeEventListener, handleWebBack, handleWebHome, onNavigationStateChange }),
     [addEventListener, removeEventListener, handleWebBack, handleWebHome, onNavigationStateChange]
@@ -2563,10 +2556,10 @@ function mergeSchemeQueryParamsInto(url) {
   }
   return baseUrl;
 }
-function getWebViewUri(local) {
+function getWebViewURL(local) {
   if (__DEV__) {
     const devUrl = `http://${local.host}:${local.port}`;
-    return mergeSchemeQueryParamsInto(devUrl).toString();
+    return mergeSchemeQueryParamsInto(devUrl);
   }
   const { url: rawUrl } = AppsInTossModule.getWebBundleURL({});
   const url = mergeSchemeQueryParamsInto(rawUrl);
@@ -2574,15 +2567,15 @@ function getWebViewUri(local) {
   if (deploymentId) {
     url.searchParams.set("_deploymentId", deploymentId);
   }
-  return url.toString();
+  return url;
 }
 function WebView({ type, local, onMessage, ...props }) {
   if (!TYPES.includes(type)) {
     throw new Error(`Invalid WebView type: '${type}'`);
   }
   const webViewRef = useRef6(null);
-  const webBackHandler = useWebBackHandler(webViewRef);
-  const uri = useMemo7(() => getWebViewUri(local), [local]);
+  const url = useMemo7(() => getWebViewURL(local), [local]);
+  const webBackHandler = useWebBackHandler(url, webViewRef);
   const top = useSafeAreaTop3();
   const bottom = useSafeAreaBottom();
   const insets = useSafeAreaInsets4();
@@ -2636,6 +2629,7 @@ function WebView({ type, local, onMessage, ...props }) {
       /** AdMobV2 */
       loadAppsInTossAdMob_isSupported: GoogleAdMob2.loadAppsInTossAdMob.isSupported,
       showAppsInTossAdMob_isSupported: GoogleAdMob2.showAppsInTossAdMob.isSupported,
+      isAppsInTossAdMobLoaded_isSupported: GoogleAdMob2.isAppsInTossAdMobLoaded.isSupported,
       /** IntegratedAd */
       loadFullScreenAd_isSupported: loadFullScreenAdForWeb.isSupported,
       showFullScreenAd_isSupported: showFullScreenAd.isSupported,
@@ -2674,6 +2668,8 @@ function WebView({ type, local, onMessage, ...props }) {
       getPendingOrders: IAP.getPendingOrders,
       getCompletedOrRefundedOrders: IAP.getCompletedOrRefundedOrders,
       completeProductGrant: IAP.completeProductGrant,
+      /** AdMobV2 */
+      isAppsInTossAdMobLoaded: GoogleAdMob2.isAppsInTossAdMobLoaded,
       /** Toss Ads */
       tossAdEventLog,
       /** Private */
@@ -2718,7 +2714,7 @@ function WebView({ type, local, onMessage, ...props }) {
       ...props,
       ...headerPropForExternalWebView,
       source: {
-        uri,
+        uri: url.href,
         // NOTE: https://github.com/react-native-webview/react-native-webview/pull/3133
         headers: {
           "User-Agent": userAgent
@@ -2744,11 +2740,11 @@ function WebView({ type, local, onMessage, ...props }) {
       allowsBackForwardNavigationGestures,
       onShouldStartLoadWithRequest: (event) => {
         try {
-          const url = new URL(event.url);
-          if (["https:", "http:"].includes(url.protocol) || url.href === "about:blank") {
+          const url2 = new URL(event.url);
+          if (["https:", "http:"].includes(url2.protocol) || url2.href === "about:blank") {
             return true;
           } else {
-            Linking.openURL(convertIntentURL(url) ?? url.href);
+            Linking.openURL(convertIntentURL(url2) ?? url2.href);
             return false;
           }
         } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@apps-in-toss/framework",
   "type": "module",
-  "version": "1.7.1",
+  "version": "1.8.1",
   "description": "The framework for Apps In Toss",
   "scripts": {
     "typecheck": "tsc --noEmit",
@@ -55,11 +55,11 @@
     "ait": "./bin/ait.js"
   },
   "dependencies": {
-    "@apps-in-toss/analytics": "1.7.1",
-    "@apps-in-toss/cli": "1.7.1",
-    "@apps-in-toss/native-modules": "1.7.1",
-    "@apps-in-toss/plugins": "1.7.1",
-    "@apps-in-toss/types": "1.7.1",
+    "@apps-in-toss/analytics": "1.8.1",
+    "@apps-in-toss/cli": "1.8.1",
+    "@apps-in-toss/native-modules": "1.8.1",
+    "@apps-in-toss/plugins": "1.8.1",
+    "@apps-in-toss/types": "1.8.1",
     "es-hangul": "^2.3.2"
   },
   "devDependencies": {