incorporate PR feedback

- rename events to `iframe-ready-for-launch-config`, `iframe-launch-config` and `set-theme` - abstract daily theme parsing into lib method
daily-co · Jul 19, 2021 · 23f36cd · 23f36cd
1 parent 7368ed2
commit 23f36cd
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 19 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -156,16 +156,15 @@ export interface DailyThemeColors {
   supportiveText?: string;
 }
 
-export type DailyThemeConfig = {
+export type DailyTheme = {
   colors: DailyThemeColors;
-} | {
-  light: {
-    colors: DailyThemeColors;
-  }
-  dark: {
-    colors: DailyThemeColors;
-  }
-}
+};
+export type DailyThemeConfig =
+  | DailyTheme
+  | {
+      light: DailyTheme;
+      dark: DailyTheme;
+    };
 
 export interface DailyCallOptions {
   url?: string;

diff --git a/src/module.js b/src/module.js
@@ -35,8 +35,9 @@ import {
   DAILY_CAMERA_ERROR_MIC_IN_USE,
   DAILY_CAMERA_ERROR_CAM_AND_MIC_IN_USE,
   // events
-  DAILY_EVENT_READY_FOR_CONFIG,
-  DAILY_EVENT_IFRAME_CONFIG,
+  DAILY_EVENT_IFRAME_READY_FOR_LAUNCH_CONFIG,
+  DAILY_EVENT_IFRAME_LAUNCH_CONFIG,
+  DAILY_EVENT_SET_THEME,
   DAILY_EVENT_LOADING,
   DAILY_EVENT_LOADED,
   DAILY_EVENT_LOAD_ATTEMPT_FAILED,
@@ -183,8 +184,9 @@ export {
 
 // events
 export {
-  DAILY_EVENT_READY_FOR_CONFIG,
-  DAILY_EVENT_IFRAME_CONFIG,
+  DAILY_EVENT_IFRAME_READY_FOR_LAUNCH_CONFIG,
+  DAILY_EVENT_IFRAME_LAUNCH_CONFIG,
+  DAILY_EVENT_SET_THEME,
   DAILY_EVENT_LOADING,
   DAILY_EVENT_LOADED,
   DAILY_EVENT_LOAD_ATTEMPT_FAILED,
@@ -382,7 +384,10 @@ const FRAME_PROPS = {
         return false;
       }
       if ('light' in o && 'dark' in o) {
-        return containsValidColors(o.light.colors) && containsValidColors(o.dark.colors);
+        return (
+          containsValidColors(o.light.colors) &&
+          containsValidColors(o.dark.colors)
+        );
       }
       return containsValidColors(o.colors);
     },
@@ -1897,7 +1902,7 @@ export default class DailyIframe extends EventEmitter {
       ...theme,
     };
     this._messageChannel.sendMessageToDailyJs({
-      action: DAILY_EVENT_READY_FOR_CONFIG,
+      action: DAILY_EVENT_SET_THEME,
     });
     return this;
   }
@@ -2136,10 +2141,21 @@ export default class DailyIframe extends EventEmitter {
 
   handleMessageFromCallMachine(msg) {
     switch (msg.action) {
-      case DAILY_EVENT_READY_FOR_CONFIG:
+      case DAILY_EVENT_IFRAME_READY_FOR_LAUNCH_CONFIG:
+        this._messageChannel.sendMessageToCallMachine(
+          {
+            action: DAILY_EVENT_IFRAME_LAUNCH_CONFIG,
+            ...this.properties,
+          },
+          null,
+          this._iframe,
+          this._callFrameId
+        );
+        break;
+      case DAILY_EVENT_SET_THEME:
         this._messageChannel.sendMessageToCallMachine(
           {
-            action: DAILY_EVENT_IFRAME_CONFIG,
+            action: DAILY_EVENT_SET_THEME,
             ...this.properties,
           },
           null,

diff --git a/src/shared-with-pluot-core/CommonIncludes.js b/src/shared-with-pluot-core/CommonIncludes.js
@@ -42,8 +42,10 @@ export const DAILY_CAMERA_ERROR_CAM_AND_MIC_IN_USE = 'cam-mic-in-use';
 
 // events
 
-export const DAILY_EVENT_READY_FOR_CONFIG = 'iframe-ready-for-config';
-export const DAILY_EVENT_IFRAME_CONFIG = 'iframe-config';
+export const DAILY_EVENT_IFRAME_READY_FOR_LAUNCH_CONFIG =
+  'iframe-ready-for-launch-config';
+export const DAILY_EVENT_IFRAME_LAUNCH_CONFIG = 'iframe-launch-config';
+export const DAILY_EVENT_SET_THEME = 'set-theme';
 export const DAILY_EVENT_LOADING = 'loading';
 export const DAILY_EVENT_LOAD_ATTEMPT_FAILED = 'load-attempt-failed';
 export const DAILY_EVENT_LOADED = 'loaded';