Prefill room ID from url

screego · Jan 11, 2021 · ab187c1 · ab187c1
1 parent d71c303
commit ab187c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ui/src/RoomManage.tsx b/ui/src/RoomManage.tsx
@@ -17,6 +17,7 @@ import {
 import {FCreateRoom, UseRoom} from './useRoom';
 import {RoomMode, UIConfig} from './message';
 import {randomRoomName} from './name';
+import {getRoomFromURL} from './useRoomID';
 import HelpIcon from '@material-ui/icons/Help';
 import logo from './logo.svg';
 import {UseConfig} from './useConfig';
@@ -38,7 +39,9 @@ const defaultMode = (authMode: UIConfig['authMode'], loggedIn: boolean): RoomMod
 };
 
 const CreateRoom = ({room, config}: Pick<UseRoom, 'room'> & {config: UIConfig}) => {
-    const [id, setId] = React.useState(randomRoomName);
+    const [id, setId] = React.useState(
+        () => getRoomFromURL(window.location.search) ?? randomRoomName()
+    );
     const [mode, setMode] = React.useState<RoomMode>(defaultMode(config.authMode, config.loggedIn));
     const [ownerLeave, setOwnerLeave] = React.useState(true);
     const submit = () =>

diff --git a/ui/src/useRoomID.ts b/ui/src/useRoomID.ts
@@ -1,6 +1,6 @@
 import React from 'react';
 
-const getRoomFromURL = (search: string): string | undefined =>
+export const getRoomFromURL = (search: string): string | undefined =>
     search
         .slice(1)
         .split('&')