Skip to content

Commit 680db01

Browse files
Refactor for React 18
1 parent 0024d3c commit 680db01

File tree

5 files changed

+8
-19
lines changed

5 files changed

+8
-19
lines changed

client/src/components/layouts/SidebarLayout.jsx

-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ import { useLocation } from "react-router-dom";
77
import { useStores } from "../../data";
88
import { observer } from "mobx-react";
99

10-
import itl from "../../translations";
11-
1210
const Sidebarlayout = observer(
1311
({ contentLeft, contentRight, isFullScreen = true }) => {
1412
const { uiStore, projectStore } = useStores();
15-
const projectDetails = projectStore.getProjectDetails();
1613

1714
const [isDragging, setIsDragging] = useState(false);
1815
const [modalOpen, setModalOpen] = useState(false);

client/src/components/modal/EditDetailsModal.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// import { Field, Form, Formik } from "formik";
22
import Modal, { ModalInterface } from "./Modal";
3-
import itl from "../../translations";
43
import { useStores } from "../../data";
5-
import { getFormData } from "../../utils/dom-utils";
64
import { observer } from "mobx-react";
75
import { ChangeEvent, SyntheticEvent, useState } from "react";
86
import { ProjectDetailInterface } from "../../data/project";
@@ -19,7 +17,6 @@ import {
1917
import {
2018
applyValueModifiers,
2119
applyVisibilityModifiers,
22-
Modifiers,
2320
ConfigValues,
2421
} from "../../utils/modifier-helpers";
2522

@@ -318,7 +315,7 @@ const EditDetailsModal = observer(
318315
defaultValue={formInputs.size}
319316
/>
320317
</label>*/}
321-
318+
322319
{/*<div className="grid">
323320
<label htmlFor="units">
324321
{itl.terms.units}

client/src/components/steps/Configs/Config.tsx

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import SlideOut from "./SlideOut";
77
import { useStores } from "../../../data";
88

99
import { OptionInterface, TemplateInterface } from "../../../data/template";
10-
import { Modifiers, ConfigValues } from "../../../utils/modifier-helpers";
10+
import { ConfigValues } from "../../../utils/modifier-helpers";
1111
import { ConfigInterface } from "../../../data/config";
1212
import Spinner from "../../Spinner";
1313

@@ -21,11 +21,6 @@ const Config = observer(({ configId }: ConfigProps) => {
2121
const template = templateStore.getTemplateByPath(
2222
config.templatePath,
2323
) as TemplateInterface;
24-
const templateOptions: OptionInterface[] =
25-
templateStore.getOptionsForTemplate(template?.modelicaPath);
26-
const templateModifiers: Modifiers = templateStore.getModifiersForTemplate(
27-
template?.modelicaPath,
28-
);
2924
const selections: ConfigValues = configStore.getConfigSelections(configId);
3025
const allOptions: { [key: string]: OptionInterface } =
3126
templateStore.getAllOptions();

client/src/index.jsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import React from "react";
2-
import ReactDOM from "react-dom";
2+
import { createRoot } from 'react-dom/client';
33
import { HashRouter as Router } from "react-router-dom";
44
import App from "./App";
55

6-
ReactDOM.render(
6+
const container = document.getElementById('root');
7+
const root = createRoot(container);
8+
root.render(
79
<React.StrictMode>
810
<Router>
911
<App />
1012
</Router>
11-
</React.StrictMode>,
12-
document.getElementById("root"),
13+
</React.StrictMode>
1314
);

client/src/utils/expression-helpers.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { storeHooks } from "./store-helpers";
21
import { deepCopy } from "./utils";
3-
import { Modifiers, applyPathModifiers } from "./modifier-helpers";
2+
import { applyPathModifiers } from "./modifier-helpers";
43
import { OptionInterface } from "../data/template";
54

65
export type Literal = boolean | string | number;

0 commit comments

Comments
 (0)