save

* Clean up cmdinput

* Remove unused css styles, clicking on textarea will focus back to textarea without closing history

* cleanup logic for activating textarea

* actions buttons should always show, should properly disable inactive views

* clicking actions toggles the view

* remove titlebar spacer, clean up padding

* Make AIChat and HistoryInfo share a common layout

* fix ai chat scroll

* clean up formatting

* fix chat textarea resizing

* align prompt and input

* update infomsg to use auxview

* update comments

* fix widths and key error

* add todo

* adjust padding for input, remove debug

* Don't capture clicks on the prompt area

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",
@@ -51,8 +50,8 @@
         "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-serialize": "^0.11.0",
         "xterm-addon-webgl": "^0.16.0"
     },
     "devDependencies": {
@@ -72,6 +71,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

@@ -42,16 +42,19 @@
     --app-bg-color: black;
     --app-accent-color: rgb(88, 193, 66);
     --app-accent-bg-color: rgba(88, 193, 66, 0.25);
+    --app-accent-bg-darker-color: rgba(88, 193, 66, 0.5);
     --app-text-color: rgb(211, 215, 207);
     --app-text-primary-color: rgb(255, 255, 255);
     --app-text-secondary-color: rgb(195, 200, 194);
     --app-text-disabled-color: rgb(173, 173, 173);
+    --app-text-bg-color: rgb(23, 23, 23);
+    --app-text-bg-disabled-color: rgb(51, 51, 51);
     --app-border-color: rgb(51, 51, 51);
-    --app-maincontent-bg-color: #333;
+    --app-maincontent-bg-color: rgb(51, 51, 51);
     --app-panel-bg-color: rgba(21, 23, 21, 1);
     --app-panel-bg-color-dev: rgb(21, 23, 48);
     --app-icon-color: rgb(139, 145, 138);
-    --app-icon-hover-color: #fff;
+    --app-icon-hover-color: rgb(255, 255, 255);
     --app-selected-mask-color: rgba(255, 255, 255, 0.06);
 
     /* global status colors */
@@ -122,18 +125,18 @@
 
     /* line colors */
     --line-sidebar-message-color: rgb(196, 160, 0);
-    --line-background: rgba(21, 23, 21, 1);
-    --line-avatar-color: #eceeec;
+    --line-background: var(--app-panel-bg-color);
+    --line-avatar-color: rgb(236, 238, 236);
     --line-text-color: rgb(211, 215, 207);
     --line-svg-fill-color: rgb(150, 152, 150);
-    --line-svg-hover-fill-color: #eceeec;
+    --line-svg-hover-fill-color: rgb(236, 238, 236);
     --line-separator-color: rgb(126, 126, 126);
     --line-error-color: var(--app-error-color);
     --line-warning-color: var(--app-warning-color);
-    --line-base-soft-blue-color: #729fcf;
+    --line-base-soft-blue-color: rgb(114, 159, 207);
     --line-active-border-color: var(--app-accent-color);
     --line-selected-bg-color: rgba(255, 255, 255, 0.05);
-    --line-selected-border-left-color: #777777;
+    --line-selected-border-left-color: rgb(119, 119, 119);
     --line-selected-error-border-color: rgba(204, 0, 0, 0.8);
     --line-selected-error-bg-color: rgb(19, 4, 3);
     --line-error-bg-color: rgba(200, 0, 0, 0.1);
@@ -152,22 +155,21 @@
     /* table colors */
     --table-border-color: rgba(241, 246, 243, 0.15);
     --table-thead-border-top-color: rgba(250, 250, 250, 0.1);
-    --table-thead-bright-border-color: #ccc;
+    --table-thead-bright-border-color: rgb(204, 204, 204);
     --table-thead-bg-color: rgba(250, 250, 250, 0.02);
     --table-tr-border-bottom-color: rgba(241, 246, 243, 0.15);
     --table-tr-hover-bg-color: rgba(255, 255, 255, 0.06);
-    --table-tr-selected-bg-color: #222;
-    --table-tr-selected-hover-bg-color: #333;
+    --table-tr-selected-bg-color: rgb(34, 34, 34);
+    --table-tr-selected-hover-bg-color: var(--app-maincontent-bg-color);
 
     /* cmdinput colors */
-    --cmdinput-textarea-bg-color: #171717;
+    --cmdinput-bg-color: var(--app-text-bg-color);
     --cmdinput-text-error-color: var(--term-red);
     --cmdinput-history-item-error-color: var(--term-bright-red);
     --cmdinput-history-item-selected-error-color: var(--term-bright-red);
-    --cmdinput-button-bg-color: rgb(88, 193, 66);
-    --cmdinput-comment-button-bg-color: rgb(57, 113, 255);
-    --cmdinput-disabled-icon-color: rgb(76, 81, 75, 1);
-    --cmdinput-history-bg-color: rgb(21, 23, 21, 1);
+    --cmdinput-button-bg-color: var(--tab-green);
+    --cmdinput-disabled-bg-color: var(--app-text-bg-disabled-color);
+    --cmdinput-history-bg-color: var(--app-bg-color);
 
     /* screen view color */
     --screen-view-text-caption-color: rgb(139, 145, 138);

public/themes/light.css

@@ -5,20 +5,20 @@
 @import url("./term-light.css");
 
 :root {
-    --app-bg-color: #fefefe;
+    --app-bg-color: rgb(254, 254, 254);
     --app-accent-color: rgb(75, 166, 57);
     --app-accent-bg-color: rgba(75, 166, 57, 0.2);
-    --app-text-color: #000;
+    --app-text-color: rgb(0, 0, 0);
     --app-text-primary-color: rgb(0, 0, 0, 0.9);
     --app-text-secondary-color: rgb(0, 0, 0, 0.7);
     --app-border-color: rgb(139 145 138);
-    --app-panel-bg-color: #e0e0e0;
-    --app-panel-bg-color-dev: #e0e0e0;
-    --app-icon-color: rgb(80, 80, 80);
-    --app-icon-hover-color: rgb(100, 100, 100);
+    --app-panel-bg-color: rgb(224, 224, 224);
+    --app-panel-bg-color-dev: rgb(224, 224, 224);
+    --app-icon-color: rgb(110, 110, 110);
+    --app-icon-hover-color: rgb(80, 80, 80);
     --app-selected-mask-color: rgba(0, 0, 0, 0.06);
 
-    --input-bg-color: #eeeeee;
+    --input-bg-color: rgb(238, 238, 238);
 
     /* tab color */
     --tab-white: rgb(0, 0, 0, 0.6);
@@ -30,8 +30,8 @@
     --table-thead-bg-color: rgba(250, 250, 250, 0.15);
     --table-tr-border-bottom-color: rgba(0, 0, 0, 0.15);
     --table-tr-hover-bg-color: rgba(0, 0, 0, 0.15);
-    --table-tr-selected-bg-color: #dddddd;
-    --table-tr-selected-hover-bg-color: #cccccc;
+    --table-tr-selected-bg-color: rgb(221, 221, 221);
+    --table-tr-selected-hover-bg-color: rgb(204, 204, 204);
 
     /* form colors */
     --form-element-border-color: rgba(0, 0, 0, 0.3);
@@ -41,8 +41,8 @@
     --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);
-    --form-element-disabled-text-color: #b7b7b7;
-    --form-element-placeholder-color: #b7b7b7;
+    --form-element-disabled-text-color: rgb(183, 183, 183);
+    --form-element-placeholder-color: rgb(183, 183, 183);
 
     --markdown-bg-color: rgb(0, 0, 0, 0.1);
 
@@ -50,8 +50,6 @@
     --modal-header-bottom-border-color: rgba(0, 0, 0, 0.3);
 
     /* cmd input */
-    --cmdinput-textarea-bg-color: rgba(0, 0, 0, 0.1);
-    --cmdinput-textarea-border-color: var(--form-element-border-color);
 
     /* scroll colors */
     --scrollbar-background-color: var(--app-bg-color);
@@ -64,15 +62,15 @@
     --line-actions-inactive-color: rgba(0, 0, 0, 0.3);
     --line-actions-active-color: rgba(0, 0, 0, 1);
 
-    --logo-button-hover-bg-color: #f0f0f0;
+    --logo-button-hover-bg-color: rgb(240, 240, 240);
 
     --xterm-viewport-border-color: rgba(0, 0, 0, 0.3);
 
-    --datepicker-cell-hover-bg-color: #f0f0f0;
+    --datepicker-cell-hover-bg-color: rgb(240, 240, 240);
     --datepicker-cell-other-text-color: rgba(0, 0, 0, 0.3);
     --datepicker-header-fade-color: rgba(0, 0, 0, 0.4);
-    --datepicker-year-header-bg-color: #f5f5f5;
-    --datepicker-year-header-border-color: #dcdcdc;
+    --datepicker-year-header-bg-color: rgb(245, 245, 245);
+    --datepicker-year-header-border-color: rgb(220, 220, 220);
 
     /* toggle colors */
     --toggle-thumb-color: var(--app-bg-color);

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,20 +1,21 @@
 // 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";
 import { GlobalModel, GlobalCommandRunner, RemotesModel, getApi } from "@/models";
 import { Toggle, InlineSettingsTextEdit, SettingsError, Dropdown } from "@/common/elements";
 import { commandRtnHandler, isBlank } from "@/util/util";
+import { getTermThemes } from "@/util/themeutil";
 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 +35,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
@@ -73,6 +74,19 @@ class ClientSettingsView extends PureComponent<{ model: RemotesModel }, { hovere
         commandRtnHandler(prtn, this.errorMessage);
     }
 
+    @boundMethod
+    handleChangeTermTheme(theme: string): void {
+        // For global terminal theme, the key is global, otherwise it's either
+        // sessionId or screenId.
+        const currTheme = GlobalModel.getTermTheme()["global"];
+        if (currTheme == theme) {
+            return;
+        }
+
+        const prtn = GlobalCommandRunner.setGlobalTermTheme(theme, false);
+        commandRtnHandler(prtn, this.errorMessage);
+    }
+
     @boundMethod
     handleChangeTelemetry(val: boolean): void {
         let prtn: Promise<CommandRtnType> = null;
@@ -193,6 +207,8 @@ class ClientSettingsView extends PureComponent<{ model: RemotesModel }, { hovere
         const curFontSize = GlobalModel.getTermFontSize();
         const curFontFamily = GlobalModel.getTermFontFamily();
         const curTheme = GlobalModel.getThemeSource();
+        const termThemes = getTermThemes(GlobalModel.termThemes, "Wave Default");
+        const currTermTheme = GlobalModel.getTermTheme()["global"] ?? termThemes[0].label;
 
         return (
             <MainView className="clientsettings-view" title="Client Settings" onClose={this.handleClose}>
@@ -233,6 +249,19 @@ class ClientSettingsView extends PureComponent<{ model: RemotesModel }, { hovere
                             />
                         </div>
                     </div>
+                    <If condition={termThemes.length > 0}>
+                        <div className="settings-field">
+                            <div className="settings-label">Terminal Theme</div>
+                            <div className="settings-input">
+                                <Dropdown
+                                    className="terminal-theme-dropdown"
+                                    options={termThemes}
+                                    defaultValue={currTermTheme}
+                                    onChange={this.handleChangeTermTheme}
+                                />
+                            </div>
+                        </div>
+                    </If>
                     <div className="settings-field">
                         <div className="settings-label">Client ID</div>
                         <div className="settings-input">{cdata.clientid}</div>

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,7 +20,7 @@ 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);
@@ -200,7 +199,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 +219,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;
@@ -451,14 +450,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 +466,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,8 +51,8 @@ class Dropdown extends PureComponent<DropdownProps, DropdownState> {
             highlightedIndex: -1,
             isTouched: false,
         };
-        this.wrapperRef = createRef();
-        this.menuRef = createRef();
+        this.wrapperRef = React.createRef();
+        this.menuRef = React.createRef();
         this.curUuid = uuidv4();
     }
 
@@ -183,10 +182,10 @@ class Dropdown extends PureComponent<DropdownProps, DropdownState> {
     }
 
     @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
@@ -206,7 +205,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,15 +1,16 @@
 // 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";
 import { GlobalModel } from "@/models";
+import { v4 as uuidv4 } from "uuid";
 
 import "./markdown.less";
+import { boundMethod } from "autobind-decorator";
 
 function LinkRenderer(props: any): any {
     let newUrl = "https://extern?" + encodeURIComponent(props.href);
@@ -29,20 +30,23 @@ 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; uuid: string },
+    {}
+> {
     blockIndex: number;
-    blockRef: RefObject<HTMLPreElement>;
+    blockRef: React.RefObject<HTMLPreElement>;
 
     constructor(props) {
         super(props);
-        this.blockRef = createRef();
-        this.blockIndex = GlobalModel.inputModel.addCodeBlockToCodeSelect(this.blockRef);
+        this.blockRef = React.createRef();
+        this.blockIndex = GlobalModel.inputModel.addCodeBlockToCodeSelect(this.blockRef, this.props.uuid);
     }
 
     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 +63,27 @@ class CodeBlockMarkdown extends PureComponent<{ children: ReactNode; codeSelectS
 }
 
 @mobxReact.observer
-class Markdown extends PureComponent<{ text: string; style?: any; extraClassName?: string; codeSelect?: boolean }, {}> {
-    CodeBlockRenderer(props: any, codeSelect: boolean, codeSelectIndex: number): any {
+class Markdown extends React.Component<
+    { text: string; style?: any; extraClassName?: string; codeSelect?: boolean },
+    {}
+> {
+    curUuid: string;
+
+    constructor(props) {
+        super(props);
+        this.curUuid = uuidv4();
+    }
+
+    @boundMethod
+    CodeBlockRenderer(props: any, codeSelect: boolean, codeSelectIndex: number, curUuid: string): any {
         if (codeSelect) {
-            return <CodeBlockMarkdown codeSelectSelectedIndex={codeSelectIndex}>{props.children}</CodeBlockMarkdown>;
+            return (
+                <CodeBlockMarkdown codeSelectSelectedIndex={codeSelectIndex} uuid={curUuid}>
+                    {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
@@ -88,7 +107,7 @@ class Markdown extends PureComponent<{ text: string; style?: any; extraClassName
             h5: (props) => HeaderRenderer(props, 5),
             h6: (props) => HeaderRenderer(props, 6),
             code: (props) => CodeRenderer(props),
-            pre: (props) => this.CodeBlockRenderer(props, codeSelect, curCodeSelectIndex),
+            pre: (props) => this.CodeBlockRenderer(props, codeSelect, curCodeSelectIndex, this.curUuid),
         };
         return (
             <div className={cn("markdown content", this.props.extraClassName)} style={this.props.style}>

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"));
     }
 }
 

src/app/common/elements/numberfield.tsx

@@ -1,16 +1,16 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { JSX, cloneElement } from "preact";
+import * as React from "react";
 import { boundMethod } from "autobind-decorator";
 
 import { TextField } from "./textfield";
 
 class NumberField extends TextField {
     @boundMethod
-    handleInputChange(e: JSX.TargetedEvent) {
+    handleInputChange(e: React.ChangeEvent<HTMLInputElement>) {
         const { required, onChange } = this.props;
-        const inputValue = (e.target as HTMLInputElement).value;
+        const inputValue = e.target.value;
 
         // Allow only numeric input
         if (inputValue === "" || /^\d*$/.test(inputValue)) {
@@ -32,7 +32,7 @@ class NumberField extends TextField {
     render() {
         // Use the render method from TextField but add the onKeyDown handler
         const renderedTextField = super.render();
-        return cloneElement(renderedTextField);
+        return React.cloneElement(renderedTextField);
     }
 }