Skip to content

Commit

Permalink
🎨 删除useState和useRef中可以自动推导的不必要的泛型参数
Browse files Browse the repository at this point in the history
  • Loading branch information
neila-a committed Jul 6, 2024
1 parent d48f0fe commit cc8ba7a
Show file tree
Hide file tree
Showing 26 changed files with 153 additions and 150 deletions.
10 changes: 5 additions & 5 deletions packages/core/ui/src/app/index/showTool/SingleTool.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ export default function SingleTool(props: {
[lists, setLists] = useAtom(listsAtom),

// states
[jumpto, setJumpTo] = useState<string>(""),
[removeDialogOpen, setRemoveDialogOpen] = useState<boolean>(false),
[elevation, setElevation] = useState<number>(lowElevation),
[jumpName, setJumpName] = useState<string>(""),
[jumpDialogOpen, setJumpDialogOpen] = useState<boolean>(false),
[jumpto, setJumpTo] = useState(""),
[removeDialogOpen, setRemoveDialogOpen] = useState(false),
[elevation, setElevation] = useState(lowElevation),
[jumpName, setJumpName] = useState(""),
[jumpDialogOpen, setJumpDialogOpen] = useState(false),

// 常量
{
Expand Down
2 changes: 1 addition & 1 deletion packages/core/ui/src/app/index/sidebar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function Sidebar(props: {
sortingFor = useAtomValue(sortingForAtom)(isImplant),
setSortingFor = useSetAtom(sortingForAtom),
[searchText, setSearchText] = useAtom(searchTextAtom),
[clickCount, setClickCount] = useState<number>(0),
[clickCount, setClickCount] = useState(0),
setTab = useSetAtom(tabAtom),
setExpand = useSetAtom(expandAtom),
tools = useAtomValue(toolsAtom);
Expand Down
2 changes: 1 addition & 1 deletion packages/core/ui/src/app/setting/about/reset/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
import Line from "./Line";
const CheckDialog = dynamic(() => import("@verkfi/shared/dialog/Check"));
export default function Reset() {
const [dialogOpen, setDialogOpen] = useState<boolean>(false);
const [dialogOpen, setDialogOpen] = useState(false);
return (
<ErrorBoundary>
<Stack direction="column" spacing={1}>
Expand Down
5 changes: 4 additions & 1 deletion packages/core/ui/src/app/setting/appearance/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,14 @@ import ColorPicker from "./ColorPicker";
import {
startTransition
} from "react";
import {
Mode
} from "@mui/system/cssVars/useCurrentColorScheme";
const colorModeIcons = [
["light", LightMode],
["dark", DarkMode],
["system", BrightnessMedium]
] satisfies [PaletteMode | "system", typeof LightMode][];
] satisfies [Mode, typeof LightMode][];
function ColorTool() {
const setInternalPalette = useSetAtom(internalPaletteAtom),
{
Expand Down
5 changes: 3 additions & 2 deletions packages/core/ui/src/app/setting/extensions/DialogButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import {
get
} from "react-intl-universal";
import {
NXTMetadata
NXTMetadata,
inputTypes
} from "./page";
import {
extensionsAtomValue
Expand All @@ -31,7 +32,7 @@ import {
startTransition
} from "react";
export default function DialogButtons(props: {
type: "modify" | "add";
type: inputTypes;
fileInfo: NXTMetadata;
files: file[];
reset(): void;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function RemoveExtensionDialog(props: {
onTrue?: () => any;
files: file[];
}) {
const [clearData, setClearData] = useState<boolean>(false),
const [clearData, setClearData] = useState(false),
clearExtensionData = useSetAtom(extensionDataCleanerAtom),
setExtensions = useSetAtom(extensionsAtom),
[lists, setLists] = useAtom(listsAtom);
Expand Down
2 changes: 1 addition & 1 deletion packages/core/ui/src/app/setting/extensions/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ import {
const PureDialog = dynamic(() => import("@verkfi/shared/dialog/Pure"));
export type inputTypes = "modify" | "add";
export default function ExtensionManager() {
const [addDialogOpen, setAddDialogOpen] = useState<boolean>(false),
const [addDialogOpen, setAddDialogOpen] = useState(false),
[fileArray, setFileArray] = useState<FilePondFile[]>([]),
[fileInfo, setFileInfo] = useAtom(fileInfoAtom),
[files, setFiles] = useAtom(filesAtom),
Expand Down
1 change: 0 additions & 1 deletion packages/core/ui/src/app/setting/option/Switcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import {
import {
startTransition
} from "react";
export type stringifyCheck = "false" | "true";
export function Switcher(props: {
option: option;
}) {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/ui/src/app/setting/option/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const PureDialog = dynamic(() => import("@verkfi/shared/dialog/Pure")),
export type option = [typeof shareAtom, string];
export default function Options() {
const [lang, setLang] = useAtom(langAtom),
[dialogOpen, setDialogOpen] = useState<boolean>(false),
[dialogOpen, setDialogOpen] = useState(false),
router = useRouter(),
langId = useId();
return (
Expand Down
9 changes: 5 additions & 4 deletions packages/shared/CopyButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ function CopyButton(props: {
onlyIcon?: boolean;
add?: ButtonOwnProps | IconButtonOwnProps;
}) {
const [showCopyDoneDialog, setShowCopyDoneDialog] = useState<boolean>(false),
[copyError, setCopyError] = useState<string>(""),
[showCopyErrorDialog, setShowCopyErrorDialog] = useState<boolean>(false),
const [showCopyDoneDialog, setShowCopyDoneDialog] = useState(false),
[copyError, setCopyError] = useState(""),
[showCopyErrorDialog, setShowCopyErrorDialog] = useState(false),
handleCopy = async () => {
try {
await navigator.clipboard.writeText(props.children);
Expand All @@ -48,7 +48,8 @@ function CopyButton(props: {
setShowCopyErrorDialog(true);
}
},
add = "add" in props ? props.add : {
add = "add" in props ? (props.add || {
}) : {
},
sx: SxProps<Theme> = {
..."sx" in add ? add.sx : {
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/dialog/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default function InputDialog(props: {
sx?: SxProps<Theme>
open: boolean;
}) {
const [input, setInput] = useState<string>(""),
const [input, setInput] = useState(""),
handleClose = () => {
props?.onCancel?.();
};
Expand Down
6 changes: 3 additions & 3 deletions packages/tools/tool-countletter/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ const logger = new LpLogger({
});
type numberType = 2 | 8 | 10 | 16;
function CountLetter() {
const [enterDialogOpen, setEnterDialogOpen] = useState<boolean>(false),
[alertDialogOpen, setAlertDialogOpen] = useState<boolean>(false),
[out, setOut] = useState<string>(""),
const [enterDialogOpen, setEnterDialogOpen] = useState(false),
[alertDialogOpen, setAlertDialogOpen] = useState(false),
[out, setOut] = useState(""),
systemId = useId(),
[numberType, setNumberType] = useState<numberType>(10);
return (
Expand Down
12 changes: 6 additions & 6 deletions packages/tools/tool-cylinder/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ import Cylinder from "./makeCylinder";
const throttleTime = 17,
initialRadius = 50;
function CylinderPage() {
const [radiusX, setRadiusX] = useState<number>(initialRadius),
[radiusZ, setRadiusZ] = useState<number>(initialRadius),
[thickness, setThickness] = useState<number>(1),
[filled, setFilled] = useState<boolean>(true),
[posX, setPosX] = useState<number>(1),
[posZ, setPosZ] = useState<number>(1),
const [radiusX, setRadiusX] = useState(initialRadius),
[radiusZ, setRadiusZ] = useState(initialRadius),
[thickness, setThickness] = useState(1),
[filled, setFilled] = useState(true),
[posX, setPosX] = useState(1),
[posZ, setPosZ] = useState(1),
radiusXID = useId(),
radiusZID = useId(),
thicknessID = useId(),
Expand Down
4 changes: 2 additions & 2 deletions packages/tools/tool-filter/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ const initialScale = 100,
scaleMax = 200;
export default function Filter() {
const [imageArray, setImageArray] = useState<FilePondFile[]>([]),
[imageFileName, setImageFileName] = useState<string>("libear-only"),
[imageFileName, setImageFileName] = useState("libear-only"),
[imageURL, setImageURL] = useBlobState(libearOnly.src),
[imageTypes, setImageTypes] = useState<ImageType[]>(ImageTypesGen),
[scale, setScale] = useState<number>(initialScale),
[scale, setScale] = useState(initialScale),
sizeId = useId(),
handleSliderChange = (event: Event, newValue: number | number[]) => setScale(Number(newValue)),
handleInputChange = (event: ChangeEvent<HTMLInputElement>) => setScale(Number(event.target.value)),
Expand Down
10 changes: 5 additions & 5 deletions packages/tools/tool-jigsaw/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ const blobToInt8Array = async (blob: Blob) => new Int8Array(await blob.arrayBuff
dragImageSize = 32;
export default function JigsawEntry() {
const [imageArray, setImageArray] = useState<FilePondFile[]>([]),
[imageFileName, setImageFileName] = useState<string>(""),
[dialogOpen, setDialogOpen] = useState<boolean>(false),
[width, setWidth] = useState<number>(initialSize),
[height, setHeight] = useState<number>(initialSize),
[imageFileName, setImageFileName] = useState(""),
[dialogOpen, setDialogOpen] = useState(false),
[width, setWidth] = useState(initialSize),
[height, setHeight] = useState(initialSize),
[jigsaws, setJigsaws] = useStoragedState<jigsaw[]>("jigsaws", []),
[resetDialogOpen, setResetDialogOpen] = useState<boolean>(false),
[resetDialogOpen, setResetDialogOpen] = useState(false),
portrait = useMediaQuery("(orientation: portrait)"),
widtha = portrait ? `calc(100vw / ${width})` : `calc(100vw / (${width} + 1))`,
heighta = portrait ? `calc((100vh - 56px) / (${height} + 1))` : `calc((100vh - 64px) / ${height})`,
Expand Down
12 changes: 6 additions & 6 deletions packages/tools/tool-mathgen/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ import range from "@verkfi/shared/range";
const defaultMax = 10,
defaultItemCount = 20;
function MathGen() {
const [min, setMin] = useState<number>(0),
[max, setMax] = useState<number>(defaultMax),
[itemCount, setItemCount] = useState<number>(defaultItemCount),
const [min, setMin] = useState(0),
[max, setMax] = useState(defaultMax),
[itemCount, setItemCount] = useState(defaultItemCount),
[maths, setMath] = useState<string[]>([]),
[subtractionCheck, setSubtractionCheck] = useState<boolean>(true),
[divisionCheck, setDivisionCheck] = useState<boolean>(true),
[showOut, setShowOut] = useState<boolean>(false),
[subtractionCheck, setSubtractionCheck] = useState(true),
[divisionCheck, setDivisionCheck] = useState(true),
[showOut, setShowOut] = useState(false),
[calcs, setCalcs] = useState<calc[]>([
"+",
"-"
Expand Down
2 changes: 1 addition & 1 deletion packages/tools/tool-mathgen/singleMath.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function SingleMath(props: {
math: string;
showOut: boolean;
}) {
const [isError, setError] = useState<boolean>(false),
const [isError, setError] = useState(false),
{
math,
showOut
Expand Down
8 changes: 4 additions & 4 deletions packages/tools/tool-pi/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import {
import generatePis from "./generatePis";
const AlertDialog = dynamic(() => import("@verkfi/shared/dialog/Alert"));
function PI() {
const [digits, setDigits] = useState<number>(1),
[useAlertShow, setUseAlertShow] = useState<boolean>(false),
[showInfoDialog, setShowInfoDialog] = useState<boolean>(false),
[dialogInfo, setDialogInfo] = useState<string>(""),
const [digits, setDigits] = useState(1),
[useAlertShow, setUseAlertShow] = useState(false),
[showInfoDialog, setShowInfoDialog] = useState(false),
[dialogInfo, setDialogInfo] = useState(""),
[out, setOut] = useState("");
return (
<>
Expand Down
4 changes: 2 additions & 2 deletions packages/tools/tool-pillar/SingleCollocation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const lowElevation = 2,
export default function SingleCollocation(props: {
collocation: collocation;
}) {
const [elevation, setElevation] = useState<number>(lowElevation);
const [elevation, setElevation] = useState(lowElevation);
return (
<Grid item component="li">
<Paper sx={{
Expand All @@ -36,7 +36,7 @@ export default function SingleCollocation(props: {
}}>
<List>
{Object.entries(props.collocation).map((value, index) => <ListItem key={value[0]} sx={{
mb: index === 1 && 1,
mb: index === 1 ? 1 : "",
pt: 0,
pb: 0
}} secondaryAction={(
Expand Down
4 changes: 2 additions & 2 deletions packages/tools/tool-pillar/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ values.forEach(value => {
});
export default function Pillar() {
const [type, setType] = useState<pillarPositions>("oneEndAndMiddle"),
[length, setLength] = useState<number>(0),
[length, setLength] = useState(0),
[filterRules, setFilterRules] = useState(emptyFilterRules as filterRules),
choosesId = useId(),
sizeLabelId = useId(),
Expand Down Expand Up @@ -95,7 +95,7 @@ export default function Pillar() {
<RadioGroup
aria-labelledby={choosesId}
value={type}
onChange={(event, value: pillarPositions) => setType(value)}
onChange={(event, value) => setType(value as pillarPositions)}
name="chooses-group"
>
{(Object.keys(examples) as pillarPositions[]).map(single => <Box key={single} sx={{
Expand Down
4 changes: 2 additions & 2 deletions packages/tools/tool-readnumber/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const nzh = new Nzh({
m_z: "正"
}); // 数字转汉字这种功能不需要什么国际化
export default function ReadNumber() {
const [string, setString] = useState<string>(""),
[number, setNumber] = useState<string>("0"),
const [string, setString] = useState("零"),
[number, setNumber] = useState("0"),
stringId = useId(),
numberId = useId();
return (
Expand Down
Loading

0 comments on commit cc8ba7a

Please sign in to comment.