react-native-daro 1.0.13 → 1.0.16

package/src/AdBannerView.tsx

@@ -1,41 +1,49 @@
-import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react';
-import { findNodeHandle, NativeModules, requireNativeComponent, UIManager, View, type DimensionValue, type NativeMethods, type ViewProps } from 'react-native';
-import type { AdBannerViewHandler, AdBannerViewProps } from './types/AdBannerViewProps';
+import {
+  forwardRef,
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+  useState,
+  type ElementRef,
+} from 'react';
+import { View, type ViewProps } from 'react-native';
+import AdBannerViewNativeComponent, {
+  Commands,
+} from './DaroMAdBannerViewNativeComponent';
+import NativeDaroModule from './NativeDaroModule';
+import type {
+  AdBannerViewHandler,
+  AdBannerViewProps,
+} from './types/AdBannerViewProps';
 import type { AdNativeEvent } from './types/AdEvent';
 import type { AdInfo, AdLoadFailedInfo } from './types/AdInfo';
 
-const { DaroMModule } = NativeModules;
-
-const {
-  BANNER_AD_FORMAT_LABEL,
-  MREC_AD_FORMAT_LABEL,
-} = DaroMModule.getConstants();
+const { BANNER_AD_FORMAT_LABEL, MREC_AD_FORMAT_LABEL } =
+  NativeDaroModule.getConstants();
 
 export enum AdFormat {
-  BANNER = BANNER_AD_FORMAT_LABEL,
-  MREC = MREC_AD_FORMAT_LABEL,
+  BANNER = 'BANNER',
+  MREC = 'MREC',
 }
 
-type AdViewNativeEvents = {
-  onAdLoadedEvent(event: AdNativeEvent<AdInfo>): void;
-  onAdLoadFailedEvent(event: AdNativeEvent<AdLoadFailedInfo>): void;
-  onAdClickedEvent(event: AdNativeEvent<AdInfo>): void;
-  onAdImpressionRecordedEvent(event: AdNativeEvent<AdInfo>): void;
+const toNativeAdFormat = (adFormat: AdFormat | string): string => {
+  switch (adFormat) {
+    case AdFormat.BANNER:
+      return BANNER_AD_FORMAT_LABEL;
+    case AdFormat.MREC:
+      return MREC_AD_FORMAT_LABEL;
+    default:
+      return adFormat;
+  }
 };
 
-const ComponentName = 'DaroMAdBannerView';
-const AdViewComponent = requireNativeComponent<AdBannerViewProps & ViewProps & AdViewNativeEvents>(ComponentName);
-type AdViewType = React.Component<AdBannerViewProps> & NativeMethods;
-
-type SizeKey = 'width' | 'height';
-type SizeRecord = Partial<Record<SizeKey, DimensionValue>>;
-
-const ADVIEW_SIZE = {
-  banner: { width: 320, height: 50 },
-  mrec: { width: 300, height: 250 },
-};
+type AdViewType = ElementRef<typeof AdBannerViewNativeComponent>;
 
-export const AdBannerView = forwardRef<AdBannerViewHandler, AdBannerViewProps & ViewProps>(function AdBannerView(
+export const AdBannerView = forwardRef<
+  AdBannerViewHandler,
+  AdBannerViewProps & ViewProps
+>(function AdBannerView(
   {
     adUnitId,
     adFormat,
@@ -51,19 +59,12 @@ export const AdBannerView = forwardRef<AdBannerViewHandler, AdBannerViewProps &
   },
   ref
 ) {
-
-  const adFormatSize = useRef<SizeRecord>({});
   const adViewRef = useRef<AdViewType | null>(null);
   const [isInitialized, setIsInitialized] = useState<boolean>(false);
 
   const loadAd = useCallback(() => {
     if (adViewRef.current) {
-      UIManager.dispatchViewManagerCommand(
-        findNodeHandle(adViewRef.current),
-        // @ts-ignore: Issue in RN ts defs
-        UIManager.getViewManagerConfig(ComponentName).Commands.loadAd,
-        [],
-      );
+      Commands.loadAd(adViewRef.current);
     }
   }, []);
 
@@ -75,19 +76,16 @@ export const AdBannerView = forwardRef<AdBannerViewHandler, AdBannerViewProps &
 
   useEffect(() => {
     (async () => {
-      if (adFormat === AdFormat.BANNER) {
-        adFormatSize.current = { width: ADVIEW_SIZE.banner.width, height: ADVIEW_SIZE.banner.height };
-      } else {
-        adFormatSize.current = { width: ADVIEW_SIZE.mrec.width, height: ADVIEW_SIZE.mrec.height };
-      }
-      const initialized = await DaroMModule.isInitialized();
+      const initialized = await NativeDaroModule.isInitialized();
       setIsInitialized(initialized);
 
       if (!initialized) {
-        console.warn('AdBannerView is mounted before the initialization of the DaroM React Native module');
+        console.warn(
+          'AdBannerView is mounted before the initialization of the DaroM React Native module'
+        );
       }
     })();
-  }, [adFormat]);
+  }, []);
 
   const onAdLoadedEvent = useCallback(
     (event: AdNativeEvent<AdInfo>) => {
@@ -124,17 +122,19 @@ export const AdBannerView = forwardRef<AdBannerViewHandler, AdBannerViewProps &
   }
 
   return (
-    <AdViewComponent
+    <AdBannerViewNativeComponent
       style={style}
-      adFormat={adFormat}
+      adFormat={toNativeAdFormat(adFormat)}
       ref={saveElement}
       adUnitId={adUnitId}
       placement={placement}
+      loadOnMount={loadOnMount}
       isVisible={isVisible}
       onAdLoadedEvent={onAdLoadedEvent}
       onAdLoadFailedEvent={onAdLoadFailedEvent}
       onAdClickedEvent={onAdClickedEvent}
       onAdImpressionRecordedEvent={onAdImpressionRecordedEvent}
-      {...otherProps} />
+      {...otherProps}
+    />
   );
-});
+});

