save

package.json

@@ -32,16 +32,15 @@
         "electron-updater": "^6.1.8",
         "framer-motion": "^10.16.16",
         "mobx": "6.12",
-        "mobx-preact": "^7.5.0",
+        "mobx-react": "^7.5.0",
         "monaco-editor": "^0.44.0",
         "mustache": "^4.2.0",
         "node-fetch": "^3.2.10",
         "overlayscrollbars": "^2.6.1",
         "overlayscrollbars-react": "^0.5.5",
         "papaparse": "^5.4.1",
-        "preact": "^10.20.1",
-        "react": "npm:@preact/compat",
-        "react-dom": "npm:@preact/compat",
+        "react": "^18.1.0",
+        "react-dom": "^18.1.0",
         "react-markdown": "^9.0.0",
         "remark": "^15.0.1",
         "remark-gfm": "^4.0.0",
@@ -50,10 +49,8 @@
         "tsx-control-statements": "^5.1.1",
         "uuid": "^9.0.0",
         "winston": "^3.8.2",
-        "xterm": "^5.3.0",
-        "xterm-addon-serialize": "^0.11.0",
-        "xterm-addon-web-links": "^0.9.0",
-        "xterm-addon-webgl": "^0.16.0"
+        "xterm": "^5.0.0",
+        "xterm-addon-web-links": "^0.9.0"
     },
     "devDependencies": {
         "@babel/cli": "^7.17.10",
@@ -72,6 +69,7 @@
         "@types/electron": "^1.6.10",
         "@types/node": "^20.11.0",
         "@types/papaparse": "^5.3.10",
+        "@types/react": "^18.0.12",
         "@types/semver": "^7.5.6",
         "@types/sprintf-js": "^1.1.3",
         "@types/throttle-debounce": "^5.0.1",

public/themes/default.css

@@ -87,7 +87,7 @@
     --form-element-border-color: rgba(241, 246, 243, 0.15);
     --form-element-bg-color: var(--app-bg-color);
     --form-element-text-color: var(--app-text-primary-color);
-    --form-element-primary-text-color: var(--app-text-primary-color);
+    --form-element-primary-text-color: var(--form-element-text-color);
     --form-element-label-color: var(--app-text-secondary-color);
     --form-element-primary-color: var(--app-accent-color);
     --form-element-secondary-color: rgba(255, 255, 255, 0.2);

public/themes/light.css

@@ -36,8 +36,8 @@
     /* form colors */
     --form-element-border-color: rgba(0, 0, 0, 0.3);
     --form-element-bg-color: var(--app-bg-color);
-    --form-element-text-color: var(--app-text-primary-color);
-    --form-element-primary-text-color: var(--app-text-primary-color);
+    --form-element-text-color: var(--app-text-color);
+    --form-element-primary-text-color: var(--app-bg-color);
     --form-element-label-color: rgba(0, 0, 0, 0.6);
     --form-element-secondary-color: rgba(0, 0, 0, 0.09);
     --form-element-icon-color: rgb(0, 0, 0, 0.6);

src/app/app.tsx

@@ -1,9 +1,8 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import React, { PureComponent } from "preact/compat";
-import { createRef, RefObject } from "preact";
-import * as mobxReact from "mobx-preact";
+import * as React from "react";
+import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
@@ -29,9 +28,9 @@ import "./app.less";
 dayjs.extend(localizedFormat);
 
 @mobxReact.observer
-class App extends PureComponent<{}, {}> {
+class App extends React.Component<{}, {}> {
     dcWait: OV<boolean> = mobx.observable.box(false, { name: "dcWait" });
-    mainContentRef: RefObject<HTMLDivElement> = createRef();
+    mainContentRef: React.RefObject<HTMLDivElement> = React.createRef();
 
     constructor(props: {}) {
         super(props);

src/app/bookmarks/bookmarks.tsx

@@ -1,8 +1,8 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import React, { PureComponent } from "preact/compat";
-import * as mobxReact from "mobx-preact";
+import * as React from "react";
+import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
@@ -22,7 +22,7 @@ type BookmarkProps = {
     bookmark: BookmarkType;
 };
 
-class BookmarkKeybindings extends PureComponent<{}, {}> {
+class BookmarkKeybindings extends React.Component<{}, {}> {
     @boundMethod
     componentDidMount(): void {
         let keybindManager = GlobalModel.keybindManager;
@@ -76,7 +76,7 @@ class BookmarkKeybindings extends PureComponent<{}, {}> {
 }
 
 @mobxReact.observer
-class Bookmark extends PureComponent<BookmarkProps, {}> {
+class Bookmark extends React.Component<BookmarkProps, {}> {
     @boundMethod
     handleDeleteClick(): void {
         let { bookmark } = this.props;
@@ -232,7 +232,7 @@ class Bookmark extends PureComponent<BookmarkProps, {}> {
 }
 
 @mobxReact.observer
-class BookmarksView extends PureComponent<{}, {}> {
+class BookmarksView extends React.Component<{}, {}> {
     @boundMethod
     handleClose() {
         GlobalModel.bookmarksModel.closeView();

src/app/clientsettings/clientsettings.tsx

@@ -1,8 +1,8 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import React, { PureComponent } from "preact/compat";
-import * as mobxReact from "mobx-preact";
+import * as React from "react";
+import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
@@ -14,7 +14,7 @@ import * as appconst from "@/app/appconst";
 import "./clientsettings.less";
 import { MainView } from "../common/elements/mainview";
 
-class ClientSettingsKeybindings extends PureComponent<{}, {}> {
+class ClientSettingsKeybindings extends React.Component<{}, {}> {
     componentDidMount() {
         let clientSettingsViewModel = GlobalModel.clientSettingsViewModel;
         let keybindManager = GlobalModel.keybindManager;
@@ -34,7 +34,7 @@ class ClientSettingsKeybindings extends PureComponent<{}, {}> {
 }
 
 @mobxReact.observer
-class ClientSettingsView extends PureComponent<{ model: RemotesModel }, { hoveredItemId: string }> {
+class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hoveredItemId: string }> {
     errorMessage: OV<string> = mobx.observable.box(null, { name: "ClientSettings-errorMessage" });
 
     @boundMethod

src/app/common/elements/button.less

@@ -27,10 +27,6 @@
         }
     }
 
-    &.primary.danger {
-        background: var(--app-error-color);
-    }
-
     &.primary.outlined {
         background: none;
         border: 1px solid var(--form-element-primary-color);
@@ -40,37 +36,6 @@
         }
     }
 
-    &.primary.greyoutlined {
-        background: none;
-        border: 1px solid var(--app-text-secondary-color);
-
-        i {
-            fill: var(--app-text-secondary-color);
-        }
-    }
-
-    &.primary.outlined,
-    &.primary.greyoutlined {
-        &.hover-danger:hover {
-            color: var(--form-element-primary-text-color);
-            border: 1px solid var(--app-error-color);
-            background: var(--app-error-color);
-        }
-    }
-
-    &.primary.outlined.danger {
-        background: none;
-        border: 1px solid var(--app-error-color);
-
-        i {
-            fill: var(--app-error-color);
-        }
-    }
-
-    &.greytext {
-        color: var(--app-text-secondary-color);
-    }
-
     &.primary.ghost {
         background: none;
         i {
@@ -78,13 +43,6 @@
         }
     }
 
-    &.primary.ghost.danger {
-        background: none;
-        i {
-            fill: var(--app-error-color);
-        }
-    }
-
     &.secondary {
         color: var(--form-element-text-color);
         background: var(--form-element-secondary-color);
@@ -98,11 +56,6 @@
         border: 1px solid var(--form-element-text-color);
     }
 
-    &.secondary.outlined.danger {
-        background: none;
-        border: 1px solid var(--app-error-color);
-    }
-
     &.secondary.ghost {
         background: none;
     }

src/app/common/elements/button.tsx

@@ -1,22 +1,22 @@
-import React, { PureComponent, ReactNode, CSSProperties } from "preact/compat";
+import * as React from "react";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
 
 import "./button.less";
 
 interface ButtonProps {
-    children: ReactNode;
+    children: React.ReactNode;
     onClick?: () => void;
     disabled?: boolean;
-    leftIcon?: ReactNode;
-    rightIcon?: ReactNode;
-    style?: CSSProperties;
+    leftIcon?: React.ReactNode;
+    rightIcon?: React.ReactNode;
+    style?: React.CSSProperties;
     autoFocus?: boolean;
     className?: string;
     termInline?: boolean;
 }
 
-class Button extends PureComponent<ButtonProps> {
+class Button extends React.Component<ButtonProps> {
     static defaultProps = {
         style: {},
         className: "primary",

src/app/common/elements/checkbox.tsx

@@ -1,17 +1,18 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { PureComponent, ReactNode } from "preact/compat";
+import * as React from "react";
+import * as mobx from "mobx";
 import cn from "classnames";
 
 import "./checkbox.less";
 
-class Checkbox extends PureComponent<
+class Checkbox extends React.Component<
     {
         checked?: boolean;
         defaultChecked?: boolean;
         onChange: (value: boolean) => void;
-        label: ReactNode;
+        label: React.ReactNode;
         className?: string;
         id?: string;
     },

src/app/common/elements/cmdstrcode.tsx

@@ -1,7 +1,7 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import React, { PureComponent } from "preact/compat";
+import * as React from "react";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
 import { If } from "tsx-control-statements/components";
@@ -11,7 +11,7 @@ import { ReactComponent as CopyIcon } from "@/assets/icons/history/copy.svg";
 
 import "./cmdstrcode.less";
 
-class CmdStrCode extends PureComponent<
+class CmdStrCode extends React.Component<
     {
         cmdstr: string;
         onUse: () => void;

src/app/common/elements/cmdtext.tsx

@@ -1,7 +1,7 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import React, { PureComponent } from "preact/compat";
+import * as React from "react";
 
 function renderCmdText(text: string): any {
     return <span>&#x2318;{text}</span>;

src/app/common/elements/datepicker.tsx

@@ -1,5 +1,4 @@
-import { RefObject, FunctionComponent, createRef, Fragment } from "preact";
-import { useState, useEffect, useRef, CSSProperties } from "preact/compat";
+import React, { useState, useEffect, useRef, createRef } from "react";
 import * as mobx from "mobx";
 import ReactDOM from "react-dom";
 import dayjs from "dayjs";
@@ -12,7 +11,7 @@ import { v4 as uuidv4 } from "uuid";
 import "./datepicker.less";
 
 interface YearRefs {
-    [key: number]: RefObject<HTMLDivElement>;
+    [key: number]: React.RefObject<HTMLDivElement>;
 }
 
 type DatePickerProps = {
@@ -21,11 +20,12 @@ type DatePickerProps = {
     format?: string;
 };
 
-const DatePicker: FunctionComponent<DatePickerProps> = ({ selectedDate, format = "MM/DD/YYYY", onSelectDate }) => {
+const DatePicker: React.FC<DatePickerProps> = ({ selectedDate, format = "MM/DD/YYYY", onSelectDate }) => {
     const [isOpen, setIsOpen] = useState(false);
     const [selDate, setSelDate] = useState(dayjs(selectedDate)); // Initialize with dayjs object
     const [showYearAccordion, setShowYearAccordion] = useState(false);
     const [expandedYear, setExpandedYear] = useState<number | null>(selDate.year());
+    const [selectionTimeoutId, setSelectionTimeoutId] = useState<string | number | NodeJS.Timeout | null>(null);
     const yearRefs = useRef<YearRefs>({});
     const wrapperRef = useRef<HTMLDivElement>(null);
     const modalRef = useRef<HTMLDivElement>(null);
@@ -200,7 +200,7 @@ const DatePicker: FunctionComponent<DatePickerProps> = ({ selectedDate, format =
         return days;
     };
 
-    const calculatePosition = (): CSSProperties => {
+    const calculatePosition = (): React.CSSProperties => {
         if (wrapperRef.current) {
             const rect = wrapperRef.current.getBoundingClientRect();
             return {
@@ -220,7 +220,7 @@ const DatePicker: FunctionComponent<DatePickerProps> = ({ selectedDate, format =
 
         for (let year = startYear; year <= endYear; year++) {
             yearsRange.push(year);
-            yearRefs.current[year] = createRef();
+            yearRefs.current[year] = React.createRef();
         }
 
         return yearsRange;
@@ -302,24 +302,51 @@ const DatePicker: FunctionComponent<DatePickerProps> = ({ selectedDate, format =
         : null;
 
     const handleDatePartChange = (part: string, value: string) => {
+        console.log("Date part changed: ", part, value);
         const newDateParts = { ...dateParts, [part]: value };
-        setDateParts(newDateParts);
-
+        console.log("New date parts: ", newDateParts);
         // Construct a new date from the updated parts
         const newDate = dayjs(`${newDateParts.YYYY}-${newDateParts.MM}-${newDateParts.DD}`);
         if (newDate.isValid()) {
-            onSelectDate(newDate.toDate()); // Call onSelectDate with the new date
+            setSelDate(newDate); // Update selDate with the new dayjs object
+        } else {
+            console.log("Invalid date");
+            setSelDate(dayjs(new Date()));
         }
+        onSelectDate(selDate.toDate()); // Call onSelectDate with the new date
     };
 
     const handleArrowNavigation = (key: string, currentPart: string) => {
+        console.log("Arrow key pressed: ", key);
         const currentIndex = formatParts.indexOf(currentPart);
         let targetInput;
 
+        const incrementInput = (part: string, increment: number) => {
+            let newValue = parseInt(dateParts[part]) + increment;
+            switch (part) {
+                case "MM":
+                    newValue = newValue > 12 ? 1 : newValue < 1 ? 12 : newValue;
+                    break;
+                case "DD":
+                    const daysInMonth = dayjs(selDate).daysInMonth();
+                    console.log("Days in month: ", daysInMonth);
+                    newValue = newValue > daysInMonth ? 1 : newValue < 1 ? daysInMonth : newValue;
+                    break;
+                case "YYYY":
+                    // No bounds for year
+                    break;
+            }
+            handleDatePartChange(part, newValue.toString());
+        };
+
         if (key == "ArrowLeft" && currentIndex > 0) {
             targetInput = inputRefs.current[formatParts[currentIndex - 1]].current;
         } else if (key == "ArrowRight" && currentIndex < formatParts.length - 1) {
             targetInput = inputRefs.current[formatParts[currentIndex + 1]].current;
+        } else if (key == "ArrowUp") {
+            incrementInput(currentPart, 1);
+        } else if (key == "ArrowDown") {
+            incrementInput(currentPart, -1);
         }
 
         if (targetInput) {
@@ -351,6 +378,14 @@ const DatePicker: FunctionComponent<DatePickerProps> = ({ selectedDate, format =
             handleArrowNavigation("ArrowRight", part);
             return true;
         });
+        keybindManager.registerKeybinding("control", domain, "generic:selectAbove", (_) => {
+            handleArrowNavigation("ArrowUp", part);
+            return true;
+        });
+        keybindManager.registerKeybinding("control", domain, "generic:selectBelow", (_) => {
+            handleArrowNavigation("ArrowDown", part);
+            return true;
+        });
         keybindManager.registerKeybinding("control", domain, "generic:space", (_) => {
             toggleModal();
             return true;
@@ -369,10 +404,10 @@ const DatePicker: FunctionComponent<DatePickerProps> = ({ selectedDate, format =
         });
         for (let numpadKey = 0; numpadKey <= 9; numpadKey++) {
             keybindManager.registerKeybinding("control", domain, "generic:numpad-" + numpadKey.toString(), (_) => {
+                console.log("Numpad key pressed: ", numpadKey);
                 const currentPart = part;
                 const maxLength = currentPart === "YYYY" ? 4 : 2;
                 const newValue = event.target.value.length < maxLength ? event.target.value + numpadKey : numpadKey;
-                let selectionTimeoutId = null;
                 handleDatePartChange(currentPart, newValue);
 
                 // Clear any existing timeout
@@ -381,10 +416,12 @@ const DatePicker: FunctionComponent<DatePickerProps> = ({ selectedDate, format =
                 }
 
                 // Re-focus and select the input after state update
-                selectionTimeoutId = setTimeout(() => {
-                    event.target.focus();
-                    event.target.select();
-                }, 0);
+                setSelectionTimeoutId(
+                    setTimeout(() => {
+                        event.target.focus();
+                        event.target.select();
+                    }, 0)
+                );
                 return true;
             });
         }
@@ -451,14 +488,14 @@ const DatePicker: FunctionComponent<DatePickerProps> = ({ selectedDate, format =
                     const inputRef = inputRefs.current[part];
 
                     return (
-                        <Fragment key={part}>
+                        <React.Fragment key={part}>
                             {index > 0 && <span>{delimiter}</span>}
                             <input
                                 readOnly
                                 ref={inputRef}
                                 type="text"
                                 value={dateParts[part]}
-                                onChange={(e) => handleDatePartChange(part, (e.target as HTMLInputElement).value)}
+                                onChange={(e) => handleDatePartChange(part, e.target.value)}
                                 onKeyDown={(e) => handleKeyDown(e, part)}
                                 onMouseDown={(e) => handleMouseDown(e, part)}
                                 onFocus={(e) => handleFocus(e, part)}
@@ -467,7 +504,7 @@ const DatePicker: FunctionComponent<DatePickerProps> = ({ selectedDate, format =
                                 className="date-input"
                                 placeholder={part}
                             />
-                        </Fragment>
+                        </React.Fragment>
                     );
                 })}
                 <i

src/app/common/elements/dropdown.tsx

@@ -1,9 +1,8 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { RefObject, createRef } from "preact";
-import React, { PureComponent, ReactNode, TargetedEvent, CSSProperties } from "preact/compat";
-import * as mobxReact from "mobx-preact";
+import * as React from "react";
+import * as mobxReact from "mobx-react";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
 import { If } from "tsx-control-statements/components";
@@ -14,8 +13,8 @@ import { GlobalModel } from "@/models";
 import "./dropdown.less";
 
 interface DropdownDecorationProps {
-    startDecoration?: ReactNode;
-    endDecoration?: ReactNode;
+    startDecoration?: React.ReactNode;
+    endDecoration?: React.ReactNode;
 }
 
 interface DropdownProps {
@@ -38,9 +37,9 @@ interface DropdownState {
 }
 
 @mobxReact.observer
-class Dropdown extends PureComponent<DropdownProps, DropdownState> {
-    wrapperRef: RefObject<HTMLDivElement>;
-    menuRef: RefObject<HTMLDivElement>;
+class Dropdown extends React.Component<DropdownProps, DropdownState> {
+    wrapperRef: React.RefObject<HTMLDivElement>;
+    menuRef: React.RefObject<HTMLDivElement>;
     timeoutId: any;
     curUuid: string;
 
@@ -52,9 +51,9 @@ class Dropdown extends PureComponent<DropdownProps, DropdownState> {
             highlightedIndex: -1,
             isTouched: false,
         };
-        this.wrapperRef = createRef();
-        this.menuRef = createRef();
-        this.curUuid = uuidv4();
+        this.wrapperRef = React.createRef();
+        this.menuRef = React.createRef();
+        this.curUuid == uuidv4();
     }
 
     componentDidMount() {
@@ -101,9 +100,6 @@ class Dropdown extends PureComponent<DropdownProps, DropdownState> {
 
     @boundMethod
     handleClick() {
-        if (!this.state.isOpen || !this.state.isTouched) {
-            this.registerKeybindings();
-        }
         this.toggleDropdown();
     }
 
@@ -113,7 +109,6 @@ class Dropdown extends PureComponent<DropdownProps, DropdownState> {
         this.registerKeybindings();
     }
 
-    @boundMethod
     registerKeybindings() {
         let keybindManager = GlobalModel.keybindManager;
         let domain = "dropdown-" + this.curUuid;
@@ -127,7 +122,6 @@ class Dropdown extends PureComponent<DropdownProps, DropdownState> {
         });
         keybindManager.registerKeybinding("control", domain, "generic:cancel", (waveEvent) => {
             this.setState({ isOpen: false });
-            this.unregisterKeybindings();
             return true;
         });
         keybindManager.registerKeybinding("control", domain, "generic:selectAbove", (waveEvent) => {
@@ -171,22 +165,20 @@ class Dropdown extends PureComponent<DropdownProps, DropdownState> {
         }
     }
 
-    @boundMethod
     handleBlur() {
         this.unregisterKeybindings();
     }
 
-    @boundMethod
     unregisterKeybindings() {
         let domain = "dropdown-" + this.curUuid;
         GlobalModel.keybindManager.unregisterDomain(domain);
     }
 
     @boundMethod
-    handleKeyDown(event) {}
+    handleKeyDown(event: React.KeyboardEvent) {}
 
     @boundMethod
-    handleSelect(value: string, event?: TargetedEvent) {
+    handleSelect(value: string, event?: React.MouseEvent | React.KeyboardEvent) {
         const { onChange } = this.props;
         if (event) {
             event.stopPropagation(); // This stops the event from bubbling up to the wrapper
@@ -197,7 +189,6 @@ class Dropdown extends PureComponent<DropdownProps, DropdownState> {
         }
         onChange(value);
         this.setState({ isOpen: false, isTouched: true });
-        this.unregisterKeybindings();
     }
 
     @boundMethod
@@ -206,7 +197,7 @@ class Dropdown extends PureComponent<DropdownProps, DropdownState> {
     }
 
     @boundMethod
-    calculatePosition(): CSSProperties {
+    calculatePosition(): React.CSSProperties {
         if (this.wrapperRef.current) {
             const rect = this.wrapperRef.current.getBoundingClientRect();
             return {

src/app/common/elements/inlinesettingstextedit.tsx

@@ -1,9 +1,8 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { createRef, RefObject } from "preact";
-import React, { PureComponent } from "preact/compat";
-import * as mobxReact from "mobx-preact";
+import * as React from "react";
+import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
@@ -15,7 +14,7 @@ import { v4 as uuidv4 } from "uuid";
 import "./inlinesettingstextedit.less";
 
 @mobxReact.observer
-class InlineSettingsTextEdit extends PureComponent<
+class InlineSettingsTextEdit extends React.Component<
     {
         text: string;
         value: string;
@@ -29,7 +28,7 @@ class InlineSettingsTextEdit extends PureComponent<
     isEditing: OV<boolean> = mobx.observable.box(false, { name: "inlineedit-isEditing" });
     tempText: OV<string>;
     shouldFocus: boolean = false;
-    inputRef: RefObject<any> = createRef();
+    inputRef: React.RefObject<any> = React.createRef();
     curId: string;
 
     componentDidMount(): void {

src/app/common/elements/inputdecoration.tsx

@@ -1,19 +1,19 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { PureComponent, ReactNode } from "preact/compat";
-import * as mobxReact from "mobx-preact";
+import * as React from "react";
+import * as mobxReact from "mobx-react";
 import cn from "classnames";
 
 import "./inputdecoration.less";
 
 interface InputDecorationProps {
     position?: "start" | "end";
-    children: ReactNode;
+    children: React.ReactNode;
 }
 
 @mobxReact.observer
-class InputDecoration extends PureComponent<InputDecorationProps, {}> {
+class InputDecoration extends React.Component<InputDecorationProps, {}> {
     render() {
         const { children, position = "end" } = this.props;
         return (

src/app/common/elements/linkbutton.tsx

@@ -1,7 +1,7 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import React, { PureComponent } from "preact/compat";
+import * as React from "react";
 import cn from "classnames";
 import { ButtonProps } from "./button";
 
@@ -11,7 +11,7 @@ interface LinkButtonProps extends ButtonProps {
     target?: string;
 }
 
-class LinkButton extends PureComponent<LinkButtonProps> {
+class LinkButton extends React.Component<LinkButtonProps> {
     render() {
         const { leftIcon, rightIcon, children, className, ...rest } = this.props;
 

src/app/common/elements/mainview.tsx

@@ -1,18 +1,18 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { PureComponent, ReactNode } from "preact/compat";
-import * as mobxReact from "mobx-preact";
+import * as React from "react";
+import * as mobxReact from "mobx-react";
 import cn from "classnames";
 import { GlobalModel } from "@/models";
 
 import "./mainview.less";
 
 @mobxReact.observer
-class MainView extends PureComponent<{
+class MainView extends React.Component<{
     title: string;
     onClose: () => void;
-    children: ReactNode;
+    children: React.ReactNode;
     className?: string;
 }> {
     render() {

src/app/common/elements/markdown.tsx

@@ -1,9 +1,8 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { createRef, RefObject, JSX } from "preact";
-import { PureComponent, ReactNode } from "preact/compat";
-import * as mobxReact from "mobx-preact";
+import * as React from "react";
+import * as mobxReact from "mobx-react";
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
 import cn from "classnames";
@@ -29,20 +28,20 @@ function CodeRenderer(props: any): any {
 }
 
 @mobxReact.observer
-class CodeBlockMarkdown extends PureComponent<{ children: ReactNode; codeSelectSelectedIndex?: number }, {}> {
+class CodeBlockMarkdown extends React.Component<{ children: React.ReactNode; codeSelectSelectedIndex?: number }, {}> {
     blockIndex: number;
-    blockRef: RefObject<HTMLPreElement>;
+    blockRef: React.RefObject<HTMLPreElement>;
 
     constructor(props) {
         super(props);
-        this.blockRef = createRef();
+        this.blockRef = React.createRef();
         this.blockIndex = GlobalModel.inputModel.addCodeBlockToCodeSelect(this.blockRef);
     }
 
     render() {
-        let clickHandler: (e: JSX.TargetedMouseEvent<HTMLElement>, blockIndex: number) => void;
+        let clickHandler: (e: React.MouseEvent<HTMLElement>, blockIndex: number) => void;
         let inputModel = GlobalModel.inputModel;
-        clickHandler = (e: JSX.TargetedMouseEvent<HTMLElement>, blockIndex: number) => {
+        clickHandler = (e: React.MouseEvent<HTMLElement>, blockIndex: number) => {
             inputModel.setCodeSelectSelectedCodeBlock(blockIndex);
         };
         let selected = this.blockIndex == this.props.codeSelectSelectedIndex;
@@ -59,12 +58,15 @@ class CodeBlockMarkdown extends PureComponent<{ children: ReactNode; codeSelectS
 }
 
 @mobxReact.observer
-class Markdown extends PureComponent<{ text: string; style?: any; extraClassName?: string; codeSelect?: boolean }, {}> {
+class Markdown extends React.Component<
+    { text: string; style?: any; extraClassName?: string; codeSelect?: boolean },
+    {}
+> {
     CodeBlockRenderer(props: any, codeSelect: boolean, codeSelectIndex: number): any {
         if (codeSelect) {
             return <CodeBlockMarkdown codeSelectSelectedIndex={codeSelectIndex}>{props.children}</CodeBlockMarkdown>;
         } else {
-            const clickHandler = (e: JSX.TargetedMouseEvent<HTMLElement>) => {
+            const clickHandler = (e: React.MouseEvent<HTMLElement>) => {
                 let blockText = (e.target as HTMLElement).innerText;
                 if (blockText) {
                     blockText = blockText.replace(/\n$/, ""); // remove trailing newline

src/app/common/elements/modal.tsx

@@ -1,9 +1,9 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { FunctionComponent } from "preact";
-import { PureComponent, ReactNode, createPortal } from "preact/compat";
+import * as React from "react";
 import { If } from "tsx-control-statements/components";
+import ReactDOM from "react-dom";
 import { Button } from "./button";
 import { v4 as uuidv4 } from "uuid";
 import { GlobalModel } from "@/models";
@@ -17,7 +17,7 @@ interface ModalHeaderProps {
     title: string;
 }
 
-const ModalHeader: FunctionComponent<ModalHeaderProps> = ({ onClose, keybindings, title }) => (
+const ModalHeader: React.FC<ModalHeaderProps> = ({ onClose, keybindings, title }) => (
     <div className="wave-modal-header">
         <If condition={keybindings && onClose}>
             <ModalKeybindings onCancel={onClose}></ModalKeybindings>
@@ -39,7 +39,7 @@ interface ModalFooterProps {
     keybindings?: boolean;
 }
 
-class ModalKeybindings extends PureComponent<{ onOk?: () => void; onCancel?: () => void }, {}> {
+class ModalKeybindings extends React.Component<{ onOk?: () => void; onCancel?: () => void }, {}> {
     curId: string;
 
     @boundMethod
@@ -70,12 +70,12 @@ class ModalKeybindings extends PureComponent<{ onOk?: () => void; onCancel?: ()
         GlobalModel.keybindManager.unregisterDomain("modal-" + this.curId);
     }
 
-    render(): ReactNode {
+    render(): React.ReactNode {
         return null;
     }
 }
 
-const ModalFooter: FunctionComponent<ModalFooterProps> = ({
+const ModalFooter: React.FC<ModalFooterProps> = ({
     onCancel,
     onOk,
     cancelLabel = "Cancel",
@@ -101,11 +101,11 @@ const ModalFooter: FunctionComponent<ModalFooterProps> = ({
 
 interface ModalProps {
     className?: string;
-    children?: ReactNode;
+    children?: React.ReactNode;
     onClickBackdrop?: () => void;
 }
 
-class Modal extends PureComponent<ModalProps> {
+class Modal extends React.Component<ModalProps> {
     static Header = ModalHeader;
     static Footer = ModalFooter;
 
@@ -127,7 +127,7 @@ class Modal extends PureComponent<ModalProps> {
     }
 
     render() {
-        return createPortal(this.renderModal(), document.getElementById("app"));
+        return ReactDOM.createPortal(this.renderModal(), document.getElementById("app"));
     }
 }