create event interface

android/build.gradle

@@ -108,7 +108,7 @@ dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-android:0.73.1"
+  implementation "com.facebook.react:react-android:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "com.github.klaviyo.klaviyo-android-sdk:analytics:1.3.5"
   implementation "com.github.klaviyo.klaviyo-android-sdk:push-fcm:1.3.5"

android/gradle.properties

@@ -4,7 +4,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx1024m -XX:MaxPermSize=256m
- org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 #
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

android/src/main/java/com/klaviyoreactnativesdk/KlaviyoReactNativeSdkModule.kt

@@ -2,7 +2,6 @@ package com.klaviyoreactnativesdk
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableMap
 import com.klaviyo.analytics.Klaviyo
 import com.klaviyo.analytics.model.*
@@ -33,21 +32,14 @@ class KlaviyoReactNativeSdkModule internal constructor(private val context: Reac
   }
 
   @ReactMethod
-  override fun createEvent(event: ReadableMap) {
-    val parsedEvent = event.toHashMap()
-    val eventName = parsedEvent.remove("event") as HashMap<String, String>
-    val eventProperties = parsedEvent.map { entry ->
-      EventKey.CUSTOM(entry.key) as EventKey to entry.value as Serializable
-    }.toMap()
-
-    println(eventName["name"])
-    println(eventProperties)
-
+  override fun createEvent(name: String, properties: ReadableMap?) {
     Klaviyo.initialize("LuYLmF", context)
-    Klaviyo.createEvent(Event(
-      type = eventName["name"] as String,
-      properties = eventProperties
-    ))
+    val event = Event(
+      type = name,
+      properties =properties?.toHashMap()?.map { entry -> EventKey.CUSTOM(entry.key) as EventKey to entry.value as Serializable }
+        ?.toMap(),
+    )
+    Klaviyo.createEvent(event = event)
   }
 
   companion object {

android/src/oldarch/KlaviyoReactNativeSdkSpec.kt

@@ -8,5 +8,5 @@ import com.facebook.react.bridge.ReadableMap
 abstract class KlaviyoReactNativeSdkSpec internal constructor(context: ReactApplicationContext) :
   ReactContextBaseJavaModule(context) {
 
-  abstract fun createEvent(event: ReadableMap)
+  abstract fun createEvent(name: String, properties: ReadableMap?)
 }

example/src/App.tsx

@@ -7,11 +7,8 @@ export default function App() {
   const [result] = React.useState<number | undefined>();
 
   React.useEffect(() => {
-    Klaviyo.createEvent({
-      event: EventType.CUSTOM('EXAMPLE_EVENT'),
-      properties: {
-        [EventProperty.EVENT_ID.name]: '123',
-      },
+    Klaviyo.createEvent(EventType.OPENED_PUSH, {
+      [EventProperty.EVENT_ID]: '123',
     });
   }, []);
 
@@ -21,11 +18,9 @@ export default function App() {
       <Button
         title="Click Me"
         onPress={() => {
-          Klaviyo.createEvent({
-            event: EventType.CUSTOM('EXAMPLE_EVENT_2'),
-            properties: {
-              [EventProperty.EVENT_ID.name]: '321',
-            },
+          Klaviyo.createCustomEvent('CUSTOM_EVENT', {
+            custom_property_2: '321',
+            [EventProperty.VALUE]: 12,
           });
         }}
       />

src/Event.ts

@@ -1,27 +1,21 @@
-export class EventType {
-  public name: string;
-
-  private constructor(name: string) {
-    this.name = name;
-  }
-
-  public static OPENED_PUSH: EventType = new EventType('$opened_push');
-  public static CUSTOM = (name: string): EventType => new EventType(name);
+export enum EventType {
+  OPENED_PUSH = '$opened_push',
 }
 
-export class EventProperty {
-  public name: string;
-
-  private constructor(name: string) {
-    this.name = name;
-  }
-
-  public static EVENT_ID: EventProperty = new EventProperty('$event_id');
-  public static CUSTOM = (name: string): EventProperty =>
-    new EventProperty(name);
+export enum EventProperty {
+  EVENT_ID = '$event_id',
+  VALUE = 'value',
 }
 
-export interface IEvent {
-  event: EventType;
-  properties?: Object;
+type KlaviyoEventPropertyType = EventProperty | string;
+
+export interface KlaviyoEventAPI {
+  readonly createEvent: (
+    name: EventType,
+    properties?: Record<KlaviyoEventPropertyType, Object>
+  ) => void;
+  readonly createCustomEvent: (
+    name: string,
+    properties?: Record<KlaviyoEventPropertyType, Object>
+  ) => void;
 }

src/NativeKlaviyoReactNativeSdk.ts

@@ -1,9 +1,9 @@
 import type { TurboModule } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
-import type { IEvent } from './Event';
+import type { KlaviyoEventAPI } from './Event';
 
-export interface Spec extends TurboModule {
-  createEvent(event: IEvent): void;
-}
+export interface KlaviyoSpec extends TurboModule, KlaviyoEventAPI {}
 
-export default TurboModuleRegistry.getEnforcing<Spec>('KlaviyoReactNativeSdk');
+export default TurboModuleRegistry.getEnforcing<KlaviyoSpec>(
+  'KlaviyoReactNativeSdk'
+);

src/index.tsx

@@ -1,13 +1,13 @@
-import type { IEvent } from './Event';
 import { KlaviyoReactNativeSdk } from './KlaviyoReactNativeSdk';
+import { EventType } from './Event';
+import type { KlaviyoSpec } from './NativeKlaviyoReactNativeSdk';
 
-interface IKlaviyo {
-  readonly createEvent: (event: IEvent) => void;
-}
-
-export const Klaviyo: IKlaviyo = {
-  createEvent(event: IEvent): void {
-    KlaviyoReactNativeSdk.createEvent(event);
+export const Klaviyo: KlaviyoSpec = {
+  createEvent(name: EventType, properties?: Record<any, Object>): void {
+    this.createCustomEvent(name, properties);
+  },
+  createCustomEvent(name: string, properties?: Record<any, Object>): void {
+    KlaviyoReactNativeSdk.createEvent(name, properties);
   },
 };