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

package/dist/meta.esbuild.json

@@ -2137,7 +2137,7 @@
       "format": "esm"
     },
     "src/Prebuilt/provider/roomLayoutProvider/hooks/useFetchRoomLayout.ts": {
-      "bytes": 2489,
+      "bytes": 2758,
       "imports": [
         {
           "path": "react",
@@ -2163,7 +2163,7 @@
       "format": "esm"
     },
     "src/Prebuilt/provider/roomLayoutProvider/index.tsx": {
-      "bytes": 1865,
+      "bytes": 2098,
       "imports": [
         {
           "path": "react",
@@ -4951,7 +4951,7 @@
       "format": "cjs"
     },
     "../hms-video-store/dist/index.js": {
-      "bytes": 356613,
+      "bytes": 355929,
       "imports": [
         {
           "path": "../../node_modules/reselect/es/index.js",
@@ -5058,6 +5058,11 @@
           "kind": "import-statement",
           "external": true
         },
+        {
+          "path": "eventemitter2",
+          "kind": "import-statement",
+          "external": true
+        },
         {
           "path": "../../node_modules/sdp-transform/lib/index.js",
           "kind": "import-statement",
@@ -10943,7 +10948,7 @@
       ],
       "format": "esm"
     },
-    "../../../../../../../tmp/tmp-2901-v3OIW4zyFLWA/19081d965e22/tldraw.css": {
+    "../../../../../../../tmp/tmp-2786-KJnVcz88Ro5M/19096a2adc21/tldraw.css": {
       "bytes": 80111,
       "imports": [
         {
@@ -10993,7 +10998,7 @@
         }
       ]
     },
-    "../../../../../../../tmp/tmp-2901-v3OIW4zyFLWA/19081d965890/index.css": {
+    "../../../../../../../tmp/tmp-2786-KJnVcz88Ro5M/19096a2ad510/index.css": {
       "bytes": 597,
       "imports": [
         {
@@ -11002,7 +11007,7 @@
           "external": true
         },
         {
-          "path": "../../../../../../../tmp/tmp-2901-v3OIW4zyFLWA/19081d965e22/tldraw.css",
+          "path": "../../../../../../../tmp/tmp-2786-KJnVcz88Ro5M/19096a2adc21/tldraw.css",
           "kind": "import-rule",
           "original": "@tldraw/tldraw/tldraw.css"
         }
@@ -11077,7 +11082,7 @@
           "original": "../../common/constants"
         },
         {
-          "path": "../../../../../../../tmp/tmp-2901-v3OIW4zyFLWA/19081d965890/index.css",
+          "path": "../../../../../../../tmp/tmp-2786-KJnVcz88Ro5M/19096a2ad510/index.css",
           "kind": "import-statement",
           "original": "@100mslive/hms-whiteboard/index.css"
         },
@@ -12716,7 +12721,7 @@
       "format": "esm"
     },
     "src/Prebuilt/AppStateContext.tsx": {
-      "bytes": 3129,
+      "bytes": 3230,
       "imports": [
         {
           "path": "react",
@@ -14950,7 +14955,7 @@
     "dist/index.js": {
       "imports": [
         {
-          "path": "dist/chunk-3RS665CV.js",
+          "path": "dist/chunk-4PDMOI7P.js",
           "kind": "import-statement"
         }
       ],
@@ -15026,16 +15031,16 @@
       "inputs": {},
       "bytes": 1882
     },
-    "dist/HLSView-HMRFCBTS.js.map": {
+    "dist/HLSView-NOYWP3DT.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
       "bytes": 100275
     },
-    "dist/HLSView-HMRFCBTS.js": {
+    "dist/HLSView-NOYWP3DT.js": {
       "imports": [
         {
-          "path": "dist/chunk-3RS665CV.js",
+          "path": "dist/chunk-4PDMOI7P.js",
           "kind": "import-statement"
         },
         {
@@ -15213,7 +15218,7 @@
         "default"
       ],
       "entryPoint": "src/Prebuilt/layouts/HLSView.jsx",
-      "cssBundle": "dist/HLSView-UZREPPDA.css",
+      "cssBundle": "dist/HLSView-ANYU6AJB.css",
       "inputs": {
         "src/Prebuilt/layouts/HLSView.jsx": {
           "bytesInOutput": 27671
@@ -15272,13 +15277,13 @@
       },
       "bytes": 61702
     },
-    "dist/chunk-3RS665CV.js.map": {
+    "dist/chunk-4PDMOI7P.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 3442935
+      "bytes": 3441758
     },
-    "dist/chunk-3RS665CV.js": {
+    "dist/chunk-4PDMOI7P.js": {
       "imports": [
         {
           "path": "react",
@@ -16305,6 +16310,11 @@
           "kind": "import-statement",
           "external": true
         },
+        {
+          "path": "eventemitter2",
+          "kind": "import-statement",
+          "external": true
+        },
         {
           "path": "uuid",
           "kind": "import-statement",
@@ -17751,7 +17761,7 @@
           "external": true
         },
         {
-          "path": "dist/HLSView-HMRFCBTS.js",
+          "path": "dist/HLSView-NOYWP3DT.js",
           "kind": "dynamic-import"
         },
         {
@@ -18340,10 +18350,10 @@
       ],
       "inputs": {
         "<define:process.env>": {
-          "bytesInOutput": 17940
+          "bytesInOutput": 17930
         },
         "../../node_modules/lodash/lodash.js": {
-          "bytesInOutput": 224289
+          "bytesInOutput": 224291
         },
         "../../node_modules/ua-parser-js/src/ua-parser.js": {
           "bytesInOutput": 42494
@@ -18649,10 +18659,10 @@
           "bytesInOutput": 2709
         },
         "src/Prebuilt/provider/roomLayoutProvider/index.tsx": {
-          "bytesInOutput": 1118
+          "bytesInOutput": 1312
         },
         "src/Prebuilt/provider/roomLayoutProvider/hooks/useFetchRoomLayout.ts": {
-          "bytesInOutput": 2254
+          "bytesInOutput": 2483
         },
         "src/Prebuilt/provider/roomLayoutProvider/constants/index.ts": {
           "bytesInOutput": 1486
@@ -18823,7 +18833,7 @@
           "bytesInOutput": 9482
         },
         "../hms-video-store/dist/index.js": {
-          "bytesInOutput": 50057
+          "bytesInOutput": 50110
         },
         "../../node_modules/reselect/es/index.js": {
           "bytesInOutput": 2539
@@ -19209,7 +19219,7 @@
         "src/Prebuilt/components/VideoLayouts/WhiteboardLayout.tsx": {
           "bytesInOutput": 2830
         },
-        "../../../../../../../tmp/tmp-2901-v3OIW4zyFLWA/19081d965890/index.css": {
+        "../../../../../../../tmp/tmp-2786-KJnVcz88Ro5M/19096a2ad510/index.css": {
           "bytesInOutput": 0
         },
         "src/Prebuilt/common/PeersSorter.ts": {
@@ -19258,7 +19268,7 @@
           "bytesInOutput": 2185
         },
         "src/Prebuilt/AppStateContext.tsx": {
-          "bytesInOutput": 2554
+          "bytesInOutput": 2668
         },
         "src/Prebuilt/components/hooks/useRedirectToLeave.tsx": {
           "bytesInOutput": 491
@@ -19378,7 +19388,7 @@
           "bytesInOutput": 2628
         }
       },
-      "bytes": 1425772
+      "bytes": 1426354
     },
     "dist/index.css.map": {
       "imports": [],
@@ -19440,22 +19450,22 @@
         }
       ],
       "inputs": {
-        "../../../../../../../tmp/tmp-2901-v3OIW4zyFLWA/19081d965e22/tldraw.css": {
+        "../../../../../../../tmp/tmp-2786-KJnVcz88Ro5M/19096a2adc21/tldraw.css": {
           "bytesInOutput": 75223
         },
-        "../../../../../../../tmp/tmp-2901-v3OIW4zyFLWA/19081d965890/index.css": {
+        "../../../../../../../tmp/tmp-2786-KJnVcz88Ro5M/19096a2ad510/index.css": {
           "bytesInOutput": 401
         }
       },
       "bytes": 75901
     },
-    "dist/HLSView-UZREPPDA.css.map": {
+    "dist/HLSView-ANYU6AJB.css.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
       "bytes": 122402
     },
-    "dist/HLSView-UZREPPDA.css": {
+    "dist/HLSView-ANYU6AJB.css": {
       "imports": [
         {
           "path": "https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap",
@@ -19509,10 +19519,10 @@
         }
       ],
       "inputs": {
-        "../../../../../../../tmp/tmp-2901-v3OIW4zyFLWA/19081d965e22/tldraw.css": {
+        "../../../../../../../tmp/tmp-2786-KJnVcz88Ro5M/19096a2adc21/tldraw.css": {
           "bytesInOutput": 75223
         },
-        "../../../../../../../tmp/tmp-2901-v3OIW4zyFLWA/19081d965890/index.css": {
+        "../../../../../../../tmp/tmp-2786-KJnVcz88Ro5M/19096a2ad510/index.css": {
           "bytesInOutput": 401
         }
       },

package/package.json

@@ -10,7 +10,7 @@
     "prebuilt",
     "roomkit"
   ],
-  "version": "0.3.15-alpha.4",
+  "version": "0.3.15-alpha.6",
   "author": "100ms",
   "license": "MIT",
   "repository": {
@@ -75,12 +75,12 @@
     "react": ">=17.0.2 <19.0.0"
   },
   "dependencies": {
-    "@100mslive/hls-player": "0.3.15-alpha.4",
+    "@100mslive/hls-player": "0.3.15-alpha.6",
     "@100mslive/hms-noise-cancellation": "0.0.1",
-    "@100mslive/hms-virtual-background": "1.13.15-alpha.4",
-    "@100mslive/hms-whiteboard": "0.0.5-alpha.4",
-    "@100mslive/react-icons": "0.10.15-alpha.4",
-    "@100mslive/react-sdk": "0.10.15-alpha.4",
+    "@100mslive/hms-virtual-background": "1.13.15-alpha.6",
+    "@100mslive/hms-whiteboard": "0.0.5-alpha.6",
+    "@100mslive/react-icons": "0.10.15-alpha.6",
+    "@100mslive/react-sdk": "0.10.15-alpha.6",
     "@100mslive/types-prebuilt": "0.12.9",
     "@emoji-mart/data": "^1.0.6",
     "@emoji-mart/react": "^1.0.1",
@@ -116,5 +116,5 @@
     "uuid": "^8.3.2",
     "worker-timers": "^7.0.40"
   },
-  "gitHead": "f7dd781ff1065f5b13e42d24f63b7ae74c2dac6b"
+  "gitHead": "d49a7ca4cb1717edf1afa0649da140ce31e179f1"
 }

package/src/Prebuilt/AppStateContext.tsx

@@ -3,7 +3,7 @@ import { usePreviousDistinct } from 'react-use';
 import { match, P } from 'ts-pattern';
 import { HMSRoomState, selectRoomState, useHMSStore } from '@100mslive/react-sdk';
 import { VBHandler } from './components/VirtualBackground/VBHandler';
-import { useRoomLayout } from './provider/roomLayoutProvider';
+import { useRoomLayout, useSetOriginalLayout } from './provider/roomLayoutProvider';
 import { useRedirectToLeave } from './components/hooks/useRedirectToLeave';
 import {
   useRoomLayoutLeaveScreen,
@@ -38,6 +38,7 @@ export const useHMSAppStateContext = () => {
 
 export const useAppStateManager = () => {
   const roomLayout = useRoomLayout();
+  const setOriginalLayout = useSetOriginalLayout();
   const [activeState, setActiveState] = React.useState<PrebuiltStates | undefined>();
   const roomState = useHMSStore(selectRoomState);
   const prevRoomState = usePreviousDistinct(roomState);
@@ -46,6 +47,7 @@ export const useAppStateManager = () => {
   const { redirectToLeave } = useRedirectToLeave();
 
   const rejoin = () => {
+    setOriginalLayout?.();
     setActiveState(isPreviewScreenEnabled ? PrebuiltStates.PREVIEW : PrebuiltStates.MEETING);
   };
 

package/src/Prebuilt/provider/roomLayoutProvider/hooks/useFetchRoomLayout.ts

@@ -26,6 +26,7 @@ export type useFetchRoomLayoutProps = {
 export type useFetchRoomLayoutResponse = {
   layout: Layout | undefined;
   updateRoomLayoutForRole: (role: string) => void;
+  setOriginalLayout: () => void;
 };
 
 export const useFetchRoomLayout = ({
@@ -34,7 +35,11 @@ export const useFetchRoomLayout = ({
 }: useFetchRoomLayoutProps): useFetchRoomLayoutResponse => {
   const [layout, setLayout] = useState<Layout | undefined>(undefined);
   const layoutResp = useRef<GetResponse>();
+  const originalLayout = useRef<Layout>();
   const isFetchInProgress = useRef(false);
+
+  const setOriginalLayout = useCallback(() => setLayout(originalLayout.current), []);
+
   const updateRoomLayoutForRole = useCallback((role: string) => {
     if (!layoutResp.current) {
       return;
@@ -71,10 +76,13 @@ export const useFetchRoomLayout = ({
         layoutForRole = defaultLayout;
       }
       const layout = layoutForRole;
+      if (!originalLayout.current) {
+        originalLayout.current = layout;
+      }
       setLayout(layout);
       isFetchInProgress.current = false;
     })();
   }, [authToken, endpoint]);
 
-  return { layout, updateRoomLayoutForRole };
+  return { layout, updateRoomLayoutForRole, setOriginalLayout };
 };

package/src/Prebuilt/provider/roomLayoutProvider/index.tsx

@@ -14,6 +14,7 @@ export const RoomLayoutContext = React.createContext<
   | {
       layout: Layout | undefined;
       updateRoomLayoutForRole: useFetchRoomLayoutResponse['updateRoomLayoutForRole'] | undefined;
+      setOriginalLayout: useFetchRoomLayoutResponse['setOriginalLayout'] | undefined;
     }
   | undefined
 >(undefined);
@@ -35,10 +36,13 @@ export const RoomLayoutProvider: React.FC<React.PropsWithChildren<RoomLayoutProv
   overrideLayout,
 }) => {
   const authToken: string = useAuthToken();
-  const { layout, updateRoomLayoutForRole } = useFetchRoomLayout({ authToken, endpoint: roomLayoutEndpoint });
+  const { layout, updateRoomLayoutForRole, setOriginalLayout } = useFetchRoomLayout({
+    authToken,
+    endpoint: roomLayoutEndpoint,
+  });
   const mergedLayout = authToken && layout ? mergeWith(layout, overrideLayout, customizer) : layout;
   return (
-    <RoomLayoutContext.Provider value={{ layout: mergedLayout, updateRoomLayoutForRole }}>
+    <RoomLayoutContext.Provider value={{ layout: mergedLayout, updateRoomLayoutForRole, setOriginalLayout }}>
       {children}
     </RoomLayoutContext.Provider>
   );
@@ -46,3 +50,4 @@ export const RoomLayoutProvider: React.FC<React.PropsWithChildren<RoomLayoutProv
 
 export const useRoomLayout = () => React.useContext(RoomLayoutContext)?.layout;
 export const useUpdateRoomLayout = () => React.useContext(RoomLayoutContext)?.updateRoomLayoutForRole;
+export const useSetOriginalLayout = () => React.useContext(RoomLayoutContext)?.setOriginalLayout;