@100mslive/roomkit-react 0.3.14-alpha.5 → 0.3.14-alpha.6

package/dist/meta.esbuild.json

@@ -10974,7 +10974,7 @@
       ],
       "format": "esm"
     },
-    "../../../../../../../tmp/tmp-2808-dzzZXVch7YJl/19030590f5d3/tldraw.css": {
+    "../../../../../../../tmp/tmp-2787-KwE6v4ehqlUy/190359341ca2/tldraw.css": {
       "bytes": 80111,
       "imports": [
         {
@@ -11024,7 +11024,7 @@
         }
       ]
     },
-    "../../../../../../../tmp/tmp-2808-dzzZXVch7YJl/19030590ee81/index.css": {
+    "../../../../../../../tmp/tmp-2787-KwE6v4ehqlUy/190359341680/index.css": {
       "bytes": 597,
       "imports": [
         {
@@ -11033,7 +11033,7 @@
           "external": true
         },
         {
-          "path": "../../../../../../../tmp/tmp-2808-dzzZXVch7YJl/19030590f5d3/tldraw.css",
+          "path": "../../../../../../../tmp/tmp-2787-KwE6v4ehqlUy/190359341ca2/tldraw.css",
           "kind": "import-rule",
           "original": "@tldraw/tldraw/tldraw.css"
         }
@@ -11108,7 +11108,7 @@
           "original": "../../common/constants"
         },
         {
-          "path": "../../../../../../../tmp/tmp-2808-dzzZXVch7YJl/19030590ee81/index.css",
+          "path": "../../../../../../../tmp/tmp-2787-KwE6v4ehqlUy/190359341680/index.css",
           "kind": "import-statement",
           "original": "@100mslive/hms-whiteboard/index.css"
         },
@@ -13891,7 +13891,7 @@
       "format": "esm"
     },
     "src/Prebuilt/App.tsx": {
-      "bytes": 10909,
+      "bytes": 10754,
       "imports": [
         {
           "path": "react",
@@ -14147,7 +14147,7 @@
       "format": "esm"
     },
     "src/Diagnostics/components.tsx": {
-      "bytes": 2317,
+      "bytes": 2686,
       "imports": [
         {
           "path": "react",
@@ -14409,7 +14409,7 @@
       "format": "esm"
     },
     "src/Diagnostics/AudioTest.tsx": {
-      "bytes": 4763,
+      "bytes": 5194,
       "imports": [
         {
           "path": "react",
@@ -14521,7 +14521,7 @@
       "format": "esm"
     },
     "src/Diagnostics/ConnectivityTest.tsx": {
-      "bytes": 11149,
+      "bytes": 11322,
       "imports": [
         {
           "path": "react",
@@ -14582,7 +14582,7 @@
       "format": "esm"
     },
     "src/Diagnostics/VideoTest.tsx": {
-      "bytes": 2316,
+      "bytes": 2346,
       "imports": [
         {
           "path": "react",
@@ -14648,7 +14648,7 @@
       "format": "esm"
     },
     "src/Diagnostics/Diagnostics.tsx": {
-      "bytes": 4440,
+      "bytes": 4574,
       "imports": [
         {
           "path": "react",
@@ -14961,7 +14961,7 @@
     "dist/index.js": {
       "imports": [
         {
-          "path": "dist/chunk-W6E3MUWX.js",
+          "path": "dist/chunk-MIJLZRDK.js",
           "kind": "import-statement"
         }
       ],
@@ -15037,16 +15037,16 @@
       "inputs": {},
       "bytes": 1882
     },
-    "dist/HLSView-AV4CONPM.js.map": {
+    "dist/HLSView-3BTMB5NS.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
       "bytes": 100275
     },
-    "dist/HLSView-AV4CONPM.js": {
+    "dist/HLSView-3BTMB5NS.js": {
       "imports": [
         {
-          "path": "dist/chunk-W6E3MUWX.js",
+          "path": "dist/chunk-MIJLZRDK.js",
           "kind": "import-statement"
         },
         {
@@ -15224,7 +15224,7 @@
         "default"
       ],
       "entryPoint": "src/Prebuilt/layouts/HLSView.jsx",
-      "cssBundle": "dist/HLSView-HMJGKVNU.css",
+      "cssBundle": "dist/HLSView-E4CL2XZ5.css",
       "inputs": {
         "src/Prebuilt/layouts/HLSView.jsx": {
           "bytesInOutput": 27671
@@ -15283,13 +15283,13 @@
       },
       "bytes": 61702
     },
-    "dist/chunk-W6E3MUWX.js.map": {
+    "dist/chunk-MIJLZRDK.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 3889166
+      "bytes": 3890716
     },
-    "dist/chunk-W6E3MUWX.js": {
+    "dist/chunk-MIJLZRDK.js": {
       "imports": [
         {
           "path": "react",
@@ -17772,7 +17772,7 @@
           "external": true
         },
         {
-          "path": "dist/HLSView-AV4CONPM.js",
+          "path": "dist/HLSView-3BTMB5NS.js",
           "kind": "dynamic-import"
         },
         {
@@ -18356,7 +18356,7 @@
       ],
       "inputs": {
         "<define:process.env>": {
-          "bytesInOutput": 17887
+          "bytesInOutput": 17868
         },
         "../../node_modules/lodash/lodash.js": {
           "bytesInOutput": 224414
@@ -18641,7 +18641,7 @@
           "bytesInOutput": 887
         },
         "src/Prebuilt/App.tsx": {
-          "bytesInOutput": 8043
+          "bytesInOutput": 7946
         },
         "src/Prebuilt/components/AppData/AppData.tsx": {
           "bytesInOutput": 6013
@@ -19237,7 +19237,7 @@
         "src/Prebuilt/components/VideoLayouts/WhiteboardLayout.tsx": {
           "bytesInOutput": 2797
         },
-        "../../../../../../../tmp/tmp-2808-dzzZXVch7YJl/19030590ee81/index.css": {
+        "../../../../../../../tmp/tmp-2787-KwE6v4ehqlUy/190359341680/index.css": {
           "bytesInOutput": 0
         },
         "src/Prebuilt/common/PeersSorter.ts": {
@@ -19382,16 +19382,16 @@
           "bytesInOutput": 27
         },
         "src/Diagnostics/Diagnostics.tsx": {
-          "bytesInOutput": 4678
+          "bytesInOutput": 4825
         },
         "src/Diagnostics/components.tsx": {
-          "bytesInOutput": 2109
+          "bytesInOutput": 2375
         },
         "src/Diagnostics/hms.ts": {
           "bytesInOutput": 237
         },
         "src/Diagnostics/AudioTest.tsx": {
-          "bytesInOutput": 4847
+          "bytesInOutput": 5341
         },
         "src/Diagnostics/DeviceSelector.jsx": {
           "bytesInOutput": 2155
@@ -19400,13 +19400,13 @@
           "bytesInOutput": 4041
         },
         "src/Diagnostics/ConnectivityTest.tsx": {
-          "bytesInOutput": 12447
+          "bytesInOutput": 12614
         },
         "src/Diagnostics/VideoTest.tsx": {
-          "bytesInOutput": 2265
+          "bytesInOutput": 2295
         }
       },
-      "bytes": 1848367
+      "bytes": 1849355
     },
     "dist/index.css.map": {
       "imports": [],
@@ -19468,22 +19468,22 @@
         }
       ],
       "inputs": {
-        "../../../../../../../tmp/tmp-2808-dzzZXVch7YJl/19030590f5d3/tldraw.css": {
+        "../../../../../../../tmp/tmp-2787-KwE6v4ehqlUy/190359341ca2/tldraw.css": {
           "bytesInOutput": 75223
         },
-        "../../../../../../../tmp/tmp-2808-dzzZXVch7YJl/19030590ee81/index.css": {
+        "../../../../../../../tmp/tmp-2787-KwE6v4ehqlUy/190359341680/index.css": {
           "bytesInOutput": 401
         }
       },
       "bytes": 75901
     },
-    "dist/HLSView-HMJGKVNU.css.map": {
+    "dist/HLSView-E4CL2XZ5.css.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
       "bytes": 122402
     },
-    "dist/HLSView-HMJGKVNU.css": {
+    "dist/HLSView-E4CL2XZ5.css": {
       "imports": [
         {
           "path": "https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap",
@@ -19537,10 +19537,10 @@
         }
       ],
       "inputs": {
-        "../../../../../../../tmp/tmp-2808-dzzZXVch7YJl/19030590f5d3/tldraw.css": {
+        "../../../../../../../tmp/tmp-2787-KwE6v4ehqlUy/190359341ca2/tldraw.css": {
           "bytesInOutput": 75223
         },
-        "../../../../../../../tmp/tmp-2808-dzzZXVch7YJl/19030590ee81/index.css": {
+        "../../../../../../../tmp/tmp-2787-KwE6v4ehqlUy/190359341680/index.css": {
           "bytesInOutput": 401
         }
       },

package/package.json

@@ -10,7 +10,7 @@
     "prebuilt",
     "roomkit"
   ],
-  "version": "0.3.14-alpha.5",
+  "version": "0.3.14-alpha.6",
   "author": "100ms",
   "license": "MIT",
   "repository": {
@@ -74,12 +74,12 @@
     "react": ">=17.0.2 <19.0.0"
   },
   "dependencies": {
-    "@100mslive/hls-player": "0.3.14-alpha.5",
+    "@100mslive/hls-player": "0.3.14-alpha.6",
     "@100mslive/hms-noise-cancellation": "0.0.1",
-    "@100mslive/hms-virtual-background": "1.13.14-alpha.5",
-    "@100mslive/hms-whiteboard": "0.0.4-alpha.5",
-    "@100mslive/react-icons": "0.10.14-alpha.5",
-    "@100mslive/react-sdk": "0.10.14-alpha.5",
+    "@100mslive/hms-virtual-background": "1.13.14-alpha.6",
+    "@100mslive/hms-whiteboard": "0.0.4-alpha.6",
+    "@100mslive/react-icons": "0.10.14-alpha.6",
+    "@100mslive/react-sdk": "0.10.14-alpha.6",
     "@100mslive/types-prebuilt": "0.12.9",
     "@emoji-mart/data": "^1.0.6",
     "@emoji-mart/react": "^1.0.1",
@@ -115,5 +115,5 @@
     "uuid": "^8.3.2",
     "worker-timers": "^7.0.40"
   },
-  "gitHead": "2d512204b017ee7b52ba3459eb0af1ef57cd8568"
+  "gitHead": "66c83d117ead187aeacea1da6e46e90a42bbc9d5"
 }

package/src/Diagnostics/AudioTest.tsx

@@ -21,7 +21,7 @@ import { useAudioOutputTest } from '../Prebuilt/components/hooks/useAudioOutputT
 import { TEST_AUDIO_URL } from '../Prebuilt/common/constants';
 
 const SelectContainer = ({ children }: { children: React.ReactNode }) => (
-  <Box css={{ w: '50%', '@lg': { w: '100%' } }}>{children}</Box>
+  <Box css={{ w: 'calc(50% - 0.75rem)', '@lg': { w: '100%' } }}>{children}</Box>
 );
 
 const MicTest = () => {
@@ -31,11 +31,13 @@ const MicTest = () => {
   const [selectedMic, setSelectedMic] = useState(audioInputDeviceId || 'default');
   const trackID = useHMSStore(selectLocalAudioTrackID);
   const audioLevel = useHMSStore(selectTrackAudioByID(trackID));
+  const { audioOutputDeviceId } = useHMSStore(selectLocalMediaSettings);
+  const { playing, setPlaying, audioRef } = useAudioOutputTest({ deviceId: audioOutputDeviceId || 'default' });
 
   return (
     <SelectContainer>
       <DeviceSelector
-        title="Microphone(Input)"
+        title="Microphone (Input)"
         devices={devices.audioInput}
         selection={selectedMic}
         icon={<MicOnIcon />}
@@ -47,6 +49,8 @@ const MicTest = () => {
       />
       <Flex css={{ gap: '$6', alignItems: 'center' }}>
         <Button
+          variant="standard"
+          icon
           onClick={() =>
             hmsDiagnostics
               .startMicCheck(selectedMic, () => {
@@ -58,23 +62,45 @@ const MicTest = () => {
           }
           disabled={isRecording}
         >
+          <MicOnIcon />
           {isRecording ? 'Recording...' : 'Record'}
         </Button>
-        {isRecording && (
-          <>
-            <Text>
-              <MicOnIcon />
-            </Text>
-            <Progress.Root value={audioLevel} css={{ h: '$2' }}>
-              <Progress.Content
-                style={{
-                  transform: `translateX(-${100 - audioLevel}%)`,
-                  transition: 'transform 0.3s',
-                }}
-              />
-            </Progress.Root>
-          </>
-        )}
+
+        <Button
+          icon
+          variant="standard"
+          outlined={hmsDiagnostics.getRecordedAudio() === TEST_AUDIO_URL}
+          onClick={() => {
+            if (audioRef.current) {
+              audioRef.current.src = hmsDiagnostics.getRecordedAudio() || '';
+              audioRef.current.play();
+            }
+          }}
+          disabled={playing || hmsDiagnostics.getRecordedAudio() === TEST_AUDIO_URL}
+        >
+          <SpeakerIcon />
+          {playing ? 'Playing...' : 'Playback'}
+        </Button>
+        <audio
+          ref={audioRef}
+          onEnded={() => setPlaying(false)}
+          onPlay={() => setPlaying(true)}
+          style={{ display: 'none' }}
+        />
+      </Flex>
+
+      <Flex align="center" css={{ mt: '$4', maxWidth: '10rem', opacity: isRecording ? '1' : '0', gap: '$4' }}>
+        <Text>
+          <MicOnIcon />
+        </Text>
+        <Progress.Root value={audioLevel} css={{ h: '$2' }}>
+          <Progress.Content
+            style={{
+              transform: `translateX(-${100 - audioLevel}%)`,
+              transition: 'transform 0.3s',
+            }}
+          />
+        </Progress.Root>
       </Flex>
     </SelectContainer>
   );
@@ -84,12 +110,15 @@ const SpeakerTest = () => {
   const actions = useHMSActions();
   const devices = useHMSStore(selectDevices);
   const { audioOutputDeviceId } = useHMSStore(selectLocalMediaSettings);
-  const { playing, setPlaying, audioRef } = useAudioOutputTest({ deviceId: audioOutputDeviceId || 'default' });
+
+  if (devices.audioOutput.length === 0) {
+    return <></>;
+  }
 
   return (
     <SelectContainer>
       <DeviceSelector
-        title="Speaker(output)"
+        title="Speaker (Output)"
         devices={devices.audioOutput}
         selection={audioOutputDeviceId || 'default'}
         icon={<SpeakerIcon />}
@@ -97,24 +126,6 @@ const SpeakerTest = () => {
           actions.setAudioOutputDevice(deviceId);
         }}
       />
-      <Button
-        onClick={() => {
-          if (audioRef.current) {
-            audioRef.current.src = hmsDiagnostics.getRecordedAudio() || TEST_AUDIO_URL;
-            audioRef.current.play();
-          }
-        }}
-        disabled={playing}
-      >
-        <SpeakerIcon />
-        <Text css={{ ml: '$4' }}>{playing ? 'Playing' : 'Playback'}</Text>
-      </Button>
-      <audio
-        ref={audioRef}
-        onEnded={() => setPlaying(false)}
-        onPlay={() => setPlaying(true)}
-        style={{ display: 'none' }}
-      />
     </SelectContainer>
   );
 };
@@ -129,8 +140,9 @@ export const AudioTest = () => {
     <>
       <TestContainer>
         <Text variant="body2" css={{ c: '$on_primary_medium' }}>
-          Record an audio clip and play it back to check that your microphone and speaker are working. If they aren't,
-          make sure your volume is turned up, try a different speaker or microphone, or check your bluetooth settings.
+          Record a 10 second audio clip and play it back to check that your microphone and speaker are working. If they
+          aren't, make sure your volume is turned up, try a different speaker or microphone, or check your bluetooth
+          settings.
         </Text>
 
         <Flex

package/src/Diagnostics/ConnectivityTest.tsx

@@ -1,7 +1,7 @@
-import React, { useState } from 'react';
+import React, { useContext, useState } from 'react';
 import { ConnectivityCheckResult, ConnectivityState, DiagnosticsRTCStats } from '@100mslive/react-sdk';
 import { CheckCircleIcon, CrossCircleIcon, LinkIcon } from '@100mslive/react-icons';
-import { TestContainer, TestFooter } from './components';
+import { DiagnosticsContext, TestContainer, TestFooter } from './components';
 import { Button } from '../Button';
 import { Box, Flex } from '../Layout';
 import { Loading } from '../Loading';
@@ -310,12 +310,14 @@ const RegionSelector = ({
 };
 
 export const ConnectivityTest = () => {
+  const { setConnectivityTested } = useContext(DiagnosticsContext);
   const [region, setRegion] = useState<string | undefined>(Object.keys(Regions)[0]);
   const [error, setError] = useState<Error | undefined>();
   const [progress, setProgress] = useState<ConnectivityState>();
   const [result, setResult] = useState<ConnectivityCheckResult | undefined>();
 
   const startTest = () => {
+    setConnectivityTested(false);
     setError(undefined);
     setResult(undefined);
     hmsDiagnostics
@@ -324,6 +326,7 @@ export const ConnectivityTest = () => {
           setProgress(state);
         },
         result => {
+          setConnectivityTested(true);
           setResult(result);
         },
         region,

package/src/Diagnostics/Diagnostics.tsx

@@ -21,8 +21,8 @@ const DiagnosticsStepIcon: Record<string, React.ReactNode> = {
 const Container = ({ children }: { children: React.ReactNode }) => (
   <Box
     css={{
-      px: '155px',
-      py: '160px',
+      px: '120px',
+      py: '120px',
       bg: '$background_dim',
       lineHeight: '1.5',
       '-webkit-text-size-adjust': '100%',
@@ -67,7 +67,7 @@ const DiagnosticsStepHeader = () => {
 
 const DiagnosticsStep = () => {
   return (
-    <Box css={{ border: '1px solid $border_default', r: '$1', w: '75%', '@lg': { w: '100%' } }}>
+    <Box css={{ border: '1px solid $border_default', r: '$1', w: '75%', maxWidth: '65rem', '@lg': { w: '100%' } }}>
       <DiagnosticsStepHeader />
       <Box css={{ maxHeight: '55vh', overflowY: 'auto' }}>
         <DiagnosticsStepTest />
@@ -77,7 +77,7 @@ const DiagnosticsStep = () => {
 };
 
 const DiagnosticsStepsList = () => {
-  const { activeStep } = useContext(DiagnosticsContext);
+  const { activeStep, connectivityTested } = useContext(DiagnosticsContext);
 
   return (
     <Box css={{ w: '25%', '@lg': { display: 'none' } }}>
@@ -85,15 +85,12 @@ const DiagnosticsStepsList = () => {
         const keys = Object.keys(DiagnosticsSteps);
         const activeStepIndex = keys.indexOf(activeStep);
         const keyIndex = keys.indexOf(key);
-        const isStepCompleted = activeStepIndex > keyIndex;
+        const isStepCompleted = activeStepIndex > keyIndex || (activeStep === 'connectivity' && connectivityTested);
 
         let color = '$on_primary_low';
         if (isStepCompleted) {
           color = '$primary_bright';
         }
-        if (activeStep === key) {
-          color = '$on_primary_high';
-        }
 
         return (
           <Flex css={{ mb: '$10', c: color, gap: '$4', alignItems: 'center' }}>
@@ -112,10 +109,11 @@ const DiagnosticsStepsList = () => {
 
 export const Diagnostics = () => {
   const [activeStep, setActiveStep] = React.useState(Object.keys(DiagnosticsSteps)[0]);
+  const [connectivityTested, setConnectivityTested] = React.useState(false);
   return (
     <HMSRoomProvider store={hmsStore} actions={hmsActions} notifications={hmsNotifications} stats={hmsStats}>
       <HMSThemeProvider themeType="default">
-        <DiagnosticsContext.Provider value={{ activeStep, setActiveStep }}>
+        <DiagnosticsContext.Provider value={{ activeStep, setActiveStep, connectivityTested, setConnectivityTested }}>
           <Container>
             <Text variant="h4">Pre-call Test</Text>
             <Text variant="md" css={{ c: '$on_primary_medium' }}>

package/src/Diagnostics/VideoTest.tsx

@@ -27,10 +27,10 @@ export const VideoTest = () => {
         {trackID && (
           <StyledVideoTile.Container
             css={{
-              w: '90%',
-              height: '$48',
+              width: '90%',
+              aspectRatio: '16/9',
               mr: '$10',
-              '@lg': { mr: 0, mb: '$10' },
+              '@lg': { mr: 0, mb: '$10', aspectRatio: '1/1' },
             }}
           >
             <Video mirror={true} trackId={trackID} />

package/src/Diagnostics/components.tsx

@@ -15,11 +15,17 @@ export const DiagnosticsSteps: Record<string, string> = {
 export const DiagnosticsContext = React.createContext<{
   activeStep: string;
   setActiveStep: React.Dispatch<React.SetStateAction<string>>;
+  connectivityTested: boolean;
+  setConnectivityTested: React.Dispatch<React.SetStateAction<boolean>>;
 }>({
   activeStep: 'video',
   setActiveStep: () => {
     return;
   },
+  connectivityTested: false,
+  setConnectivityTested: () => {
+    return;
+  },
 });
 
 export const TestContainer = ({ css, children }: { css?: CSS; children: React.ReactNode }) => {
@@ -55,11 +61,17 @@ export const TestFooter = ({
       css={{
         py: '$8',
         px: '$10',
+        position: 'sticky',
+        bottom: '0',
+        background: '$background_dim',
         justifyContent: 'space-between',
         alignItems: 'center',
         borderTop: '1px solid $border_default',
         fontSize: '$sm',
+        borderBottomLeftRadius: '$1',
+        borderBottomRightRadius: '$1',
         lineHeight: '$sm',
+        zIndex: 1001,
         '@lg': { flexDirection: 'column', gap: '$8' },
       }}
     >

package/src/Prebuilt/App.tsx

@@ -1,10 +1,5 @@
 import React, { MutableRefObject, useEffect, useRef } from 'react';
-import {
-  HMSDiagnosticsInterface,
-  HMSStatsStoreWrapper,
-  HMSStoreWrapper,
-  IHMSNotifications,
-} from '@100mslive/hms-video-store';
+import { HMSStatsStoreWrapper, HMSStoreWrapper, IHMSNotifications } from '@100mslive/hms-video-store';
 import { Layout, Logo, Screens, Theme, Typography } from '@100mslive/types-prebuilt';
 import { match } from 'ts-pattern';
 import {
@@ -85,7 +80,6 @@ export type HMSPrebuiltRefType = {
   hmsStore: HMSStoreWrapper;
   hmsStats: HMSStatsStoreWrapper;
   hmsNotifications: IHMSNotifications;
-  hmsDiagnostics: HMSDiagnosticsInterface;
 };
 
 export const HMSPrebuilt = React.forwardRef<HMSPrebuiltRefType, HMSPrebuiltProps>(
@@ -115,7 +109,6 @@ export const HMSPrebuilt = React.forwardRef<HMSPrebuiltRefType, HMSPrebuiltProps
       const hmsActions = hms.getActions();
       const hmsNotifications = hms.getNotifications();
       const hmsStats = hms.getStats();
-      const hmsDiagnostics = hms.getDiagnosticsSDK();
       hms.triggerOnSubscribe();
 
       reactiveStore.current = {
@@ -123,7 +116,6 @@ export const HMSPrebuilt = React.forwardRef<HMSPrebuiltRefType, HMSPrebuiltProps
         hmsStats,
         hmsStore,
         hmsNotifications,
-        hmsDiagnostics,
       };
     }, []);