@100mslive/roomkit-react 0.2.6-alpha.2 → 0.2.6-alpha.3

package/dist/meta.esbuild.json

@@ -26,7 +26,7 @@
       "format": "esm"
     },
     "src/Prebuilt/common/constants.ts": {
-      "bytes": 4304,
+      "bytes": 4269,
       "imports": [
         {
           "path": "@100mslive/react-sdk",
@@ -2068,6 +2068,111 @@
       ],
       "format": "esm"
     },
+    "../../node_modules/lodash/lodash.js": {
+      "bytes": 544098,
+      "imports": [
+        {
+          "path": "<define:process.env>",
+          "kind": "import-statement",
+          "external": true
+        }
+      ],
+      "format": "cjs"
+    },
+    "src/Prebuilt/provider/roomLayoutProvider/constants/index.ts": {
+      "bytes": 1549,
+      "imports": [
+        {
+          "path": "@100mslive/types-prebuilt/elements/join_form",
+          "kind": "import-statement",
+          "external": true
+        },
+        {
+          "path": "<define:process.env>",
+          "kind": "import-statement",
+          "external": true
+        }
+      ],
+      "format": "esm"
+    },
+    "src/Prebuilt/provider/roomLayoutProvider/hooks/useFetchRoomLayout.ts": {
+      "bytes": 2489,
+      "imports": [
+        {
+          "path": "react",
+          "kind": "import-statement",
+          "external": true
+        },
+        {
+          "path": "src/Prebuilt/provider/roomLayoutProvider/constants/index.ts",
+          "kind": "import-statement",
+          "original": "../constants"
+        },
+        {
+          "path": "<define:process.env>",
+          "kind": "import-statement",
+          "external": true
+        },
+        {
+          "path": "<runtime>",
+          "kind": "import-statement",
+          "external": true
+        }
+      ],
+      "format": "esm"
+    },
+    "src/Prebuilt/provider/roomLayoutProvider/index.tsx": {
+      "bytes": 1857,
+      "imports": [
+        {
+          "path": "react",
+          "kind": "import-statement",
+          "external": true
+        },
+        {
+          "path": "../../node_modules/lodash/lodash.js",
+          "kind": "import-statement",
+          "original": "lodash"
+        },
+        {
+          "path": "src/Prebuilt/components/AppData/useUISettings.js",
+          "kind": "import-statement",
+          "original": "../../components/AppData/useUISettings"
+        },
+        {
+          "path": "src/Prebuilt/provider/roomLayoutProvider/hooks/useFetchRoomLayout.ts",
+          "kind": "import-statement",
+          "original": "./hooks/useFetchRoomLayout"
+        },
+        {
+          "path": "<define:process.env>",
+          "kind": "import-statement",
+          "external": true
+        }
+      ],
+      "format": "esm"
+    },
+    "src/Prebuilt/provider/roomLayoutProvider/hooks/useRoomLayoutScreen.ts": {
+      "bytes": 2273,
+      "imports": [
+        {
+          "path": "@100mslive/types-prebuilt",
+          "kind": "import-statement",
+          "external": true
+        },
+        {
+          "path": "src/Prebuilt/provider/roomLayoutProvider/index.tsx",
+          "kind": "import-statement",
+          "original": ".."
+        },
+        {
+          "path": "<define:process.env>",
+          "kind": "import-statement",
+          "external": true
+        }
+      ],
+      "format": "esm"
+    },
     "src/Prebuilt/components/AppData/useSidepane.js": {
       "bytes": 2509,
       "imports": [
@@ -2100,7 +2205,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/AppData/AppData.tsx": {
-      "bytes": 4939,
+      "bytes": 5537,
       "imports": [
         {
           "path": "react",
@@ -2117,6 +2222,11 @@
           "kind": "import-statement",
           "original": "../Settings/LayoutSettings"
         },
+        {
+          "path": "src/Prebuilt/provider/roomLayoutProvider/hooks/useRoomLayoutScreen.ts",
+          "kind": "import-statement",
+          "original": "../../provider/roomLayoutProvider/hooks/useRoomLayoutScreen"
+        },
         {
           "path": "src/Prebuilt/components/hooks/useUserPreferences.jsx",
           "kind": "import-statement",
@@ -3088,111 +3198,6 @@
       ],
       "format": "esm"
     },
-    "../../node_modules/lodash/lodash.js": {
-      "bytes": 544098,
-      "imports": [
-        {
-          "path": "<define:process.env>",
-          "kind": "import-statement",
-          "external": true
-        }
-      ],
-      "format": "cjs"
-    },
-    "src/Prebuilt/provider/roomLayoutProvider/constants/index.ts": {
-      "bytes": 1549,
-      "imports": [
-        {
-          "path": "@100mslive/types-prebuilt/elements/join_form",
-          "kind": "import-statement",
-          "external": true
-        },
-        {
-          "path": "<define:process.env>",
-          "kind": "import-statement",
-          "external": true
-        }
-      ],
-      "format": "esm"
-    },
-    "src/Prebuilt/provider/roomLayoutProvider/hooks/useFetchRoomLayout.ts": {
-      "bytes": 2489,
-      "imports": [
-        {
-          "path": "react",
-          "kind": "import-statement",
-          "external": true
-        },
-        {
-          "path": "src/Prebuilt/provider/roomLayoutProvider/constants/index.ts",
-          "kind": "import-statement",
-          "original": "../constants"
-        },
-        {
-          "path": "<define:process.env>",
-          "kind": "import-statement",
-          "external": true
-        },
-        {
-          "path": "<runtime>",
-          "kind": "import-statement",
-          "external": true
-        }
-      ],
-      "format": "esm"
-    },
-    "src/Prebuilt/provider/roomLayoutProvider/index.tsx": {
-      "bytes": 1857,
-      "imports": [
-        {
-          "path": "react",
-          "kind": "import-statement",
-          "external": true
-        },
-        {
-          "path": "../../node_modules/lodash/lodash.js",
-          "kind": "import-statement",
-          "original": "lodash"
-        },
-        {
-          "path": "src/Prebuilt/components/AppData/useUISettings.js",
-          "kind": "import-statement",
-          "original": "../../components/AppData/useUISettings"
-        },
-        {
-          "path": "src/Prebuilt/provider/roomLayoutProvider/hooks/useFetchRoomLayout.ts",
-          "kind": "import-statement",
-          "original": "./hooks/useFetchRoomLayout"
-        },
-        {
-          "path": "<define:process.env>",
-          "kind": "import-statement",
-          "external": true
-        }
-      ],
-      "format": "esm"
-    },
-    "src/Prebuilt/provider/roomLayoutProvider/hooks/useRoomLayoutScreen.ts": {
-      "bytes": 2273,
-      "imports": [
-        {
-          "path": "@100mslive/types-prebuilt",
-          "kind": "import-statement",
-          "external": true
-        },
-        {
-          "path": "src/Prebuilt/provider/roomLayoutProvider/index.tsx",
-          "kind": "import-statement",
-          "original": ".."
-        },
-        {
-          "path": "<define:process.env>",
-          "kind": "import-statement",
-          "external": true
-        }
-      ],
-      "format": "esm"
-    },
     "src/Prebuilt/common/hooks.ts": {
       "bytes": 3796,
       "imports": [
@@ -8798,7 +8803,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/VirtualBackground/VBPicker.tsx": {
-      "bytes": 6884,
+      "bytes": 7273,
       "imports": [
         {
           "path": "react",
@@ -9144,7 +9149,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/Preview/PreviewJoin.tsx": {
-      "bytes": 9973,
+      "bytes": 9972,
       "imports": [
         {
           "path": "react",
@@ -12329,7 +12334,7 @@
       "format": "esm"
     },
     "src/Prebuilt/App.tsx": {
-      "bytes": 10446,
+      "bytes": 10479,
       "imports": [
         {
           "path": "react",
@@ -12780,7 +12785,7 @@
     "dist/index.js": {
       "imports": [
         {
-          "path": "dist/chunk-DO5NCPPI.js",
+          "path": "dist/chunk-ZJU5GUBY.js",
           "kind": "import-statement"
         }
       ],
@@ -12853,16 +12858,16 @@
       "inputs": {},
       "bytes": 1822
     },
-    "dist/HLSView-U3DKJBM7.js.map": {
+    "dist/HLSView-7QXLQ4KD.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
       "bytes": 59786
     },
-    "dist/HLSView-U3DKJBM7.js": {
+    "dist/HLSView-7QXLQ4KD.js": {
       "imports": [
         {
-          "path": "dist/chunk-DO5NCPPI.js",
+          "path": "dist/chunk-ZJU5GUBY.js",
           "kind": "import-statement"
         },
         {
@@ -13026,13 +13031,13 @@
       },
       "bytes": 37440
     },
-    "dist/chunk-DO5NCPPI.js.map": {
+    "dist/chunk-ZJU5GUBY.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 3101904
+      "bytes": 3103545
     },
-    "dist/chunk-DO5NCPPI.js": {
+    "dist/chunk-ZJU5GUBY.js": {
       "imports": [
         {
           "path": "react",
@@ -13374,6 +13379,21 @@
           "kind": "import-statement",
           "external": true
         },
+        {
+          "path": "react",
+          "kind": "import-statement",
+          "external": true
+        },
+        {
+          "path": "@100mslive/types-prebuilt/elements/join_form",
+          "kind": "import-statement",
+          "external": true
+        },
+        {
+          "path": "react",
+          "kind": "import-statement",
+          "external": true
+        },
         {
           "path": "@100mslive/react-sdk",
           "kind": "import-statement",
@@ -13684,21 +13704,6 @@
           "kind": "import-statement",
           "external": true
         },
-        {
-          "path": "react",
-          "kind": "import-statement",
-          "external": true
-        },
-        {
-          "path": "@100mslive/types-prebuilt/elements/join_form",
-          "kind": "import-statement",
-          "external": true
-        },
-        {
-          "path": "react",
-          "kind": "import-statement",
-          "external": true
-        },
         {
           "path": "react-use",
           "kind": "import-statement",
@@ -15280,7 +15285,7 @@
           "external": true
         },
         {
-          "path": "dist/HLSView-U3DKJBM7.js",
+          "path": "dist/HLSView-7QXLQ4KD.js",
           "kind": "dynamic-import"
         },
         {
@@ -15702,7 +15707,7 @@
       ],
       "inputs": {
         "<define:process.env>": {
-          "bytesInOutput": 18176
+          "bytesInOutput": 18180
         },
         "../../node_modules/lodash/lodash.js": {
           "bytesInOutput": 224267
@@ -15750,7 +15755,7 @@
           "bytesInOutput": 5061
         },
         "src/Prebuilt/common/constants.ts": {
-          "bytesInOutput": 3421
+          "bytesInOutput": 3385
         },
         "src/Theme/ThemeProvider.tsx": {
           "bytesInOutput": 1926
@@ -15954,10 +15959,10 @@
           "bytesInOutput": 887
         },
         "src/Prebuilt/App.tsx": {
-          "bytesInOutput": 7625
+          "bytesInOutput": 7656
         },
         "src/Prebuilt/components/AppData/AppData.tsx": {
-          "bytesInOutput": 4415
+          "bytesInOutput": 5077
         },
         "src/Prebuilt/components/Settings/LayoutSettings.tsx": {
           "bytesInOutput": 2705
@@ -15974,6 +15979,18 @@
         "src/Prebuilt/components/Settings/common.ts": {
           "bytesInOutput": 241
         },
+        "src/Prebuilt/provider/roomLayoutProvider/hooks/useRoomLayoutScreen.ts": {
+          "bytesInOutput": 1436
+        },
+        "src/Prebuilt/provider/roomLayoutProvider/index.tsx": {
+          "bytesInOutput": 1118
+        },
+        "src/Prebuilt/provider/roomLayoutProvider/hooks/useFetchRoomLayout.ts": {
+          "bytesInOutput": 2254
+        },
+        "src/Prebuilt/provider/roomLayoutProvider/constants/index.ts": {
+          "bytesInOutput": 1486
+        },
         "src/Prebuilt/components/AppData/useSidepane.js": {
           "bytesInOutput": 1934
         },
@@ -16050,7 +16067,7 @@
           "bytesInOutput": 178
         },
         "src/Prebuilt/components/PIP/PIPComponent.jsx": {
-          "bytesInOutput": 2336
+          "bytesInOutput": 2338
         },
         "src/Prebuilt/components/PIP/PIPManager.js": {
           "bytesInOutput": 9164
@@ -16070,18 +16087,6 @@
         "src/Prebuilt/common/hooks.ts": {
           "bytesInOutput": 2675
         },
-        "src/Prebuilt/provider/roomLayoutProvider/index.tsx": {
-          "bytesInOutput": 1118
-        },
-        "src/Prebuilt/provider/roomLayoutProvider/hooks/useFetchRoomLayout.ts": {
-          "bytesInOutput": 2256
-        },
-        "src/Prebuilt/provider/roomLayoutProvider/constants/index.ts": {
-          "bytesInOutput": 1486
-        },
-        "src/Prebuilt/provider/roomLayoutProvider/hooks/useRoomLayoutScreen.ts": {
-          "bytesInOutput": 1436
-        },
         "src/Prebuilt/components/Settings/SettingsModal.jsx": {
           "bytesInOutput": 8963
         },
@@ -16422,7 +16427,7 @@
           "bytesInOutput": 1050
         },
         "src/Prebuilt/components/VirtualBackground/VBPicker.tsx": {
-          "bytesInOutput": 6793
+          "bytesInOutput": 7244
         },
         "src/Prebuilt/components/VirtualBackground/VBCollection.tsx": {
           "bytesInOutput": 1157
@@ -16629,7 +16634,7 @@
           "bytesInOutput": 651
         }
       },
-      "bytes": 1265343
+      "bytes": 1266496
     }
   }
 }

package/package.json

@@ -10,7 +10,7 @@
     "prebuilt",
     "roomkit"
   ],
-  "version": "0.2.6-alpha.2",
+  "version": "0.2.6-alpha.3",
   "author": "100ms",
   "license": "MIT",
   "repository": {
@@ -82,10 +82,10 @@
     "react": ">=17.0.2 <19.0.0"
   },
   "dependencies": {
-    "@100mslive/hls-player": "0.2.6-alpha.2",
-    "@100mslive/hms-virtual-background": "1.12.6-alpha.2",
-    "@100mslive/react-icons": "0.9.6-alpha.2",
-    "@100mslive/react-sdk": "0.9.6-alpha.2",
+    "@100mslive/hls-player": "0.2.6-alpha.3",
+    "@100mslive/hms-virtual-background": "1.12.6-alpha.3",
+    "@100mslive/react-icons": "0.9.6-alpha.3",
+    "@100mslive/react-sdk": "0.9.6-alpha.3",
     "@100mslive/types-prebuilt": "0.12.6",
     "@emoji-mart/data": "^1.0.6",
     "@emoji-mart/react": "^1.0.1",
@@ -120,5 +120,5 @@
     "uuid": "^8.3.2",
     "worker-timers": "^7.0.40"
   },
-  "gitHead": "21fe3fa3f76f115ecedc9ffb68a5a43a7d760bef"
+  "gitHead": "e1e1ecc82a980ca298ecb36c81c35ab7500b06b4"
 }

package/src/Prebuilt/App.tsx

@@ -96,8 +96,8 @@ export const HMSPrebuilt = React.forwardRef<HMSPrebuiltRefType, HMSPrebuiltProps
     ref,
   ) => {
     const reactiveStore = useRef<HMSPrebuiltRefType>();
-
     const [hydrated, setHydrated] = React.useState(false);
+
     useEffect(() => {
       setHydrated(true);
       const hms = new HMSReactiveStore();
@@ -122,14 +122,13 @@ export const HMSPrebuilt = React.forwardRef<HMSPrebuiltRefType, HMSPrebuiltProps
       (ref as MutableRefObject<HMSPrebuiltRefType>).current = { ...reactiveStore.current };
     }, [ref]);
 
-    // leave room when component unmounts
-    useEffect(
-      () => () => {
+    useEffect(() => {
+      // leave room when component unmounts
+      return () => {
         VBHandler.reset();
         reactiveStore?.current?.hmsActions.leave();
-      },
-      [],
-    );
+      };
+    }, []);
 
     const endpointsObj = endpoints as
       | {
@@ -214,7 +213,6 @@ export const HMSPrebuilt = React.forwardRef<HMSPrebuiltRefType, HMSPrebuiltProps
                         },
                       }}
                     >
-                      <AppData />
                       <Init />
                       <DialogContainerProvider dialogContainerSelector={containerSelector}>
                         <Box
@@ -291,6 +289,7 @@ function AppRoutes({
   return (
     <AppStateContext.Provider value={{ rejoin }}>
       <>
+        {activeState !== PrebuiltStates.LEAVE && <AppData />}
         <ToastContainer />
         <Notifications />
         <MwebLandscapePrompt />

package/src/Prebuilt/common/constants.ts

@@ -46,8 +46,8 @@ export const APP_DATA = {
   disableNotifications: 'disableNotifications',
   pollState: 'pollState',
   background: 'background',
-  backgroundType: 'backgroundType',
 };
+
 export const UI_SETTINGS = {
   isAudioOnly: 'isAudioOnly',
   maxTileCount: 'maxTileCount',

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

@@ -10,6 +10,7 @@ import {
   useRecordingStreaming,
 } from '@100mslive/react-sdk';
 import { LayoutMode } from '../Settings/LayoutSettings';
+import { useRoomLayoutConferencingScreen } from '../../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
 //@ts-ignore
 import { UserPreferencesKeys, useUserPreferences } from '../hooks/useUserPreferences';
 // @ts-ignore
@@ -60,7 +61,6 @@ const initialAppData = {
   [APP_DATA.activeScreensharePeerId]: '',
   [APP_DATA.disableNotifications]: false,
   [APP_DATA.background]: 'none',
-  [APP_DATA.backgroundType]: 'none',
   [APP_DATA.pollState]: {
     [POLL_STATE.pollInView]: '',
     [POLL_STATE.view]: '',
@@ -71,6 +71,8 @@ export const AppData = React.memo(() => {
   const hmsActions = useHMSActions();
   const [preferences = {}] = useUserPreferences(UserPreferencesKeys.UI_SETTINGS);
   const appData = useHMSStore(selectFullAppData);
+  const { elements } = useRoomLayoutConferencingScreen();
+  const toggleVB = useSidepaneToggle(SIDE_PANE_OPTIONS.VB);
 
   useEffect(() => {
     hmsActions.initAppData({
@@ -103,6 +105,19 @@ export const AppData = React.memo(() => {
     hmsActions.setAppData(APP_DATA.subscribedNotifications, preferences.subscribedNotifications, true);
   }, [preferences.subscribedNotifications, hmsActions]);
 
+  useEffect(() => {
+    let defaultMediaURL;
+    elements?.virtual_background?.background_media?.forEach(media => {
+      if (media.default && media.url) {
+        defaultMediaURL = media.url;
+      }
+    });
+    if (defaultMediaURL) {
+      hmsActions.setAppData(APP_DATA.background, defaultMediaURL);
+      toggleVB();
+    }
+  }, [hmsActions, elements?.virtual_background?.background_media, toggleVB]);
+
   return <ResetStreamingStart />;
 });
 

package/src/Prebuilt/components/Preview/PreviewJoin.tsx

@@ -103,7 +103,6 @@ const PreviewJoin = ({
     asRole,
   });
   const roomState = useHMSStore(selectRoomState);
-
   const savePreferenceAndJoin = useCallback(() => {
     setPreviewPreference({
       name,