mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-18 23:33:12 +09:00
Write the URL immediately when a search filter is cleared
The search box clear (X) button cleared the filter live but only wrote the URL when the dropdown closed. commitFilter now accepts an explicit value so the clear handlers can commit right away (avoiding the stale-state race of reading the live override in the same event), for both useColumnSearch and the Users filter. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
bb4c82ea5a
commit
2898fdf5d3
3 files changed
+22
-12
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import React, { useRef } from "react";
|
||||
import { InputRef, Input, Space, Segmented, Button, Typography, Tag } from "antd";
|
||||
import { InputRef, Input, Space, Segmented, Typography, Tag } from "antd";
|
||||
import type { FilterDropdownProps } from "antd/es/table/interface";
|
||||
import { CheckOutlined, CloseOutlined, MinusOutlined } from "@ant-design/icons";
|
||||
import { UserDetails } from "@clusterio/lib";
|
||||
@@ -135,13 +135,16 @@ export function useUserFilter(
|
||||
? decodeFilter(String(selectedKeys[0]))
|
||||
: {};
|
||||
|
||||
// Update the live filter as the user types/toggles; the URL is only written
|
||||
// when the dropdown closes (see filterDropdownProps.onOpenChange below).
|
||||
function update(next: Partial<UserFilter>) {
|
||||
// Update the live filter as the user types/toggles; the URL is only written when the
|
||||
// dropdown closes (see onOpenChange), or immediately when `commit` is set (e.g. clear).
|
||||
function update(next: Partial<UserFilter>, commit = false) {
|
||||
const encoded = encodeFilter({ ...filter, ...next });
|
||||
const values = encoded === "{}" ? null : [encoded];
|
||||
setSelectedKeys(values ?? []);
|
||||
tableState.setFilter(columnKey, values);
|
||||
if (commit) {
|
||||
tableState.commitFilter(columnKey, values);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -154,7 +157,7 @@ export function useUserFilter(
|
||||
allowClear
|
||||
onSearch={() => close()}
|
||||
onChange={(e) => update({ search: e.target.value !== "" ? e.target.value : undefined })}
|
||||
onClear={() => update({ search: undefined })}
|
||||
onClear={() => update({ search: undefined }, true)}
|
||||
/>
|
||||
|
||||
{withStatus &&<>
|
||||
|
||||
Reference in new issue
Block a user