@100mslive/roomkit-react 0.3.12-alpha.5 → 0.3.12-alpha.7

package/dist/meta.esbuild.json

@@ -26,7 +26,7 @@
       "format": "esm"
     },
     "src/Prebuilt/common/constants.ts": {
-      "bytes": 4521,
+      "bytes": 4563,
       "imports": [
         {
           "path": "@100mslive/react-sdk",
@@ -1997,7 +1997,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/AppData/useUISettings.js": {
-      "bytes": 6214,
+      "bytes": 6649,
       "imports": [
         {
           "path": "react",
@@ -2277,7 +2277,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/AppData/AppData.tsx": {
-      "bytes": 5935,
+      "bytes": 6297,
       "imports": [
         {
           "path": "react",
@@ -2850,7 +2850,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/AudioVideoToggle.tsx": {
-      "bytes": 9981,
+      "bytes": 10776,
       "imports": [
         {
           "path": "react",
@@ -2922,6 +2922,11 @@
           "kind": "import-statement",
           "original": "../provider/roomLayoutProvider/hooks/useRoomLayoutScreen"
         },
+        {
+          "path": "src/Prebuilt/components/AppData/useUISettings.js",
+          "kind": "import-statement",
+          "original": "./AppData/useUISettings"
+        },
         {
           "path": "src/Prebuilt/components/hooks/useAudioOutputTest.tsx",
           "kind": "import-statement",
@@ -4890,7 +4895,7 @@
       "format": "cjs"
     },
     "../hms-video-store/dist/index.js": {
-      "bytes": 338124,
+      "bytes": 339294,
       "imports": [
         {
           "path": "../../node_modules/reselect/es/index.js",
@@ -6769,7 +6774,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/Streaming/Common.jsx": {
-      "bytes": 3964,
+      "bytes": 4034,
       "imports": [
         {
           "path": "react",
@@ -10944,7 +10949,7 @@
       ],
       "format": "esm"
     },
-    "../../../../../../../tmp/tmp-2820-qIAsQhpY2UjE/18fe8231ee82/tldraw.css": {
+    "../../../../../../../tmp/tmp-2799-B2lKLlzDadvJ/1900669ab903/tldraw.css": {
       "bytes": 80111,
       "imports": [
         {
@@ -10994,7 +10999,7 @@
         }
       ]
     },
-    "../../../../../../../tmp/tmp-2820-qIAsQhpY2UjE/18fe8231e7a0/index.css": {
+    "../../../../../../../tmp/tmp-2799-B2lKLlzDadvJ/1900669ab1e0/index.css": {
       "bytes": 597,
       "imports": [
         {
@@ -11003,7 +11008,7 @@
           "external": true
         },
         {
-          "path": "../../../../../../../tmp/tmp-2820-qIAsQhpY2UjE/18fe8231ee82/tldraw.css",
+          "path": "../../../../../../../tmp/tmp-2799-B2lKLlzDadvJ/1900669ab903/tldraw.css",
           "kind": "import-rule",
           "original": "@tldraw/tldraw/tldraw.css"
         }
@@ -11078,7 +11083,7 @@
           "original": "../../common/constants"
         },
         {
-          "path": "../../../../../../../tmp/tmp-2820-qIAsQhpY2UjE/18fe8231e7a0/index.css",
+          "path": "../../../../../../../tmp/tmp-2799-B2lKLlzDadvJ/1900669ab1e0/index.css",
           "kind": "import-statement",
           "original": "@100mslive/hms-whiteboard/index.css"
         },
@@ -11275,13 +11280,18 @@
       "format": "esm"
     },
     "src/Prebuilt/plugins/CaptionsViewer.tsx": {
-      "bytes": 7075,
+      "bytes": 7363,
       "imports": [
         {
           "path": "react",
           "kind": "import-statement",
           "external": true
         },
+        {
+          "path": "react-draggable",
+          "kind": "import-statement",
+          "external": true
+        },
         {
           "path": "react-use",
           "kind": "import-statement",
@@ -14302,7 +14312,7 @@
     "dist/index.js": {
       "imports": [
         {
-          "path": "dist/chunk-AKD6OMF6.js",
+          "path": "dist/chunk-KBVFTNP3.js",
           "kind": "import-statement"
         }
       ],
@@ -14376,16 +14386,16 @@
       "inputs": {},
       "bytes": 1822
     },
-    "dist/HLSView-FFS2AZC5.js.map": {
+    "dist/HLSView-Z6DOGESA.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
       "bytes": 100275
     },
-    "dist/HLSView-FFS2AZC5.js": {
+    "dist/HLSView-Z6DOGESA.js": {
       "imports": [
         {
-          "path": "dist/chunk-AKD6OMF6.js",
+          "path": "dist/chunk-KBVFTNP3.js",
           "kind": "import-statement"
         },
         {
@@ -14563,7 +14573,7 @@
         "default"
       ],
       "entryPoint": "src/Prebuilt/layouts/HLSView.jsx",
-      "cssBundle": "dist/HLSView-KS57W3WL.css",
+      "cssBundle": "dist/HLSView-5NGWLWHH.css",
       "inputs": {
         "src/Prebuilt/layouts/HLSView.jsx": {
           "bytesInOutput": 27671
@@ -14622,13 +14632,13 @@
       },
       "bytes": 61702
     },
-    "dist/chunk-AKD6OMF6.js.map": {
+    "dist/chunk-KBVFTNP3.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 3271970
+      "bytes": 3277660
     },
-    "dist/chunk-AKD6OMF6.js": {
+    "dist/chunk-KBVFTNP3.js": {
       "imports": [
         {
           "path": "react",
@@ -17080,6 +17090,11 @@
           "kind": "import-statement",
           "external": true
         },
+        {
+          "path": "react-draggable",
+          "kind": "import-statement",
+          "external": true
+        },
         {
           "path": "react-use",
           "kind": "import-statement",
@@ -17101,7 +17116,7 @@
           "external": true
         },
         {
-          "path": "dist/HLSView-FFS2AZC5.js",
+          "path": "dist/HLSView-Z6DOGESA.js",
           "kind": "dynamic-import"
         },
         {
@@ -17603,7 +17618,7 @@
       ],
       "inputs": {
         "<define:process.env>": {
-          "bytesInOutput": 17925
+          "bytesInOutput": 17885
         },
         "../../node_modules/lodash/lodash.js": {
           "bytesInOutput": 224310
@@ -17651,7 +17666,7 @@
           "bytesInOutput": 5061
         },
         "src/Prebuilt/common/constants.ts": {
-          "bytesInOutput": 3571
+          "bytesInOutput": 3613
         },
         "src/Theme/ThemeProvider.tsx": {
           "bytesInOutput": 1926
@@ -17861,7 +17876,7 @@
           "bytesInOutput": 7828
         },
         "src/Prebuilt/components/AppData/AppData.tsx": {
-          "bytesInOutput": 5542
+          "bytesInOutput": 6004
         },
         "src/Prebuilt/components/Settings/LayoutSettings.tsx": {
           "bytesInOutput": 2705
@@ -17870,7 +17885,7 @@
           "bytesInOutput": 973
         },
         "src/Prebuilt/components/AppData/useUISettings.js": {
-          "bytesInOutput": 5454
+          "bytesInOutput": 5870
         },
         "src/Prebuilt/components/hooks/useUserPreferences.jsx": {
           "bytesInOutput": 748
@@ -17912,7 +17927,7 @@
           "bytesInOutput": 3306
         },
         "src/Prebuilt/components/AudioVideoToggle.tsx": {
-          "bytesInOutput": 10280
+          "bytesInOutput": 11007
         },
         "src/Prebuilt/components/IconButtonWithOptions/IconButtonWithOptions.tsx": {
           "bytesInOutput": 3173
@@ -18206,7 +18221,7 @@
           "bytesInOutput": 8166
         },
         "src/Prebuilt/components/Streaming/Common.jsx": {
-          "bytesInOutput": 2247
+          "bytesInOutput": 2317
         },
         "src/Prebuilt/components/Polls/common/StatusIndicator.tsx": {
           "bytesInOutput": 795
@@ -18445,7 +18460,7 @@
         "src/Prebuilt/components/VideoLayouts/WhiteboardLayout.tsx": {
           "bytesInOutput": 2793
         },
-        "../../../../../../../tmp/tmp-2820-qIAsQhpY2UjE/18fe8231e7a0/index.css": {
+        "../../../../../../../tmp/tmp-2799-B2lKLlzDadvJ/1900669ab1e0/index.css": {
           "bytesInOutput": 0
         },
         "src/Prebuilt/common/PeersSorter.ts": {
@@ -18458,7 +18473,7 @@
           "bytesInOutput": 1536
         },
         "src/Prebuilt/plugins/CaptionsViewer.tsx": {
-          "bytesInOutput": 6381
+          "bytesInOutput": 6631
         },
         "src/Prebuilt/components/hooks/useCloseScreenshareWhiteboard.tsx": {
           "bytesInOutput": 619
@@ -18587,7 +18602,7 @@
           "bytesInOutput": 651
         }
       },
-      "bytes": 1342758
+      "bytes": 1344685
     },
     "dist/index.css.map": {
       "imports": [],
@@ -18649,22 +18664,22 @@
         }
       ],
       "inputs": {
-        "../../../../../../../tmp/tmp-2820-qIAsQhpY2UjE/18fe8231ee82/tldraw.css": {
+        "../../../../../../../tmp/tmp-2799-B2lKLlzDadvJ/1900669ab903/tldraw.css": {
           "bytesInOutput": 75223
         },
-        "../../../../../../../tmp/tmp-2820-qIAsQhpY2UjE/18fe8231e7a0/index.css": {
+        "../../../../../../../tmp/tmp-2799-B2lKLlzDadvJ/1900669ab1e0/index.css": {
           "bytesInOutput": 401
         }
       },
       "bytes": 75901
     },
-    "dist/HLSView-KS57W3WL.css.map": {
+    "dist/HLSView-5NGWLWHH.css.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
       "bytes": 122402
     },
-    "dist/HLSView-KS57W3WL.css": {
+    "dist/HLSView-5NGWLWHH.css": {
       "imports": [
         {
           "path": "https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap",
@@ -18718,10 +18733,10 @@
         }
       ],
       "inputs": {
-        "../../../../../../../tmp/tmp-2820-qIAsQhpY2UjE/18fe8231ee82/tldraw.css": {
+        "../../../../../../../tmp/tmp-2799-B2lKLlzDadvJ/1900669ab903/tldraw.css": {
           "bytesInOutput": 75223
         },
-        "../../../../../../../tmp/tmp-2820-qIAsQhpY2UjE/18fe8231e7a0/index.css": {
+        "../../../../../../../tmp/tmp-2799-B2lKLlzDadvJ/1900669ab1e0/index.css": {
           "bytesInOutput": 401
         }
       },

package/package.json

@@ -10,7 +10,7 @@
     "prebuilt",
     "roomkit"
   ],
-  "version": "0.3.12-alpha.5",
+  "version": "0.3.12-alpha.7",
   "author": "100ms",
   "license": "MIT",
   "repository": {
@@ -74,13 +74,13 @@
     "react": ">=17.0.2 <19.0.0"
   },
   "dependencies": {
-    "@100mslive/hls-player": "0.3.12-alpha.5",
+    "@100mslive/hls-player": "0.3.12-alpha.7",
     "@100mslive/hms-noise-cancellation": "0.0.1",
-    "@100mslive/hms-virtual-background": "1.13.12-alpha.5",
-    "@100mslive/hms-whiteboard": "0.0.2-alpha.5",
-    "@100mslive/react-icons": "0.10.12-alpha.5",
-    "@100mslive/react-sdk": "0.10.12-alpha.5",
-    "@100mslive/types-prebuilt": "0.12.8",
+    "@100mslive/hms-virtual-background": "1.13.12-alpha.7",
+    "@100mslive/hms-whiteboard": "0.0.2-alpha.7",
+    "@100mslive/react-icons": "0.10.12-alpha.7",
+    "@100mslive/react-sdk": "0.10.12-alpha.7",
+    "@100mslive/types-prebuilt": "0.12.9",
     "@emoji-mart/data": "^1.0.6",
     "@emoji-mart/react": "^1.0.1",
     "@radix-ui/react-accordion": "1.0.0",
@@ -115,5 +115,5 @@
     "uuid": "^8.3.2",
     "worker-timers": "^7.0.40"
   },
-  "gitHead": "09711a75695943a34c79faf0c018f57b80ad0fa7"
+  "gitHead": "b88ca5d4312e552bb6379028339d8c27f6de09aa"
 }

package/src/Prebuilt/common/constants.ts

@@ -47,6 +47,7 @@ export const APP_DATA = {
   sheet: 'sheet',
   caption: 'caption',
   loadingEffects: 'loadingEffects',
+  noiseCancellation: 'noiseCancellation',
 };
 
 export const UI_SETTINGS = {

package/src/Prebuilt/components/AppData/AppData.tsx

@@ -17,7 +17,7 @@ import { UserPreferencesKeys, useUserPreferences } from '../hooks/useUserPrefere
 // @ts-ignore
 import { useIsSidepaneTypeOpen, useSidepaneToggle } from './useSidepane';
 // @ts-ignore
-import { useSetAppDataByKey } from './useUISettings';
+import { useSetAppDataByKey, useSetNoiseCancellationEnabled } from './useUISettings';
 import {
   APP_DATA,
   CHAT_SELECTOR,
@@ -68,6 +68,7 @@ const initialAppData = {
   },
   // by default on because of on demand now, for beam disabled
   [APP_DATA.caption]: false,
+  [APP_DATA.noiseCancellation]: false,
 };
 
 export const AppData = React.memo(() => {
@@ -78,6 +79,13 @@ export const AppData = React.memo(() => {
   const toggleVB = useSidepaneToggle(SIDE_PANE_OPTIONS.VB);
   const { isLocalVideoEnabled } = useAVToggle();
   const sidepaneOpenedRef = useRef(false);
+  const [, setNoiseCancellationEnabled] = useSetNoiseCancellationEnabled();
+
+  useEffect(() => {
+    if (elements?.noise_cancellation?.enabled_by_default) {
+      setNoiseCancellationEnabled(true);
+    }
+  }, [elements?.noise_cancellation?.enabled_by_default, setNoiseCancellationEnabled]);
 
   const defaultMediaURL = useMemo(() => {
     const media = elements?.virtual_background?.background_media || [];

package/src/Prebuilt/components/AppData/useUISettings.js

@@ -201,3 +201,13 @@ export const usePollViewState = () => {
     view: pollState?.view,
   };
 };
+
+export const useIsNoiseCancellationEnabled = () => {
+  const IsNoiseCancellationEnabled = useHMSStore(selectAppDataByPath(APP_DATA.noiseCancellation));
+  return IsNoiseCancellationEnabled;
+};
+
+export const useSetNoiseCancellationEnabled = () => {
+  const [isNoiseCancellationEnabled, setNoiseCancellationEnabled] = useSetAppDataByKey(APP_DATA.noiseCancellation);
+  return [isNoiseCancellationEnabled, setNoiseCancellationEnabled];
+};

package/src/Prebuilt/components/AudioVideoToggle.tsx

@@ -37,6 +37,8 @@ import { Text } from '../../Text';
 import { Tooltip } from '../../Tooltip';
 import IconButton from '../IconButton';
 import { useRoomLayoutConferencingScreen } from '../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
+// @ts-ignore: No implicit Any
+import { useIsNoiseCancellationEnabled, useSetNoiseCancellationEnabled } from './AppData/useUISettings';
 import { useAudioOutputTest } from './hooks/useAudioOutputTest';
 import { isMacOS, TEST_AUDIO_URL } from '../common/constants';
 
@@ -97,8 +99,8 @@ const OptionLabel = ({ children, icon }: { children: React.ReactNode; icon: Reac
 const plugin = new HMSKrispPlugin();
 const NoiseCancellation = () => {
   const localPeerAudioTrackID = useHMSStore(selectLocalAudioTrackID);
+  const [enabled, setEnabled] = useSetNoiseCancellationEnabled();
   const isPluginAdded = useHMSStore(selectIsLocalAudioPluginPresent(plugin.getName()));
-  const [active, setActive] = useState(isPluginAdded);
   const [inProgress, setInProgress] = useState(false);
   const actions = useHMSActions();
   const room = useHMSStore(selectRoom);
@@ -106,15 +108,15 @@ const NoiseCancellation = () => {
   useEffect(() => {
     (async () => {
       setInProgress(true);
-      if (active && !isPluginAdded) {
+      if (enabled && !isPluginAdded) {
         await actions.addPluginToAudioTrack(plugin);
       }
-      if (!active && isPluginAdded) {
+      if (!enabled && isPluginAdded) {
         await actions.removePluginFromAudioTrack(plugin);
       }
       setInProgress(false);
     })();
-  }, [actions, active, isPluginAdded]);
+  }, [actions, enabled, isPluginAdded]);
 
   if (!plugin.isSupported() || !room.isNoiseCancellationEnabled || !localPeerAudioTrackID) {
     return null;
@@ -132,7 +134,7 @@ const NoiseCancellation = () => {
         }}
         onClick={e => {
           e.preventDefault();
-          setActive(value => !value);
+          setEnabled(!enabled);
         }}
       >
         <Text css={{ display: 'flex', alignItems: 'center', gap: '$2', fontSize: '$xs', '& svg': { size: '$8' } }}>
@@ -141,11 +143,11 @@ const NoiseCancellation = () => {
         </Text>
         <Switch
           id="noise_cancellation"
-          checked={active}
+          checked={enabled && isPluginAdded}
           disabled={inProgress}
           onClick={e => e.stopPropagation()}
           onCheckedChange={value => {
-            setActive(value);
+            setEnabled(value);
           }}
         />
       </Dropdown.Item>
@@ -216,11 +218,28 @@ export const AudioVideoToggle = ({ hideOptions = false }) => {
   const shouldShowAudioOutput = 'setSinkId' in HTMLMediaElement.prototype && Number(audioOutput?.length) > 0;
   const { screenType } = useRoomLayoutConferencingScreen();
   const [showSettings, setShowSettings] = useState(false);
+  const isPluginAdded = useHMSStore(selectIsLocalAudioPluginPresent(plugin.getName()));
+  const isNoiseCancellationEnabled = useIsNoiseCancellationEnabled();
+
+  useEffect(() => {
+    (async () => {
+      if (isNoiseCancellationEnabled && !isPluginAdded) {
+        await actions.addPluginToAudioTrack(plugin);
+      }
+      if (isNoiseCancellationEnabled && isPluginAdded) {
+        ToastManager.addToast({
+          title: `Noise Reduction Enabled`,
+          variant: 'standard',
+          duration: 2000,
+          icon: <AudioLevelIcon />,
+        });
+      }
+    })();
+  }, [actions, isNoiseCancellationEnabled, isPluginAdded]);
 
   if (!toggleAudio && !toggleVideo) {
     return null;
   }
-
   return (
     <Fragment>
       {toggleAudio ? (

package/src/Prebuilt/components/Streaming/Common.jsx

@@ -43,18 +43,19 @@ export const ContentHeader = ({ onBack, onClose, title = '', content }) => {
       css={{ w: '100%', py: '$8', px: '$10', cursor: 'pointer', borderBottom: '1px solid $border_bright', mb: '$8' }}
     >
       {onBack ? (
-        <Text
+        <Flex
+          align="center"
           css={{
-            alignSelf: 'center',
             mr: '$8',
+            color: '$on_surface_high',
           }}
           onClick={onBack}
           data-testid="go_back"
         >
           <ChevronLeftIcon />
-        </Text>
+        </Flex>
       ) : null}
-      <Box css={{ flex: '1 1 0' }}>
+      <Box css={{ flex: '1 1 0', display: 'flex', alignItems: 'center' }}>
         {title ? (
           <Text
             variant="tiny"

package/src/Prebuilt/plugins/CaptionsViewer.tsx

@@ -1,4 +1,5 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
+import Draggable from 'react-draggable';
 import { useMedia } from 'react-use';
 import {
   HMSTranscript,
@@ -178,6 +179,8 @@ export const CaptionsViewer = () => {
 
   const isTranscriptionEnabled = useHMSStore(selectIsTranscriptionEnabled);
 
+  const nodeRef = useRef<HTMLDivElement>(null);
+
   useEffect(() => {
     const timeInterval = setInterval(() => {
       if (!captionQueue) {
@@ -205,30 +208,33 @@ export const CaptionsViewer = () => {
     return null;
   }
   return (
-    <Box
-      css={{
-        position: 'absolute',
-        w: isMobile ? '100%' : '40%',
-        bottom: showCaptionAtTop ? '' : '0',
-        top: showCaptionAtTop ? '0' : '',
-        left: isMobile ? 0 : '50%',
-        transform: isMobile ? '' : 'translateX(-50%)',
-        background: '#000000A3',
-        overflow: 'clip',
-        zIndex: 10,
-        height: 'fit-content',
-        r: '$1',
-        p: '$6',
-        transition: 'bottom 0.3s ease-in-out',
-        '&:empty': { display: 'none' },
-      }}
-    >
-      <Flex direction="column">
-        {dataToShow.map((data: { [key: string]: string }, index: number) => {
-          const key = Object.keys(data)[0];
-          return <TranscriptView key={index} peer_id={key} data={data[key]} />;
-        })}
-      </Flex>
-    </Box>
+    <Draggable bounds="parent" nodeRef={nodeRef} defaultPosition={{ x: isMobile ? 0 : -200, y: 0 }}>
+      <Box
+        ref={nodeRef}
+        css={{
+          position: 'absolute',
+          w: isMobile ? '100%' : '40%',
+          bottom: showCaptionAtTop ? '' : '0',
+          top: showCaptionAtTop ? '0' : '',
+          left: isMobile ? 0 : '50%',
+          transform: isMobile ? '' : 'translateX(-50%)',
+          background: '#000000A3',
+          overflow: 'clip',
+          zIndex: 10,
+          height: 'fit-content',
+          r: '$1',
+          p: '$6',
+          transition: 'bottom 0.3s ease-in-out',
+          '&:empty': { display: 'none' },
+        }}
+      >
+        <Flex direction="column">
+          {dataToShow.map((data: { [key: string]: string }, index: number) => {
+            const key = Object.keys(data)[0];
+            return <TranscriptView key={index} peer_id={key} data={data[key]} />;
+          })}
+        </Flex>
+      </Box>
+    </Draggable>
   );
 };