Skip to content

Commit 00bf764

Browse files
glebtvglebtv
committed
fix: mantine tests and theme example
1 parent 766cb11 commit 00bf764

File tree

25 files changed

+202
-103
lines changed

25 files changed

+202
-103
lines changed

‎examples/theme-mantine-demo/src/pages/posts/create.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ export const PostCreate: React.FC = () => {
5656
{...getInputProps("category.id")}
5757
{...selectProps}
5858
/>
59-
<Text mt={8} weight={500} size="sm" color="#212529">
59+
<Text mt={8} fw={500} size="sm" color="#212529">
6060
Content
6161
</Text>
6262
<MDEditor
6363
data-color-mode="light"
6464
{...getInputProps("content")}
6565
/>
6666
{errors.content && (
67-
<Text mt={2} weight={500} size="xs" color="red">
67+
<Text mt={2} fw={500} size="xs" color="red">
6868
{errors.content}
6969
</Text>
7070
)}

‎examples/theme-mantine-demo/src/pages/posts/edit.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export const PostEdit: React.FC = () => {
6464
{...getInputProps("category.id")}
6565
{...selectProps}
6666
/>
67-
<Text mt={8} weight={500} size="sm" color="#212529">
67+
<Text mt={8} fw={500} size="sm" color="#212529">
6868
Content
6969
</Text>
7070
<MDEditor

‎examples/theme-mantine-demo/src/pages/posts/list.tsx

+11-7
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,17 @@ export const PostList: React.FC = () => {
204204
})}
205205
</tbody>
206206
</Table>
207-
<br />
208-
<Pagination
209-
position="right"
210-
total={pageCount}
211-
page={current}
212-
onChange={setCurrent}
213-
/>
207+
208+
<Group
209+
justify="right"
210+
mt="md"
211+
>
212+
<Pagination
213+
total={pageCount}
214+
value={current}
215+
onChange={setCurrent}
216+
/>
217+
</Group>
214218
</List>
215219
</ScrollArea>
216220
);

