Skip to content

Fix 2D configure loading progress #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
QuakeWang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix 2D configure loading progress #434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/components/two-string/canvas-router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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);
Expand All @@ -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));
Expand All @@ -94,7 +89,7 @@ export const CanvasRouter = () => {
!showAuthorizeButton ||
['/settings', '/errors', '/console'].includes(path) ||
hideDesignScene ||
hideConfigureScene;
showLoader;
const configureKeyboardIsSelectable = useAppSelector(
getConfigureKeyboardIsSelectable,
);
Expand Down