refactoring

eez-open · Nov 8, 2024 · 683d0e8 · 683d0e8
1 parent 3ed3d37
commit 683d0e8
Show file tree

Hide file tree

Showing 31 changed files with 887 additions and 741 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -84,7 +84,6 @@
         "@types/pg": "^8.6.5",
         "@types/plotly.js-dist-min": "^2.3.4",
         "@types/react": "^18.2.0",
-        "@types/react-color": "^3.0.6",
         "@types/react-dom": "^18.2.0",
         "@types/react-virtualized-auto-sizer": "^1.0.1",
         "@types/react-window": "^1.8.5",
@@ -123,6 +122,7 @@
         "@emotion/react": "^11.11.0",
         "@popperjs/core": "^2.9.2",
         "@types/d3-format": "^3.0.4",
+        "@uiw/react-color-chrome": "^2.3.2",
         "adm-zip": "^0.5.9",
         "app-module-path": "^2.2.0",
         "archiver": "^5.3.0",
@@ -166,10 +166,9 @@
         "python-shell": "^3.0.1",
         "quill": "^1.3.7",
         "react": "^18.2.0",
-        "react-color": "^2.19.3",
         "react-dom": "^18.2.0",
         "react-select": "^5.8.1",
-        "react-toastify": "^8.2.0",
+        "react-toastify": "^10.0.6",
         "react-virtualized-auto-sizer": "^1.0.7",
         "react-window": "^1.8.8",
         "rimraf": "^3.0.2",

diff --git a/packages/eez-studio-ui/_stylesheets/project-editor.less b/packages/eez-studio-ui/_stylesheets/project-editor.less
@@ -540,13 +540,12 @@
 }
 
 .EezStudio_ThemedColorInput_DropdownContent {
-    font-size: 0.8rem;
-
-    padding: 0;
-    margin: 0;
+    background: transparent;
+    border: none;
 
-    border-radius: 4px;
-    overflow: hidden;
+    .w-color-chrome {
+        color: #333;
+    }
 }
 
 .EezStudio_ObjectReferenceInput_DropdownButton {

diff --git a/packages/eez-studio-ui/generic-dialog.tsx b/packages/eez-studio-ui/generic-dialog.tsx
@@ -239,7 +239,7 @@ export const GenericDialog = observer(
             this.errorMessages = undefined;
 
             if (this.props.setOnChangeCallback) {
-                this.props.setOnChangeCallback(this.onChange.bind(this));
+                this.props.setOnChangeCallback(this.onChange);
             }
         }
 
@@ -320,7 +320,7 @@ export const GenericDialog = observer(
             return true;
         }
 
-        onChange(fieldProperties: any, value: any) {
+        onChange = (fieldProperties: any, value: any) => {
             this.fieldValues[fieldProperties.name] = value;
 
             if (this.errorMessages) {
@@ -337,7 +337,7 @@ export const GenericDialog = observer(
             }
 
             this.progressType = "none";
-        }
+        };
 
         validate() {
             let errorMessages: any;

diff --git a/packages/eez-studio-ui/properties-electron.tsx b/packages/eez-studio-ui/properties-electron.tsx
@@ -18,13 +18,7 @@ export const FileInputProperty = observer(
         },
         {}
     > {
-        constructor(props: any) {
-            super(props);
-
-            this.onSelectFile = this.onSelectFile.bind(this);
-        }
-
-        async onSelectFile(event: any) {
+        onSelectFile = async (event: any) => {
             event.preventDefault();
 
             const result = await dialog.showOpenDialog(getCurrentWindow(), {
@@ -36,7 +30,7 @@ export const FileInputProperty = observer(
             if (filePaths && filePaths[0]) {
                 this.props.onChange(filePaths[0]);
             }
-        }
+        };
 
         render() {
             let id = this.props.id || guid();

diff --git a/packages/eez-studio-ui/properties.tsx b/packages/eez-studio-ui/properties.tsx
@@ -665,11 +665,9 @@ export const KeybindingProperty = observer(
             makeObservable(this, {
                 keybinding: computed
             });
-
-            this.onKeyDown = this.onKeyDown.bind(this);
         }
 
-        onKeyDown(event: any) {
+        onKeyDown = (event: any) => {
             if (
                 event.nativeEvent.key === "Escape" ||
                 event.nativeEvent.key === "Enter" ||
@@ -715,7 +713,7 @@ export const KeybindingProperty = observer(
             }
 
             this.props.onChange(keybinding.join("+"));
-        }
+        };
 
         get keybinding() {
             return (
@@ -946,7 +944,7 @@ export class AbsoluteFileInputProperty extends React.Component<
     },
     {}
 > {
-    async onSelect() {
+    onSelect = async () => {
         const result = await dialog.showOpenDialog({
             properties: ["openFile"],
             filters: [{ name: "All Files", extensions: ["*"] }]
@@ -955,7 +953,7 @@ export class AbsoluteFileInputProperty extends React.Component<
         if (result.filePaths && result.filePaths[0]) {
             this.props.onChange(result.filePaths[0]);
         }
-    }
+    };
 
     render() {
         return (
@@ -968,7 +966,7 @@ export class AbsoluteFileInputProperty extends React.Component<
                     <button
                         className="btn btn-secondary"
                         type="button"
-                        onClick={this.onSelect.bind(this)}
+                        onClick={this.onSelect}
                     >
                         &hellip;
                     </button>