Skip to content

Commit b6d71c4

Browse files
Updated imodel-delete to itwin-react V3 (#153)
* Updated imodel-delete to itwin-react V3, removed support from react 17.x * Resolved the comments * Removed the 1st Changelog --------- Co-authored-by: Danish Mehmood <64415995+DanishMehmood-bit@users.noreply.github.com>
1 parent bf4e902 commit b6d71c4

5 files changed

Lines changed: 55 additions & 17 deletions

File tree

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@itwin/delete-imodel-react",
5+
"comment": "Updated imodel-delete to itwin-react V3",
6+
"type": "minor"
7+
}
8+
],
9+
"packageName": "@itwin/delete-imodel-react"
10+
}

common/config/rush/pnpm-lock.yaml

Lines changed: 21 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/modules/delete-imodel/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"dependencies": {
3434
"@itwin/itwinui-icons-react": "^2.2.0",
35-
"@itwin/itwinui-react": "^2.12.18"
35+
"@itwin/itwinui-react": "^3.18.0"
3636
},
3737
"devDependencies": {
3838
"@rollup/plugin-commonjs": "~17.1.0",
@@ -74,4 +74,4 @@
7474
"react": "^17.0.2 || ^18.3.1",
7575
"react-dom": "^17.0.2 || ^18.3.1"
7676
}
77-
}
77+
}

packages/modules/delete-imodel/src/components/DeleteIModel.test.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ import React from "react";
77

88
import { DeleteIModel } from "./DeleteIModel";
99

10+
jest.mock("@itwin/itwinui-react", () => ({
11+
...jest.requireActual("@itwin/itwinui-react"),
12+
useToaster: () => ({
13+
positive: jest.fn(),
14+
informational: jest.fn(),
15+
negative: jest.fn(),
16+
warning: jest.fn(),
17+
}),
18+
}));
19+
1020
describe("DeleteIModel", () => {
1121
const fetchMock = jest.fn(() => Promise.resolve({ ok: true } as Response));
1222
global.fetch = fetchMock;

packages/modules/delete-imodel/src/components/DeleteIModel.tsx

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
ModalContent,
1313
ProgressRadial,
1414
ThemeProvider,
15-
toaster,
15+
useToaster,
1616
} from "@itwin/itwinui-react";
1717
import React from "react";
1818

@@ -47,6 +47,14 @@ export type DeleteIModelProps = {
4747
};
4848

4949
export function DeleteIModel(props: DeleteIModelProps) {
50+
return (
51+
<ThemeProvider>
52+
<DeleteIModelComponent {...props} />
53+
</ThemeProvider>
54+
);
55+
}
56+
57+
function DeleteIModelComponent(props: DeleteIModelProps) {
5058
const {
5159
imodel: { id: imodelId, name: imodelName },
5260
accessToken,
@@ -56,6 +64,7 @@ export function DeleteIModel(props: DeleteIModelProps) {
5664
onSuccess,
5765
stringsOverrides,
5866
} = props;
67+
const toaster = useToaster();
5968
const [isOpen, setIsOpen] = React.useState(true);
6069
const [isLoading, setIsLoading] = React.useState(false);
6170

@@ -106,7 +115,7 @@ export function DeleteIModel(props: DeleteIModelProps) {
106115
}, [onClose]);
107116

108117
return (
109-
<ThemeProvider theme="inherit">
118+
<>
110119
<Modal
111120
isOpen={isOpen}
112121
style={{ maxWidth: 600 }}
@@ -133,7 +142,7 @@ export function DeleteIModel(props: DeleteIModelProps) {
133142
</ModalButtonBar>
134143
</Modal>
135144
{isLoading && <OverlaySpinner />}
136-
</ThemeProvider>
145+
</>
137146
);
138147
}
139148

0 commit comments

Comments
 (0)