react-native-daro 2.0.8 → 2.1.0
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 +5 -0
- package/android/src/main/java/com/daro/reactnative/DaroRNAdNativeViewManager.kt +5 -0
- package/android/src/main/java/com/daro/reactnative/DaroRNModule.kt +42 -0
- package/android/src/main/java/com/daro/reactnative/event/DaroRNEvent.kt +8 -0
- package/android/src/main/java/com/daro/reactnative/impl/DaroRNPreloadModuleImpl.kt +77 -0
- package/android/src/main/java/com/daro/reactnative/preload/DaroRNPreloadRegistry.kt +57 -0
- package/android/src/main/java/com/daro/reactnative/util/AdInfoUtil.kt +11 -0
- package/android/src/main/java/com/daro/reactnative/view/DaroMediaView.kt +3 -0
- package/android/src/main/java/com/daro/reactnative/view/DaroRNAdBannerViewContainer.kt +29 -8
- package/android/src/main/java/com/daro/reactnative/view/DaroRNAdNativeViewContainer.kt +29 -8
- package/android/src/oldarch/java/com/daro/reactnative/DaroRNModuleSpec.kt +14 -0
- 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+Preload.swift +122 -0
- package/ios/DaroRNModule.mm +6 -0
- package/ios/DaroRNModule.swift +5 -0
- package/ios/Fabric/DaroRNAdBannerComponentView.mm +5 -0
- package/ios/Fabric/DaroRNNativeAdComponentView.mm +5 -0
- package/ios/Paper/DaroRNAdBannerViewManager.m +1 -0
- package/ios/Paper/DaroRNNativeAdViewManager.m +1 -0
- package/ios/Shared/DaroRNBannerAdView.swift +16 -2
- package/ios/Shared/DaroRNNativeAdView.swift +63 -32
- package/ios/Shared/DaroRNPreloadRegistry.swift +54 -0
- package/lib/commonjs/AdBannerView.js +2 -0
- 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/DaroRNAdBannerViewNativeComponent.ts +2 -0
- package/lib/commonjs/DaroRNNativeAdViewNativeComponent.ts +2 -0
- package/lib/commonjs/NativeDaroModule.js.map +1 -1
- package/lib/commonjs/hooks/useAdPreload.js +61 -0
- package/lib/commonjs/hooks/useAdPreload.js.map +1 -0
- package/lib/commonjs/index.js +37 -0
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/nativeAd/NativeAdView.js +2 -0
- package/lib/commonjs/nativeAd/NativeAdView.js.map +1 -1
- package/lib/commonjs/types/NativeAdViewProps.js.map +1 -1
- package/lib/module/AdBannerView.js +2 -0
- 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/DaroRNAdBannerViewNativeComponent.ts +2 -0
- package/lib/module/DaroRNNativeAdViewNativeComponent.ts +2 -0
- package/lib/module/NativeDaroModule.js.map +1 -1
- package/lib/module/hooks/useAdPreload.js +56 -0
- package/lib/module/hooks/useAdPreload.js.map +1 -0
- package/lib/module/index.js +2 -0
- package/lib/module/index.js.map +1 -1
- package/lib/module/nativeAd/NativeAdView.js +2 -0
- 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/DaroRNAdBannerViewNativeComponent.d.ts +1 -0
- package/lib/typescript/commonjs/src/DaroRNAdBannerViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/DaroRNNativeAdViewNativeComponent.d.ts +1 -0
- package/lib/typescript/commonjs/src/DaroRNNativeAdViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/NativeDaroModule.d.ts +5 -0
- package/lib/typescript/commonjs/src/NativeDaroModule.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/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/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/DaroRNAdBannerViewNativeComponent.d.ts +1 -0
- package/lib/typescript/module/src/DaroRNAdBannerViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/module/src/DaroRNNativeAdViewNativeComponent.d.ts +1 -0
- package/lib/typescript/module/src/DaroRNNativeAdViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/module/src/NativeDaroModule.d.ts +5 -0
- package/lib/typescript/module/src/NativeDaroModule.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/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/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 +2 -0
- package/src/AdPreload.ts +141 -0
- package/src/DaroRNAdBannerViewNativeComponent.ts +2 -0
- package/src/DaroRNNativeAdViewNativeComponent.ts +2 -0
- package/src/NativeDaroModule.ts +17 -0
- package/src/hooks/useAdPreload.ts +82 -0
- package/src/index.tsx +16 -0
- package/src/nativeAd/NativeAdView.tsx +2 -0
- package/src/types/AdBannerViewProps.ts +6 -0
- package/src/types/NativeAdViewProps.ts +6 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AdBannerViewProps.d.ts","sourceRoot":"","sources":["../../../../../src/types/AdBannerViewProps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,mBAAmB,GAAG;IAChC;;OAEG;IACH,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"AdBannerViewProps.d.ts","sourceRoot":"","sources":["../../../../../src/types/AdBannerViewProps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,mBAAmB,GAAG;IAChC;;OAEG;IACH,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,OAAO,CAAC,EAAE,eAAe,CAAC;CAC3B,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { NativeAdPreload } from '../AdPreload';
|
|
1
2
|
import type { AdProps } from './AdProps';
|
|
2
3
|
export declare enum NativeAdAssetType {
|
|
3
4
|
TITLE = "title",// 광고 제목
|
|
@@ -24,5 +25,10 @@ export type NativeAdViewProps = AdProps & {
|
|
|
24
25
|
onNativeAdAssetLoaded?: (assetTypes: ReadonlySet<NativeAdAssetType>) => void;
|
|
25
26
|
loadOnMount?: boolean;
|
|
26
27
|
adChoicesPosition?: AdChoicesPosition;
|
|
28
|
+
/**
|
|
29
|
+
* 미리 받아 둔 광고. 마운트 때 한 번 쓰이고, 없거나 실패 / 만료면 일반 로드를 한다.
|
|
30
|
+
* `adUnitKey` 는 preload 를 만들 때와 같은 값을 준다.
|
|
31
|
+
*/
|
|
32
|
+
preload?: NativeAdPreload;
|
|
27
33
|
};
|
|
28
34
|
//# sourceMappingURL=NativeAdViewProps.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NativeAdViewProps.d.ts","sourceRoot":"","sources":["../../../../../src/types/NativeAdViewProps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,oBAAY,iBAAiB;IAC3B,KAAK,UAAU,CAAE,QAAQ;IACzB,IAAI,SAAS,CAAE,QAAQ;IACvB,IAAI,SAAS,CAAE,SAAS;IACxB,KAAK,UAAU,CAAE,gBAAgB;IACjC,cAAc,iBAAiB,CAAE,cAAc;IAC/C,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,iBAAiB,GACzB,SAAS,GACT,UAAU,GACV,aAAa,GACb,YAAY,CAAC;AAEjB;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC;;OAEG;IACH,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG;IACxC,qBAAqB,CAAC,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;IAC7E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"NativeAdViewProps.d.ts","sourceRoot":"","sources":["../../../../../src/types/NativeAdViewProps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,oBAAY,iBAAiB;IAC3B,KAAK,UAAU,CAAE,QAAQ;IACzB,IAAI,SAAS,CAAE,QAAQ;IACvB,IAAI,SAAS,CAAE,SAAS;IACxB,KAAK,UAAU,CAAE,gBAAgB;IACjC,cAAc,iBAAiB,CAAE,cAAc;IAC/C,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,iBAAiB,GACzB,SAAS,GACT,UAAU,GACV,aAAa,GACb,YAAY,CAAC;AAEjB;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC;;OAEG;IACH,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG;IACxC,qBAAqB,CAAC,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;IAC7E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC;;;OAGG;IACH,OAAO,CAAC,EAAE,eAAe,CAAC;CAC3B,CAAC"}
|
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@ const JETIFIER_IGNORELIST_ENTRIES = ['react-android', 'hermes-android'];
|
|
|
10
10
|
// 2.2.20 인 이유: Expo 의 Kotlin→KSP 매핑이 지원하는 최신 2.2 계열이다.
|
|
11
11
|
const KOTLIN_VERSION_KEY = 'android.kotlinVersion';
|
|
12
12
|
const MIN_KOTLIN_VERSION = '2.2.20';
|
|
13
|
-
const DARO_GRADLE_PLUGIN_CLASSPATH = 'so.daro:daro-plugin:2.0.
|
|
13
|
+
const DARO_GRADLE_PLUGIN_CLASSPATH = 'so.daro:daro-plugin:2.0.3';
|
|
14
14
|
const GRADLE_CLASSPATH_PATTERN = /^classpath\s*(?:\(\s*['"][^'"]+['"]\s*\)|['"][^'"]+['"])/;
|
|
15
15
|
const GRADLE_NON_CODE_PATTERN = /\/\/[^\r\n]*|\/\*[\s\S]*?\*\/|'''[\s\S]*?'''|"""[\s\S]*?"""|'(?:\\[\s\S]|[^'\\])*'|"(?:\\[\s\S]|[^"\\])*"|\$\/(?:\$(?:\$|\/)|(?!\/\$)[\s\S])*\/\$|\/(?:\\\/|[^/])+\//g;
|
|
16
16
|
const SAFEDK_WORKAROUND_KEY = 'daro.safedkConfigurationCacheWorkaround';
|
|
@@ -36,7 +36,7 @@ const DARO_APP_PLUGIN_LINE = `apply plugin: "${DARO_APP_PLUGIN_ID}"`;
|
|
|
36
36
|
// compileOnly 로 물고 compileOnly 는 전이되지 않으므로, 소비자 런타임에 실제로 실리는
|
|
37
37
|
// 것은 여기서 꽂는 이 좌표 하나뿐이다. 갈리면 우리 Kotlin 이 새 시그니처로 컴파일되어
|
|
38
38
|
// 옛 아티팩트 위에서 돈다 (DARO-1591 — 복제 자체를 없애는 것은 그 이슈에 남아 있다).
|
|
39
|
-
const DARO_SDK_DEPENDENCY = 'so.daro:daro-sdk:2.0
|
|
39
|
+
const DARO_SDK_DEPENDENCY = 'so.daro:daro-sdk:2.1.0';
|
|
40
40
|
const DARO_SDK_DEPENDENCY_LINE_PATTERN = /^\s*(?:implementation|api|compileOnly|runtimeOnly)\s*(?:\(\s*)?['"]so\.daro:daro-(?:[am]|sdk):[^'"]+['"]\s*\)?\s*(?:\/\/.*)?$/gm;
|
|
41
41
|
function replaceOrThrow(contents, pattern, replacement, target) {
|
|
42
42
|
if (!pattern.test(contents)) {
|
package/src/AdBannerView.tsx
CHANGED
|
@@ -49,6 +49,7 @@ export const AdBannerView = forwardRef<
|
|
|
49
49
|
adFormat,
|
|
50
50
|
loadOnMount = true,
|
|
51
51
|
isVisible = true,
|
|
52
|
+
preload,
|
|
52
53
|
onAdLoaded,
|
|
53
54
|
onAdLoadFailed,
|
|
54
55
|
onAdClicked,
|
|
@@ -127,6 +128,7 @@ export const AdBannerView = forwardRef<
|
|
|
127
128
|
ref={saveElement}
|
|
128
129
|
adUnitKey={adUnitKey}
|
|
129
130
|
loadOnMount={loadOnMount}
|
|
131
|
+
preloadId={preload?.preloadId}
|
|
130
132
|
isVisible={isVisible}
|
|
131
133
|
onAdLoadedEvent={onAdLoadedEvent}
|
|
132
134
|
onAdLoadFailedEvent={onAdLoadFailedEvent}
|
package/src/AdPreload.ts
ADDED
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
import { AdEventEmitter } from './EventEmitter';
|
|
2
|
+
import NativeDaroModule from './NativeDaroModule';
|
|
3
|
+
import type { AdFormat } from './AdBannerView';
|
|
4
|
+
import type { AdInfo, AdLoadFailedInfo } from './types/AdInfo';
|
|
5
|
+
import type { AdChoicesPosition } from './types/NativeAdViewProps';
|
|
6
|
+
|
|
7
|
+
const {
|
|
8
|
+
ON_AD_PRELOAD_SUCCESS_EVENT,
|
|
9
|
+
ON_AD_PRELOAD_FAILED_EVENT,
|
|
10
|
+
BANNER_AD_FORMAT_LABEL,
|
|
11
|
+
MREC_AD_FORMAT_LABEL,
|
|
12
|
+
} = NativeDaroModule.getConstants();
|
|
13
|
+
|
|
14
|
+
export enum AdPreloadEventType {
|
|
15
|
+
SUCCESS = 'SUCCESS',
|
|
16
|
+
FAIL = 'FAIL',
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export interface AdPreloadEventPayloadMap {
|
|
20
|
+
[AdPreloadEventType.SUCCESS]: AdInfo;
|
|
21
|
+
[AdPreloadEventType.FAIL]: AdLoadFailedInfo;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
const NATIVE_EVENT_BY_TYPE: Record<AdPreloadEventType, string> = {
|
|
25
|
+
[AdPreloadEventType.SUCCESS]: ON_AD_PRELOAD_SUCCESS_EVENT,
|
|
26
|
+
[AdPreloadEventType.FAIL]: ON_AD_PRELOAD_FAILED_EVENT,
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
let nextPreloadId = 1;
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* 뷰 광고 하나를 뷰 없이 미리 받아 두는 객체. 같은 화면의 `AdBannerView` / `NativeAdView` 에
|
|
33
|
+
* `preload` prop 으로 넘기면 마운트 때 받아 둔 광고를 쓴다.
|
|
34
|
+
*
|
|
35
|
+
* - 객체 하나에 광고 하나. 로딩 중이거나 유효한 광고가 있을 때의 {@link preload} 는 무시된다.
|
|
36
|
+
* - 받아 둔 광고는 한 번만 쓰인다. 마운트로 소비된 뒤 다시 받으려면 {@link preload} 를 다시 부른다.
|
|
37
|
+
* - 실패했거나 만료된 ( 10분 ) 광고를 넘겨받은 뷰는 일반 로드를 한다.
|
|
38
|
+
* - 쓰지 않은 광고는 화면을 떠날 때 {@link destroy} 로 정리한다.
|
|
39
|
+
*/
|
|
40
|
+
abstract class AdPreload {
|
|
41
|
+
/** 뷰의 `preloadId` prop 으로 넘어가는 값. 직접 쓸 일은 없다. */
|
|
42
|
+
readonly preloadId = `daro-preload-${nextPreloadId++}`;
|
|
43
|
+
|
|
44
|
+
private readonly eventEmitter = new AdEventEmitter();
|
|
45
|
+
// destroy 뒤에 도착한 이전 요청의 결과를 버린다.
|
|
46
|
+
private active = false;
|
|
47
|
+
|
|
48
|
+
constructor(readonly adUnitKey: string) {}
|
|
49
|
+
|
|
50
|
+
protected abstract requestPreload(): Promise<void>;
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* 광고를 미리 받기 시작한다. Promise 는 네이티브가 요청을 받아 둔 시점에 끝난다 —
|
|
54
|
+
* 광고 수신 결과는 {@link addPreloadEventListener} 로 온다. 결과를 기다리지 않고 마운트해도 된다.
|
|
55
|
+
*/
|
|
56
|
+
preload(): Promise<void> {
|
|
57
|
+
this.active = true;
|
|
58
|
+
return this.requestPreload();
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
addPreloadEventListener<T extends AdPreloadEventType>(
|
|
62
|
+
type: T,
|
|
63
|
+
listener: (info: AdPreloadEventPayloadMap[T]) => void
|
|
64
|
+
): () => void {
|
|
65
|
+
const preloadId = this.preloadId;
|
|
66
|
+
return this.eventEmitter.addEventListener(
|
|
67
|
+
NATIVE_EVENT_BY_TYPE[type],
|
|
68
|
+
(payload: any) => {
|
|
69
|
+
if (!this.active || payload?.preloadId !== preloadId) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
const info = { ...payload };
|
|
73
|
+
delete info.preloadId;
|
|
74
|
+
listener(info);
|
|
75
|
+
}
|
|
76
|
+
);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
removeAllListeners(): void {
|
|
80
|
+
this.eventEmitter.removeAllListeners();
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
/**
|
|
84
|
+
* 쓰지 않은 광고를 정리한다. 여러 번 불러도 된다. 이미 뷰에 넘어간 광고는 그 뷰가 정리한다.
|
|
85
|
+
* 다시 {@link preload} 를 부르면 새로 받는다.
|
|
86
|
+
*/
|
|
87
|
+
destroy(): void {
|
|
88
|
+
this.active = false;
|
|
89
|
+
NativeDaroModule.destroyAdPreload(this.preloadId);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
export type BannerAdPreloadOptions = {
|
|
94
|
+
adUnitKey: string;
|
|
95
|
+
adFormat: AdFormat;
|
|
96
|
+
};
|
|
97
|
+
|
|
98
|
+
export class BannerAdPreload extends AdPreload {
|
|
99
|
+
readonly adFormat: AdFormat;
|
|
100
|
+
|
|
101
|
+
constructor({ adUnitKey, adFormat }: BannerAdPreloadOptions) {
|
|
102
|
+
super(adUnitKey);
|
|
103
|
+
this.adFormat = adFormat;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
protected requestPreload(): Promise<void> {
|
|
107
|
+
return NativeDaroModule.preloadBannerAd(
|
|
108
|
+
this.preloadId,
|
|
109
|
+
this.adUnitKey,
|
|
110
|
+
(this.adFormat as string) === 'MREC'
|
|
111
|
+
? MREC_AD_FORMAT_LABEL
|
|
112
|
+
: BANNER_AD_FORMAT_LABEL
|
|
113
|
+
);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
export type NativeAdPreloadOptions = {
|
|
118
|
+
adUnitKey: string;
|
|
119
|
+
/** iOS 는 광고를 받을 때 정해진다. `NativeAdView` 의 `adChoicesPosition` 과 같은 값을 준다. */
|
|
120
|
+
adChoicesPosition?: AdChoicesPosition;
|
|
121
|
+
};
|
|
122
|
+
|
|
123
|
+
export class NativeAdPreload extends AdPreload {
|
|
124
|
+
readonly adChoicesPosition: AdChoicesPosition;
|
|
125
|
+
|
|
126
|
+
constructor({
|
|
127
|
+
adUnitKey,
|
|
128
|
+
adChoicesPosition = 'bottomRight',
|
|
129
|
+
}: NativeAdPreloadOptions) {
|
|
130
|
+
super(adUnitKey);
|
|
131
|
+
this.adChoicesPosition = adChoicesPosition;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
protected requestPreload(): Promise<void> {
|
|
135
|
+
return NativeDaroModule.preloadNativeAd(
|
|
136
|
+
this.preloadId,
|
|
137
|
+
this.adUnitKey,
|
|
138
|
+
this.adChoicesPosition
|
|
139
|
+
);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
@@ -30,6 +30,8 @@ export interface NativeProps extends ViewProps {
|
|
|
30
30
|
adUnitKey: string;
|
|
31
31
|
adFormat: string;
|
|
32
32
|
loadOnMount?: WithDefault<boolean, true>;
|
|
33
|
+
// preload 로 받아 둔 광고의 id. 비어 있으면 일반 로드다.
|
|
34
|
+
preloadId?: string;
|
|
33
35
|
isVisible?: WithDefault<boolean, true>;
|
|
34
36
|
onAdLoadedEvent?: DirectEventHandler<AdInfoPayload>;
|
|
35
37
|
onAdLoadFailedEvent?: DirectEventHandler<AdLoadFailedInfoPayload>;
|
|
@@ -32,6 +32,8 @@ type AdChoicesPosition = 'topLeft' | 'topRight' | 'bottomRight' | 'bottomLeft';
|
|
|
32
32
|
export interface NativeProps extends ViewProps {
|
|
33
33
|
adUnitKey: string;
|
|
34
34
|
loadOnMount?: WithDefault<boolean, true>;
|
|
35
|
+
// preload 로 받아 둔 광고의 id. 비어 있으면 일반 로드다.
|
|
36
|
+
preloadId?: string;
|
|
35
37
|
adChoicesPosition?: WithDefault<AdChoicesPosition, 'bottomRight'>;
|
|
36
38
|
|
|
37
39
|
titleView?: Int32;
|
package/src/NativeDaroModule.ts
CHANGED
|
@@ -39,6 +39,9 @@ export type DaroModuleConstants = {
|
|
|
39
39
|
ON_LIGHTPOPUP_HIDDEN_EVENT: string;
|
|
40
40
|
ON_LIGHTPOPUP_AD_IMPRESSION_RECORDED: string;
|
|
41
41
|
|
|
42
|
+
ON_AD_PRELOAD_SUCCESS_EVENT: string;
|
|
43
|
+
ON_AD_PRELOAD_FAILED_EVENT: string;
|
|
44
|
+
|
|
42
45
|
BANNER_AD_FORMAT_LABEL: string;
|
|
43
46
|
MREC_AD_FORMAT_LABEL: string;
|
|
44
47
|
UNKNOWN_AD_FORMAT_LABEL?: string;
|
|
@@ -103,6 +106,20 @@ export interface Spec extends TurboModule {
|
|
|
103
106
|
adUnitKey: string,
|
|
104
107
|
configuration: UnsafeObject
|
|
105
108
|
) => Promise<void>;
|
|
109
|
+
|
|
110
|
+
// 뷰 광고 preload. Promise 는 네이티브 보관 준비 완료이고, 광고 수신 결과는
|
|
111
|
+
// ON_AD_PRELOAD_*_EVENT 로 온다. `preloadId` 는 뷰의 `preloadId` prop 과 짝이다.
|
|
112
|
+
preloadBannerAd: (
|
|
113
|
+
preloadId: string,
|
|
114
|
+
adUnitKey: string,
|
|
115
|
+
adFormat: string
|
|
116
|
+
) => Promise<void>;
|
|
117
|
+
preloadNativeAd: (
|
|
118
|
+
preloadId: string,
|
|
119
|
+
adUnitKey: string,
|
|
120
|
+
adChoicesPosition: string
|
|
121
|
+
) => Promise<void>;
|
|
122
|
+
destroyAdPreload: (preloadId: string) => void;
|
|
106
123
|
}
|
|
107
124
|
|
|
108
125
|
export default TurboModuleRegistry.getEnforcing<Spec>('DaroRNModule');
|
|
@@ -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
|
+
}
|
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,
|
|
@@ -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
|
|
@@ -147,6 +148,7 @@ const NativeAdViewImpl = forwardRef<
|
|
|
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
|
};
|
|
@@ -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
|
};
|