arg new/old

This commit is contained in:
Seth Trowbridge 2023-06-18 07:36:55 -04:00
parent 24ba4e8f5b
commit a781b3300c
2 changed files with 17 additions and 10 deletions

View File

@ -19,7 +19,7 @@ Socket.addEventListener('message', async(event:{data:string})=>
handlers.forEach(handler=>handler(reImport)); handlers.forEach(handler=>handler(reImport));
HMR.update(); HMR.update();
}); });
Socket.addEventListener("error", ()=>{clearInterval(SocketTimer); console.log("HRM socket lost")}) Socket.addEventListener("error", ()=>{clearInterval(SocketTimer); console.log("HMR socket lost")})
const SocketTimer = setInterval(()=>{Socket.send("ping")}, 5000); const SocketTimer = setInterval(()=>{Socket.send("ping")}, 5000);
const HMR = const HMR =

View File

@ -6,7 +6,7 @@ export type StateCapture = {state:StateType, set:ReactParts.StateUpdater<StateTy
type FuncArgs = [element:keyof ReactParts.JSX.IntrinsicElements, props:Record<string, string>, children:ReactParts.JSX.Element[]]; type FuncArgs = [element:keyof ReactParts.JSX.IntrinsicElements, props:Record<string, string>, children:ReactParts.JSX.Element[]];
const H = ReactParts.createElement; const H = ReactParts.createElement;
const MapAt =(inMap:Map<string, StateCapture>, inIndex:number)=> const MapIndex =(inMap:Map<string, StateCapture>, inIndex:number)=>
{ {
let index = 0; let index = 0;
for(const kvp of inMap) for(const kvp of inMap)
@ -58,18 +58,24 @@ const ProxyElement = (props:{__args:FuncArgs})=>
const ProxyState =(arg:StateType)=> const ProxyState =(arg:StateType)=>
{ {
const id = ReactParts.useId(); const id = ReactParts.useId();
//const argOriginal = arg;
// does statesOld have an entry for this state? use that instead of the passed arg // does statesOld have an entry for this state? use that instead of the passed arg
const check = MapAt(HMR.statesOld, HMR.statesNew.size); const check = MapIndex(HMR.statesOld, HMR.statesNew.size);
const argOld = check ? check[1].state : arg;
const lastKnowReloads = HMR.reloads; const lastKnowReloads = HMR.reloads;
const [stateGet, stateSet] = ReactParts.useState(check ? check[1].state : arg); const [stateGet, stateSet] = ReactParts.useState(argOld);
ReactParts.useEffect(()=>{ ReactParts.useEffect(()=>{
/*
i have no idea what this does
return ()=>{ return ()=>{
if(HMR.reloads == lastKnowReloads) if(HMR.reloads == lastKnowReloads)
{ {
// this is a switch/ui change, not a HMR reload change // this is a switch/ui change, not a HMR reload change
const oldState = MapAt(HMR.statesOld, HMR.statesNew.size-1); const oldState = MapIndex(HMR.statesOld, HMR.statesNew.size-1);
oldState && HMR.statesOld.set(oldState[0], {...oldState[1], state:arg}); oldState && HMR.statesOld.set(oldState[0], {...oldState[1], state:arg});
console.log("check: ui-invoked") console.log("check: ui-invoked")
@ -80,18 +86,19 @@ const ProxyState =(arg:StateType)=>
} }
HMR.statesNew.delete(id); HMR.statesNew.delete(id);
} }
*/
}, []); }, []);
if(!HMR.statesNew.has(id)) if(!HMR.statesNew.has(id))
{ {
HMR.statesNew.set(id, {state:arg, set:stateSet, reload:HMR.reloads}); HMR.statesNew.set(id, {state:argOld, set:stateSet, reload:HMR.reloads});
} }
function proxySetter (arg:StateType) function proxySetter (inArg:StateType)
{ {
//console.log("state spy update", id, arg); //console.log("state spy update", id, arg);
HMR.statesNew.set(id, {state:arg, set:stateSet, reload:HMR.reloads}); HMR.statesNew.set(id, {state:inArg, set:stateSet, reload:HMR.reloads});
return stateSet(arg); return stateSet(inArg);
} }
return [stateGet, proxySetter]; return [stateGet, proxySetter];