From 8b9e5b963f40f75d4dee51a22a272c7cd221d21f Mon Sep 17 00:00:00 2001 From: codetypes Date: Tue, 30 Apr 2024 15:51:36 +0800 Subject: [PATCH] format code --- src/components/editor.tsx | 59 ++++++++++++++++--------------- src/components/inspector.tsx | 2 +- src/components/workspace.tsx | 15 +++++--- src/contexts/setting-context.ts | 2 +- src/contexts/workspace-context.ts | 33 +++++++++-------- src/misc/keys.ts | 2 +- 6 files changed, 61 insertions(+), 52 deletions(-) diff --git a/src/components/editor.tsx b/src/components/editor.tsx index 1a73edf..7b36c52 100644 --- a/src/components/editor.tsx +++ b/src/components/editor.tsx @@ -11,6 +11,7 @@ import { message } from "@/misc/hooks"; import i18n from "@/misc/i18n"; import { Hotkey, isHotkeyPressed, isMacos, useHotkeys } from "@/misc/keys"; import Path from "@/misc/path"; +import { mergeClassNames } from "@/misc/util"; import { ArrowDownOutlined, ArrowUpOutlined, CloseOutlined } from "@ant-design/icons"; import G6, { G6GraphEvent, Item, TreeGraph } from "@antv/g6"; import { dialog } from "@electron/remote"; @@ -18,7 +19,7 @@ import { useSize } from "ahooks"; import { Button, Dropdown, Flex, FlexProps, Input, InputRef, MenuProps } from "antd"; import { clipboard } from "electron"; import * as fs from "fs"; -import React, { FC, KeyboardEvent, useCallback, useEffect, useMemo, useRef, useState } from "react"; +import React, { FC, KeyboardEvent, useEffect, useMemo, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; import { FiDelete } from "react-icons/fi"; import { IoMdReturnLeft } from "react-icons/io"; @@ -27,7 +28,6 @@ import { VscCaseSensitive } from "react-icons/vsc"; import { mergeRefs } from "react-merge-refs"; import { useDebounceCallback } from "usehooks-ts"; import "./register-node"; -import { mergeClassNames } from "@/misc/util"; export interface EditorProps extends React.HTMLAttributes { data: EditorStore; @@ -148,7 +148,7 @@ export const Editor: FC = ({ onUpdate: updateState, data: editor, . filterCase: false, filterFocus: false, filterType: "", - placeholder: "" + placeholder: "", }); const onSearchChange = (option: FilterOption) => { @@ -238,10 +238,13 @@ export const Editor: FC = ({ onUpdate: updateState, data: editor, . let found = false; if (option.filterType === "nodeId") { if (option.filterStr === node.id) { - found = true + found = true; } } else { - if (includeString(node.name, option) || includeString(node.desc || node.def.desc, option)) { + if ( + includeString(node.name, option) || + includeString(node.desc || node.def.desc, option) + ) { found = true; } else if (node.input) { for (const str of node.input) { @@ -1091,40 +1094,40 @@ export const Editor: FC = ({ onUpdate: updateState, data: editor, . }; const searchByType = (type: string) => { - let placeholder = "" - const filterType = type + let placeholder = ""; + const filterType = type; // todo multiple parameter format judgment switch (type) { case "nodeId": - placeholder = t("jumpNode") - break + placeholder = t("jumpNode"); + break; default: - placeholder = t("searchNode") - break + placeholder = t("searchNode"); + break; } if (!showingSearch) { - setFilterOption({ ...filterOption, placeholder, filterType }) - setShowingSearch(true) - return + setFilterOption({ ...filterOption, placeholder, filterType }); + setShowingSearch(true); + return; } - if (filterOption.filterType === type) return searchIptRef.current?.focus() - setShowingSearch(false) + if (filterOption.filterType === type) return searchIptRef.current?.focus(); + setShowingSearch(false); setTimeout(() => { - setShowingSearch(true) - setFilterOption({ ...filterOption, placeholder, filterType }) - searchIptRef.current?.focus() - }, 50) - } + setShowingSearch(true); + setFilterOption({ ...filterOption, placeholder, filterType }); + searchIptRef.current?.focus(); + }, 50); + }; const handleKeyDown = (e: KeyboardEvent) => { if (e.code === Hotkey.Enter) { - nextResult() + nextResult(); } else if ((e.ctrlKey || e.metaKey) && e.code === "KeyF") { - searchByType("") + searchByType(""); } else if ((e.ctrlKey || e.metaKey) && e.code === "KeyG") { - searchByType("nodeId") + searchByType("nodeId"); } - } + }; return (
= ({ onUpdate: updateState, data: editor, . > = ({ onUpdate: updateState, data: editor, . index: 0, }) } - onKeyDown={ handleKeyDown } + onKeyDown={handleKeyDown} suffix={ {filterOption.filterType !== "nodeId" && ( @@ -1249,7 +1252,7 @@ export const Editor: FC = ({ onUpdate: updateState, data: editor, . filterFocus: false, filterStr: "", filterType: "", - placeholder: "" + placeholder: "", }); keysRef.current?.focus(); }} diff --git a/src/components/inspector.tsx b/src/components/inspector.tsx index 0098023..d250939 100644 --- a/src/components/inspector.tsx +++ b/src/components/inspector.tsx @@ -1,4 +1,4 @@ -import { EditNode, EditTree, FileTreeType, useWorkspace } from "@/contexts/workspace-context"; +import { EditNode, EditTree, useWorkspace } from "@/contexts/workspace-context"; import { NodeArgType, NodeModel, TreeGraphData, TreeModel } from "@/misc/b3type"; import { Hotkey, isMacos } from "@/misc/keys"; import Path from "@/misc/path"; diff --git a/src/components/workspace.tsx b/src/components/workspace.tsx index 7817337..4f3df38 100644 --- a/src/components/workspace.tsx +++ b/src/components/workspace.tsx @@ -7,7 +7,7 @@ import { app } from "@electron/remote"; import { Button, Flex, Layout, Space, Tabs, Tag, Tooltip } from "antd"; import { FC, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; -import { FaExclamationTriangle, FaRegFolderOpen } from "react-icons/fa"; +import { FaExclamationTriangle } from "react-icons/fa"; import { PiTreeStructureFill } from "react-icons/pi"; import { VscNewFolder, VscRepo } from "react-icons/vsc"; import useForceUpdate from "use-force-update"; @@ -44,7 +44,14 @@ export const Workspace: FC = () => { const { width = 0, height = 0 } = useWindowSize(); const keysRef = useHotkeys( - [Hotkey.Save, Hotkey.CloseEditor, Hotkey.SearchTree, Hotkey.Build, Hotkey.SearchNode, Hotkey.JumpNode], + [ + Hotkey.Save, + Hotkey.CloseEditor, + Hotkey.SearchTree, + Hotkey.Build, + Hotkey.SearchNode, + Hotkey.JumpNode, + ], (event) => { if (isHotkeyPressed(Hotkey.Save)) { event.preventDefault(); @@ -68,8 +75,8 @@ export const Workspace: FC = () => { event.preventDefault(); workspace.editing?.dispatch("searchNode"); } else if (isHotkeyPressed(Hotkey.JumpNode)) { - event.preventDefault() - workspace.editing?.dispatch("jumpNode") + event.preventDefault(); + workspace.editing?.dispatch("jumpNode"); } } ); diff --git a/src/contexts/setting-context.ts b/src/contexts/setting-context.ts index 864a371..2a1791f 100644 --- a/src/contexts/setting-context.ts +++ b/src/contexts/setting-context.ts @@ -1,7 +1,7 @@ import { readJson, writeJson } from "@/misc/util"; import { app } from "@electron/remote"; -import { create } from "zustand"; import * as fs from "fs"; +import { create } from "zustand"; const settingPath = app.getPath("userData") + "/settings.json"; diff --git a/src/contexts/workspace-context.ts b/src/contexts/workspace-context.ts index 62e079c..dab73fa 100644 --- a/src/contexts/workspace-context.ts +++ b/src/contexts/workspace-context.ts @@ -145,13 +145,13 @@ export type WorkspaceStore = { }; const loadFileTree = (workdir: string, filename: string) => { - const fullpath = fs.realpathSync(`${ workdir }/${ filename }`); + const fullpath = fs.realpathSync(`${workdir}/${filename}`); if (!fs.existsSync(fullpath)) { return; } const stat = fs.statSync(fullpath); - if (!( stat.isDirectory() || fullpath.endsWith(".json") )) { + if (!(stat.isDirectory() || fullpath.endsWith(".json"))) { return; } @@ -164,13 +164,13 @@ const loadFileTree = (workdir: string, filename: string) => { data.children = []; const files = fs.readdirSync(data.path); files.forEach((v) => { - const child = loadFileTree(workdir, `${ filename }/${ v }`); + const child = loadFileTree(workdir, `${filename}/${v}`); if (child) { data.children?.push(child); } }); data.children.sort((a, b) => { - if (( a.children && b.children ) || ( !a.children && !b.children )) { + if ((a.children && b.children) || (!a.children && !b.children)) { return a.title.localeCompare(b.title); } else { return a.children ? -1 : 1; @@ -188,7 +188,7 @@ const saveFile = (editor?: EditorStore) => { } }; -export const useWorkspace = create((set, get) => ( { +export const useWorkspace = create((set, get) => ({ allFiles: [], fileTree: undefined, editors: [], @@ -210,15 +210,15 @@ export const useWorkspace = create((set, get) => ( { if (!fs.existsSync(path)) { useSetting.getState().removeRecent(path); } - message.error(`load workspace error: ${ path }`); + message.error(`load workspace error: ${path}`); } } }, createProject: () => { const path = dialog.showSaveDialogSync({ - properties: [ "showOverwriteConfirmation", "createDirectory" ], - filters: [ { name: "Behavior3 Workspace", extensions: [ "b3-workspace" ] } ], + properties: ["showOverwriteConfirmation", "createDirectory"], + filters: [{ name: "Behavior3 Workspace", extensions: ["b3-workspace"] }], }); if (path) { const workspace = get(); @@ -234,7 +234,7 @@ export const useWorkspace = create((set, get) => ( { const win = BrowserWindow.getFocusedWindow(); if (win) { const path = dialog.showOpenDialogSync(win, { - filters: [ { name: "workspace", extensions: [ "b3-workspace" ] } ], + filters: [{ name: "workspace", extensions: ["b3-workspace"] }], }); if (path?.length) { ipcRenderer.invoke("open-win", path[0]); @@ -248,7 +248,7 @@ export const useWorkspace = create((set, get) => ( { if (workspace.path) if (!buildDir) { buildDir = dialog.showOpenDialogSync({ - properties: [ "openDirectory", "createDirectory" ], + properties: ["openDirectory", "createDirectory"], })?.[0]; } if (buildDir) { @@ -281,9 +281,9 @@ export const useWorkspace = create((set, get) => ( { batchProject: () => { const workspace = get(); const scriptPath = dialog.showOpenDialogSync({ - properties: [ "openFile" ], + properties: ["openFile"], defaultPath: workspace.workdir, - filters: [ { name: "Javascript", extensions: [ "js" ] } ], + filters: [{ name: "Javascript", extensions: ["js"] }], })?.[0]; if (scriptPath) { try { @@ -329,7 +329,7 @@ export const useWorkspace = create((set, get) => ( { workspace.edit(editor.path); } catch (error) { console.error(error); - message.error(`invalid file: ${ path }`); + message.error(`invalid file: ${path}`); } } else if (workspace.editing !== editor) { workspace.edit(editor.path); @@ -389,8 +389,7 @@ export const useWorkspace = create((set, get) => ( { saveFile(workspace.editing); }, - saveAs: () => { - }, + saveAs: () => {}, saveAll: () => { const workspace = get(); @@ -445,7 +444,7 @@ export const useWorkspace = create((set, get) => ( { loadNodeDefs: () => { const workspace = get(); - const nodeDefData = readJson(`${ workspace.workdir }/node-config.b3-setting`) as NodeDef[]; + const nodeDefData = readJson(`${workspace.workdir}/node-config.b3-setting`) as NodeDef[]; const nodeDefs: Map = new Map(); for (const v of nodeDefData) { nodeDefs.set(v.name, v); @@ -479,4 +478,4 @@ export const useWorkspace = create((set, get) => ( { const workspace = get(); return workspace.nodeDefs.has(name); }, -} )); +})); diff --git a/src/misc/keys.ts b/src/misc/keys.ts index cf111b6..c338797 100644 --- a/src/misc/keys.ts +++ b/src/misc/keys.ts @@ -33,7 +33,7 @@ export function useHotkeys( keys: Keys, callback: HotkeyCallback, options?: OptionsOrDependencyArray, - dependencies?: OptionsOrDependencyArray, + dependencies?: OptionsOrDependencyArray ): MutableRefObject> { if (keys instanceof Array) { keys = keys.filter((v) => !!v);