refactor: base components

src/components/base/base-dialog.tsx

@@ -31,22 +31,23 @@ export interface DialogRef {
   close: () => void;
 }
 
-export const BaseDialog: React.FC<Props> = (props) => {
+export const BaseDialog: React.FC<Props> = ({
-  const {
+  open,
-    open,
+  title,
-    title,
+  children,
-    children,
+  okBtn,
-    okBtn,
+  cancelBtn,
-    cancelBtn,
+  contentSx,
-    contentSx,
+  disableCancel,
-    disableCancel,
+  disableOk,
-    disableOk,
+  disableFooter,
-    disableFooter,
+  loading,
-    loading,
+  onOk,
-  } = props;
+  onCancel,
-
+  onClose,
+}) => {
   return (
-    <Dialog open={open} onClose={props.onClose}>
+    <Dialog open={open} onClose={onClose}>
       <DialogTitle>{title}</DialogTitle>
 
       <DialogContent sx={contentSx}>{children}</DialogContent>
@@ -54,16 +55,12 @@ export const BaseDialog: React.FC<Props> = (props) => {
       {!disableFooter && (
         <DialogActions>
           {!disableCancel && (
-            <Button variant="outlined" onClick={props.onCancel}>
+            <Button variant="outlined" onClick={onCancel}>
               {cancelBtn}
             </Button>
           )}
           {!disableOk && (
-            <LoadingButton
+            <LoadingButton loading={loading} variant="contained" onClick={onOk}>
-              loading={loading}
-              variant="contained"
-              onClick={props.onOk}
-            >
               {okBtn}
             </LoadingButton>
           )}

src/components/base/base-error-boundary.tsx

@@ -20,10 +20,8 @@ interface Props {
   children?: ReactNode;
 }
 
-export const BaseErrorBoundary = (props: Props) => {
+export const BaseErrorBoundary = ({ children }: Props) => {
   return (
-    <ErrorBoundary FallbackComponent={ErrorFallback}>
+    <ErrorBoundary FallbackComponent={ErrorFallback}>{children}</ErrorBoundary>
-      {props.children}
-    </ErrorBoundary>
   );
 };

src/components/base/base-fieldset.tsx

@@ -9,30 +9,36 @@ type Props = {
   children?: React.ReactNode;
 };
 
-export const BaseFieldset: React.FC<Props> = (props: Props) => {
+export const BaseFieldset: React.FC<Props> = ({
+  label,
+  fontSize,
+  width,
+  padding,
+  children,
+}: Props) => {
   const Fieldset = styled(Box)<{ component?: string }>(() => ({
     position: "relative",
     border: "1px solid #bbb",
     borderRadius: "5px",
-    width: props.width ?? "auto",
+    width: width ?? "auto",
-    padding: props.padding ?? "15px",
+    padding: padding ?? "15px",
   }));
 
   const Label = styled("legend")(({ theme }) => ({
     position: "absolute",
     top: "-10px",
-    left: props.padding ?? "15px",
+    left: padding ?? "15px",
     backgroundColor: theme.palette.background.paper,
     backgroundImage:
       "linear-gradient(rgba(255, 255, 255, 0.16), rgba(255, 255, 255, 0.16))",
     color: theme.palette.text.primary,
-    fontSize: props.fontSize ?? "1em",
+    fontSize: fontSize ?? "1em",
   }));
 
   return (
     <Fieldset component="fieldset">
-      <Label>{props.label}</Label>
+      <Label>{label}</Label>
-      {props.children}
+      {children}
     </Fieldset>
   );
 };

src/components/base/base-search-box.tsx

@@ -1,6 +1,13 @@
 import { Box, SvgIcon, TextField, styled } from "@mui/material";
 import Tooltip from "@mui/material/Tooltip";
-import { ChangeEvent, useEffect, useMemo, useRef, useState } from "react";
+import {
+  ChangeEvent,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import { useTranslation } from "react-i18next";
 
 import matchCaseIcon from "@/assets/image/component/match_case.svg?react";
@@ -35,15 +42,20 @@ const StyledTextField = styled(TextField)(({ theme }) => ({
   },
 }));
 
-export const BaseSearchBox = (props: SearchProps) => {
+export const BaseSearchBox = ({
+  placeholder,
+  matchCase: defaultMatchCase = false,
+  matchWholeWord: defaultMatchWholeWord = false,
+  useRegularExpression: defaultUseRegularExpression = false,
+  onSearch,
+}: SearchProps) => {
   const { t } = useTranslation();
   const inputRef = useRef<HTMLInputElement>(null);
-  const [matchCase, setMatchCase] = useState(props.matchCase ?? false);
+  const onSearchRef = useRef(onSearch);
-  const [matchWholeWord, setMatchWholeWord] = useState(
+  const [matchCase, setMatchCase] = useState(defaultMatchCase);
-    props.matchWholeWord ?? false,
+  const [matchWholeWord, setMatchWholeWord] = useState(defaultMatchWholeWord);
-  );
   const [useRegularExpression, setUseRegularExpression] = useState(
-    props.useRegularExpression ?? false,
+    defaultUseRegularExpression,
   );
   const [errorMessage, setErrorMessage] = useState("");
 
@@ -56,8 +68,8 @@ export const BaseSearchBox = (props: SearchProps) => {
     inheritViewBox: true,
   };
 
-  // 验证正则表达式的辅助函数
+  // Helper that verifies whether a pattern is a valid regular expression
-  const validateRegex = (pattern: string) => {
+  const validateRegex = useCallback((pattern: string) => {
     if (!pattern) return true;
     try {
       new RegExp(pattern);
@@ -66,46 +78,48 @@ export const BaseSearchBox = (props: SearchProps) => {
       console.warn("[BaseSearchBox] validateRegex error:", e);
       return false;
     }
-  };
+  }, []);
 
   const createMatcher = useMemo(() => {
     return (searchText: string) => {
-      try {
+      if (useRegularExpression && searchText) {
-        // 当启用正则表达式验证是否合规
+        const isValid = validateRegex(searchText);
-        if (useRegularExpression && searchText) {
+        if (!isValid) {
-          const isValid = validateRegex(searchText);
+          // Invalid regex should result in no match
-          if (!isValid) {
+          return () => false;
-            throw new Error(t("Invalid regular expression"));
+        }
-          }
+      }
+
+      return (content: string) => {
+        if (!searchText) {
+          return true;
         }
 
-        return (content: string) => {
+        const item = !matchCase ? content.toLowerCase() : content;
-          if (!searchText) return true;
+        const searchItem = !matchCase ? searchText.toLowerCase() : searchText;
 
-          const item = !matchCase ? content.toLowerCase() : content;
+        if (useRegularExpression) {
-          const searchItem = !matchCase ? searchText.toLowerCase() : searchText;
+          return new RegExp(searchItem).test(item);
+        }
 
-          if (useRegularExpression) {
+        if (matchWholeWord) {
-            return new RegExp(searchItem).test(item);
+          return new RegExp(`\\b${searchItem}\\b`).test(item);
-          }
+        }
 
-          if (matchWholeWord) {
+        return item.includes(searchItem);
-            return new RegExp(`\\b${searchItem}\\b`).test(item);
+      };
-          }
-
-          return item.includes(searchItem);
-        };
-      } catch (err) {
-        setErrorMessage(err instanceof Error ? err.message : `${err}`);
-        return () => false; // 无效正则规则 不匹配值
-      }
     };
-  }, [matchCase, matchWholeWord, useRegularExpression, t]);
+  }, [matchCase, matchWholeWord, useRegularExpression, validateRegex]);
+
+  useEffect(() => {
+    onSearchRef.current = onSearch;
+  }, [onSearch]);
 
   useEffect(() => {
     if (!inputRef.current) return;
     const value = inputRef.current.value;
-    props.onSearch(createMatcher(value), {
+    const matcher = createMatcher(value);
+    onSearchRef.current(matcher, {
       text: value,
       matchCase,
       matchWholeWord,
@@ -117,7 +131,7 @@ export const BaseSearchBox = (props: SearchProps) => {
     const value = e.target?.value ?? "";
     setErrorMessage("");
 
-    // 验证正则表达式
+    // Validate regex input eagerly
     if (useRegularExpression && value) {
       const isValid = validateRegex(value);
       if (!isValid) {
@@ -125,7 +139,8 @@ export const BaseSearchBox = (props: SearchProps) => {
       }
     }
 
-    props.onSearch(createMatcher(value), {
+    const matcher = createMatcher(value);
+    onSearchRef.current(matcher, {
       text: value,
       matchCase,
       matchWholeWord,
@@ -133,6 +148,21 @@ export const BaseSearchBox = (props: SearchProps) => {
     });
   };
 
+  const handleToggleUseRegularExpression = () => {
+    setUseRegularExpression((prev) => {
+      const next = !prev;
+      if (!next) {
+        setErrorMessage("");
+      } else {
+        const value = inputRef.current?.value ?? "";
+        if (value && !validateRegex(value)) {
+          setErrorMessage(t("Invalid regular expression"));
+        }
+      }
+      return next;
+    });
+  };
+
   return (
     <Tooltip title={errorMessage || ""} placement="bottom-start">
       <StyledTextField
@@ -143,7 +173,7 @@ export const BaseSearchBox = (props: SearchProps) => {
         size="small"
         variant="outlined"
         spellCheck="false"
-        placeholder={props.placeholder ?? t("Filter conditions")}
+        placeholder={placeholder ?? t("Filter conditions")}
         sx={{ input: { py: 0.65, px: 1.25 } }}
         onChange={onChange}
         error={!!errorMessage}
@@ -158,7 +188,7 @@ export const BaseSearchBox = (props: SearchProps) => {
                       component={matchCaseIcon}
                       {...iconStyle}
                       aria-label={matchCase ? "active" : "inactive"}
-                      onClick={() => setMatchCase(!matchCase)}
+                      onClick={() => setMatchCase((prev) => !prev)}
                     />
                   </div>
                 </Tooltip>
@@ -168,7 +198,7 @@ export const BaseSearchBox = (props: SearchProps) => {
                       component={matchWholeWordIcon}
                       {...iconStyle}
                       aria-label={matchWholeWord ? "active" : "inactive"}
-                      onClick={() => setMatchWholeWord(!matchWholeWord)}
+                      onClick={() => setMatchWholeWord((prev) => !prev)}
                     />
                   </div>
                 </Tooltip>
@@ -178,10 +208,8 @@ export const BaseSearchBox = (props: SearchProps) => {
                       component={useRegularExpressionIcon}
                       aria-label={useRegularExpression ? "active" : "inactive"}
                       {...iconStyle}
-                      onClick={() =>
+                      onClick={handleToggleUseRegularExpression}
-                        setUseRegularExpression(!useRegularExpression)
+                    />
-                      }
-                    />{" "}
                   </div>
                 </Tooltip>
               </Box>

src/hooks/useServiceInstaller.ts

@@ -3,6 +3,7 @@ import { useCallback } from "react";
 
 import { installService, restartCore } from "@/services/cmds";
 import { showNotice } from "@/services/noticeService";
+
 import { useSystemState } from "./use-system-state";
 
 const executeWithErrorHandling = async (
@@ -34,6 +35,8 @@ export const useServiceInstaller = () => {
     );
 
     await executeWithErrorHandling(() => restartCore(), "Restarting Core...");
+    await mutateRunningMode();
+    await mutateServiceOk();
   }, [mutateRunningMode, mutateServiceOk]);
   return { installServiceAndRestartCore };
 };

src/hooks/useServiceUninstaller.ts

@@ -37,6 +37,8 @@ export const useServiceUninstaller = () => {
     );
 
     await executeWithErrorHandling(() => restartCore(), "Restarting Core...");
+    await mutateRunningMode();
+    await mutateServiceOk();
   }, [mutateRunningMode, mutateServiceOk]);
 
   return { uninstallServiceAndRestartCore };