Save work, everything working except tab bar reorder group

save work
2026-04-22 15:26:58 -07:00 · 2024-03-29 20:00:04 -07:00 · 2024-03-29 19:55:53 -07:00 · 2024-03-29 19:05:45 -07:00 · 2024-03-29 17:13:06 -07:00
134 changed files with 8632 additions and 11013 deletions
@@ -23,7 +23,6 @@
        "@table-nav/react": "^0.0.7",
        "@tanstack/match-sorter-utils": "^8.8.4",
        "@tanstack/react-table": "^8.10.3",
-        "@withfig/autocomplete": "^2.652.3",
        "autobind-decorator": "^2.4.0",
        "base64-js": "^1.5.1",
        "classnames": "^2.3.1",
@@ -33,15 +32,16 @@
        "electron-updater": "^6.1.8",
        "framer-motion": "^10.16.16",
        "mobx": "6.12",
-        "mobx-react": "^7.5.0",
+        "mobx-react": "^9.1.1",
        "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",
-        "react": "^18.1.0",
-        "react-dom": "^18.1.0",
+        "preact": "^10.20.1",
+        "react": "npm:@preact/compat",
+        "react-dom": "npm:@preact/compat",
        "react-markdown": "^9.0.0",
        "remark": "^15.0.1",
        "remark-gfm": "^4.0.0",
@@ -51,8 +51,8 @@
        "uuid": "^9.0.0",
        "winston": "^3.8.2",
        "xterm": "^5.3.0",
-        "xterm-addon-web-links": "^0.9.0",
        "xterm-addon-serialize": "^0.11.0",
+        "xterm-addon-web-links": "^0.9.0",
        "xterm-addon-webgl": "^0.16.0"
    },
    "devDependencies": {
@@ -72,13 +72,11 @@
        "@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",
        "@types/uuid": "^9.0.7",
        "@types/webpack-env": "^1.18.3",
-        "@withfig/autocomplete-types": "^1.30.0",
        "babel-loader": "^9.1.3",
        "babel-plugin-jsx-control-statements": "^4.1.2",
        "copy-webpack-plugin": "^12.0.0",
@@ -42,19 +42,16 @@
    --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: rgb(51, 51, 51);
+    --app-maincontent-bg-color: #333;
    --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: rgb(255, 255, 255);
+    --app-icon-hover-color: #fff;
    --app-selected-mask-color: rgba(255, 255, 255, 0.06);

    /* global status colors */
@@ -125,18 +122,18 @@

    /* line colors */
    --line-sidebar-message-color: rgb(196, 160, 0);
-    --line-background: var(--app-panel-bg-color);
-    --line-avatar-color: rgb(236, 238, 236);
+    --line-background: rgba(21, 23, 21, 1);
+    --line-avatar-color: #eceeec;
    --line-text-color: rgb(211, 215, 207);
    --line-svg-fill-color: rgb(150, 152, 150);
-    --line-svg-hover-fill-color: rgb(236, 238, 236);
+    --line-svg-hover-fill-color: #eceeec;
    --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: rgb(114, 159, 207);
+    --line-base-soft-blue-color: #729fcf;
    --line-active-border-color: var(--app-accent-color);
    --line-selected-bg-color: rgba(255, 255, 255, 0.05);
-    --line-selected-border-left-color: rgb(119, 119, 119);
+    --line-selected-border-left-color: #777777;
    --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);
@@ -155,21 +152,22 @@
    /* 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: rgb(204, 204, 204);
+    --table-thead-bright-border-color: #ccc;
    --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: rgb(34, 34, 34);
-    --table-tr-selected-hover-bg-color: var(--app-maincontent-bg-color);
+    --table-tr-selected-bg-color: #222;
+    --table-tr-selected-hover-bg-color: #333;

    /* cmdinput colors */
-    --cmdinput-bg-color: var(--app-text-bg-color);
+    --cmdinput-textarea-bg-color: #171717;
    --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: var(--tab-green);
