Skip to content

Commit 191c2c9

Browse files
CopilotTechQuery
andcommitted
Fix TypeScript issues in RestTable and example
Co-authored-by: TechQuery <[email protected]>
1 parent 82d2b30 commit 191c2c9

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

registry/new-york/blocks/rest-table/example.tsx

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,29 @@
11
"use client";
22

33
import { computed } from "mobx";
4+
import { TranslationModel } from "mobx-i18n";
45
import { observer } from "mobx-react";
56
import { GitRepository } from "mobx-github";
67

78
import { BadgeBar } from "../badge-bar/badge-bar";
8-
import { i18n, repositoryStore } from "@/models/example";
9+
import { repositoryStore } from "@/models/example";
910
import { Column, RestTable } from "./rest-table";
1011

12+
const tableI18n = new TranslationModel({
13+
en_US: {
14+
load_more: "Load more",
15+
no_more: "No more",
16+
submit: "Submit",
17+
cancel: "Cancel",
18+
create: "Create",
19+
view: "View",
20+
edit: "Edit",
21+
delete: "Delete",
22+
total_x_rows: "Total {{totalCount}} rows",
23+
sure_to_delete_x: "Are you sure to delete {{keys}}?",
24+
},
25+
});
26+
1127
export const RestTableExample = observer(() => {
1228
const columns = computed<Column<GitRepository>[]>(() => [
1329
{
@@ -64,20 +80,7 @@ export const RestTableExample = observer(() => {
6480
deletable
6581
columns={columns}
6682
store={repositoryStore}
67-
translator={{
68-
...i18n,
69-
t: (key: string, data?: Record<string, any>) => {
70-
const translations: Record<string, string> = {
71-
create: "Create",
72-
view: "View",
73-
edit: "Edit",
74-
delete: "Delete",
75-
total_x_rows: `Total ${data?.totalCount || 0} rows`,
76-
sure_to_delete_x: `Are you sure to delete ${data?.keys || ""}?`,
77-
};
78-
return translations[key] || key;
79-
},
80-
}}
83+
translator={tableI18n}
8184
onCheck={(keys) => console.log("Checked keys:", keys)}
8285
/>
8386
</div>

registry/new-york/blocks/rest-table/rest-table.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ type Translator<T extends DataObject> = RestFormProps<T>["translator"] &
4848
export interface RestTableProps<
4949
D extends DataObject,
5050
F extends Filter<D> = Filter<D>
51-
> extends Omit<
52-
HTMLAttributes<HTMLDivElement>,
53-
"onSubmit" | "onReset" | "children"
54-
>,
55-
Omit<RestFormProps<D>, "id" | "size" | "fields" | "translator"> {
51+
> extends Omit<HTMLAttributes<HTMLDivElement>, "onSubmit" | "onReset" | "children"> {
5652
filter?: F;
5753
filterFields?: Field<F>[];
5854
editable?: boolean;
@@ -64,6 +60,9 @@ export interface RestTableProps<
6460
striped?: boolean;
6561
hover?: boolean;
6662
responsive?: boolean;
63+
store?: RestFormProps<D>["store"];
64+
onSubmit?: RestFormProps<D>["onSubmit"];
65+
onReset?: RestFormProps<D>["onReset"];
6766
}
6867

6968
@observer

0 commit comments

Comments
 (0)