package/src/AppOpenAd.ts

@@ -1,9 +1,10 @@
-import { NativeModules } from 'react-native';
+import { Platform } from 'react-native';
 import {
   addEventListener,
   removeEventListener,
   AdEventEmitter,
 } from './EventEmitter';
+import NativeDaroModule from './NativeDaroModule';
 import type {
   AdDisplayFailedInfo,
   AdInfo,
@@ -11,7 +12,11 @@ import type {
 } from './types/AdInfo';
 import { AdEventType, type AdEventPayloadMap } from './types/AdEvent';
 
-const { DaroMModule } = NativeModules;
+const IS_SUPPORTED_PLATFORM = Platform.OS === 'ios';
+
+const warnUnsupportedPlatform = () => {
+  console.warn('AppOpenAd is only supported on iOS.');
+};
 
 const {
   ON_APPOPEN_AD_LOADED_EVENT,
@@ -21,7 +26,7 @@ const {
   ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT,
   ON_APPOPEN_AD_HIDDEN_EVENT,
   ON_APPOPEN_AD_IMPRESSION_RECORDED,
-} = DaroMModule.getConstants();
+} = NativeDaroModule.getConstants();
 
 const NATIVE_EVENT_BY_TYPE: Record<AdEventType, string> = {
   [AdEventType.LOADED]: ON_APPOPEN_AD_LOADED_EVENT,
@@ -34,24 +39,44 @@ const NATIVE_EVENT_BY_TYPE: Record<AdEventType, string> = {
 };
 
 export class AppOpenAd {
+  private static _nextRequestId = 1;
+  private static _legacyRequestIds = new Map<string, number>();
+  private static _legacyRequestIdSet = new Set<number>();
+
   private readonly eventEmitter = new AdEventEmitter();
 
-  private constructor(private readonly adUnitId: string) {}
+  private constructor(
+    private readonly requestId: number,
+    private readonly adUnitId: string
+  ) {}
 
   static createForAdRequest(adUnitId: string): AppOpenAd {
-    return new AppOpenAd(adUnitId);
+    const requestId = AppOpenAd._nextRequestId++;
+    return new AppOpenAd(requestId, adUnitId);
   }
 
   isAdReady(): Promise<boolean> {
-    return DaroMModule.isAppOpenAdReady(this.adUnitId);
+    if (!IS_SUPPORTED_PLATFORM) {
+      return Promise.resolve(false);
+    }
+    return NativeDaroModule.isAppOpenAdReady(this.requestId, this.adUnitId);
   }
 
   load(): void {
-    DaroMModule.loadAppOpenAd(this.adUnitId);
+    if (!IS_SUPPORTED_PLATFORM) {
+      warnUnsupportedPlatform();
+      return;
+    }
+    NativeDaroModule.loadAppOpenAd(this.requestId, this.adUnitId);
   }
 
   show(placement?: string | null, customData?: string | null): void {
-    DaroMModule.showAppOpenAd(
+    if (!IS_SUPPORTED_PLATFORM) {
+      warnUnsupportedPlatform();
+      return;
+    }
+    NativeDaroModule.showAppOpenAd(
+      this.requestId,
       this.adUnitId,
       placement ?? undefined,
       customData ?? undefined
@@ -62,10 +87,15 @@ export class AppOpenAd {
     type: T,
     listener: (info: AdEventPayloadMap[T]) => void
   ): () => void {
+    if (!IS_SUPPORTED_PLATFORM) {
+      warnUnsupportedPlatform();
+      return () => {};
+    }
+
     const nativeEvent = NATIVE_EVENT_BY_TYPE[type];
-    const adUnitId = this.adUnitId;
+    const requestId = this.requestId;
     return this.eventEmitter.addEventListener(nativeEvent, (payload: any) => {
-      if (payload?.adUnitId !== undefined && payload.adUnitId !== adUnitId) {
+      if (payload?.requestId !== requestId) {
         return;
       }
       listener(payload);
@@ -78,14 +108,50 @@ export class AppOpenAd {
 
   // ---- Deprecated static API (backward compatibility) ----
 
+  private static _getLegacyRequestId(adUnitId: string): number {
+    let requestId = AppOpenAd._legacyRequestIds.get(adUnitId);
+    if (requestId === undefined) {
+      requestId = AppOpenAd._nextRequestId++;
+      AppOpenAd._legacyRequestIds.set(adUnitId, requestId);
+      AppOpenAd._legacyRequestIdSet.add(requestId);
+    }
+    return requestId;
+  }
+
+  private static _addLegacyEventListener<T>(
+    event: string,
+    listener: (info: T) => void
+  ): void {
+    if (!IS_SUPPORTED_PLATFORM) {
+      warnUnsupportedPlatform();
+      return;
+    }
+
+    addEventListener(event, (payload: any) => {
+      if (!AppOpenAd._legacyRequestIdSet.has(payload?.requestId)) {
+        return;
+      }
+      listener(payload);
+    });
+  }
+
   /** @deprecated `AppOpenAd.createForAdRequest(adUnitId)` 인스턴스의 `isAdReady()`를 사용하세요. */
   static isAdReady(adUnitId: string): Promise<boolean> {
-    return DaroMModule.isAppOpenAdReady(adUnitId);
+    if (!IS_SUPPORTED_PLATFORM) {
+      return Promise.resolve(false);
+    }
+    const requestId = AppOpenAd._getLegacyRequestId(adUnitId);
+    return NativeDaroModule.isAppOpenAdReady(requestId, adUnitId);
   }
 
   /** @deprecated `AppOpenAd.createForAdRequest(adUnitId)` 인스턴스의 `load()`를 사용하세요. */
   static loadAd(adUnitId: string): void {
-    DaroMModule.loadAppOpenAd(adUnitId);
+    if (!IS_SUPPORTED_PLATFORM) {
+      warnUnsupportedPlatform();
+      return;
+    }
+    const requestId = AppOpenAd._getLegacyRequestId(adUnitId);
+    NativeDaroModule.loadAppOpenAd(requestId, adUnitId);
   }
 
   /** @deprecated `AppOpenAd.createForAdRequest(adUnitId)` 인스턴스의 `show()`를 사용하세요. */
@@ -94,7 +160,13 @@ export class AppOpenAd {
     placement?: string | null,
     customData?: string | null
   ): void {
-    DaroMModule.showAppOpenAd(
+    if (!IS_SUPPORTED_PLATFORM) {
+      warnUnsupportedPlatform();
+      return;
+    }
+    const requestId = AppOpenAd._getLegacyRequestId(adUnitId);
+    NativeDaroModule.showAppOpenAd(
+      requestId,
       adUnitId,
       placement ?? undefined,
       customData ?? undefined
@@ -103,7 +175,7 @@ export class AppOpenAd {
 
   /** @deprecated `addAdEventListener(AdEventType.LOADED, ...)`를 인스턴스에서 사용하세요. */
   static addAdLoadedEventListener(listener: (adInfo: AdInfo) => void): void {
-    addEventListener(ON_APPOPEN_AD_LOADED_EVENT, listener);
+    AppOpenAd._addLegacyEventListener(ON_APPOPEN_AD_LOADED_EVENT, listener);
   }
 
   /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
@@ -115,7 +187,10 @@ export class AppOpenAd {
   static addAdLoadFailedEventListener(
     listener: (errorInfo: AdLoadFailedInfo) => void
   ): void {
-    addEventListener(ON_APPOPEN_AD_LOAD_FAILED_EVENT, listener);
+    AppOpenAd._addLegacyEventListener(
+      ON_APPOPEN_AD_LOAD_FAILED_EVENT,
+      listener
+    );
   }
 
   /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
@@ -125,7 +200,7 @@ export class AppOpenAd {
 
   /** @deprecated `addAdEventListener(AdEventType.CLICKED, ...)`를 인스턴스에서 사용하세요. */
   static addAdClickedEventListener(listener: (adInfo: AdInfo) => void): void {
-    addEventListener(ON_APPOPEN_AD_CLICKED_EVENT, listener);
+    AppOpenAd._addLegacyEventListener(ON_APPOPEN_AD_CLICKED_EVENT, listener);
   }
 
   /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
@@ -135,7 +210,7 @@ export class AppOpenAd {
 
   /** @deprecated `addAdEventListener(AdEventType.DISPLAYED, ...)`를 인스턴스에서 사용하세요. */
   static addAdDisplayedEventListener(listener: (adInfo: AdInfo) => void): void {
-    addEventListener(ON_APPOPEN_AD_DISPLAYED_EVENT, listener);
+    AppOpenAd._addLegacyEventListener(ON_APPOPEN_AD_DISPLAYED_EVENT, listener);
   }
 
   /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
@@ -147,7 +222,10 @@ export class AppOpenAd {
   static addAdFailedToDisplayEventListener(
     listener: (errorInfo: AdDisplayFailedInfo) => void
   ): void {
-    addEventListener(ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT, listener);
+    AppOpenAd._addLegacyEventListener(
+      ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT,
+      listener
+    );
   }
 
   /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
@@ -157,7 +235,7 @@ export class AppOpenAd {
 
   /** @deprecated `addAdEventListener(AdEventType.HIDDEN, ...)`를 인스턴스에서 사용하세요. */
   static addAdHiddenEventListener(listener: (adInfo: AdInfo) => void): void {
-    addEventListener(ON_APPOPEN_AD_HIDDEN_EVENT, listener);
+    AppOpenAd._addLegacyEventListener(ON_APPOPEN_AD_HIDDEN_EVENT, listener);
   }
 
   /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
@@ -169,7 +247,10 @@ export class AppOpenAd {
   static addAdImpressionRecordedListener(
     listener: (adInfo: AdInfo) => void
   ): void {
-    addEventListener(ON_APPOPEN_AD_IMPRESSION_RECORDED, listener);
+    AppOpenAd._addLegacyEventListener(
+      ON_APPOPEN_AD_IMPRESSION_RECORDED,
+      listener
+    );
   }
 
   /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */

package/src/DaroMAdBannerViewNativeComponent.ts

@@ -0,0 +1,47 @@
+/* eslint-disable @react-native/no-deep-imports -- React Native 0.74 codegen parser compatibility requires these imports. */
+import type * as React from 'react';
+import type { HostComponent, ViewProps } from 'react-native';
+import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import type {
+  DirectEventHandler,
+  Double,
+  Int32,
+  WithDefault,
+} from 'react-native/Libraries/Types/CodegenTypes';
+
+type AdInfoPayload = {
+  adUnitId: string;
+  latencyMillis: Double;
+};
+
+type AdLoadFailedInfoPayload = {
+  adUnitId: string;
+  code: Int32;
+  message: string;
+  latencyMillis: Double;
+};
+
+export interface NativeProps extends ViewProps {
+  adUnitId: string;
+  adFormat: string;
+  placement?: string | null;
+  loadOnMount?: WithDefault<boolean, true>;
+  isVisible?: WithDefault<boolean, true>;
+  onAdLoadedEvent?: DirectEventHandler<AdInfoPayload>;
+  onAdLoadFailedEvent?: DirectEventHandler<AdLoadFailedInfoPayload>;
+  onAdClickedEvent?: DirectEventHandler<AdInfoPayload>;
+  onAdImpressionRecordedEvent?: DirectEventHandler<AdInfoPayload>;
+}
+
+type ComponentType = HostComponent<NativeProps>;
+
+interface NativeCommands {
+  loadAd: (viewRef: React.ElementRef<ComponentType>) => void;
+}
+
+export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
+  supportedCommands: ['loadAd'],
+});
+
+export default codegenNativeComponent<NativeProps>('DaroMAdBannerView');

package/src/DaroMNativeAdViewNativeComponent.ts

@@ -0,0 +1,62 @@
+/* eslint-disable @react-native/no-deep-imports -- React Native 0.74 codegen parser compatibility requires these imports. */
+import type * as React from 'react';
+import type { HostComponent, ViewProps } from 'react-native';
+import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import type {
+  DirectEventHandler,
+  Double,
+  Int32,
+  UnsafeMixed,
+  WithDefault,
+} from 'react-native/Libraries/Types/CodegenTypes';
+
+type AdInfoPayload = {
+  adUnitId: string;
+  latencyMillis: Double;
+};
+
+type AdLoadFailedInfoPayload = {
+  adUnitId: string;
+  code: Int32;
+  message: string;
+  latencyMillis: Double;
+};
+
+type AdChoicesPosition = 'topLeft' | 'topRight' | 'bottomRight' | 'bottomLeft';
+
+export interface NativeProps extends ViewProps {
+  adUnitId: string;
+  placement?: string | null;
+  loadOnMount?: WithDefault<boolean, true>;
+  adChoicesPosition?: WithDefault<AdChoicesPosition, 'bottomRight'>;
+
+  titleView?: Int32;
+  bodyView?: Int32;
+  callToActionView?: Int32;
+  iconView?: Int32;
+  mediaView?: Int32;
+
+  titleViewStyleProps?: UnsafeMixed;
+  bodyViewStyleProps?: UnsafeMixed;
+  callToActionViewStyleProps?: UnsafeMixed;
+  iconViewStyleProps?: UnsafeMixed;
+  mediaViewStyleProps?: UnsafeMixed;
+
+  onAdLoadedEvent?: DirectEventHandler<AdInfoPayload>;
+  onAdLoadFailedEvent?: DirectEventHandler<AdLoadFailedInfoPayload>;
+  onAdClickedEvent?: DirectEventHandler<AdInfoPayload>;
+  onAdImpressionRecordedEvent?: DirectEventHandler<AdInfoPayload>;
+}
+
+type ComponentType = HostComponent<NativeProps>;
+
+interface NativeCommands {
+  loadAd: (viewRef: React.ElementRef<ComponentType>) => void;
+}
+
+export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
+  supportedCommands: ['loadAd'],
+});
+
+export default codegenNativeComponent<NativeProps>('DaroMNativeAdView');

package/src/DaroMediaViewNativeComponent.ts

@@ -0,0 +1,9 @@
+/* eslint-disable @react-native/no-deep-imports -- React Native 0.74 codegen parser compatibility requires this import. */
+import type { ViewProps } from 'react-native';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+
+export interface NativeProps extends ViewProps {}
+
+export default codegenNativeComponent<NativeProps>('DaroMediaView', {
+  excludedPlatforms: ['iOS'],
+});

package/src/ErrorCode.ts

@@ -1,4 +1,3 @@
-
 export enum ErrorCode {
-	UNSPECIFIED = 0
+  UNSPECIFIED = 0,
 }

package/src/EventEmitter.ts

@@ -1,17 +1,19 @@
-import { NativeModules, NativeEventEmitter } from 'react-native';
+import { NativeEventEmitter } from 'react-native';
 import type { EventSubscription } from 'react-native';
+import NativeDaroModule from './NativeDaroModule';
 import type { AdEventObject, AdEventListener } from './types/AdEvent';
 
-const { DaroMModule } = NativeModules;
-
-const emitter = new NativeEventEmitter(DaroMModule);
+const emitter = new NativeEventEmitter(NativeDaroModule);
 const subscriptions: Map<string, Set<EventSubscription>> = new Map();
 
 export const addEventListener = <T extends AdEventObject>(
   event: string,
   handler: AdEventListener<T>
 ): (() => void) => {
-  const subscription: EventSubscription = emitter.addListener(event, handler);
+  const subscription: EventSubscription = emitter.addListener(
+    event,
+    handler as (...args: Object[]) => void
+  );
 
   if (!subscriptions.has(event)) {
     subscriptions.set(event, new Set());
@@ -34,7 +36,7 @@ export class AdEventEmitter {
   private subscriptions: Map<string, Set<EventSubscription>> = new Map();
 
   constructor() {
-    this.emitter = new NativeEventEmitter(DaroMModule);
+    this.emitter = new NativeEventEmitter(NativeDaroModule);
   }
 
   addEventListener<T extends AdEventObject>(
@@ -43,7 +45,7 @@ export class AdEventEmitter {
   ): () => void {
     const subscription: EventSubscription = this.emitter.addListener(
       event,
-      handler
+      handler as (...args: Object[]) => void
     );
 
     if (!this.subscriptions.has(event)) {