react-native-daro 2.0.7 → 2.0.9-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/android/build.gradle +3 -1
- package/android/src/main/java/com/daro/reactnative/DaroRNAdBannerViewManager.kt +8 -3
- package/android/src/main/java/com/daro/reactnative/DaroRNAdNativeViewManager.kt +8 -3
- package/android/src/main/java/com/daro/reactnative/DaroRNModule.kt +76 -34
- package/android/src/main/java/com/daro/reactnative/event/DaroRNEvent.kt +8 -0
- package/android/src/main/java/com/daro/reactnative/impl/DaroRNInterstitialModuleImpl.kt +13 -13
- package/android/src/main/java/com/daro/reactnative/impl/DaroRNLightPopupModuleImpl.kt +12 -12
- package/android/src/main/java/com/daro/reactnative/impl/DaroRNPreloadModuleImpl.kt +77 -0
- package/android/src/main/java/com/daro/reactnative/impl/DaroRNRewardedAdModuleImpl.kt +14 -14
- package/android/src/main/java/com/daro/reactnative/preload/DaroRNPreloadRegistry.kt +57 -0
- package/android/src/main/java/com/daro/reactnative/util/AdInfoUtil.kt +27 -16
- package/android/src/main/java/com/daro/reactnative/view/DaroMediaView.kt +3 -0
- package/android/src/main/java/com/daro/reactnative/view/DaroRNAdBannerViewContainer.kt +36 -15
- package/android/src/main/java/com/daro/reactnative/view/DaroRNAdNativeViewContainer.kt +36 -15
- package/android/src/oldarch/java/com/daro/reactnative/DaroRNModuleSpec.kt +28 -14
- package/android/src/test/java/com/daro/reactnative/preload/DaroRNPreloadRegistryTest.kt +65 -0
- package/android/src/test/java/com/daro/reactnative/view/DaroMediaViewTest.kt +45 -0
- package/android/src/test/java/com/daro/reactnative/view/DaroRNPreloadFirstLoadTest.kt +160 -0
- package/ios/DaroRNModule+AppOpen.swift +9 -9
- package/ios/DaroRNModule+Interstitial.swift +9 -9
- package/ios/DaroRNModule+LightPopup.swift +13 -13
- package/ios/DaroRNModule+Preload.swift +122 -0
- package/ios/DaroRNModule+Rewarded.swift +14 -14
- package/ios/DaroRNModule.mm +20 -14
- package/ios/DaroRNModule.swift +6 -1
- package/ios/Fabric/DaroRNAdBannerComponentView.mm +12 -7
- package/ios/Fabric/DaroRNNativeAdComponentView.mm +12 -7
- package/ios/Paper/DaroRNAdBannerViewManager.m +2 -1
- package/ios/Paper/DaroRNNativeAdViewManager.m +2 -1
- package/ios/Shared/DaroRNBannerAdView.swift +23 -9
- package/ios/Shared/DaroRNNativeAdView.swift +77 -46
- package/ios/Shared/DaroRNPreloadRegistry.swift +54 -0
- package/lib/commonjs/AdBannerView.js +4 -2
- package/lib/commonjs/AdBannerView.js.map +1 -1
- package/lib/commonjs/AdPreload.js +105 -0
- package/lib/commonjs/AdPreload.js.map +1 -0
- package/lib/commonjs/AppOpenAd.js +22 -22
- package/lib/commonjs/AppOpenAd.js.map +1 -1
- package/lib/commonjs/DaroRNAdBannerViewNativeComponent.ts +5 -3
- package/lib/commonjs/DaroRNNativeAdViewNativeComponent.ts +5 -3
- package/lib/commonjs/InterstitialAd.js +24 -24
- package/lib/commonjs/InterstitialAd.js.map +1 -1
- package/lib/commonjs/LightPopupAd.js +27 -27
- package/lib/commonjs/LightPopupAd.js.map +1 -1
- package/lib/commonjs/NativeDaroModule.js.map +1 -1
- package/lib/commonjs/RewardedAd.js +22 -22
- package/lib/commonjs/RewardedAd.js.map +1 -1
- package/lib/commonjs/hooks/useAdPreload.js +61 -0
- package/lib/commonjs/hooks/useAdPreload.js.map +1 -0
- package/lib/commonjs/hooks/useInterstitialAd.js +6 -6
- package/lib/commonjs/hooks/useInterstitialAd.js.map +1 -1
- package/lib/commonjs/hooks/useLightPopupAd.js +5 -5
- package/lib/commonjs/hooks/useLightPopupAd.js.map +1 -1
- package/lib/commonjs/hooks/useRewardedAd.js +6 -6
- package/lib/commonjs/hooks/useRewardedAd.js.map +1 -1
- package/lib/commonjs/index.js +37 -0
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/nativeAd/NativeAdView.js +4 -2
- package/lib/commonjs/nativeAd/NativeAdView.js.map +1 -1
- package/lib/commonjs/types/NativeAdViewProps.js.map +1 -1
- package/lib/module/AdBannerView.js +4 -2
- package/lib/module/AdBannerView.js.map +1 -1
- package/lib/module/AdPreload.js +98 -0
- package/lib/module/AdPreload.js.map +1 -0
- package/lib/module/AppOpenAd.js +22 -22
- package/lib/module/AppOpenAd.js.map +1 -1
- package/lib/module/DaroRNAdBannerViewNativeComponent.ts +5 -3
- package/lib/module/DaroRNNativeAdViewNativeComponent.ts +5 -3
- package/lib/module/InterstitialAd.js +24 -24
- package/lib/module/InterstitialAd.js.map +1 -1
- package/lib/module/LightPopupAd.js +27 -27
- package/lib/module/LightPopupAd.js.map +1 -1
- package/lib/module/NativeDaroModule.js.map +1 -1
- package/lib/module/RewardedAd.js +22 -22
- package/lib/module/RewardedAd.js.map +1 -1
- package/lib/module/hooks/useAdPreload.js +56 -0
- package/lib/module/hooks/useAdPreload.js.map +1 -0
- package/lib/module/hooks/useInterstitialAd.js +6 -6
- package/lib/module/hooks/useInterstitialAd.js.map +1 -1
- package/lib/module/hooks/useLightPopupAd.js +5 -5
- package/lib/module/hooks/useLightPopupAd.js.map +1 -1
- package/lib/module/hooks/useRewardedAd.js +6 -6
- package/lib/module/hooks/useRewardedAd.js.map +1 -1
- package/lib/module/index.js +2 -0
- package/lib/module/index.js.map +1 -1
- package/lib/module/nativeAd/NativeAdView.js +4 -2
- package/lib/module/nativeAd/NativeAdView.js.map +1 -1
- package/lib/module/types/NativeAdViewProps.js.map +1 -1
- package/lib/typescript/commonjs/src/AdBannerView.d.ts +1 -0
- package/lib/typescript/commonjs/src/AdBannerView.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/AdPreload.d.ts +62 -0
- package/lib/typescript/commonjs/src/AdPreload.d.ts.map +1 -0
- package/lib/typescript/commonjs/src/AppOpenAd.d.ts +8 -8
- package/lib/typescript/commonjs/src/AppOpenAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/DaroRNAdBannerViewNativeComponent.d.ts +4 -3
- package/lib/typescript/commonjs/src/DaroRNAdBannerViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/DaroRNNativeAdViewNativeComponent.d.ts +4 -3
- package/lib/typescript/commonjs/src/DaroRNNativeAdViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/InterstitialAd.d.ts +8 -8
- package/lib/typescript/commonjs/src/InterstitialAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/LightPopupAd.d.ts +9 -9
- package/lib/typescript/commonjs/src/LightPopupAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/NativeDaroModule.d.ts +19 -14
- package/lib/typescript/commonjs/src/NativeDaroModule.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/RewardedAd.d.ts +8 -8
- package/lib/typescript/commonjs/src/RewardedAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/hooks/useAdPreload.d.ts +19 -0
- package/lib/typescript/commonjs/src/hooks/useAdPreload.d.ts.map +1 -0
- package/lib/typescript/commonjs/src/hooks/useInterstitialAd.d.ts +1 -1
- package/lib/typescript/commonjs/src/hooks/useInterstitialAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/hooks/useLightPopupAd.d.ts +1 -1
- package/lib/typescript/commonjs/src/hooks/useLightPopupAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/hooks/useRewardedAd.d.ts +1 -1
- package/lib/typescript/commonjs/src/hooks/useRewardedAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/index.d.ts +4 -0
- package/lib/typescript/commonjs/src/index.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/nativeAd/NativeAdView.d.ts +1 -0
- package/lib/typescript/commonjs/src/nativeAd/NativeAdView.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/types/AdBannerViewProps.d.ts +6 -0
- package/lib/typescript/commonjs/src/types/AdBannerViewProps.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/types/AdInfo.d.ts +2 -2
- package/lib/typescript/commonjs/src/types/AdInfo.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/types/AdProps.d.ts +1 -1
- package/lib/typescript/commonjs/src/types/AdProps.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/types/NativeAdViewProps.d.ts +6 -0
- package/lib/typescript/commonjs/src/types/NativeAdViewProps.d.ts.map +1 -1
- package/lib/typescript/module/src/AdBannerView.d.ts +1 -0
- package/lib/typescript/module/src/AdBannerView.d.ts.map +1 -1
- package/lib/typescript/module/src/AdPreload.d.ts +62 -0
- package/lib/typescript/module/src/AdPreload.d.ts.map +1 -0
- package/lib/typescript/module/src/AppOpenAd.d.ts +8 -8
- package/lib/typescript/module/src/AppOpenAd.d.ts.map +1 -1
- package/lib/typescript/module/src/DaroRNAdBannerViewNativeComponent.d.ts +4 -3
- package/lib/typescript/module/src/DaroRNAdBannerViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/module/src/DaroRNNativeAdViewNativeComponent.d.ts +4 -3
- package/lib/typescript/module/src/DaroRNNativeAdViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/module/src/InterstitialAd.d.ts +8 -8
- package/lib/typescript/module/src/InterstitialAd.d.ts.map +1 -1
- package/lib/typescript/module/src/LightPopupAd.d.ts +9 -9
- package/lib/typescript/module/src/LightPopupAd.d.ts.map +1 -1
- package/lib/typescript/module/src/NativeDaroModule.d.ts +19 -14
- package/lib/typescript/module/src/NativeDaroModule.d.ts.map +1 -1
- package/lib/typescript/module/src/RewardedAd.d.ts +8 -8
- package/lib/typescript/module/src/RewardedAd.d.ts.map +1 -1
- package/lib/typescript/module/src/hooks/useAdPreload.d.ts +19 -0
- package/lib/typescript/module/src/hooks/useAdPreload.d.ts.map +1 -0
- package/lib/typescript/module/src/hooks/useInterstitialAd.d.ts +1 -1
- package/lib/typescript/module/src/hooks/useInterstitialAd.d.ts.map +1 -1
- package/lib/typescript/module/src/hooks/useLightPopupAd.d.ts +1 -1
- package/lib/typescript/module/src/hooks/useLightPopupAd.d.ts.map +1 -1
- package/lib/typescript/module/src/hooks/useRewardedAd.d.ts +1 -1
- package/lib/typescript/module/src/hooks/useRewardedAd.d.ts.map +1 -1
- package/lib/typescript/module/src/index.d.ts +4 -0
- package/lib/typescript/module/src/index.d.ts.map +1 -1
- package/lib/typescript/module/src/nativeAd/NativeAdView.d.ts +1 -0
- package/lib/typescript/module/src/nativeAd/NativeAdView.d.ts.map +1 -1
- package/lib/typescript/module/src/types/AdBannerViewProps.d.ts +6 -0
- package/lib/typescript/module/src/types/AdBannerViewProps.d.ts.map +1 -1
- package/lib/typescript/module/src/types/AdInfo.d.ts +2 -2
- package/lib/typescript/module/src/types/AdInfo.d.ts.map +1 -1
- package/lib/typescript/module/src/types/AdProps.d.ts +1 -1
- package/lib/typescript/module/src/types/AdProps.d.ts.map +1 -1
- package/lib/typescript/module/src/types/NativeAdViewProps.d.ts +6 -0
- package/lib/typescript/module/src/types/NativeAdViewProps.d.ts.map +1 -1
- package/package.json +1 -1
- package/plugin/build/withAndroid.js +2 -2
- package/react-native-daro.podspec +1 -1
- package/src/AdBannerView.tsx +4 -2
- package/src/AdPreload.ts +141 -0
- package/src/AppOpenAd.ts +21 -21
- package/src/DaroRNAdBannerViewNativeComponent.ts +5 -3
- package/src/DaroRNNativeAdViewNativeComponent.ts +5 -3
- package/src/InterstitialAd.ts +23 -23
- package/src/LightPopupAd.ts +26 -26
- package/src/NativeDaroModule.ts +31 -14
- package/src/RewardedAd.ts +21 -21
- package/src/hooks/useAdPreload.ts +82 -0
- package/src/hooks/useInterstitialAd.ts +6 -6
- package/src/hooks/useLightPopupAd.ts +5 -5
- package/src/hooks/useRewardedAd.ts +6 -6
- package/src/index.tsx +16 -0
- package/src/nativeAd/NativeAdView.tsx +4 -2
- package/src/types/AdBannerViewProps.ts +6 -0
- package/src/types/AdInfo.ts +2 -2
- package/src/types/AdProps.ts +1 -1
- package/src/types/NativeAdViewProps.ts +6 -0
package/src/RewardedAd.ts
CHANGED
|
@@ -48,26 +48,26 @@ export class RewardedAd {
|
|
|
48
48
|
|
|
49
49
|
private constructor(
|
|
50
50
|
private readonly requestId: number,
|
|
51
|
-
private readonly
|
|
51
|
+
private readonly adUnitKey: string
|
|
52
52
|
) {}
|
|
53
53
|
|
|
54
|
-
static createForAdRequest(
|
|
54
|
+
static createForAdRequest(adUnitKey: string): RewardedAd {
|
|
55
55
|
const requestId = RewardedAd._nextRequestId++;
|
|
56
|
-
return new RewardedAd(requestId,
|
|
56
|
+
return new RewardedAd(requestId, adUnitKey);
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
isAdReady(): Promise<boolean> {
|
|
60
|
-
return NativeDaroModule.isRewardedAdReady(this.requestId, this.
|
|
60
|
+
return NativeDaroModule.isRewardedAdReady(this.requestId, this.adUnitKey);
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
load(): void {
|
|
64
|
-
NativeDaroModule.loadRewardedAd(this.requestId, this.
|
|
64
|
+
NativeDaroModule.loadRewardedAd(this.requestId, this.adUnitKey);
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
show(customData?: string | null): void {
|
|
68
68
|
NativeDaroModule.showRewardedAd(
|
|
69
69
|
this.requestId,
|
|
70
|
-
this.
|
|
70
|
+
this.adUnitKey,
|
|
71
71
|
customData ?? null
|
|
72
72
|
);
|
|
73
73
|
}
|
|
@@ -92,11 +92,11 @@ export class RewardedAd {
|
|
|
92
92
|
|
|
93
93
|
// ---- Deprecated static API (backward compatibility) ----
|
|
94
94
|
|
|
95
|
-
private static _getLegacyRequestId(
|
|
96
|
-
let requestId = RewardedAd._legacyRequestIds.get(
|
|
95
|
+
private static _getLegacyRequestId(adUnitKey: string): number {
|
|
96
|
+
let requestId = RewardedAd._legacyRequestIds.get(adUnitKey);
|
|
97
97
|
if (requestId === undefined) {
|
|
98
98
|
requestId = RewardedAd._nextRequestId++;
|
|
99
|
-
RewardedAd._legacyRequestIds.set(
|
|
99
|
+
RewardedAd._legacyRequestIds.set(adUnitKey, requestId);
|
|
100
100
|
RewardedAd._legacyRequestIdSet.add(requestId);
|
|
101
101
|
}
|
|
102
102
|
return requestId;
|
|
@@ -114,22 +114,22 @@ export class RewardedAd {
|
|
|
114
114
|
});
|
|
115
115
|
}
|
|
116
116
|
|
|
117
|
-
/** @deprecated `RewardedAd.createForAdRequest(
|
|
118
|
-
static isAdReady(
|
|
119
|
-
const requestId = RewardedAd._getLegacyRequestId(
|
|
120
|
-
return NativeDaroModule.isRewardedAdReady(requestId,
|
|
117
|
+
/** @deprecated `RewardedAd.createForAdRequest(adUnitKey)` 인스턴스의 `isAdReady()`를 사용하세요. */
|
|
118
|
+
static isAdReady(adUnitKey: string): Promise<boolean> {
|
|
119
|
+
const requestId = RewardedAd._getLegacyRequestId(adUnitKey);
|
|
120
|
+
return NativeDaroModule.isRewardedAdReady(requestId, adUnitKey);
|
|
121
121
|
}
|
|
122
122
|
|
|
123
|
-
/** @deprecated `RewardedAd.createForAdRequest(
|
|
124
|
-
static loadAd(
|
|
125
|
-
const requestId = RewardedAd._getLegacyRequestId(
|
|
126
|
-
NativeDaroModule.loadRewardedAd(requestId,
|
|
123
|
+
/** @deprecated `RewardedAd.createForAdRequest(adUnitKey)` 인스턴스의 `load()`를 사용하세요. */
|
|
124
|
+
static loadAd(adUnitKey: string): void {
|
|
125
|
+
const requestId = RewardedAd._getLegacyRequestId(adUnitKey);
|
|
126
|
+
NativeDaroModule.loadRewardedAd(requestId, adUnitKey);
|
|
127
127
|
}
|
|
128
128
|
|
|
129
|
-
/** @deprecated `RewardedAd.createForAdRequest(
|
|
130
|
-
static showAd(
|
|
131
|
-
const requestId = RewardedAd._getLegacyRequestId(
|
|
132
|
-
NativeDaroModule.showRewardedAd(requestId,
|
|
129
|
+
/** @deprecated `RewardedAd.createForAdRequest(adUnitKey)` 인스턴스의 `show()`를 사용하세요. */
|
|
130
|
+
static showAd(adUnitKey: string, customData?: string | null): void {
|
|
131
|
+
const requestId = RewardedAd._getLegacyRequestId(adUnitKey);
|
|
132
|
+
NativeDaroModule.showRewardedAd(requestId, adUnitKey, customData ?? null);
|
|
133
133
|
}
|
|
134
134
|
|
|
135
135
|
/** @deprecated `addAdEventListener(AdEventType.LOADED, ...)`를 인스턴스에서 사용하세요. */
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { useEffect, useMemo, useRef } from 'react';
|
|
2
|
+
import {
|
|
3
|
+
AdPreloadEventType,
|
|
4
|
+
BannerAdPreload,
|
|
5
|
+
NativeAdPreload,
|
|
6
|
+
type BannerAdPreloadOptions,
|
|
7
|
+
type NativeAdPreloadOptions,
|
|
8
|
+
} from '../AdPreload';
|
|
9
|
+
import type { AdInfo, AdLoadFailedInfo } from '../types/AdInfo';
|
|
10
|
+
|
|
11
|
+
export type UseAdPreloadCallbacks = {
|
|
12
|
+
onPreloadSuccess?: (adInfo: AdInfo) => void;
|
|
13
|
+
onPreloadFail?: (error: AdLoadFailedInfo) => void;
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
export type UseBannerAdPreloadOptions = BannerAdPreloadOptions &
|
|
17
|
+
UseAdPreloadCallbacks;
|
|
18
|
+
export type UseNativeAdPreloadOptions = NativeAdPreloadOptions &
|
|
19
|
+
UseAdPreloadCallbacks;
|
|
20
|
+
|
|
21
|
+
// 마운트 때 받기 시작하고 언마운트 때 쓰지 않은 광고를 정리한다.
|
|
22
|
+
function usePreloadLifecycle(
|
|
23
|
+
preload: BannerAdPreload | NativeAdPreload,
|
|
24
|
+
callbacks: UseAdPreloadCallbacks
|
|
25
|
+
) {
|
|
26
|
+
const callbacksRef = useRef(callbacks);
|
|
27
|
+
callbacksRef.current = callbacks;
|
|
28
|
+
|
|
29
|
+
useEffect(() => {
|
|
30
|
+
const unsubscribeSuccess = preload.addPreloadEventListener(
|
|
31
|
+
AdPreloadEventType.SUCCESS,
|
|
32
|
+
(adInfo) => callbacksRef.current.onPreloadSuccess?.(adInfo)
|
|
33
|
+
);
|
|
34
|
+
const unsubscribeFail = preload.addPreloadEventListener(
|
|
35
|
+
AdPreloadEventType.FAIL,
|
|
36
|
+
(error) => callbacksRef.current.onPreloadFail?.(error)
|
|
37
|
+
);
|
|
38
|
+
preload.preload().catch((error: unknown) => {
|
|
39
|
+
console.warn('[Daro] preload request was rejected', error);
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
return () => {
|
|
43
|
+
unsubscribeSuccess();
|
|
44
|
+
unsubscribeFail();
|
|
45
|
+
preload.destroy();
|
|
46
|
+
};
|
|
47
|
+
}, [preload]);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* 배너 / MREC 광고를 이 컴포넌트가 사는 동안 미리 받아 둔다.
|
|
52
|
+
* 돌려준 객체를 같은 화면의 `AdBannerView` 에 `preload` prop 으로 넘긴다.
|
|
53
|
+
*/
|
|
54
|
+
export function useBannerAdPreload({
|
|
55
|
+
adUnitKey,
|
|
56
|
+
adFormat,
|
|
57
|
+
...callbacks
|
|
58
|
+
}: UseBannerAdPreloadOptions): BannerAdPreload {
|
|
59
|
+
const preload = useMemo(
|
|
60
|
+
() => new BannerAdPreload({ adUnitKey, adFormat }),
|
|
61
|
+
[adUnitKey, adFormat]
|
|
62
|
+
);
|
|
63
|
+
usePreloadLifecycle(preload, callbacks);
|
|
64
|
+
return preload;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* 네이티브 광고를 이 컴포넌트가 사는 동안 미리 받아 둔다.
|
|
69
|
+
* 돌려준 객체를 같은 화면의 `NativeAdView` 에 `preload` prop 으로 넘긴다.
|
|
70
|
+
*/
|
|
71
|
+
export function useNativeAdPreload({
|
|
72
|
+
adUnitKey,
|
|
73
|
+
adChoicesPosition,
|
|
74
|
+
...callbacks
|
|
75
|
+
}: UseNativeAdPreloadOptions): NativeAdPreload {
|
|
76
|
+
const preload = useMemo(
|
|
77
|
+
() => new NativeAdPreload({ adUnitKey, adChoicesPosition }),
|
|
78
|
+
[adUnitKey, adChoicesPosition]
|
|
79
|
+
);
|
|
80
|
+
usePreloadLifecycle(preload, callbacks);
|
|
81
|
+
return preload;
|
|
82
|
+
}
|
|
@@ -26,7 +26,7 @@ export type UseInterstitialAdResult = {
|
|
|
26
26
|
};
|
|
27
27
|
|
|
28
28
|
export function useInterstitialAd(
|
|
29
|
-
|
|
29
|
+
adUnitKey: string | null,
|
|
30
30
|
options: UseInterstitialAdOptions = {}
|
|
31
31
|
): UseInterstitialAdResult {
|
|
32
32
|
const adRef = useRef<InterstitialAd | null>(null);
|
|
@@ -38,7 +38,7 @@ export function useInterstitialAd(
|
|
|
38
38
|
});
|
|
39
39
|
|
|
40
40
|
const load = useCallback(() => {
|
|
41
|
-
if (!
|
|
41
|
+
if (!adUnitKey) {
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
44
|
|
|
@@ -49,7 +49,7 @@ export function useInterstitialAd(
|
|
|
49
49
|
|
|
50
50
|
setState({ isLoaded: false, isLoading: true });
|
|
51
51
|
ad.load();
|
|
52
|
-
}, [
|
|
52
|
+
}, [adUnitKey]);
|
|
53
53
|
|
|
54
54
|
const show = useCallback(() => {
|
|
55
55
|
adRef.current?.show();
|
|
@@ -66,11 +66,11 @@ export function useInterstitialAd(
|
|
|
66
66
|
adRef.current = null;
|
|
67
67
|
setState({ isLoaded: false, isLoading: false });
|
|
68
68
|
|
|
69
|
-
if (!
|
|
69
|
+
if (!adUnitKey) {
|
|
70
70
|
return;
|
|
71
71
|
}
|
|
72
72
|
|
|
73
|
-
const ad = InterstitialAd.createForAdRequest(
|
|
73
|
+
const ad = InterstitialAd.createForAdRequest(adUnitKey);
|
|
74
74
|
adRef.current = ad;
|
|
75
75
|
|
|
76
76
|
ad.addAdEventListener(AdEventType.LOADED, (info) => {
|
|
@@ -106,7 +106,7 @@ export function useInterstitialAd(
|
|
|
106
106
|
adRef.current = null;
|
|
107
107
|
}
|
|
108
108
|
};
|
|
109
|
-
}, [
|
|
109
|
+
}, [adUnitKey]);
|
|
110
110
|
|
|
111
111
|
return {
|
|
112
112
|
...state,
|
|
@@ -31,7 +31,7 @@ export type UseLightPopupAdResult = {
|
|
|
31
31
|
};
|
|
32
32
|
|
|
33
33
|
export function useLightPopupAd(
|
|
34
|
-
|
|
34
|
+
adUnitKey: string | null,
|
|
35
35
|
options: UseLightPopupAdOptions = {}
|
|
36
36
|
): UseLightPopupAdResult {
|
|
37
37
|
const adRef = useRef<LightPopupAd | null>(null);
|
|
@@ -43,13 +43,13 @@ export function useLightPopupAd(
|
|
|
43
43
|
});
|
|
44
44
|
|
|
45
45
|
const createAd = useCallback(() => {
|
|
46
|
-
if (!
|
|
46
|
+
if (!adUnitKey) {
|
|
47
47
|
return null;
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
adRef.current?.destroy();
|
|
51
51
|
|
|
52
|
-
const ad = LightPopupAd.createForAdRequest(
|
|
52
|
+
const ad = LightPopupAd.createForAdRequest(adUnitKey);
|
|
53
53
|
adRef.current = ad;
|
|
54
54
|
|
|
55
55
|
ad.addAdEventListener(AdEventType.LOADED, (info) => {
|
|
@@ -80,7 +80,7 @@ export function useLightPopupAd(
|
|
|
80
80
|
});
|
|
81
81
|
|
|
82
82
|
return ad;
|
|
83
|
-
}, [
|
|
83
|
+
}, [adUnitKey]);
|
|
84
84
|
|
|
85
85
|
const load = useCallback(
|
|
86
86
|
(loadOptions?: UseLightPopupAdLoadOptions) => {
|
|
@@ -116,7 +116,7 @@ export function useLightPopupAd(
|
|
|
116
116
|
adRef.current?.destroy();
|
|
117
117
|
adRef.current = null;
|
|
118
118
|
setState({ isLoaded: false, isLoading: false });
|
|
119
|
-
}, [
|
|
119
|
+
}, [adUnitKey]);
|
|
120
120
|
|
|
121
121
|
useEffect(() => {
|
|
122
122
|
return () => {
|
|
@@ -28,7 +28,7 @@ export type UseRewardedAdResult = {
|
|
|
28
28
|
};
|
|
29
29
|
|
|
30
30
|
export function useRewardedAd(
|
|
31
|
-
|
|
31
|
+
adUnitKey: string | null,
|
|
32
32
|
options: UseRewardedAdOptions = {}
|
|
33
33
|
): UseRewardedAdResult {
|
|
34
34
|
const adRef = useRef<RewardedAd | null>(null);
|
|
@@ -40,7 +40,7 @@ export function useRewardedAd(
|
|
|
40
40
|
});
|
|
41
41
|
|
|
42
42
|
const load = useCallback(() => {
|
|
43
|
-
if (!
|
|
43
|
+
if (!adUnitKey) {
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
46
|
|
|
@@ -51,7 +51,7 @@ export function useRewardedAd(
|
|
|
51
51
|
|
|
52
52
|
setState({ isLoaded: false, isLoading: true });
|
|
53
53
|
ad.load();
|
|
54
|
-
}, [
|
|
54
|
+
}, [adUnitKey]);
|
|
55
55
|
|
|
56
56
|
const show = useCallback((customData?: string | null) => {
|
|
57
57
|
adRef.current?.show(customData);
|
|
@@ -68,11 +68,11 @@ export function useRewardedAd(
|
|
|
68
68
|
adRef.current = null;
|
|
69
69
|
setState({ isLoaded: false, isLoading: false });
|
|
70
70
|
|
|
71
|
-
if (!
|
|
71
|
+
if (!adUnitKey) {
|
|
72
72
|
return;
|
|
73
73
|
}
|
|
74
74
|
|
|
75
|
-
const ad = RewardedAd.createForAdRequest(
|
|
75
|
+
const ad = RewardedAd.createForAdRequest(adUnitKey);
|
|
76
76
|
adRef.current = ad;
|
|
77
77
|
|
|
78
78
|
ad.addAdEventListener(AdEventType.LOADED, (info) => {
|
|
@@ -111,7 +111,7 @@ export function useRewardedAd(
|
|
|
111
111
|
adRef.current = null;
|
|
112
112
|
}
|
|
113
113
|
};
|
|
114
|
-
}, [
|
|
114
|
+
}, [adUnitKey]);
|
|
115
115
|
|
|
116
116
|
return {
|
|
117
117
|
...state,
|
package/src/index.tsx
CHANGED
|
@@ -22,6 +22,22 @@ export type {
|
|
|
22
22
|
UseLightPopupAdResult,
|
|
23
23
|
} from './hooks/useLightPopupAd';
|
|
24
24
|
|
|
25
|
+
export {
|
|
26
|
+
AdPreloadEventType,
|
|
27
|
+
BannerAdPreload,
|
|
28
|
+
NativeAdPreload,
|
|
29
|
+
} from './AdPreload';
|
|
30
|
+
export type {
|
|
31
|
+
AdPreloadEventPayloadMap,
|
|
32
|
+
BannerAdPreloadOptions,
|
|
33
|
+
NativeAdPreloadOptions,
|
|
34
|
+
} from './AdPreload';
|
|
35
|
+
export { useBannerAdPreload, useNativeAdPreload } from './hooks/useAdPreload';
|
|
36
|
+
export type {
|
|
37
|
+
UseBannerAdPreloadOptions,
|
|
38
|
+
UseNativeAdPreloadOptions,
|
|
39
|
+
} from './hooks/useAdPreload';
|
|
40
|
+
|
|
25
41
|
export { NativeAdView } from './nativeAd/NativeAdView';
|
|
26
42
|
export {
|
|
27
43
|
BodyView,
|
|
@@ -68,7 +68,7 @@ const NativeAdViewImpl = forwardRef<
|
|
|
68
68
|
NativeAdViewProps & ViewProps
|
|
69
69
|
>(function NativeAdViewImpl(
|
|
70
70
|
{
|
|
71
|
-
|
|
71
|
+
adUnitKey,
|
|
72
72
|
onAdLoaded,
|
|
73
73
|
onNativeAdAssetLoaded,
|
|
74
74
|
onAdLoadFailed,
|
|
@@ -78,6 +78,7 @@ const NativeAdViewImpl = forwardRef<
|
|
|
78
78
|
style,
|
|
79
79
|
loadOnMount = true,
|
|
80
80
|
adChoicesPosition = 'bottomRight',
|
|
81
|
+
preload,
|
|
81
82
|
...otherProps
|
|
82
83
|
},
|
|
83
84
|
ref
|
|
@@ -145,8 +146,9 @@ const NativeAdViewImpl = forwardRef<
|
|
|
145
146
|
<NativeAdViewNativeComponent
|
|
146
147
|
ref={saveElement}
|
|
147
148
|
{...otherProps}
|
|
148
|
-
|
|
149
|
+
adUnitKey={adUnitKey}
|
|
149
150
|
loadOnMount={loadOnMount}
|
|
151
|
+
preloadId={preload?.preloadId}
|
|
150
152
|
adChoicesPosition={adChoicesPosition}
|
|
151
153
|
titleView={nativeAdAssetRegistrations.titleView?.nativeTag ?? 0}
|
|
152
154
|
bodyView={nativeAdAssetRegistrations.bodyView?.nativeTag ?? 0}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { AdFormat } from '../AdBannerView';
|
|
2
|
+
import type { BannerAdPreload } from '../AdPreload';
|
|
2
3
|
import type { AdProps } from './AdProps';
|
|
3
4
|
|
|
4
5
|
export type AdBannerViewHandler = {
|
|
@@ -13,4 +14,9 @@ export type AdBannerViewProps = AdProps & {
|
|
|
13
14
|
adFormat: AdFormat;
|
|
14
15
|
loadOnMount?: boolean;
|
|
15
16
|
isVisible?: boolean;
|
|
17
|
+
/**
|
|
18
|
+
* 미리 받아 둔 광고. 마운트 때 한 번 쓰이고, 없거나 실패 / 만료면 일반 로드를 한다.
|
|
19
|
+
* `adUnitKey`, `adFormat` 은 preload 를 만들 때와 같은 값을 준다.
|
|
20
|
+
*/
|
|
21
|
+
preload?: BannerAdPreload;
|
|
16
22
|
};
|
package/src/types/AdInfo.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { ErrorCode } from '../ErrorCode';
|
|
|
3
3
|
// Represents an ad
|
|
4
4
|
export type AdInfo = {
|
|
5
5
|
// The ad unit ID for which this ad was loaded.
|
|
6
|
-
|
|
6
|
+
adUnitKey: string;
|
|
7
7
|
// The total latency in milliseconds for this waterfall to finish processing.
|
|
8
8
|
latencyMillis: number;
|
|
9
9
|
|
|
@@ -28,7 +28,7 @@ export type AdInfo = {
|
|
|
28
28
|
// Encapsulates various data for MAX load errors.
|
|
29
29
|
export type AdLoadFailedInfo = {
|
|
30
30
|
// The ad unit ID for which this ad was loaded.
|
|
31
|
-
|
|
31
|
+
adUnitKey: string;
|
|
32
32
|
|
|
33
33
|
// The error code for the error.
|
|
34
34
|
code: ErrorCode;
|
package/src/types/AdProps.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { NativeAdPreload } from '../AdPreload';
|
|
1
2
|
import type { AdProps } from './AdProps';
|
|
2
3
|
|
|
3
4
|
export enum NativeAdAssetType {
|
|
@@ -32,4 +33,9 @@ export type NativeAdViewProps = AdProps & {
|
|
|
32
33
|
onNativeAdAssetLoaded?: (assetTypes: ReadonlySet<NativeAdAssetType>) => void;
|
|
33
34
|
loadOnMount?: boolean;
|
|
34
35
|
adChoicesPosition?: AdChoicesPosition;
|
|
36
|
+
/**
|
|
37
|
+
* 미리 받아 둔 광고. 마운트 때 한 번 쓰이고, 없거나 실패 / 만료면 일반 로드를 한다.
|
|
38
|
+
* `adUnitKey` 는 preload 를 만들 때와 같은 값을 준다.
|
|
39
|
+
*/
|
|
40
|
+
preload?: NativeAdPreload;
|
|
35
41
|
};
|