@tellescope/video-chat 1.3.31 → 1.3.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellescope/video-chat",
-  "version": "1.3.31",
+  "version": "1.3.33",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -34,13 +34,13 @@
     "@fontsource/roboto": "^4.5.1",
     "@mui/icons-material": "^5.0.1",
     "@mui/material": "^5.0.2",
-    "@tellescope/constants": "^1.3.31",
-    "@tellescope/react-components": "^1.3.31",
-    "@tellescope/sdk": "^1.3.31",
-    "@tellescope/types-client": "^1.3.31",
-    "@tellescope/types-models": "^1.3.31",
+    "@tellescope/constants": "^1.3.32",
+    "@tellescope/react-components": "^1.3.32",
+    "@tellescope/sdk": "^1.3.32",
+    "@tellescope/types-client": "^1.3.32",
+    "@tellescope/types-models": "^1.3.32",
     "@tellescope/types-utilities": "^1.3.20",
-    "@tellescope/utilities": "^1.3.31",
+    "@tellescope/utilities": "^1.3.32",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "amazon-chime-sdk-component-library-react": "^2.15.0",
@@ -55,7 +55,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
-  "gitHead": "9fa02cafdddaf42d015f767b3ff3a4e369e2dd40",
+  "gitHead": "9af0a42a6d12f0c2c4366060fb46fe134f6bd04b",
   "publishConfig": {
     "access": "public"
   }

package/src/video_shared.tsx

@@ -23,7 +23,6 @@ import {
   Flex,
   Typography,
   LoadingButton,
-  useSession,
   useResolvedSession,
   Button,
 } from "@tellescope/react-components"
@@ -121,12 +120,14 @@ export type WaitingRoomProps = {
   calendarEvent: CalendarEvent,
   onGoBack?: () => void,
 }
-export const WaitingRoom = ({ calendarEvent, onGoBack } : WaitingRoomProps) => {
-  const session = useSession()
+interface WaitingRoomResolvedProps extends WaitingRoomProps {
+  join: (meetingInfo: { Meeting: MeetingInfo } | string, attendeeInfo?: { Attendee: AttendeeInfo }) => Promise<void>,
+  start?: () => void,
+}
+const WaitingRoomShared = ({ calendarEvent, join, start, onGoBack }: WaitingRoomResolvedProps) => {
+  const session = useResolvedSession()
   const [, { findById: findEvent }] = useCalendarEvents()
   const [, { findById: findMeeting }] = useMeetings()
-  const { startAndJoinMeeting } = useStartAndJoinMeetingForCalendarEvent(calendarEvent.id)
-  const { joinMeeting } = useJoinVideoCall()
 
   const tsMeeting = findMeeting(calendarEvent?.meetingId ?? '')
 
@@ -158,12 +159,13 @@ export const WaitingRoom = ({ calendarEvent, onGoBack } : WaitingRoomProps) => {
       <LoadingButton variant="contained" 
         disabled={
            (!meetingIsStarted && !isHost)
+        || (!meetingIsStarted && !start)
         || (meetingIsStarted && !tsMeeting)
         }
         onClick={
           meetingIsStarted 
-            ? () => joinMeeting(tsMeeting.id) 
-            : startAndJoinMeeting
+            ? () => join(tsMeeting.id) 
+            : start
         } 
         submitText={
           meetingIsStarted ? "Join Meeting" : "Start Meeting" 
@@ -191,6 +193,26 @@ export const WaitingRoom = ({ calendarEvent, onGoBack } : WaitingRoomProps) => {
   )
 }
 
+// Only users can start meeting, avoid using useStartAndJoin... hook as enduser
+const WaitingRoomUser = (props : WaitingRoomProps) => {
+  const { startAndJoinMeeting } = useStartAndJoinMeetingForCalendarEvent(props.calendarEvent.id)
+  const { joinMeeting } = useJoinVideoCall()
+
+  return <WaitingRoomShared {...props} start={startAndJoinMeeting} join={joinMeeting} />
+}
+
+const WaitingRoomEnduser = (props : WaitingRoomProps) => {
+  const { joinMeeting } = useJoinVideoCall()
+  return <WaitingRoomShared {...props} join={joinMeeting} />
+}
+
+export const WaitingRoom = (props: WaitingRoomProps) => {
+  const session = useResolvedSession()
+  const Component = session.type === 'user' ? WaitingRoomUser : WaitingRoomEnduser
+
+  return <Component {...props} />
+}
+
 export interface VideoCallNativeProps {
   onLeave?: () => void,
 }