fix: improving web initialization

This commit is contained in:
Kevin Nadro
2025-04-16 15:34:46 -06:00
parent fb3fcfeef3
commit e344e4a063
5 changed files with 12 additions and 8 deletions

View File

@ -2,11 +2,12 @@ import { AppStateProvider } from '@src/AppState'
import LspProvider from '@src/components/LspProvider' import LspProvider from '@src/components/LspProvider'
import { MachineManagerProvider } from '@src/components/MachineManagerProvider' import { MachineManagerProvider } from '@src/components/MachineManagerProvider'
import { OpenInDesktopAppHandler } from '@src/components/OpenInDesktopAppHandler' import { OpenInDesktopAppHandler } from '@src/components/OpenInDesktopAppHandler'
import { SystemIOMachineLogicListener } from '@src/components/Providers/SystemIOProviderDesktop' import { SystemIOMachineLogicListenerDesktop } from '@src/components/Providers/SystemIOProviderDesktop'
import { SystemIOMachineLogicListenerWeb } from '@src/components/Providers/SystemIOProviderWeb'
import { RouteProvider } from '@src/components/RouteProvider' import { RouteProvider } from '@src/components/RouteProvider'
import { KclContextProvider } from '@src/lang/KclProvider' import { KclContextProvider } from '@src/lang/KclProvider'
import { Outlet } from 'react-router-dom' import { Outlet } from 'react-router-dom'
import { isDesktop } from '@src/lib/isDesktop'
// Root component will live for the entire applications runtime // Root component will live for the entire applications runtime
function RootLayout() { function RootLayout() {
return ( return (
@ -16,7 +17,11 @@ function RootLayout() {
<KclContextProvider> <KclContextProvider>
<AppStateProvider> <AppStateProvider>
<MachineManagerProvider> <MachineManagerProvider>
<SystemIOMachineLogicListener /> {isDesktop() ? (
<SystemIOMachineLogicListenerDesktop />
) : (
<SystemIOMachineLogicListenerWeb />
)}
<Outlet /> <Outlet />
</MachineManagerProvider> </MachineManagerProvider>
</AppStateProvider> </AppStateProvider>

View File

@ -13,7 +13,7 @@ import { useNavigate } from 'react-router-dom'
import { commandBarActor } from '@src/machines/commandBarMachine' import { commandBarActor } from '@src/machines/commandBarMachine'
import { projectCommands } from '@src/lib/commandBarConfigs/projectsCommandConfig' import { projectCommands } from '@src/lib/commandBarConfigs/projectsCommandConfig'
export function SystemIOMachineLogicListener() { export function SystemIOMachineLogicListenerDesktop() {
const requestedProjectName = useRequestedProjectName() const requestedProjectName = useRequestedProjectName()
const requestedFileName = useRequestedFileName() const requestedFileName = useRequestedFileName()
const projectDirectoryPath = useProjectDirectoryPath() const projectDirectoryPath = useProjectDirectoryPath()

View File

@ -0,0 +1,3 @@
export function SystemIOMachineLogicListenerWeb() {
return null
}

View File

@ -79,10 +79,8 @@ export const useSettings = () =>
return settings return settings
}) })
// TODO: Debugging
export const systemIOActor = appActor.getSnapshot().children.systemIO! export const systemIOActor = appActor.getSnapshot().children.systemIO!
window.systemIOActor = systemIOActor
export const engineStreamActor = appActor.system.get( export const engineStreamActor = appActor.system.get(
ENGINE_STREAM ENGINE_STREAM
) as EngineStreamActor ) as EngineStreamActor

View File

@ -664,8 +664,6 @@ export const commandBarActor = createActor(commandBarMachine, {
}, },
}).start() }).start()
window.commandBarActor = commandBarActor
/** Basic state snapshot selector */ /** Basic state snapshot selector */
const cmdBarStateSelector = (state: SnapshotFrom<typeof commandBarActor>) => const cmdBarStateSelector = (state: SnapshotFrom<typeof commandBarActor>) =>
state state