diff --git a/src/behavior3 b/src/behavior3 index f45acd9..d6e3f08 160000 --- a/src/behavior3 +++ b/src/behavior3 @@ -1 +1 @@ -Subproject commit f45acd9d309156eb3fe05df4d68c2a3015c3f5cc +Subproject commit d6e3f089504ae999030cb439fbb023d900705d53 diff --git a/src/components/editor.tsx b/src/components/editor.tsx index 5021f9e..2498b17 100644 --- a/src/components/editor.tsx +++ b/src/components/editor.tsx @@ -44,7 +44,6 @@ interface FilterOption { filterFocus: boolean; filterType: "content" | "id"; placeholder: string; - isFocused: boolean; } const createTreeData = (node: NodeModel, parent?: string) => { @@ -227,7 +226,6 @@ export const Editor: FC = ({ onUpdate: updateState, data: editor, . filterFocus: true, filterType: "content", placeholder: "", - isFocused: false, }); const onSearchChange = (option: FilterOption) => { @@ -710,10 +708,6 @@ export const Editor: FC = ({ onUpdate: updateState, data: editor, . }; const createNode = () => { - if (filterOption.isFocused) { - return; - } - if (!editor.selectedId) { message.warning(t("node.noNodeSelected")); return; @@ -1391,8 +1385,6 @@ export const Editor: FC = ({ onUpdate: updateState, data: editor, . index: 0, }) } - onFocus={() => setFilterOption({ ...filterOption, isFocused: true })} - onBlur={() => setFilterOption({ ...filterOption, isFocused: false })} onKeyDownCapture={handleKeyDown} suffix={ @@ -1421,12 +1413,12 @@ export const Editor: FC = ({ onUpdate: updateState, data: editor, . filterOption.filterFocus && "b3-editor-filter-selected" )} icon={} - onClick={() => + onClick={() => { onSearchChange({ ...filterOption, filterFocus: !filterOption.filterFocus, - }) - } + }); + }} /> } @@ -1471,7 +1463,6 @@ export const Editor: FC = ({ onUpdate: updateState, data: editor, . filterStr: "", filterType: "content", placeholder: "", - isFocused: false, }); keysRef.current?.focus(); }} diff --git a/src/components/inspector.tsx b/src/components/inspector.tsx index 698002a..c8fe503 100644 --- a/src/components/inspector.tsx +++ b/src/components/inspector.tsx @@ -50,7 +50,6 @@ import { isNodeArgOptional, isValidVariableName, isVariadic, - loadVarDef, parseExpr, usingGroups, usingVars, @@ -259,7 +258,6 @@ const TreeInspector: FC = () => { // set form values useEffect(() => { - loadVarDef(workspace.editingTree.import); form.resetFields(); form.setFieldValue("name", workspace.editingTree.name); form.setFieldValue("desc", workspace.editingTree.desc); @@ -624,7 +622,10 @@ const NodeInspector: FC = () => { form.setFieldValue("debug", data.debug); form.setFieldValue("disabled", data.disabled); form.setFieldValue("path", data.path); - form.setFieldValue("group", def.group); + form.setFieldValue( + "group", + def.group?.map((g) => ({ label: g, value: g })) + ); if (def.children === undefined || def.children === -1) { form.setFieldValue("children", t("node.children.unlimited")); } else { @@ -872,30 +873,32 @@ const NodeInspector: FC = () => { labelCol={{ span: "auto" }} onFinish={finish} > - - - - usingGroups[g])) { - return Promise.reject( - new Error(t("node.groupNotEnabled", { group: def.group })) - ); - } - return Promise.resolve(); - }, - }, - ]} - > + {workspace.groupDefs.length > 0 && def.group?.length && ( - - + usingGroups[g])) { + return Promise.reject( + new Error(t("node.groupNotEnabled", { group: def.group })) + ); + } + return Promise.resolve(); + }, + }, + ]} + > +