research/dope2-webapp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more cleanup

Browse source
This commit is contained in:
Joeri Exelmans 2025-05-18 11:05:03 +02:00
parent 802373ba16
commit fe83532261
1 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/LetInBlock.tsx
View file

@ -18,29 +18,20 @@ export interface LetInBlockState {
interface LetInBlockProps extends State2Props<LetInBlockState,EditorState> {} interface LetInBlockProps extends State2Props<LetInBlockState,EditorState> {}
export function LetInBlock({state, setState, suggestionPriority}: LetInBlockProps) { export function LetInBlock(props: LetInBlockProps) {
return <span className="letIn"> return <span className="letIn">
<div className="decl"> <div className="decl">
<DeclColumns <DeclColumns {...props} />
state={state}
setState={setState}
suggestionPriority={suggestionPriority}
/>
</div> </div>
<div className="inner"> <div className="inner">
<InnerMost <InnerMost {...props} />
state={state}
setState={setState}
suggestionPriority={suggestionPriority}
/>
</div> </div>
</span> </span>
} }
function DeclColumns({state, setState, suggestionPriority}) { function DeclColumns({state: {name, value, inner}, setState, suggestionPriority}) {
const env = useContext(EnvContext); const env = useContext(EnvContext);
const globalContext = useContext(GlobalContext); const globalContext = useContext(GlobalContext);
const {name, value, inner} = state;
const setInner = callback => setState(state => ({...state, inner: callback(state.inner)})); const setInner = callback => setState(state => ({...state, inner: callback(state.inner)}));
const setValue = callback => setState(state => ({...state, value: callback(state.value)})); const setValue = callback => setState(state => ({...state, value: callback(state.value)}));
@ -53,7 +44,6 @@ function DeclColumns({state, setState, suggestionPriority}) {
const resolved = evalEditorBlock(inner, innerEnv); const resolved = evalEditorBlock(inner, innerEnv);
return scoreResolved(resolved, suggestionPriority); return scoreResolved(resolved, suggestionPriority);
}; };
const innerSuggestionPriority = suggestionPriority;
const nameRef = useRef<HTMLInputElement>(null); const nameRef = useRef<HTMLInputElement>(null);
useEffect(() => { useEffect(() => {
@ -61,8 +51,8 @@ function DeclColumns({state, setState, suggestionPriority}) {
}, []); }, []);
useEffect(() => autoInputWidth(nameRef, name, 60), [nameRef, name]); useEffect(() => autoInputWidth(nameRef, name, 60), [nameRef, name]);
const valueResolved = evalEditorBlock(state.value, env); const valueResolved = evalEditorBlock(value, env);
const innerEnv = makeInnerEnv(env, state.name, valueResolved); const innerEnv = makeInnerEnv(env, name, valueResolved);
return <> return <>
<span className="keyword column">let&nbsp;</span> <span className="keyword column">let&nbsp;</span>
@ -90,7 +80,7 @@ function DeclColumns({state, setState, suggestionPriority}) {
<DeclColumns <DeclColumns
state={inner} state={inner}
setState={setInner} setState={setInner}
suggestionPriority={innerSuggestionPriority} suggestionPriority={suggestionPriority}
/> />
</EnvContext> </EnvContext>
} }