@etsoo/react 1.4.99 → 1.5.0

package/lib/app/ReactApp.d.ts

@@ -138,6 +138,11 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param callback Callback
      */
     freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
     /**
      * Set page data
      * @param data Page data

package/lib/app/ReactApp.js

@@ -1,5 +1,6 @@
 import { ActionResultError, BridgeUtils, CoreApp, createClient } from '@etsoo/appscript';
 import { WindowStorage } from '@etsoo/shared';
+import { redirectTo } from '@reach/router';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -188,6 +189,13 @@ export class ReactApp extends CoreApp {
             inputs: progress
         });
     }
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url) {
+        redirectTo(url);
+    }
     /**
      * Set page data
      * @param data Page data

package/lib/mu/BridgeCloseButton.js

@@ -24,8 +24,9 @@ export function BridgeCloseButton(props) {
             onClick(event);
         host.exit();
     };
-    return (React.createElement(IconButton, { "aria-label": "close", color: "primary", onClick: onClickLocal, sx: {
+    return (React.createElement(IconButton, { "aria-label": "close", color: "secondary", onClick: onClickLocal, title: title, sx: {
             position: 'absolute',
+            zIndex: (theme) => theme.zIndex.appBar + 1,
             top: (theme) => theme.spacing(0.5),
             right: (theme) => theme.spacing(0.5)
         }, ...rest },

package/lib/mu/SelectEx.js

@@ -116,7 +116,9 @@ export function SelectEx(props) {
         React.createElement(InputLabel, { id: labelId, shrink: search
                 ? MUGlobal.searchFieldShrink
                 : MUGlobal.inputFieldShrink }, label),
-        React.createElement(Select, { ref: divRef, value: localOptions.length > 0 ? valueState !== null && valueState !== void 0 ? valueState : '' : '', input: React.createElement(OutlinedInput, { notched: true, label: label }), labelId: labelId, name: name, multiple: multiple, onChange: (event, child) => {
+        React.createElement(Select, { ref: divRef, value: localOptions.some((option) => itemChecked(getId(option)))
+                ? valueState !== null && valueState !== void 0 ? valueState : ''
+                : '', input: React.createElement(OutlinedInput, { notched: true, label: label }), labelId: labelId, name: name, multiple: multiple, onChange: (event, child) => {
                 if (onChange)
                     onChange(event, child);
                 if (multiple)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.4.99",
+    "version": "1.5.0",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.2.42",
+        "@etsoo/appscript": "^1.2.43",
         "@etsoo/notificationbase": "^1.1.1",
         "@etsoo/shared": "^1.1.11",
         "@mui/icons-material": "^5.4.1",

package/src/app/ReactApp.ts

@@ -14,6 +14,7 @@ import {
     NotificationReturn
 } from '@etsoo/notificationbase';
 import { DataTypes, WindowStorage } from '@etsoo/shared';
+import { redirectTo } from '@reach/router';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -349,6 +350,14 @@ export class ReactApp<
         );
     }
 
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    override redirectTo(url: string) {
+        redirectTo(url);
+    }
+
     /**
      * Set page data
      * @param data Page data

package/src/mu/BridgeCloseButton.tsx

@@ -47,10 +47,12 @@ export function BridgeCloseButton(props: BridgeCloseButtonProps) {
     return (
         <IconButton
             aria-label="close"
-            color="primary"
+            color="secondary"
             onClick={onClickLocal}
+            title={title}
             sx={{
                 position: 'absolute',
+                zIndex: (theme) => theme.zIndex.appBar + 1,
                 top: (theme) => theme.spacing(0.5),
                 right: (theme) => theme.spacing(0.5)
             }}

package/src/mu/SelectEx.tsx

@@ -211,7 +211,11 @@ export function SelectEx<T extends {} = IdLabelDto>(props: SelectExProps<T>) {
             </InputLabel>
             <Select
                 ref={divRef}
-                value={localOptions.length > 0 ? valueState ?? '' : ''}
+                value={
+                    localOptions.some((option) => itemChecked(getId(option)))
+                        ? valueState ?? ''
+                        : ''
+                }
                 input={<OutlinedInput notched label={label} />}
                 labelId={labelId}
                 name={name}