From 010d02caca4553dd097dc1892a18eb71e9d971cb Mon Sep 17 00:00:00 2001 From: dank074 Date: Thu, 17 Mar 2022 19:31:40 -0500 Subject: [PATCH 1/5] fix some outgoing packets --- src/components/achievements/AchievementsView.tsx | 2 +- src/components/navigator/NavigatorView.tsx | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/achievements/AchievementsView.tsx b/src/components/achievements/AchievementsView.tsx index 05e6db94..08521fb5 100644 --- a/src/components/achievements/AchievementsView.tsx +++ b/src/components/achievements/AchievementsView.tsx @@ -197,7 +197,7 @@ export const AchievementsView: FC<{}> = props => useEffect(() => { - if(!isVisible || !isInitalized) return; + if(!isVisible || isInitalized) return; SendMessageComposer(new RequestAchievementsMessageComposer()); }, [ isVisible, isInitalized ]); diff --git a/src/components/navigator/NavigatorView.tsx b/src/components/navigator/NavigatorView.tsx index 0f65ba0d..d8cee5ff 100644 --- a/src/components/navigator/NavigatorView.tsx +++ b/src/components/navigator/NavigatorView.tsx @@ -220,10 +220,13 @@ export const NavigatorView: FC<{}> = props => flag: false } }); - - SendMessageComposer(new NavigatorInitComposer()); }, [ isVisible, needsNavigatorUpdate ]); + useEffect(() => + { + SendMessageComposer(new NavigatorInitComposer()); + }, []); + useEffect(() => { if(!topLevelContexts || !topLevelContexts.length) return; From 37c0a83558580bf927eb77cb209b51ab7510906a Mon Sep 17 00:00:00 2001 From: dank074 Date: Thu, 17 Mar 2022 20:08:16 -0500 Subject: [PATCH 2/5] refresh navigator on opened --- src/components/navigator/NavigatorView.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/navigator/NavigatorView.tsx b/src/components/navigator/NavigatorView.tsx index d8cee5ff..2a40f9ba 100644 --- a/src/components/navigator/NavigatorView.tsx +++ b/src/components/navigator/NavigatorView.tsx @@ -25,7 +25,7 @@ export const NavigatorView: FC<{}> = props => const [ isRoomLinkOpen, setRoomLinkOpen ] = useState(false); const [ pendingDoorState, setPendingDoorState ] = useState<{ roomData: RoomDataParser, state: string }>(null); 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) => { @@ -212,7 +212,7 @@ export const NavigatorView: FC<{}> = props => useEffect(() => { - if(!isVisible || !needsNavigatorUpdate) return; + if(!needsNavigatorUpdate) return; dispatchNavigatorState({ type: NavigatorActions.SET_NEEDS_UPDATE, @@ -220,12 +220,16 @@ export const NavigatorView: FC<{}> = props => flag: false } }); - }, [ isVisible, needsNavigatorUpdate ]); + + SendMessageComposer(new NavigatorInitComposer()); + }, [ needsNavigatorUpdate ]); useEffect(() => { - SendMessageComposer(new NavigatorInitComposer()); - }, []); + if(!isVisible || !topLevelContext) return; + + sendSearch('', topLevelContext.code); + }, [isVisible, sendSearch, topLevelContext]) useEffect(() => { From 7b50616fa3ff31a1c255bbdf8206c8f7704276b9 Mon Sep 17 00:00:00 2001 From: Bill Date: Fri, 18 Mar 2022 01:07:09 -0400 Subject: [PATCH 3/5] Bump renderer version --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 82f1eedb..41a78960 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/free-solid-svg-icons": "^6.1.0", "@fortawesome/react-fontawesome": "^0.1.17", - "@nitrots/nitro-renderer": "^1.1.11", + "@nitrots/nitro-renderer": "^1.1.12", "animate.css": "^4.1.1", "classnames": "^2.3.1", "cross-env": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index dd05459f..a3bb1d10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1426,10 +1426,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@nitrots/nitro-renderer@^1.1.11": - version "1.1.11" - resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.1.11.tgz#6802fcd8f38b98a3ae42f30bb547ae3883f1eb78" - integrity sha512-FlMRiJqkDnpKQX08EL3llvgKedGx10KV6fRyMYCnhqlE+bpJTpMW9ZpGAaaRn2in2Dw3GaoYGrIeSuKIu2URnA== +"@nitrots/nitro-renderer@^1.1.12": + version "1.1.12" + resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.1.12.tgz#63647988aebbb891d06fa679e547bf9e4c9d6331" + integrity sha512-RKLkxCxXCG07BQRKbR9QTZQeG0T1WFflJmEzBWdnxgWAJwD9CYAx7ZTFT1VVt22tkMA2q5Tu/KfFjzPQXV4F8Q== dependencies: "@pixi/canvas-renderer" "^6.2.2" "@pixi/extract" "^6.2.2" From 7a9fc3df34efbdd084b367f4d7302fc1d4d302cc Mon Sep 17 00:00:00 2001 From: Bill Date: Fri, 18 Mar 2022 02:15:17 -0400 Subject: [PATCH 4/5] Bump renderer version --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 41a78960..c03ac7f7 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/free-solid-svg-icons": "^6.1.0", "@fortawesome/react-fontawesome": "^0.1.17", - "@nitrots/nitro-renderer": "^1.1.12", + "@nitrots/nitro-renderer": "^1.1.13", "animate.css": "^4.1.1", "classnames": "^2.3.1", "cross-env": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index a3bb1d10..309add21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1426,10 +1426,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@nitrots/nitro-renderer@^1.1.12": - version "1.1.12" - resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.1.12.tgz#63647988aebbb891d06fa679e547bf9e4c9d6331" - integrity sha512-RKLkxCxXCG07BQRKbR9QTZQeG0T1WFflJmEzBWdnxgWAJwD9CYAx7ZTFT1VVt22tkMA2q5Tu/KfFjzPQXV4F8Q== +"@nitrots/nitro-renderer@^1.1.13": + version "1.1.13" + resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.1.13.tgz#0173ebda69c41031903461a21a4b3dfa0bd6fcaa" + integrity sha512-LGk8514m+/+Y50kOdkP7dVG9DXTNPM3kD/U+wDJBw6MPkxe0R2blhwPoELK02jO6Ehfoz5v+nlhNeUTHzRZzeg== dependencies: "@pixi/canvas-renderer" "^6.2.2" "@pixi/extract" "^6.2.2" From 9d1d49c12d59349a3067ec25230f76ef9729484f Mon Sep 17 00:00:00 2001 From: Endrit Date: Fri, 18 Mar 2022 13:50:48 +0100 Subject: [PATCH 5/5] fixed user chooser --- src/components/room/widgets/choosers/UserChooserWidgetView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/room/widgets/choosers/UserChooserWidgetView.tsx b/src/components/room/widgets/choosers/UserChooserWidgetView.tsx index be9ccf5e..6f8641b8 100644 --- a/src/components/room/widgets/choosers/UserChooserWidgetView.tsx +++ b/src/components/room/widgets/choosers/UserChooserWidgetView.tsx @@ -19,7 +19,7 @@ export const UserChooserWidgetView: FC<{}> = props => { 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 ]);