highlight args when click input/output

src/components/editor.tsx

@@ -17,11 +17,11 @@ import { useShallow } from "zustand/react/shallow";
 import {
   EditEvent,
   EditNode,
-  EditTree,
   EditorStore,
+  EditTree,
   useWorkspace,
 } from "../contexts/workspace-context";
-import { NodeModel, TreeGraphData, TreeModel } from "../misc/b3type";
+import { isExprType, NodeModel, TreeGraphData, TreeModel } from "../misc/b3type";
 import * as b3util from "../misc/b3util";
 import { message } from "../misc/hooks";
 import i18n from "../misc/i18n";
@@ -195,6 +195,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
 
   const onSearchChange = (option: FilterOption) => {
     option.results.length = 0;
+    editor.searchingText = option.filterStr;
     filterNodes(option, editor.data);
     setFilterOption({
       ...option,
@@ -237,11 +238,16 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
     }
   };
 
+  const parseExpr = (expr: string) => {
+    return expr.split(/[^a-zA-Z0-9_]/);
+  };
+
   const findHightlight = (node: TreeGraphData, highlight: string[], changed?: TreeGraphData[]) => {
     changed ||= [];
-    if (node.highlightInput || node.highlightOutput) {
+    if (node.highlightInput || node.highlightOutput || node.highlightArgs) {
       node.highlightInput = false;
       node.highlightOutput = false;
+      node.highlightArgs = false;
       changed.push(node);
     }
 
@@ -265,6 +271,31 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
       }
     }
 
+    node.def.args?.forEach((arg) => {
+      if (isExprType(arg.type)) {
+        const expr: string | string[] = node.args?.[arg.name];
+        if (typeof expr === "string") {
+          for (const v of parseExpr(expr)) {
+            if (highlight.includes(v)) {
+              node.highlightArgs = true;
+              changed.push(node);
+              break;
+            }
+          }
+        } else if (expr instanceof Array) {
+          loop: for (const str of expr) {
+            for (const v of parseExpr(str)) {
+              if (highlight.includes(v)) {
+                node.highlightArgs = true;
+                changed.push(node);
+                break loop;
+              }
+            }
+          }
+        }
+      }
+    });
+
     node.children?.forEach((child: TreeGraphData) => findHightlight(child, highlight, changed));
 
     return changed;
@@ -312,28 +343,32 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
             includeString(node.desc || node.def.desc, option)
           ) {
             found = true;
-          } else if (node.input) {
+          }
+          if (!found && node.input) {
             for (const str of node.input) {
               if (includeString(str, option)) {
                 found = true;
                 break;
               }
             }
-          } else if (node.args) {
+          }
+          if (!found && node.args) {
             for (const str in node.args) {
-              if (includeString(str, option)) {
+              if (includeString(str, option) || includeString(node.args[str], option)) {
                 found = true;
                 break;
               }
             }
-          } else if (node.output) {
+          }
+          if (!found && node.output) {
             for (const str of node.output) {
               if (includeString(str, option)) {
                 found = true;
                 break;
               }
             }
-          } else if (node.path) {
+          }
+          if (!found && node.path) {
             if (includeString(node.path, option)) {
               found = true;
             }
@@ -847,10 +882,32 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
         data.output?.forEach((v) => v && highlight.push(v));
       }
       const changed = findHightlight(editor.data, highlight);
-      changed.forEach((v) => {
+      if (changed.length > 0) {
-        const item = editor.graph.findById(v.id);
+        const refreshHighlight = (node: TreeGraphData) => {
-        item.draw();
+          const item = editor.graph.findById(node.id);
-      });
+          if (highlight.length > 0) {
+            node.highlightGray = !(
+              node.highlightInput ||
+              node.highlightOutput ||
+              node.highlightArgs
+            );
+          } else {
+            node.highlightGray = false;
+          }
+          item.draw();
+          if (node.children) {
+            node.children.forEach(refreshHighlight);
+          }
+        };
+        refreshHighlight(editor.data);
+      }
+      if (highlight.length === 0 && editor.searchingText) {
+        onSearchChange({
+          ...filterOption,
+          filterType: "content",
+          filterStr: editor.searchingText,
+        });
+      }
     });
 
     editor.graph.on("node:contextmenu", (e: G6GraphEvent) => {
@@ -1044,10 +1101,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
   useKeyDown(Hotkey.Undo, keysRef, () => undo());
   useKeyDown(Hotkey.Redo, keysRef, () => redo());
   useKeyDown([Hotkey.Insert, Hotkey.Enter], keysRef, () => createNode());
-  useKeyDown([Hotkey.Delete, Hotkey.Backspace], keysRef, () => {
+  useKeyDown([Hotkey.Delete, Hotkey.Backspace], keysRef, () => deleteNode());
-    console.log("delete");
-    deleteNode();
-  });
 
   editor.dispatch = (event: EditEvent, data: unknown) => {
     switch (event) {
@@ -1060,7 +1114,6 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
         break;
       }
       case "delete": {
-        console.log("delete1");
         deleteNode();
         break;
       }
@@ -1223,7 +1276,6 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
     } else if ((e.ctrlKey || e.metaKey) && e.code === "KeyG") {
       searchByType("id");
     }
-    console.log(e.code);
     e.stopPropagation();
   };
 

src/components/register-node.ts

@@ -351,6 +351,19 @@ G6.registerNode(
       const args: any = data.args;
       if (nodeDef.args && args && Object.keys(args).length > 0) {
         const { str, line } = toBreakWord(`${i18n.t("regnode.args")}${JSON.stringify(args)}`, 200);
+        if (data.highlightArgs) {
+          addShape("rect", {
+            attrs: {
+              x: x - 2,
+              y: y + 17,
+              width: w - 6,
+              height: 18,
+              fill: "#0d1117",
+              radius: [r, r, r, r],
+            },
+            name: "args-text-bg",
+          });
+        }
         addShape("text", {
           attrs: {
             textBaseline: "top",
@@ -359,7 +372,8 @@ G6.registerNode(
             w,
             lineHeight: 20,
             text: str,
-            fill: textColor,
+            fill: data.highlightArgs ? "white" : textColor,
+            fontWeight: data.highlightArgs ? "bolder" : undefined,
           },
           name: "args-text",
         });

src/contexts/workspace-context.ts

@@ -60,6 +60,7 @@ export class EditorStore {
   unsave: boolean = false;
   modifiedTime: number = Date.now();
   alertReload: boolean = false;
+  searchingText?: string;
 
   historyStack: NodeModel[] = [];
   historyIndex: number = 0;

src/misc/b3type.ts

@@ -65,6 +65,7 @@ export interface TreeGraphData extends G6TreeGraphData {
   size?: number[];
   highlightInput?: boolean;
   highlightOutput?: boolean;
+  highlightArgs?: boolean;
   highlightGray?: boolean;
   status?: number;
 }