more cleanup

src/LetInBlock.tsx

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