Merge branch 'fix/tolerant-providers' of github.com:executablebooks/t…

…hebe into fix/tolerant-providers
jupyter-book · Sep 4, 2023 · c0f3b2a · c0f3b2a
2 parents c4e9c6f + bf91f51
commit c0f3b2a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/packages/react/src/ThebeServerProvider.tsx b/packages/react/src/ThebeServerProvider.tsx
@@ -14,13 +14,13 @@ type ListenerFn = (data: ThebeEventData) => void;
 
 export const ThebeServerContext = React.createContext<
   | {
+      connecting: boolean;
+      ready: boolean;
       config?: Config;
       events?: ThebeEvents;
       server?: ThebeServer;
-      connecting: boolean;
-      ready: boolean;
-      connect: () => void;
-      disconnect: () => Promise<void>;
+      connect?: () => void;
+      disconnect?: () => Promise<void>;
     }
   | undefined
 >(undefined);
@@ -147,7 +147,10 @@ export function useThebeServer() {
   const { core } = thebe ?? {};
 
   const serverContext = useContext(ThebeServerContext);
-  const { config, events, server, connecting, ready, connect, disconnect } = serverContext ?? {};
+  const { config, events, server, connecting, ready, connect, disconnect } = serverContext ?? {
+    ready: false,
+    connecting: false,
+  };
 
   const [error, setError] = useState<string | undefined>(); // TODO how to handle errors better via the provider
   const [eventCallbacks, setEventCallbacks] = useState<ThebeEventCb[]>([]);
@@ -195,5 +198,5 @@ export function useThebeServer() {
         subscribe,
         unsubAll,
       }
-    : {};
+    : { connecting: false, ready: false };
 }
diff --git a/packages/react/src/ThebeSessionProvider.tsx b/packages/react/src/ThebeSessionProvider.tsx
@@ -7,8 +7,8 @@ interface ThebeSessionContextData {
   path?: string;
   session?: ThebeSession;
   error?: string;
-  starting?: boolean;
-  ready?: boolean;
+  starting: boolean;
+  ready: boolean;
   start?: () => Promise<void>;
   shutdown?: () => Promise<void>;
 }
@@ -104,5 +104,5 @@ export function ThebeSessionProvider({
 
 export function useThebeSession(): ThebeSessionContextData {
   const sessionContext = useContext(ThebeSessionContext);
-  return sessionContext ?? {};
+  return sessionContext ?? { starting: false, ready: false };
 }