refactor a bit more
This commit is contained in:
parent
230916ceb1
commit
fdbf43a4e9
11 changed files with 79 additions and 90 deletions
|
|
@ -18,7 +18,6 @@ export interface LetInBlockState {
|
|||
}
|
||||
|
||||
interface LetInBlockProps extends State2Props<LetInBlockState,ExprBlockState> {
|
||||
addParam: (e: ExprBlockState) => void;
|
||||
}
|
||||
|
||||
export function LetInBlock(props: LetInBlockProps) {
|
||||
|
|
@ -32,7 +31,7 @@ export function LetInBlock(props: LetInBlockProps) {
|
|||
</span>
|
||||
}
|
||||
|
||||
function DeclColumns({state: {name, value, inner, focus}, setState, suggestionPriority, addParam}) {
|
||||
function DeclColumns({state: {name, value, inner, focus}, setState, suggestionPriority}) {
|
||||
const env = useContext(EnvContext);
|
||||
const globalContext = useContext(GlobalContext);
|
||||
|
||||
|
|
@ -55,11 +54,9 @@ function DeclColumns({state: {name, value, inner, focus}, setState, suggestionPr
|
|||
placeholder="<name>"
|
||||
text={name}
|
||||
suggestion=""
|
||||
focus={focus}
|
||||
onEnter={() => {}}
|
||||
onCancel={() => {}}
|
||||
onTextChange={name => setState(state => ({...state, name}))}
|
||||
setFocus={focus => setState(state => ({...state, focus}))}
|
||||
extraHandlers={{}}
|
||||
/>
|
||||
</span>
|
||||
|
|
@ -70,7 +67,6 @@ function DeclColumns({state: {name, value, inner, focus}, setState, suggestionPr
|
|||
setState={setValue}
|
||||
suggestionPriority={valueSuggestionPriority}
|
||||
onCancel={() => setState(state => state.inner)} // keep inner
|
||||
addParam={addParam}
|
||||
/>
|
||||
</span>
|
||||
{inner.kind === "let" &&
|
||||
|
|
@ -80,14 +76,13 @@ function DeclColumns({state: {name, value, inner, focus}, setState, suggestionPr
|
|||
state={inner}
|
||||
setState={setInner}
|
||||
suggestionPriority={suggestionPriority}
|
||||
addParam={addParam}
|
||||
/>
|
||||
</EnvContext>
|
||||
}
|
||||
</>;
|
||||
}
|
||||
|
||||
function InnerMost({state, setState, suggestionPriority, addParam}) {
|
||||
function InnerMost({state, setState, suggestionPriority}) {
|
||||
const env = useContext(EnvContext);
|
||||
const globalContext = useContext(GlobalContext);
|
||||
const setInner = callback => setState(state => ({...state, inner: callback(state.inner)}));
|
||||
|
|
@ -100,7 +95,6 @@ function InnerMost({state, setState, suggestionPriority, addParam}) {
|
|||
state={state.inner}
|
||||
setState={setInner}
|
||||
suggestionPriority={suggestionPriority}
|
||||
addParam={addParam}
|
||||
/>
|
||||
</EnvContext>;
|
||||
}
|
||||
|
|
@ -111,7 +105,6 @@ function InnerMost({state, setState, suggestionPriority, addParam}) {
|
|||
setState={setInner}
|
||||
suggestionPriority={suggestionPriority}
|
||||
onCancel={onCancel} // keep value
|
||||
addParam={addParam}
|
||||
/>
|
||||
</EnvContext>
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue