Commit 0cf27d80 authored by Grant's avatar Grant
Browse files

fix initial client load position (fixes #36)

parent 6308992e

packages/client/src/contexts/TemplateContext.tsx

+17 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ import { 
  createContext,

  useContext,

  useEffect,

  useRef,

  useState,

} from "react";

import { IRouterData, Router } from "../lib/router";
@@ -52,7 +53,11 @@ export const TemplateContext = ({ children }: PropsWithChildren) => { 
  const [y, setY] = useState(routerData.template?.y || 0);

  const [opacity, setOpacity] = useState(100);



  const initAt = useRef<number>();



  useEffect(() => {

    initAt.current = Date.now();



    const handleNavigate = (data: IRouterData) => {

      if (data.template) {

        setEnable(true);
@@ -74,6 +79,17 @@ export const TemplateContext = ({ children }: PropsWithChildren) => { 


  useEffect(() => {

    Router.setTemplate({ enabled: enable, width, x, y, url });



    if (!initAt.current) {

      console.debug("TemplateContext updating router but no initAt");

    } else if (Date.now() - initAt.current < 2 * 1000) {

      console.debug(

        "TemplateContext updating router too soon after init",

        Date.now() - initAt.current

      );

    }



    if (initAt.current && Date.now() - initAt.current > 2 * 1000)

      Router.queueUpdate();

  }, [enable, width, x, y, url]);

packages/client/src/lib/router.ts

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class _Router extends EventEmitter<RouterEvents> { 
    const url = this.getURL();

    if (!url) return;



    console.log("[Router] Updating URL");

    console.log("[Router] Updating URL", url);

    window.history.replaceState({}, "", url);

  }