From 00c2685169bd238b75de17c19bcbd993036b08b9 Mon Sep 17 00:00:00 2001 From: Ian Mancini Date: Sun, 15 Nov 2020 11:49:32 -0300 Subject: [PATCH] Rename client/Store.ts to client/store.ts --- packages/client/src/3d/Controls.tsx | 5 ++--- packages/client/src/components/MenuOverlay.tsx | 2 +- packages/client/src/{Store.ts => store.ts} | 5 +++++ 3 files changed, 8 insertions(+), 4 deletions(-) rename packages/client/src/{Store.ts => store.ts} (77%) diff --git a/packages/client/src/3d/Controls.tsx b/packages/client/src/3d/Controls.tsx index dda034d..018b195 100644 --- a/packages/client/src/3d/Controls.tsx +++ b/packages/client/src/3d/Controls.tsx @@ -1,12 +1,11 @@ import React, { useEffect, useRef } from 'react' import { PointerLockControls } from '@react-three/drei' -import api from '../Store' +import api from '../store' const Controls: React.FC = () => { const ref = useRef(null) - const setPointerLockControls = api.getState().setPointerLockControls - const setPointerLockStatus = api.getState().setPointerLockStatus + const { setPointerLockStatus, setPointerLockControls } = api.getState() useEffect(() => { if (ref.current) { diff --git a/packages/client/src/components/MenuOverlay.tsx b/packages/client/src/components/MenuOverlay.tsx index efabd63..6e41912 100644 --- a/packages/client/src/components/MenuOverlay.tsx +++ b/packages/client/src/components/MenuOverlay.tsx @@ -11,7 +11,7 @@ import { useToast, } from '@chakra-ui/react' -import useStore from '../Store' +import useStore from '../store' const MenuOverlay: React.FC = () => { const [helpToastShown, setHelpToastShown] = useState(false) diff --git a/packages/client/src/Store.ts b/packages/client/src/store.ts similarity index 77% rename from packages/client/src/Store.ts rename to packages/client/src/store.ts index 02ebad1..a1cbb01 100644 --- a/packages/client/src/Store.ts +++ b/packages/client/src/store.ts @@ -1,11 +1,14 @@ import create from 'zustand' import { PointerLockControls } from '@react-three/drei' +import { Socket } from 'socket.io-client' type State = { pointerLockControls: PointerLockControls | undefined pointerLocked: boolean setPointerLockStatus: (status: boolean) => void setPointerLockControls: (controls: PointerLockControls) => void + socket: null | Socket + setSocket: (socket: Socket | null) => void } const useStore = create((set) => ({ @@ -13,6 +16,8 @@ const useStore = create((set) => ({ pointerLocked: false, setPointerLockStatus: (status) => set(() => ({ pointerLocked: status })), setPointerLockControls: (controls) => set(() => ({ pointerLockControls: controls })), + socket: null, + setSocket: (socket) => set(() => ({ socket })), })) export default useStore