From d50ef6458c0992a97d968e2781ff21c98f4cbca4 Mon Sep 17 00:00:00 2001 From: QuakeWang Date: Mon, 24 Aug 2026 14:12:17 +0800 Subject: [PATCH] Fix 2D configure loading progress Remove the 3D asset loading dependency from the 2D configure scene so it waits only for the keyboard definition and keymap data. Signed-off-by: QuakeWang --- src/components/two-string/canvas-router.tsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/components/two-string/canvas-router.tsx b/src/components/two-string/canvas-router.tsx index f1ba4edb..b32dc169 100644 --- a/src/components/two-string/canvas-router.tsx +++ b/src/components/two-string/canvas-router.tsx @@ -1,4 +1,3 @@ -import {useProgress} from '@react-three/drei'; import {DefinitionVersionMap, KeyColorType} from '@the-via/reader'; import React, {useCallback, useEffect, useMemo, useRef} from 'react'; import {shallowEqual} from 'react-redux'; @@ -62,7 +61,6 @@ export const CanvasRouter = () => { const body = useRef(document.body); const containerRef = useRef(null); const loadProgress = useAppSelector(getLoadProgress); - const {progress} = useProgress(); const dispatch = useAppDispatch(); const containerDimensions = useSize(containerRef); const dimensions = useSize(body); @@ -81,9 +79,6 @@ export const CanvasRouter = () => { [localDefinitions, definitionVersion], ); const hideDesignScene = '/design' === path && !versionDefinitions.length; - const hideConfigureScene = - '/' === path && - (!selectedDefinition || (loadProgress + progress / 100) / 2 !== 1); const terrainOnClick = useCallback(() => { if (true) { dispatch(updateSelectedKey(null)); @@ -94,7 +89,7 @@ export const CanvasRouter = () => { !showAuthorizeButton || ['/settings', '/errors', '/console'].includes(path) || hideDesignScene || - hideConfigureScene; + showLoader; const configureKeyboardIsSelectable = useAppSelector( getConfigureKeyboardIsSelectable, );