mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 16:13:12 +09:00
Improve UX on keyboard
This commit is contained in:
2 files changed
+63
-19
No files matched your search
@@ -1,5 +1,5 @@
|
|||||||
import React, { useContext, useEffect, useState } from "react";
|
import React, { useContext, useEffect, useState, useRef } from "react";
|
||||||
import { Button, Divider, Input, TreeSelect } from "antd";
|
import { Button, Divider, Input, InputRef, RefSelectProps, TreeSelect } from "antd";
|
||||||
|
|
||||||
import * as lib from "@clusterio/lib";
|
import * as lib from "@clusterio/lib";
|
||||||
import { InputComponentProps } from "../BaseWebPlugin";
|
import { InputComponentProps } from "../BaseWebPlugin";
|
||||||
@@ -17,6 +17,9 @@ export default function InputPartialVersion (
|
|||||||
const fieldDefinition = props.fieldDefinition || defaultFieldDefinition;
|
const fieldDefinition = props.fieldDefinition || defaultFieldDefinition;
|
||||||
const [versions, setVersions] = useState<readonly lib.PartialVersion[]>(lib.ApiVersions);
|
const [versions, setVersions] = useState<readonly lib.PartialVersion[]>(lib.ApiVersions);
|
||||||
const [customVersion, setCustomVersion] = useState("");
|
const [customVersion, setCustomVersion] = useState("");
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const inputRef = useRef<InputRef>(null);
|
||||||
|
const selectRef = useRef<RefSelectProps>(null);
|
||||||
const control = useContext(ControlContext);
|
const control = useContext(ControlContext);
|
||||||
const account = useAccount();
|
const account = useAccount();
|
||||||
|
|
||||||
@@ -58,6 +61,7 @@ export default function InputPartialVersion (
|
|||||||
|
|
||||||
return <TreeSelect
|
return <TreeSelect
|
||||||
showSearch
|
showSearch
|
||||||
|
ref={selectRef}
|
||||||
style={{ minWidth: 175 }}
|
style={{ minWidth: 175 }}
|
||||||
onChange={(value) => props.onChange(value ?? null)}
|
onChange={(value) => props.onChange(value ?? null)}
|
||||||
value={props.value}
|
value={props.value}
|
||||||
@@ -65,30 +69,48 @@ export default function InputPartialVersion (
|
|||||||
allowClear={fieldDefinition.optional}
|
allowClear={fieldDefinition.optional}
|
||||||
className={props.className}
|
className={props.className}
|
||||||
disabled={props.disabled}
|
disabled={props.disabled}
|
||||||
|
open={open}
|
||||||
|
onOpenChange={newOpen => {
|
||||||
|
setOpen(newOpen);
|
||||||
|
if (newOpen && typeof props.value === "string") {
|
||||||
|
setCustomVersion(props.value);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onKeyDown={e => {
|
||||||
|
if (open && e.key === "Tab") {
|
||||||
|
e.preventDefault();
|
||||||
|
inputRef.current?.focus();
|
||||||
|
}
|
||||||
|
}}
|
||||||
popupRender={(menu) => {
|
popupRender={(menu) => {
|
||||||
const isValid = lib.isPartialVersion(customVersion);
|
const isValid = lib.isPartialVersion(customVersion);
|
||||||
|
|
||||||
|
const submit = () => {
|
||||||
|
if (customVersion && isValid) {
|
||||||
|
setTimeout(() => selectRef.current?.focus(), 0);
|
||||||
|
props.onChange(customVersion);
|
||||||
|
setOpen(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{menu}
|
{menu}
|
||||||
<Divider style={{ margin: "8px 0" }} />
|
<Divider style={{ margin: "8px 0" }} />
|
||||||
<div style={{ display: "flex", gap: 8, padding: "0 8px 4px" }}>
|
<div style={{ display: "flex", gap: 8, padding: "0 8px 4px" }}>
|
||||||
<Input
|
<Input
|
||||||
|
ref={inputRef}
|
||||||
style={{ flex: 1 }}
|
style={{ flex: 1 }}
|
||||||
placeholder="Custom X.Y.Z"
|
placeholder="Custom X.Y.Z"
|
||||||
value={customVersion}
|
value={customVersion}
|
||||||
status={
|
status={customVersion && !isValid ? "error" : undefined}
|
||||||
customVersion && !isValid ? "error" : undefined
|
|
||||||
}
|
|
||||||
onChange={(e) => setCustomVersion(e.target.value)}
|
onChange={(e) => setCustomVersion(e.target.value)}
|
||||||
|
onPressEnter={submit}
|
||||||
/>
|
/>
|
||||||
<Button
|
<Button
|
||||||
type="primary"
|
type="primary"
|
||||||
disabled={!customVersion || !isValid}
|
disabled={!customVersion || !isValid}
|
||||||
onClick={() => {
|
onClick={submit}
|
||||||
props.onChange(customVersion);
|
|
||||||
setCustomVersion("");
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
Use
|
Use
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React, { useContext, useEffect, useState } from "react";
|
import React, { useContext, useEffect, useState, useRef } from "react";
|
||||||
import { Button, Divider, Input, TreeSelect } from "antd";
|
import { Button, Divider, Input, InputRef, RefSelectProps, TreeSelect } from "antd";
|
||||||
|
|
||||||
import * as lib from "@clusterio/lib";
|
import * as lib from "@clusterio/lib";
|
||||||
import { InputComponentProps } from "../BaseWebPlugin";
|
import { InputComponentProps } from "../BaseWebPlugin";
|
||||||
@@ -17,6 +17,9 @@ export default function InputTargetVersion (
|
|||||||
const fieldDefinition = props.fieldDefinition || defaultFieldDefinition;
|
const fieldDefinition = props.fieldDefinition || defaultFieldDefinition;
|
||||||
const [versions, setVersions] = useState<readonly lib.TargetVersion[]>(lib.ApiVersions);
|
const [versions, setVersions] = useState<readonly lib.TargetVersion[]>(lib.ApiVersions);
|
||||||
const [customVersion, setCustomVersion] = useState("");
|
const [customVersion, setCustomVersion] = useState("");
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const inputRef = useRef<InputRef>(null);
|
||||||
|
const selectRef = useRef<RefSelectProps>(null);
|
||||||
const control = useContext(ControlContext);
|
const control = useContext(ControlContext);
|
||||||
const account = useAccount();
|
const account = useAccount();
|
||||||
|
|
||||||
@@ -61,6 +64,7 @@ export default function InputTargetVersion (
|
|||||||
|
|
||||||
return <TreeSelect
|
return <TreeSelect
|
||||||
showSearch
|
showSearch
|
||||||
|
ref={selectRef}
|
||||||
style={{ minWidth: 175 }}
|
style={{ minWidth: 175 }}
|
||||||
onChange={(value) => props.onChange(value ?? null)}
|
onChange={(value) => props.onChange(value ?? null)}
|
||||||
value={props.value}
|
value={props.value}
|
||||||
@@ -68,8 +72,29 @@ export default function InputTargetVersion (
|
|||||||
allowClear={fieldDefinition.optional}
|
allowClear={fieldDefinition.optional}
|
||||||
className={props.className}
|
className={props.className}
|
||||||
disabled={props.disabled}
|
disabled={props.disabled}
|
||||||
|
open={open}
|
||||||
|
onOpenChange={newOpen => {
|
||||||
|
setOpen(newOpen);
|
||||||
|
if (newOpen && typeof props.value === "string") {
|
||||||
|
setCustomVersion(props.value);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onKeyDown={e => {
|
||||||
|
if (open && e.key === "Tab") {
|
||||||
|
e.preventDefault();
|
||||||
|
inputRef.current?.focus();
|
||||||
|
}
|
||||||
|
}}
|
||||||
popupRender={(menu) => {
|
popupRender={(menu) => {
|
||||||
const isValid = lib.isPartialVersion(customVersion);
|
const isValid = lib.isTargetVersion(customVersion);
|
||||||
|
|
||||||
|
const submit = () => {
|
||||||
|
if (customVersion && isValid) {
|
||||||
|
setTimeout(() => selectRef.current?.focus(), 0);
|
||||||
|
props.onChange(customVersion);
|
||||||
|
setOpen(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -77,21 +102,18 @@ export default function InputTargetVersion (
|
|||||||
<Divider style={{ margin: "8px 0" }} />
|
<Divider style={{ margin: "8px 0" }} />
|
||||||
<div style={{ display: "flex", gap: 8, padding: "0 8px 4px" }}>
|
<div style={{ display: "flex", gap: 8, padding: "0 8px 4px" }}>
|
||||||
<Input
|
<Input
|
||||||
|
ref={inputRef}
|
||||||
style={{ flex: 1 }}
|
style={{ flex: 1 }}
|
||||||
placeholder="Custom X.Y.Z"
|
placeholder="Custom X.Y.Z"
|
||||||
value={customVersion}
|
value={customVersion}
|
||||||
status={
|
status={customVersion && !isValid ? "error" : undefined}
|
||||||
customVersion && !isValid ? "error" : undefined
|
|
||||||
}
|
|
||||||
onChange={(e) => setCustomVersion(e.target.value)}
|
onChange={(e) => setCustomVersion(e.target.value)}
|
||||||
|
onPressEnter={submit}
|
||||||
/>
|
/>
|
||||||
<Button
|
<Button
|
||||||
type="primary"
|
type="primary"
|
||||||
disabled={!customVersion || !isValid}
|
disabled={!customVersion || !isValid}
|
||||||
onClick={() => {
|
onClick={submit}
|
||||||
props.onChange(customVersion);
|
|
||||||
setCustomVersion("");
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
Use
|
Use
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
Reference in new issue
Block a user