Skip to content

Commit

Permalink
Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Laynester committed Mar 18, 2022
2 parents 3d40c29 + 39a85bd commit be92aed
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.13",
"animate.css": "^4.1.1",
"classnames": "^2.3.1",
"cross-env": "^7.0.3",
Expand Down
2 changes: 1 addition & 1 deletion src/components/achievements/AchievementsView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export const AchievementsView: FC<{}> = props =>

useEffect(() =>
{
if(!isVisible || !isInitalized) return;
if(!isVisible || isInitalized) return;

SendMessageComposer(new RequestAchievementsMessageComposer());
}, [ isVisible, isInitalized ]);
Expand Down
15 changes: 11 additions & 4 deletions src/components/navigator/NavigatorView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) =>
{
Expand Down Expand Up @@ -212,17 +212,24 @@ export const NavigatorView: FC<{}> = props =>

useEffect(() =>
{
if(!isVisible || !needsNavigatorUpdate) return;
if(!needsNavigatorUpdate) return;

dispatchNavigatorState({
type: NavigatorActions.SET_NEEDS_UPDATE,
payload: {
flag: false
}
});

SendMessageComposer(new NavigatorInitComposer());
}, [ isVisible, needsNavigatorUpdate ]);
}, [ needsNavigatorUpdate ]);

useEffect(() =>
{
if(!isVisible || !topLevelContext) return;

sendSearch('', topLevelContext.code);
}, [isVisible, sendSearch, topLevelContext])

useEffect(() =>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]);

Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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.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"
Expand Down

0 comments on commit be92aed

Please sign in to comment.