@100mslive/roomkit-react 0.3.11-alpha.4 → 0.3.11-alpha.6

package/dist/meta.esbuild.json

@@ -2884,7 +2884,7 @@
       "format": "esm"
     },
     "src/Prebuilt/common/hooks.ts": {
-      "bytes": 8658,
+      "bytes": 8890,
       "imports": [
         {
           "path": "react",
@@ -2936,6 +2936,11 @@
           "kind": "import-statement",
           "original": "../provider/roomLayoutProvider/hooks/useRoomLayoutScreen"
         },
+        {
+          "path": "src/Prebuilt/common/utils.js",
+          "kind": "import-statement",
+          "original": "../common/utils"
+        },
         {
           "path": "src/Prebuilt/common/constants.ts",
           "kind": "import-statement",
@@ -3874,7 +3879,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/MoreSettings/CaptionContent.tsx": {
-      "bytes": 4785,
+      "bytes": 4817,
       "imports": [
         {
           "path": "react",
@@ -4162,7 +4167,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/MoreSettings/SplitComponents/DesktopOptions.tsx": {
-      "bytes": 9336,
+      "bytes": 8447,
       "imports": [
         {
           "path": "react",
@@ -5110,7 +5115,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/MoreSettings/SplitComponents/MwebOptions.tsx": {
-      "bytes": 13046,
+      "bytes": 12430,
       "imports": [
         {
           "path": "react",
@@ -10444,7 +10449,7 @@
       ],
       "format": "esm"
     },
-    "../../../../../../../tmp/tmp-2829-Ahld4ijGqZ75/18fa4f756302/tldraw.css": {
+    "../../../../../../../tmp/tmp-2882-2YUxhrGA2jsu/18fa993d4a82/tldraw.css": {
       "bytes": 80111,
       "imports": [
         {
@@ -10494,7 +10499,7 @@
         }
       ]
     },
-    "../../../../../../../tmp/tmp-2829-Ahld4ijGqZ75/18fa4f755cd0/index.css": {
+    "../../../../../../../tmp/tmp-2882-2YUxhrGA2jsu/18fa993d4310/index.css": {
       "bytes": 597,
       "imports": [
         {
@@ -10503,7 +10508,7 @@
           "external": true
         },
         {
-          "path": "../../../../../../../tmp/tmp-2829-Ahld4ijGqZ75/18fa4f756302/tldraw.css",
+          "path": "../../../../../../../tmp/tmp-2882-2YUxhrGA2jsu/18fa993d4a82/tldraw.css",
           "kind": "import-rule",
           "original": "@tldraw/tldraw/tldraw.css"
         }
@@ -10578,7 +10583,7 @@
           "original": "../../common/constants"
         },
         {
-          "path": "../../../../../../../tmp/tmp-2829-Ahld4ijGqZ75/18fa4f755cd0/index.css",
+          "path": "../../../../../../../tmp/tmp-2882-2YUxhrGA2jsu/18fa993d4310/index.css",
           "kind": "import-statement",
           "original": "@100mslive/hms-whiteboard/index.css"
         },
@@ -13666,7 +13671,7 @@
     "dist/index.js": {
       "imports": [
         {
-          "path": "dist/chunk-GSFPM77I.js",
+          "path": "dist/chunk-6RJ75CE5.js",
           "kind": "import-statement"
         }
       ],
@@ -13740,16 +13745,16 @@
       "inputs": {},
       "bytes": 1822
     },
-    "dist/HLSView-MHOO2EMG.js.map": {
+    "dist/HLSView-EDTAEGGA.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
       "bytes": 99904
     },
-    "dist/HLSView-MHOO2EMG.js": {
+    "dist/HLSView-EDTAEGGA.js": {
       "imports": [
         {
-          "path": "dist/chunk-GSFPM77I.js",
+          "path": "dist/chunk-6RJ75CE5.js",
           "kind": "import-statement"
         },
         {
@@ -13927,7 +13932,7 @@
         "default"
       ],
       "entryPoint": "src/Prebuilt/layouts/HLSView.jsx",
-      "cssBundle": "dist/HLSView-GJNR5AIU.css",
+      "cssBundle": "dist/HLSView-4TKT4P7R.css",
       "inputs": {
         "src/Prebuilt/layouts/HLSView.jsx": {
           "bytesInOutput": 25793
@@ -13986,13 +13991,13 @@
       },
       "bytes": 58515
     },
-    "dist/chunk-GSFPM77I.js.map": {
+    "dist/chunk-6RJ75CE5.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 3251941
+      "bytes": 3249438
     },
-    "dist/chunk-GSFPM77I.js": {
+    "dist/chunk-6RJ75CE5.js": {
       "imports": [
         {
           "path": "react",
@@ -16470,7 +16475,7 @@
           "external": true
         },
         {
-          "path": "dist/HLSView-MHOO2EMG.js",
+          "path": "dist/HLSView-EDTAEGGA.js",
           "kind": "dynamic-import"
         },
         {
@@ -16948,7 +16953,7 @@
       ],
       "inputs": {
         "<define:process.env>": {
-          "bytesInOutput": 17869
+          "bytesInOutput": 17871
         },
         "../../node_modules/lodash/lodash.js": {
           "bytesInOutput": 224301
@@ -17305,7 +17310,7 @@
           "bytesInOutput": 606
         },
         "src/Prebuilt/common/hooks.ts": {
-          "bytesInOutput": 6276
+          "bytesInOutput": 6357
         },
         "src/Prebuilt/components/Leave/LeaveRoom.tsx": {
           "bytesInOutput": 2346
@@ -17332,7 +17337,7 @@
           "bytesInOutput": 474
         },
         "src/Prebuilt/components/MoreSettings/SplitComponents/DesktopOptions.tsx": {
-          "bytesInOutput": 8135
+          "bytesInOutput": 7090
         },
         "src/Prebuilt/components/PIP/index.jsx": {
           "bytesInOutput": 178
@@ -17371,7 +17376,7 @@
           "bytesInOutput": 989
         },
         "src/Prebuilt/components/MoreSettings/CaptionContent.tsx": {
-          "bytesInOutput": 4749
+          "bytesInOutput": 4757
         },
         "src/Prebuilt/components/MoreSettings/FullScreenItem.tsx": {
           "bytesInOutput": 628
@@ -17392,7 +17397,7 @@
           "bytesInOutput": 1651
         },
         "src/Prebuilt/components/MoreSettings/SplitComponents/MwebOptions.tsx": {
-          "bytesInOutput": 11600
+          "bytesInOutput": 10844
         },
         "src/Prebuilt/components/Header/StreamActions.tsx": {
           "bytesInOutput": 9080
@@ -17790,7 +17795,7 @@
         "src/Prebuilt/components/VideoLayouts/WhiteboardLayout.tsx": {
           "bytesInOutput": 2656
         },
-        "../../../../../../../tmp/tmp-2829-Ahld4ijGqZ75/18fa4f755cd0/index.css": {
+        "../../../../../../../tmp/tmp-2882-2YUxhrGA2jsu/18fa993d4310/index.css": {
           "bytesInOutput": 0
         },
         "src/Prebuilt/common/PeersSorter.ts": {
@@ -17929,7 +17934,7 @@
           "bytesInOutput": 651
         }
       },
-      "bytes": 1303464
+      "bytes": 1301754
     },
     "dist/index.css.map": {
       "imports": [],
@@ -17991,22 +17996,22 @@
         }
       ],
       "inputs": {
-        "../../../../../../../tmp/tmp-2829-Ahld4ijGqZ75/18fa4f756302/tldraw.css": {
+        "../../../../../../../tmp/tmp-2882-2YUxhrGA2jsu/18fa993d4a82/tldraw.css": {
           "bytesInOutput": 75223
         },
-        "../../../../../../../tmp/tmp-2829-Ahld4ijGqZ75/18fa4f755cd0/index.css": {
+        "../../../../../../../tmp/tmp-2882-2YUxhrGA2jsu/18fa993d4310/index.css": {
           "bytesInOutput": 401
         }
       },
       "bytes": 75901
     },
-    "dist/HLSView-GJNR5AIU.css.map": {
+    "dist/HLSView-4TKT4P7R.css.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
       "bytes": 122402
     },
-    "dist/HLSView-GJNR5AIU.css": {
+    "dist/HLSView-4TKT4P7R.css": {
       "imports": [
         {
           "path": "https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap",
@@ -18060,10 +18065,10 @@
         }
       ],
       "inputs": {
-        "../../../../../../../tmp/tmp-2829-Ahld4ijGqZ75/18fa4f756302/tldraw.css": {
+        "../../../../../../../tmp/tmp-2882-2YUxhrGA2jsu/18fa993d4a82/tldraw.css": {
           "bytesInOutput": 75223
         },
-        "../../../../../../../tmp/tmp-2829-Ahld4ijGqZ75/18fa4f755cd0/index.css": {
+        "../../../../../../../tmp/tmp-2882-2YUxhrGA2jsu/18fa993d4310/index.css": {
           "bytesInOutput": 401
         }
       },

package/package.json

@@ -10,7 +10,7 @@
     "prebuilt",
     "roomkit"
   ],
-  "version": "0.3.11-alpha.4",
+  "version": "0.3.11-alpha.6",
   "author": "100ms",
   "license": "MIT",
   "repository": {
@@ -74,12 +74,12 @@
     "react": ">=17.0.2 <19.0.0"
   },
   "dependencies": {
-    "@100mslive/hls-player": "0.3.11-alpha.4",
+    "@100mslive/hls-player": "0.3.11-alpha.6",
     "@100mslive/hms-noise-cancellation": "0.0.1",
-    "@100mslive/hms-virtual-background": "1.13.11-alpha.4",
-    "@100mslive/hms-whiteboard": "0.0.1-alpha.4",
-    "@100mslive/react-icons": "0.10.11-alpha.4",
-    "@100mslive/react-sdk": "0.10.11-alpha.4",
+    "@100mslive/hms-virtual-background": "1.13.11-alpha.6",
+    "@100mslive/hms-whiteboard": "0.0.1-alpha.6",
+    "@100mslive/react-icons": "0.10.11-alpha.6",
+    "@100mslive/react-sdk": "0.10.11-alpha.6",
     "@100mslive/types-prebuilt": "0.12.8",
     "@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": "c39a01d169bc0ab2239fcc4baf7b6cb205653c5c"
+  "gitHead": "951030b3ea1ecbfba6a716713b329bb3a56b7653"
 }

package/src/Prebuilt/common/hooks.ts

@@ -28,6 +28,8 @@ import { useRoomLayout } from '../provider/roomLayoutProvider';
 // @ts-ignore
 import { useSetAppDataByKey } from '../components/AppData/useUISettings';
 import { useRoomLayoutConferencingScreen } from '../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
+// @ts-ignore: No implicit any
+import { isScreenshareSupported } from '../common/utils';
 import { APP_DATA, CHAT_SELECTOR, RTMP_RECORD_DEFAULT_RESOLUTION } from './constants';
 /**
  * Hook to execute a callback when alone in room(after a certain 5d of time)
@@ -232,9 +234,11 @@ export interface WaitingRoomInfo {
 export function useWaitingRoomInfo(): WaitingRoomInfo {
   const localPeerRole = useHMSStore(selectLocalPeerRole);
   const { video, audio, screen } = useHMSStore(selectIsAllowedToPublish);
+  const isScreenShareAllowed = isScreenshareSupported();
   const roles = useHMSStore(selectRolesMap);
   const peersByRoles = useHMSStore(selectPeersByRoles(localPeerRole?.subscribeParams.subscribeToRoles || []));
-  const isNotAllowedToPublish = !(video || audio || screen);
+  // show no publish as screenshare in mweb is not possible
+  const isNotAllowedToPublish = !(video || audio || (screen && isScreenShareAllowed));
   const isScreenOnlyPublishParams: boolean = screen && !(video || audio);
   const hasSubscribedRolePublishing: boolean = useMemo(() => {
     return peersByRoles.some((peer: HMSPeer) => {

package/src/Prebuilt/components/MoreSettings/CaptionContent.tsx

@@ -38,7 +38,8 @@ export const CaptionContent = ({ isMobile, onExit }: { isMobile: boolean; onExit
       </Text>
       {!isMobile ? (
         <Text variant="sm" css={{ color: '$on_surface_medium', pb: '$6', mb: '$8', '@md': { px: '$8', mt: '$4' } }}>
-          This will {isTranscriptionEnabled ? 'disable' : 'enable'} Closed Captions for everyone in this room. You can
+          This will {isTranscriptionEnabled ? 'disable' : 'enable'} Closed Captions for everyone in this room. You
+          can&nbsp;
           {isTranscriptionEnabled ? 'enable' : 'disable'} it later.
         </Text>
       ) : null}
@@ -123,7 +124,8 @@ export const CaptionContent = ({ isMobile, onExit }: { isMobile: boolean; onExit
       </Flex>
       {isMobile && (
         <Text variant="sm" css={{ color: '$on_surface_medium', pb: '$6', mb: '$8', '@md': { px: '$8', mt: '$4' } }}>
-          This will {isTranscriptionEnabled ? 'disable' : 'enable'} Closed Captions for everyone in this room. You can
+          This will {isTranscriptionEnabled ? 'disable' : 'enable'} Closed Captions for everyone in this room. You
+          can&nbsp;
           {isTranscriptionEnabled ? 'enable' : 'disable'} it later.
         </Text>
       )}

package/src/Prebuilt/components/MoreSettings/SplitComponents/DesktopOptions.tsx

@@ -6,23 +6,9 @@ import {
   HLSLiveStreamingScreen_Elements,
 } from '@100mslive/types-prebuilt';
 import { match } from 'ts-pattern';
-import {
-  selectAppData,
-  selectIsTranscriptionEnabled,
-  selectLocalPeerID,
-  useHMSActions,
-  useHMSStore,
-} from '@100mslive/react-sdk';
-import {
-  BrbIcon,
-  CheckIcon,
-  HamburgerMenuIcon,
-  InfoIcon,
-  OpenCaptionIcon,
-  PipIcon,
-  SettingsIcon,
-} from '@100mslive/react-icons';
-import { Checkbox, Dropdown, Flex, Switch, Text, Tooltip } from '../../../..';
+import { selectAppData, selectLocalPeerID, useHMSActions, useHMSStore } from '@100mslive/react-sdk';
+import { BrbIcon, CheckIcon, HamburgerMenuIcon, InfoIcon, PipIcon, SettingsIcon } from '@100mslive/react-icons';
+import { Checkbox, Dropdown, Flex, Text, Tooltip } from '../../../..';
 import IconButton from '../../../IconButton';
 // @ts-ignore: No implicit any
 import { PIP } from '../../PIP';
@@ -75,7 +61,6 @@ export const DesktopOptions = ({
   const { isBRBOn, toggleBRB } = useMyMetadata();
   const isPipOn = PictureInPicture.isOn();
   const isBRBEnabled = !!elements?.brb;
-  const isTranscriptionEnabled = useHMSStore(selectIsTranscriptionEnabled);
 
   useDropdownList({ open: openModals.size > 0, name: 'MoreSettings' });
 
@@ -131,24 +116,6 @@ export const DesktopOptions = ({
               </Flex>
             </Dropdown.Item>
           ) : null}
-
-          <Dropdown.Item
-            data-testid="closed_caption_admin"
-            onClick={() => {
-              updateState(MODALS.CAPTION, true);
-            }}
-          >
-            <OpenCaptionIcon />
-            <Flex direction="column" css={{ flexGrow: '1' }}>
-              <Text variant="sm" css={{ ml: '$4', color: '$on_surface_high' }}>
-                Closed Captions
-              </Text>
-              <Text variant="caption" css={{ ml: '$4', color: '$on_surface_medium' }}>
-                {isTranscriptionEnabled ? 'Enabled' : 'Disabled'}
-              </Text>
-            </Flex>
-            <Switch id="closed_caption_start_stop" checked={isTranscriptionEnabled} disabled={false} />
-          </Dropdown.Item>
           {screenType !== 'hls_live_streaming' ? (
             <Dropdown.Item css={{ p: 0, '&:empty': { display: 'none' } }}>
               <PIP

package/src/Prebuilt/components/MoreSettings/SplitComponents/MwebOptions.tsx

@@ -5,7 +5,6 @@ import { match } from 'ts-pattern';
 import {
   selectIsConnectedToRoom,
   selectIsLocalVideoEnabled,
-  selectIsTranscriptionEnabled,
   selectPeerCount,
   selectPermissions,
   useHMSActions,
@@ -14,14 +13,12 @@ import {
 } from '@100mslive/react-sdk';
 import {
   BrbIcon,
-  ClosedCaptionIcon,
   CrossIcon,
   EmojiIcon,
   HamburgerMenuIcon,
   HandIcon,
   HandRaiseSlashedIcon,
   InfoIcon,
-  OpenCaptionIcon,
   PeopleIcon,
   QuizActiveIcon,
   QuizIcon,
@@ -53,7 +50,7 @@ import { useSheetToggle } from '../../AppData/useSheet';
 // @ts-ignore: No implicit any
 import { usePollViewToggle, useSidepaneToggle } from '../../AppData/useSidepane';
 // @ts-ignore: No implicit Any
-import { useSetIsCaptionEnabled, useShowPolls } from '../../AppData/useUISettings';
+import { useShowPolls } from '../../AppData/useUISettings';
 // @ts-ignore: No implicit any
 import { useDropdownList } from '../../hooks/useDropdownList';
 import { useMyMetadata } from '../../hooks/useMetadata';
@@ -108,9 +105,6 @@ export const MwebOptions = ({
   const isLocalVideoEnabled = useHMSStore(selectIsLocalVideoEnabled);
   const { startRecording, isRecordingLoading } = useRecordingHandler();
 
-  const isTranscriptionEnabled = useHMSStore(selectIsTranscriptionEnabled);
-
-  const [isCaptionEnabled] = useSetIsCaptionEnabled();
   useDropdownList({ open: openModals.size > 0 || openOptionsSheet || openSettingsSheet, name: 'MoreSettings' });
 
   const updateState = (modalName: string, value: boolean) => {
@@ -195,15 +189,6 @@ export const MwebOptions = ({
                 <ActionTile.Title>{isHandRaised ? 'Lower' : 'Raise'} Hand</ActionTile.Title>
               </ActionTile.Root>
             ) : null}
-            <ActionTile.Root
-              onClick={() => {
-                setOpenOptionsSheet(false);
-                updateState(MODALS.CAPTION, true);
-              }}
-            >
-              {isTranscriptionEnabled && isCaptionEnabled ? <ClosedCaptionIcon /> : <OpenCaptionIcon />}
-              <ActionTile.Title>Closed Caption</ActionTile.Title>
-            </ActionTile.Root>
             {isLocalVideoEnabled && !!elements?.virtual_background ? (
               <ActionTile.Root
                 onClick={() => {