nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2024-11-23 14:40:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev

Browse Source
This commit is contained in:
Layne 2022-03-18 17:29:07 -04:00
commit be92aede93
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -14,7 +14,7 @@
"@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/fontawesome-svg-core": "^6.1.0",
"@fortawesome/free-solid-svg-icons": "^6.1.0", "@fortawesome/free-solid-svg-icons": "^6.1.0",
"@fortawesome/react-fontawesome": "^0.1.17", "@fortawesome/react-fontawesome": "^0.1.17",
"@nitrots/nitro-renderer": "^1.1.11", "@nitrots/nitro-renderer": "^1.1.13",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"classnames": "^2.3.1", "classnames": "^2.3.1",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",

2
src/components/achievements/AchievementsView.tsx
View File

@ -197,7 +197,7 @@ export const AchievementsView: FC<{}> = props =>
useEffect(() => useEffect(() =>
{ {
if(!isVisible || !isInitalized) return; if(!isVisible || isInitalized) return;
SendMessageComposer(new RequestAchievementsMessageComposer()); SendMessageComposer(new RequestAchievementsMessageComposer());
}, [ isVisible, isInitalized ]); }, [ isVisible, isInitalized ]);

13
src/components/navigator/NavigatorView.tsx
View File

@ -25,7 +25,7 @@ export const NavigatorView: FC<{}> = props =>
const [ isRoomLinkOpen, setRoomLinkOpen ] = useState(false); const [ isRoomLinkOpen, setRoomLinkOpen ] = useState(false);
const [ pendingDoorState, setPendingDoorState ] = useState<{ roomData: RoomDataParser, state: string }>(null); const [ pendingDoorState, setPendingDoorState ] = useState<{ roomData: RoomDataParser, state: string }>(null);
const [ navigatorState, dispatchNavigatorState ] = useReducer(NavigatorReducer, initialNavigator); const [ navigatorState, dispatchNavigatorState ] = useReducer(NavigatorReducer, initialNavigator);
const { needsNavigatorUpdate = false, topLevelContext = null, topLevelContexts = null, homeRoomId } = navigatorState; const { needsNavigatorUpdate = true, topLevelContext = null, topLevelContexts = null, homeRoomId } = navigatorState;
const onNavigatorEvent = useCallback((event: NavigatorEvent) => const onNavigatorEvent = useCallback((event: NavigatorEvent) =>
{ {
@ -212,7 +212,7 @@ export const NavigatorView: FC<{}> = props =>
useEffect(() => useEffect(() =>
{ {
if(!isVisible || !needsNavigatorUpdate) return; if(!needsNavigatorUpdate) return;
dispatchNavigatorState({ dispatchNavigatorState({
type: NavigatorActions.SET_NEEDS_UPDATE, type: NavigatorActions.SET_NEEDS_UPDATE,
@ -222,7 +222,14 @@ export const NavigatorView: FC<{}> = props =>
}); });
SendMessageComposer(new NavigatorInitComposer()); SendMessageComposer(new NavigatorInitComposer());
}, [ isVisible, needsNavigatorUpdate ]); }, [ needsNavigatorUpdate ]);
useEffect(() =>
{
if(!isVisible || !topLevelContext) return;
sendSearch('', topLevelContext.code);
}, [isVisible, sendSearch, topLevelContext])
useEffect(() => useEffect(() =>
{ {

2
src/components/room/widgets/choosers/UserChooserWidgetView.tsx
View File

@ -19,7 +19,7 @@ export const UserChooserWidgetView: FC<{}> = props =>
{ {
if(prevValue) clearTimeout(prevValue); if(prevValue) clearTimeout(prevValue);
return setTimeout(() => widgetHandler.processWidgetMessage(new RoomWidgetRequestWidgetMessage(RoomWidgetRequestWidgetMessage.FURNI_CHOOSER)), 100); return setTimeout(() => widgetHandler.processWidgetMessage(new RoomWidgetRequestWidgetMessage(RoomWidgetRequestWidgetMessage.USER_CHOOSER)), 100);
}) })
}, [ isVisible, widgetHandler ]); }, [ isVisible, widgetHandler ]);

8
yarn.lock
View File

@ -1426,10 +1426,10 @@
"@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/resolve-uri" "^3.0.3"
"@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/sourcemap-codec" "^1.4.10"
"@nitrots/nitro-renderer@^1.1.11": "@nitrots/nitro-renderer@^1.1.13":
version "1.1.11" version "1.1.13"
resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.1.11.tgz#6802fcd8f38b98a3ae42f30bb547ae3883f1eb78" resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.1.13.tgz#0173ebda69c41031903461a21a4b3dfa0bd6fcaa"
integrity sha512-FlMRiJqkDnpKQX08EL3llvgKedGx10KV6fRyMYCnhqlE+bpJTpMW9ZpGAaaRn2in2Dw3GaoYGrIeSuKIu2URnA== integrity sha512-LGk8514m+/+Y50kOdkP7dVG9DXTNPM3kD/U+wDJBw6MPkxe0R2blhwPoELK02jO6Ehfoz5v+nlhNeUTHzRZzeg==
dependencies: dependencies:
"@pixi/canvas-renderer" "^6.2.2" "@pixi/canvas-renderer" "^6.2.2"
"@pixi/extract" "^6.2.2" "@pixi/extract" "^6.2.2"