-    --cmdinput-disabled-bg-color: var(--app-text-bg-disabled-color);
-    --cmdinput-history-bg-color: var(--app-bg-color);
+    --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);

    /* screen view color */
    --screen-view-text-caption-color: rgb(139, 145, 138);
@@ -5,20 +5,20 @@
@import url("./term-light.css");

 :root {
-    --app-bg-color: rgb(254, 254, 254);
+    --app-bg-color: #fefefe;
    --app-accent-color: rgb(75, 166, 57);
    --app-accent-bg-color: rgba(75, 166, 57, 0.2);
-    --app-text-color: rgb(0, 0, 0);
+    --app-text-color: #000;
    --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: 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-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-selected-mask-color: rgba(0, 0, 0, 0.06);

-    --input-bg-color: rgb(238, 238, 238);
+    --input-bg-color: #eeeeee;

    /* 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: rgb(221, 221, 221);
-    --table-tr-selected-hover-bg-color: rgb(204, 204, 204);
+    --table-tr-selected-bg-color: #dddddd;
+    --table-tr-selected-hover-bg-color: #cccccc;

    /* 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: rgb(183, 183, 183);
-    --form-element-placeholder-color: rgb(183, 183, 183);
+    --form-element-disabled-text-color: #b7b7b7;
+    --form-element-placeholder-color: #b7b7b7;

    --markdown-bg-color: rgb(0, 0, 0, 0.1);

@@ -50,6 +50,8 @@
    --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);
@@ -62,15 +64,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: rgb(240, 240, 240);
+    --logo-button-hover-bg-color: #f0f0f0;

    --xterm-viewport-border-color: rgba(0, 0, 0, 0.3);

-    --datepicker-cell-hover-bg-color: rgb(240, 240, 240);
+    --datepicker-cell-hover-bg-color: #f0f0f0;
    --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: rgb(245, 245, 245);
-    --datepicker-year-header-border-color: rgb(220, 220, 220);
+    --datepicker-year-header-bg-color: #f5f5f5;
+    --datepicker-year-header-border-color: #dcdcdc;

    /* toggle colors */
    --toggle-thumb-color: var(--app-bg-color);
@@ -28,7 +28,7 @@ import "./app.less";
 dayjs.extend(localizedFormat);

@mobxReact.observer
-class App extends React.Component<{}, {}> {
+class App extends React.PureComponent<{}, {}> {
    dcWait: OV<boolean> = mobx.observable.box(false, { name: "dcWait" });
    mainContentRef: React.RefObject<HTMLDivElement> = React.createRef();

@@ -64,7 +64,3 @@ export enum StatusIndicatorLevel {

 // matches packet.go
 export const ErrorCode_InvalidCwd = "ERRCWD";
-
-export const InputAuxView_History = "history";
-export const InputAuxView_Info = "info";
-export const InputAuxView_AIChat = "aichat";
@@ -22,7 +22,7 @@ type BookmarkProps = {
    bookmark: BookmarkType;
 };

-class BookmarkKeybindings extends React.Component<{}, {}> {
+class BookmarkKeybindings extends React.PureComponent<{}, {}> {
    @boundMethod
    componentDidMount(): void {
        let keybindManager = GlobalModel.keybindManager;
@@ -76,7 +76,7 @@ class BookmarkKeybindings extends React.Component<{}, {}> {
 }

@mobxReact.observer
-class Bookmark extends React.Component<BookmarkProps, {}> {
+class Bookmark extends React.PureComponent<BookmarkProps, {}> {
    @boundMethod
    handleDeleteClick(): void {
        let { bookmark } = this.props;
@@ -232,7 +232,7 @@ class Bookmark extends React.Component<BookmarkProps, {}> {
 }

@mobxReact.observer
-class BookmarksView extends React.Component<{}, {}> {
+class BookmarksView extends React.PureComponent<{}, {}> {
    @boundMethod
    handleClose() {
        GlobalModel.bookmarksModel.closeView();
@@ -7,15 +7,14 @@ 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, Button } from "@/common/elements";
+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";
+import { MainView } from "../common/elements/mainview";

-class ClientSettingsKeybindings extends React.Component<{}, {}> {
+class ClientSettingsKeybindings extends React.PureComponent<{}, {}> {
    componentDidMount() {
        let clientSettingsViewModel = GlobalModel.clientSettingsViewModel;
        let keybindManager = GlobalModel.keybindManager;
@@ -35,7 +34,7 @@ class ClientSettingsKeybindings extends React.Component<{}, {}> {
 }

@mobxReact.observer
-class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hoveredItemId: string }> {
+class ClientSettingsView extends React.PureComponent<{ model: RemotesModel }, { hoveredItemId: string }> {
    errorMessage: OV<string> = mobx.observable.box(null, { name: "ClientSettings-errorMessage" });

    @boundMethod
@@ -74,19 +73,6 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
        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;
@@ -207,8 +193,6 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
        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}>
@@ -249,19 +233,6 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
                            />
                        </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>
@@ -6,7 +6,7 @@ import "./button.less";

 interface ButtonProps {
    children: React.ReactNode;
-    onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;
+    onClick?: () => void;
    disabled?: boolean;
    leftIcon?: React.ReactNode;
    rightIcon?: React.ReactNode;
@@ -14,24 +14,23 @@ interface ButtonProps {
    autoFocus?: boolean;
    className?: string;
    termInline?: boolean;
-    title?: string;
 }

-class Button extends React.Component<ButtonProps> {
+class Button extends React.PureComponent<ButtonProps> {
    static defaultProps = {
        style: {},
        className: "primary",
    };

    @boundMethod
-    handleClick(e) {
+    handleClick() {
        if (this.props.onClick && !this.props.disabled) {
-            this.props.onClick(e);
+            this.props.onClick();
        }
    }

    render() {
-        const { leftIcon, rightIcon, children, disabled, style, autoFocus, termInline, className, title } = this.props;
+        const { leftIcon, rightIcon, children, disabled, style, autoFocus, termInline, className } = this.props;

        return (
            <button
@@ -40,7 +39,6 @@ class Button extends React.Component<ButtonProps> {
                disabled={disabled}
                style={style}
                autoFocus={autoFocus}
-                title={title}
            >
                {leftIcon && <span className="icon-left">{leftIcon}</span>}
                {children}
@@ -7,7 +7,7 @@ import cn from "classnames";

 import "./checkbox.less";

-class Checkbox extends React.Component<
+class Checkbox extends React.PureComponent<
    {
        checked?: boolean;
        defaultChecked?: boolean;
@@ -11,7 +11,7 @@ import { ReactComponent as CopyIcon } from "@/assets/icons/history/copy.svg";

 import "./cmdstrcode.less";

-class CmdStrCode extends React.Component<
+class CmdStrCode extends React.PureComponent<
    {
        cmdstr: string;
        onUse: () => void;
@@ -1,7 +0,0 @@
-.copy-button {
-    padding: 5px 5px;
-
-    .fa-check {
-        color: var(--app-success-color);
-    }
-}
@@ -1,51 +0,0 @@
-import * as React from "react";
-import { Button } from "./button";
-import { boundMethod } from "autobind-decorator";
-import * as mobxReact from "mobx-react";
-import * as mobx from "mobx";
-
-import "./copybutton.less";
-
-type CopyButtonProps = {
-    title: string;
-    onClick: (e: React.MouseEvent<HTMLButtonElement>) => void;
-};
-
-@mobxReact.observer
-class CopyButton extends React.Component<CopyButtonProps, {}> {
-    isCopied: OV<boolean> = mobx.observable.box(false, { name: "isCopied" });
-
-    @boundMethod
-    handleOnClick(e: React.MouseEvent<HTMLButtonElement>) {
-        if (this.isCopied.get()) {
-            return;
-        }
-        mobx.action(() => {
-            this.isCopied.set(true);
-        })();
-        setTimeout(() => {
-            mobx.action(() => {
-                this.isCopied.set(false);
-            })();
-        }, 2000);
-        if (this.props.onClick) {
-            this.props.onClick(e);
-        }
-    }
-
-    render() {
-        const { title, onClick } = this.props;
-        const isCopied = this.isCopied.get();
-        return (
-            <Button onClick={this.handleOnClick} className="copy-button secondary ghost" title={title}>
-                {isCopied ? (
-                    <i className="fa-sharp fa-solid fa-check"></i>
-                ) : (
-                    <i className="fa-sharp fa-solid fa-copy"></i>
-                )}
-            </Button>
-        );
-    }
-}
-
-export { CopyButton };
@@ -457,7 +457,7 @@ const DatePicker: React.FC<DatePickerProps> = ({ selectedDate, format = "MM/DD/Y
                                ref={inputRef}
                                type="text"
                                value={dateParts[part]}
-                                onChange={(e) => handleDatePartChange(part, e.target.value)}
+                                onChange={(e) => handleDatePartChange(part, (e.target as HTMLInputElement).value)}
                                onKeyDown={(e) => handleKeyDown(e, part)}
                                onMouseDown={(e) => handleMouseDown(e, part)}
                                onFocus={(e) => handleFocus(e, part)}
@@ -36,8 +36,7 @@ interface DropdownState {
    isTouched: boolean;
 }

-@mobxReact.observer
-class Dropdown extends React.Component<DropdownProps, DropdownState> {
+class Dropdown extends React.PureComponent<DropdownProps, DropdownState> {
    wrapperRef: React.RefObject<HTMLDivElement>;
    menuRef: React.RefObject<HTMLDivElement>;
    timeoutId: any;
@@ -182,10 +181,10 @@ class Dropdown extends React.Component<DropdownProps, DropdownState> {
    }

    @boundMethod
-    handleKeyDown(event: React.KeyboardEvent) {}
+    handleKeyDown(event: React.TargetedEvent) {}

    @boundMethod
-    handleSelect(value: string, event?: React.MouseEvent | React.KeyboardEvent) {
+    handleSelect(value: string, event?: React.TargetedEvent) {
        const { onChange } = this.props;
        if (event) {
            event.stopPropagation(); // This stops the event from bubbling up to the wrapper
@@ -18,4 +18,3 @@ export { Toggle } from "./toggle";
 export { Tooltip } from "./tooltip";
 export { TabIcon } from "./tabicon";
 export { DatePicker } from "./datepicker";
-export { CopyButton } from "./copybutton";
@@ -14,7 +14,7 @@ import { v4 as uuidv4 } from "uuid";
 import "./inlinesettingstextedit.less";

@mobxReact.observer
-class InlineSettingsTextEdit extends React.Component<
+class InlineSettingsTextEdit extends React.PureComponent<
    {
        text: string;
        value: string;
@@ -13,7 +13,7 @@ interface InputDecorationProps {
 }

@mobxReact.observer
-class InputDecoration extends React.Component<InputDecorationProps, {}> {
+class InputDecoration extends React.PureComponent<InputDecorationProps, {}> {
    render() {
        const { children, position = "end" } = this.props;
        return (
@@ -11,7 +11,7 @@ interface LinkButtonProps extends ButtonProps {
    target?: string;
 }

-class LinkButton extends React.Component<LinkButtonProps> {
+class LinkButton extends React.PureComponent<LinkButtonProps> {
    render() {
        const { leftIcon, rightIcon, children, className, ...rest } = this.props;

@@ -9,7 +9,7 @@ import { GlobalModel } from "@/models";
 import "./mainview.less";

@mobxReact.observer
-class MainView extends React.Component<{
+class MainView extends React.PureComponent<{
    title: string;
    onClose: () => void;
    children: React.ReactNode;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Evan Simkowitz	c4589c4cff	Save work, everything working except tab bar reorder group	2024-03-29 20:00:04 -07:00
Evan Simkowitz	664db7ff6c	save work	2024-03-29 19:55:53 -07:00
Evan Simkowitz	22338d8249	save work	2024-03-29 19:05:45 -07:00
Evan Simkowitz	630e46d4ba	It works	2024-03-29 17:13:06 -07:00