‎nx.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"neverConnectToCloud": true,
23
"tasksRunnerOptions": {
34
"default": {
45
"runner": "@nrwl/nx-cloud",

‎packages/chakra-ui/test/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
LegacyAuthProvider,
1313
} from "@refinedev/core";
1414

15-
import { MockRouterProvider, MockJSONServer } from "@test";
15+
import { MockRouterProvider, MockJSONServer } from "@refinedev/ui-tests";
1616

1717
const List = () => {
1818
return <div>hede</div>;

‎packages/core/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"include": ["src", "types"],
33
"extends": "../../tsconfig.build.json",
44
"compilerOptions": {
5+
"traceResolution": true,
56
"rootDir": "./src",
67
"baseUrl": ".",
78
"importHelpers": false,

‎packages/core/tsconfig.test.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"types"
66
],
77
"compilerOptions": {
8+
"traceResolution": true,
89
"rootDir": ".",
910
"types": [
1011
"jest"

‎packages/mantine/jest.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ module.exports = {
1111
testPathIgnorePatterns: ["<rootDir>/node_modules/"],
1212
moduleNameMapper: {
1313
...pathsToModuleNameMapper(paths, { prefix: "<rootDir>/" }),
14+
'^@test$': '<rootDir>/test',
1415
"\\.css$": "identity-obj-proxy",
1516
},
1617
displayName: "mantine",

‎packages/mantine/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
},
6262
"peerDependencies": {
6363
"@emotion/react": "^11.8.2",
64-
"@mantine/core": "^5.10.4",
65-
"@mantine/form": "^5.10.4",
66-
"@mantine/hooks": "^5.10.4",
67-
"@mantine/notifications": "^5.10.4",
64+
"@mantine/core": "^7.5.1",
65+
"@mantine/form": "^7.5.1",
66+
"@mantine/hooks": "^7.5.1",
67+
"@mantine/notifications": "^7.5.1",
6868
"@refinedev/cli": "^2.0.0",
6969
"@refinedev/core": "^4.46.1",
7070
"@types/react": "^17.0.0 || ^18.0.0",

‎packages/mantine/src/components/breadcrumb/index.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
TestWrapper,
77
ITestWrapperProps,
88
act,
9-
MockLegacyRouterProvider,
9+
mockLegacyRouterProvider,
1010
} from "@test";
1111

1212
import { Breadcrumb } from "./";
@@ -23,7 +23,7 @@ const renderBreadcrumb = (
2323
{
2424
wrapper: TestWrapper({
2525
...wrapperProps,
26-
legacyRouterProvider: MockLegacyRouterProvider,
26+
legacyRouterProvider: mockLegacyRouterProvider(),
2727
}),
2828
},
2929
);

‎packages/mantine/src/components/crud/edit/index.spec.tsx

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Route, Routes } from "react-router-dom";
33
import { AccessControlProvider } from "@refinedev/core";
44

55
import {
6-
MockLegacyRouterProvider,
6+
mockLegacyRouterProvider,
77
act,
88
fireEvent,
99
ITestWrapperProps,
@@ -35,7 +35,7 @@ const renderEdit = (
3535
</Routes>,
3636
{
3737
wrapper: TestWrapper({
38-
legacyRouterProvider: MockLegacyRouterProvider,
38+
legacyRouterProvider: mockLegacyRouterProvider(),
3939
routerInitialEntries: ["/posts/edit/1"],
4040
accessControlProvider,
4141
...wrapperOptions,
@@ -63,7 +63,7 @@ describe("Edit", () => {
6363
</Routes>,
6464
{
6565
wrapper: TestWrapper({
66-
legacyRouterProvider: MockLegacyRouterProvider,
66+
legacyRouterProvider: mockLegacyRouterProvider(),
6767
routerInitialEntries: ["/custom"],
6868
}),
6969
},
@@ -93,7 +93,7 @@ describe("Edit", () => {
9393
</Routes>,
9494
{
9595
wrapper: TestWrapper({
96-
legacyRouterProvider: MockLegacyRouterProvider,
96+
legacyRouterProvider: mockLegacyRouterProvider(),
9797
resources: [{ name: "posts", canDelete: true }],
9898
routerInitialEntries: ["/posts/edit/1"],
9999
}),
@@ -127,7 +127,7 @@ describe("Edit", () => {
127127
</Routes>,
128128
{
129129
wrapper: TestWrapper({
130-
legacyRouterProvider: MockLegacyRouterProvider,
130+
legacyRouterProvider: mockLegacyRouterProvider(),
131131
resources: [{ name: "posts", canDelete: false }],
132132
routerInitialEntries: ["/posts/edit/1"],
133133
}),
@@ -161,7 +161,7 @@ describe("Edit", () => {
161161

162162
{
163163
wrapper: TestWrapper({
164-
legacyRouterProvider: MockLegacyRouterProvider,
164+
legacyRouterProvider: mockLegacyRouterProvider(),
165165
resources: [{ name: "posts", canDelete: true }],
166166
routerInitialEntries: ["/posts/edit/1"],
167167
}),
@@ -192,7 +192,7 @@ describe("Edit", () => {
192192
</Routes>,
193193
{
194194
wrapper: TestWrapper({
195-
legacyRouterProvider: MockLegacyRouterProvider,
195+
legacyRouterProvider: mockLegacyRouterProvider(),
196196
resources: [{ name: "posts", canDelete: false }],
197197
routerInitialEntries: ["/posts/edit/1"],
198198
}),
@@ -214,7 +214,7 @@ describe("Edit", () => {
214214
</Routes>,
215215
{
216216
wrapper: TestWrapper({
217-
legacyRouterProvider: MockLegacyRouterProvider,
217+
legacyRouterProvider: mockLegacyRouterProvider(),
218218
resources: [{ name: "posts", canDelete: false }],
219219
routerInitialEntries: ["/posts/edit/1"],
220220
}),
@@ -316,7 +316,7 @@ describe("Edit", () => {
316316
</Routes>,
317317
{
318318
wrapper: TestWrapper({
319-
legacyRouterProvider: MockLegacyRouterProvider,
319+
legacyRouterProvider: mockLegacyRouterProvider(),
320320
resources: [{ name: "posts" }],
321321
routerInitialEntries: ["/posts/edit/1"],
322322
}),
@@ -335,7 +335,7 @@ describe("Edit", () => {
335335
</Routes>,
336336
{
337337
wrapper: TestWrapper({
338-
legacyRouterProvider: MockLegacyRouterProvider,
338+
legacyRouterProvider: mockLegacyRouterProvider(),
339339
resources: [{ name: "posts" }],
340340
routerInitialEntries: ["/posts/edit/1"],
341341
}),
@@ -489,7 +489,7 @@ describe("auto save", () => {
489489
wrapper: TestWrapper({
490490
resources: [{ name: "posts", canDelete: false }],
491491
routerInitialEntries: ["/posts/edit/1"],
492-
legacyRouterProvider: MockLegacyRouterProvider,
492+
legacyRouterProvider: mockLegacyRouterProvider(),
493493
dataProvider: {
494494
...MockJSONServer,
495495
update: () => {
@@ -548,7 +548,7 @@ describe("auto save", () => {
548548
wrapper: TestWrapper({
549549
resources: [{ name: "posts", canDelete: false }],
550550
routerInitialEntries: ["/posts/edit/1"],
551-
legacyRouterProvider: MockLegacyRouterProvider,
551+
legacyRouterProvider: mockLegacyRouterProvider(),
552552
dataProvider: {
553553
...MockJSONServer,
554554
update: () => {

‎packages/mantine/src/components/crud/list/index.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { crudListTests } from "@refinedev/ui-tests";
33
import { RefineButtonTestIds } from "@refinedev/ui-types";
44
import { Route, Routes } from "react-router-dom";
55
import { CreateButton } from "@components/buttons";
6-
import { MockLegacyRouterProvider, render, TestWrapper } from "@test";
6+
import { mockLegacyRouterProvider, render, TestWrapper } from "@test";
77
import { List } from "./index";
88

99
const renderList = (list: ReactNode) => {
@@ -14,7 +14,7 @@ const renderList = (list: ReactNode) => {
1414
{
1515
wrapper: TestWrapper({
1616
routerInitialEntries: ["/posts"],
17-
legacyRouterProvider: MockLegacyRouterProvider,
17+
legacyRouterProvider: mockLegacyRouterProvider(),
1818
}),
1919
},
2020
);

‎packages/mantine/src/components/crud/show/index.spec.tsx

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Route, Routes } from "react-router-dom";
33
import { AccessControlProvider } from "@refinedev/core";
44
import { crudShowTests } from "@refinedev/ui-tests";
55

6-
import { MockLegacyRouterProvider, render, TestWrapper, waitFor } from "@test";
6+
import { mockLegacyRouterProvider, render, TestWrapper, waitFor } from "@test";
77

88
import { Show } from "./index";
99
import { RefineButtonTestIds } from "@refinedev/ui-types";
@@ -26,7 +26,7 @@ const renderShow = (
2626
wrapper: TestWrapper({
2727
routerInitialEntries: ["/posts/show/1"],
2828
accessControlProvider,
29-
legacyRouterProvider: MockLegacyRouterProvider,
29+
legacyRouterProvider: mockLegacyRouterProvider(),
3030
}),
3131
},
3232
);
@@ -120,7 +120,7 @@ describe("Show", () => {
120120
wrapper: TestWrapper({
121121
resources: [{ name: "posts", edit: () => null }],
122122
routerInitialEntries: ["/posts/show/1"],
123-
legacyRouterProvider: MockLegacyRouterProvider,
123+
legacyRouterProvider: mockLegacyRouterProvider(),
124124
}),
125125
},
126126
);
@@ -154,7 +154,7 @@ describe("Show", () => {
154154
wrapper: TestWrapper({
155155
resources: [{ name: "posts" }],
156156
routerInitialEntries: ["/posts/show/1"],
157-
legacyRouterProvider: MockLegacyRouterProvider,
157+
legacyRouterProvider: mockLegacyRouterProvider(),
158158
}),
159159
},
160160
);
@@ -187,7 +187,7 @@ describe("Show", () => {
187187
wrapper: TestWrapper({
188188
resources: [{ name: "posts", edit: () => null }],
189189
routerInitialEntries: ["/posts/show/1"],
190-
legacyRouterProvider: MockLegacyRouterProvider,
190+
legacyRouterProvider: mockLegacyRouterProvider(),
191191
}),
192192
},
193193
);
@@ -218,7 +218,7 @@ describe("Show", () => {
218218
wrapper: TestWrapper({
219219
resources: [{ name: "posts" }],
220220
routerInitialEntries: ["/posts/show/1"],
221-
legacyRouterProvider: MockLegacyRouterProvider,
221+
legacyRouterProvider: mockLegacyRouterProvider(),
222222
}),
223223
},
224224
);
@@ -251,7 +251,7 @@ describe("Show", () => {
251251
wrapper: TestWrapper({
252252
resources: [{ name: "posts", edit: () => null }],
253253
routerInitialEntries: ["/posts/show/1"],
254-
legacyRouterProvider: MockLegacyRouterProvider,
254+
legacyRouterProvider: mockLegacyRouterProvider(),
255255
}),
256256
},
257257
);
@@ -287,7 +287,7 @@ describe("Show", () => {
287287
wrapper: TestWrapper({
288288
resources: [{ name: "posts", canDelete: true }],
289289
routerInitialEntries: ["/posts/show/1"],
290-
legacyRouterProvider: MockLegacyRouterProvider,
290+
legacyRouterProvider: mockLegacyRouterProvider(),
291291
}),
292292
},
293293
);
@@ -320,7 +320,7 @@ describe("Show", () => {
320320
wrapper: TestWrapper({
321321
resources: [{ name: "posts", canDelete: false }],
322322
routerInitialEntries: ["/posts/show/1"],
323-
legacyRouterProvider: MockLegacyRouterProvider,
323+
legacyRouterProvider: mockLegacyRouterProvider(),
324324
}),
325325
},
326326
);
@@ -351,7 +351,7 @@ describe("Show", () => {
351351
wrapper: TestWrapper({
352352
resources: [{ name: "posts", canDelete: true }],
353353
routerInitialEntries: ["/posts/show/1"],
354-
legacyRouterProvider: MockLegacyRouterProvider,
354+
legacyRouterProvider: mockLegacyRouterProvider(),
355355
}),
356356
},
357357
);
@@ -382,7 +382,7 @@ describe("Show", () => {
382382
wrapper: TestWrapper({
383383
resources: [{ name: "posts", canDelete: false }],
384384
routerInitialEntries: ["/posts/show/1"],
385-
legacyRouterProvider: MockLegacyRouterProvider,
385+
legacyRouterProvider: mockLegacyRouterProvider(),
386386
}),
387387
},
388388
);
@@ -415,7 +415,7 @@ describe("Show", () => {
415415
wrapper: TestWrapper({
416416
resources: [{ name: "posts", canDelete: true }],
417417
routerInitialEntries: ["/posts/show/1"],
418-
legacyRouterProvider: MockLegacyRouterProvider,
418+
legacyRouterProvider: mockLegacyRouterProvider(),
419419
}),
420420
},
421421
);
@@ -438,7 +438,7 @@ describe("Show", () => {
438438
wrapper: TestWrapper({
439439
resources: [{ name: "posts" }],
440440
routerInitialEntries: ["/posts/show/1"],
441-
legacyRouterProvider: MockLegacyRouterProvider,
441+
legacyRouterProvider: mockLegacyRouterProvider(),
442442
}),
443443
},
444444
);
@@ -459,7 +459,7 @@ describe("Show", () => {
459459
wrapper: TestWrapper({
460460
resources: [{ name: "posts" }],
461461
routerInitialEntries: ["/posts/show/1"],
462-
legacyRouterProvider: MockLegacyRouterProvider,
462+
legacyRouterProvider: mockLegacyRouterProvider(),
463463
}),
464464
},
465465
);
@@ -503,7 +503,7 @@ describe("Show", () => {
503503
wrapper: TestWrapper({
504504
resources: [{ name: "posts" }],
505505
routerInitialEntries: ["/posts/show/1"],
506-
legacyRouterProvider: MockLegacyRouterProvider,
506+
legacyRouterProvider: mockLegacyRouterProvider(),
507507
}),
508508
},
509509
);

0 commit comments

Comments
 (0)