upgrade to electron 18.3.6

eez-open · Sep 28, 2022 · f4e5a1e · f4e5a1e
1 parent 1eee978
commit f4e5a1e
Show file tree

Hide file tree

Showing 29 changed files with 1,687 additions and 1,108 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,51 +44,51 @@
     "devDependencies": {
         "@types/adm-zip": "^0.5.0",
         "@types/archiver": "^2.1.2",
-        "@types/better-sqlite3": "^7.4.2",
+        "@types/better-sqlite3": "^7.6.0",
         "@types/bootstrap": "^5.0.16",
         "@types/chokidar": "^2.1.3",
         "@types/classnames": "^2.2.10",
         "@types/css": "0.0.33",
-        "@types/debug": "^4.1.5",
-        "@types/decompress": "^4.2.3",
+        "@types/debug": "^4.1.7",
+        "@types/decompress": "^4.2.4",
         "@types/deep-equal": "^1.0.1",
         "@types/emscripten": "^1.39.6",
-        "@types/ffi-napi": "^4.0.5",
+        "@types/ffi-napi": "^4.0.6",
         "@types/jquery": "^3.3.38",
-        "@types/json-stable-stringify": "^1.0.32",
-        "@types/lodash": "^4.14.150",
+        "@types/json-stable-stringify": "^1.0.34",
+        "@types/lodash": "^4.14.185",
         "@types/marked": "^0.7.3",
-        "@types/moment-duration-format": "^2.2.2",
-        "@types/mousetrap": "^1.6.3",
+        "@types/moment-duration-format": "^2.2.3",
+        "@types/mousetrap": "^1.6.9",
         "@types/node": "^16.6.1",
         "@types/pg": "^8.6.5",
-        "@types/plotly.js-dist-min": "^2.3.0",
-        "@types/react": "^17.0.43",
+        "@types/plotly.js-dist-min": "^2.3.1",
+        "@types/react": "^18.0.21",
         "@types/react-color": "^3.0.6",
-        "@types/react-dom": "^17.0.14",
+        "@types/react-dom": "^18.0.6",
         "@types/react-virtualized-auto-sizer": "^1.0.1",
         "@types/react-window": "^1.8.5",
-        "@types/ref-napi": "^3.0.4",
-        "@types/request": "^2.48.4",
-        "@types/request-promise-native": "^1.0.17",
+        "@types/ref-napi": "^3.0.5",
+        "@types/request": "^2.48.8",
+        "@types/request-promise-native": "^1.0.18",
         "@types/serialport": "^8.0.2",
         "@types/sha256": "^0.2.0",
-        "@types/tinycolor2": "^1.4.2",
+        "@types/tinycolor2": "^1.4.3",
         "@types/usb": "^1.5.3",
         "@types/xml-formatter": "^2.1.1",
         "@types/xterm": "^3.0.0",
-        "concurrently": "^5.2.0",
-        "electron": "17.2.0",
-        "electron-builder": "^22.14.13",
-        "electron-packager": "^15.4.0",
-        "esbuild": "^0.13.6",
+        "concurrently": "^5.3.0",
+        "electron": "18.3.6",
+        "electron-builder": "^23.3.3",
+        "electron-packager": "^16.0.0",
+        "esbuild": "^0.13.15",
         "esbuild-node-externals": "^1.3.0",
-        "globby": "^11.0.0",
+        "globby": "^11.1.0",
         "gulp": "^4.0.2",
         "gulp-cli": "^2.2.0",
         "gulp-terser": "^2.1.0",
         "json-to-pretty-yaml": "^1.2.2",
-        "less": "^3.11.1",
+        "less": "^3.13.1",
         "less-plugin-clean-css": "^1.5.1",
         "madge": "^5.0.1",
         "node-gyp": "8.4.1",
@@ -109,7 +109,7 @@
         "adm-zip": "^0.5.9",
         "app-module-path": "^2.2.0",
         "archiver": "^5.3.0",
-        "better-sqlite3": "^7.5.0",
+        "better-sqlite3": "^7.6.2",
         "bootstrap": "^5.0.2",
         "bootstrap-dark-5": "^1.1.0",
         "chokidar": "^3.4.0",
@@ -120,7 +120,7 @@
         "deep-equal": "^2.0.5",
         "ffi-napi": "^4.0.3",
         "fft-windowing": "^0.1.4",
-        "file-type": "^8.0.0",
+        "file-type": "^8.1.0",
         "flexlayout-react": "^0.6.9",
         "fourier-transform": "^1.1.2",
         "fs-extra": "^6.0.1",
@@ -147,11 +147,11 @@
         "python-shell": "^3.0.1",
         "queue": "^6.0.2",
         "quill": "^1.3.7",
-        "react": "^18.0.0",
+        "react": "^18.2.0",
         "react-color": "^2.19.3",
-        "react-dnd": "^15.1.1",
-        "react-dnd-html5-backend": "^15.1.2",
-        "react-dom": "^18.0.0",
+        "react-dnd": "^15.1.2",
+        "react-dnd-html5-backend": "^15.1.3",
+        "react-dom": "^18.2.0",
         "react-electron-web-view": "^2.0.1",
         "react-toastify": "^8.2.0",
         "react-virtualized-auto-sizer": "^1.0.6",

diff --git a/packages/eez-studio-ui/action.tsx b/packages/eez-studio-ui/action.tsx
@@ -7,6 +7,7 @@ import { Icon } from "eez-studio-ui/icon";
 const Action = observer(
     class Action extends React.Component<
         {
+            children?: React.ReactNode;
             title: string;
             onClick?: (event: any) => void;
             selected?: boolean;
@@ -156,6 +157,7 @@ export const ButtonAction = observer(
 export const DropdownButtonAction = observer(
     class DropdownButtonAction extends React.Component<
         {
+            children?: React.ReactNode;
             text: string;
             icon?: string;
             iconSize?: number;
@@ -210,6 +212,7 @@ export const DropdownButtonAction = observer(
 export const DropdownIconAction = observer(
     class DropdownIconAction extends React.Component<
         {
+            children?: React.ReactNode;
             icon: string;
             iconSize?: number;
             title: string;

diff --git a/packages/eez-studio-ui/alert.tsx b/packages/eez-studio-ui/alert.tsx
@@ -5,6 +5,7 @@ import classNames from "classnames";
 export const Alert = observer(
     class Alert extends React.Component<
         {
+            children?: React.ReactNode;
             onDismiss?: () => void;
             className?: string;
         },
@@ -33,6 +34,7 @@ export const Alert = observer(
 export const AlertDanger = observer(
     class AlertDanger extends React.Component<
         {
+            children?: React.ReactNode;
             onDismiss?: () => void;
             className?: string;
         },

diff --git a/packages/eez-studio-ui/balloon.tsx b/packages/eez-studio-ui/balloon.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { observer } from "mobx-react";
 
 export const Balloon = observer(
-    class Balloon extends React.Component<{}, {}> {
+    class Balloon extends React.Component<{ children: React.ReactNode }> {
         render() {
             return (
                 <div>

diff --git a/packages/eez-studio-ui/chart/chart.tsx b/packages/eez-studio-ui/chart/chart.tsx
@@ -3571,26 +3571,19 @@ class MeasurementsController {
 ////////////////////////////////////////////////////////////////////////////////
 
 export const ChartsView = observer(
-    class ChartsView extends React.Component<
-        {
-            chartsController: IChartsController;
-            className?: string;
-            tabIndex?: number;
-            sideDockAvailable?: boolean;
-        },
-        {}
-    > {
+    class ChartsView extends React.Component<{
+        children?: React.ReactNode;
+        chartsController: IChartsController;
+        className?: string;
+        tabIndex?: number;
+        sideDockAvailable?: boolean;
+    }> {
         animationFrameRequestId: any = undefined;
         div: HTMLDivElement | null = null;
         sideDock: SideDockComponent | null = null;
         chartMeasurements: ChartMeasurementsComponent | null = null;
 
-        constructor(props: {
-            chartsController: IChartsController;
-            className?: string;
-            tabIndex?: number;
-            sideDockAvailable?: boolean;
-        }) {
+        constructor(props: any) {
             super(props);
 
             makeObservable(this, {

diff --git a/packages/eez-studio-ui/dialog.tsx b/packages/eez-studio-ui/dialog.tsx
@@ -17,7 +17,7 @@ export interface IDialogOptions {
         width: number;
         height?: number;
     };
-    fieldsEnclosureDiv?: React.ComponentType;
+    fieldsEnclosureDiv?: React.ComponentType<{ children?: React.ReactNode }>;
 }
 
 export function showDialog(dialog: JSX.Element, opts?: IDialogOptions) {
@@ -73,6 +73,7 @@ export function showDialog(dialog: JSX.Element, opts?: IDialogOptions) {
 
 export const Dialog = observer(
     class Dialog extends React.Component<{
+        children?: React.ReactNode;
         modal?: boolean;
         open?: boolean;
         title?: string;
@@ -220,7 +221,7 @@ export const BootstrapDialog = observer(
         okEnabled?: () => boolean;
         disableButtons: boolean;
         buttons?: IDialogButton[];
-        children: React.ReactNode;
+        children?: React.ReactNode;
         additionalFooterControl?: React.ReactNode;
         backdrop?: "static" | boolean;
     }> {

diff --git a/packages/eez-studio-ui/generic-dialog.tsx b/packages/eez-studio-ui/generic-dialog.tsx
@@ -111,14 +111,12 @@ export const TableField = observer(
 ////////////////////////////////////////////////////////////////////////////////
 
 export const RadioGroupProperty = observer(
-    class RadioGroupProperty extends React.Component<
-        {
-            id?: string;
-            name: string;
-            errors?: string[];
-        },
-        {}
-    > {
+    class RadioGroupProperty extends React.Component<{
+        children?: React.ReactNode;
+        id?: string;
+        name: string;
+        errors?: string[];
+    }> {
         render() {
             let id = this.props.id || guid();
 

diff --git a/packages/eez-studio-ui/header-with-body.tsx b/packages/eez-studio-ui/header-with-body.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import classNames from "classnames";
 
 export class Header extends React.Component<{
+    children?: React.ReactNode;
     className?: string;
 }> {
     render() {
@@ -11,6 +12,7 @@ export class Header extends React.Component<{
 }
 
 export class ToolbarHeader extends React.Component<{
+    children?: React.ReactNode;
     className?: string;
     style?: React.CSSProperties;
 }> {
@@ -30,6 +32,7 @@ export class ToolbarHeader extends React.Component<{
 }
 
 export class Body extends React.Component<{
+    children?: React.ReactNode;
     className?: string;
     tabIndex?: number;
     visible?: boolean;
@@ -57,6 +60,7 @@ export class Body extends React.Component<{
 }
 
 class HeaderWithBody extends React.Component<{
+    children?: React.ReactNode;
     className?: string;
     onContextMenu?: (event: React.MouseEvent<HTMLDivElement>) => void;
     style?: React.CSSProperties;
@@ -79,6 +83,7 @@ class HeaderWithBody extends React.Component<{
 }
 
 export class VerticalHeaderWithBody extends React.Component<{
+    children?: React.ReactNode;
     className?: string;
     onContextMenu?: (event: React.MouseEvent<HTMLDivElement>) => void;
     style?: React.CSSProperties;
@@ -101,6 +106,7 @@ export class VerticalHeaderWithBody extends React.Component<{
 }
 
 export class HorizontalHeaderWithBody extends React.Component<{
+    children?: React.ReactNode;
     className?: string;
 }> {
     render() {

diff --git a/packages/eez-studio-ui/list.tsx b/packages/eez-studio-ui/list.tsx
@@ -135,15 +135,13 @@ export const List = observer(
 );
 
 export const ListContainer = observer(
-    class ListContainer extends React.Component<
-        {
-            tabIndex: any;
-            minHeight?: number;
-            maxHeight?: number;
-            className?: string;
-        },
-        {}
-    > {
+    class ListContainer extends React.Component<{
+        children?: React.ReactNode;
+        tabIndex: any;
+        minHeight?: number;
+        maxHeight?: number;
+        className?: string;
+    }> {
         render() {
             const { minHeight, maxHeight } = this.props;
             return (

diff --git a/packages/eez-studio-ui/properties.tsx b/packages/eez-studio-ui/properties.tsx
@@ -12,6 +12,7 @@ import { ListContainer, List, IListNode } from "eez-studio-ui/list";
 export const PropertyEnclosure = observer(
     class PropertyEnclosure extends React.Component<
         {
+            children?: React.ReactNode;
             errors?: string[];
             style?: React.CSSProperties;
             className?: string;
@@ -444,19 +445,17 @@ export const StaticRichTextProperty = observer(
 );
 
 export const SelectProperty = observer(
-    class SelectProperty extends React.Component<
-        {
-            id?: string;
-            name: string;
-            value: string;
-            onChange: (value: string) => void;
-            inputGroupButton?: React.ReactNode;
-            selectStyle?: React.CSSProperties;
-            errors?: string[];
-            comboBox?: boolean;
-        },
-        {}
-    > {
+    class SelectProperty extends React.Component<{
+        children?: React.ReactNode;
+        id?: string;
+        name: string;
+        value: string;
+        onChange: (value: string) => void;
+        inputGroupButton?: React.ReactNode;
+        selectStyle?: React.CSSProperties;
+        errors?: string[];
+        comboBox?: boolean;
+    }> {
         render() {
             let id = this.props.id || guid();
 
@@ -760,6 +759,7 @@ export const ColorInputProperty = observer(
 
 export const PropertyList = observer(
     class PropertyList extends React.Component<{
+        children?: React.ReactNode;
         className?: string;
     }> {
         render() {
@@ -779,6 +779,7 @@ export const PropertyList = observer(
 
 export class Checkbox extends React.Component<
     {
+        children?: React.ReactNode;
         checked: boolean;
         onChange: (checked: boolean) => void;
     },
@@ -807,6 +808,7 @@ export class Checkbox extends React.Component<
 
 export class Radio extends React.Component<
     {
+        children?: React.ReactNode;
         checked: boolean;
         onChange: () => void;
     },

diff --git a/packages/eez-studio-ui/side-dock.tsx b/packages/eez-studio-ui/side-dock.tsx
@@ -143,6 +143,7 @@ export class DockablePanelsComponent extends React.Component<{
 export const DockablePanels = observer(DockablePanelsComponent);
 
 export class SideDockComponent extends React.Component<{
+    children?: React.ReactNode;
     persistId: string;
     layoutId: string;
     defaultLayoutConfig: any;

diff --git a/packages/eez-studio-ui/splitter.tsx b/packages/eez-studio-ui/splitter.tsx
@@ -9,6 +9,8 @@ import { Draggable } from "eez-studio-ui/draggable";
 const SPLITTER_SIZE = 8;
 
 interface SplitterProps {
+    children?: React.ReactNode;
+
     type: "horizontal" | "vertical";
     className?: string;