andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 01:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

dont close dialog if clicking outside, also fix warning https://w3c.github.io/aria/#aria-hidden

Browse Source
This commit is contained in:
proddy
2024-07-20 11:44:18 +02:00
parent a0ba0e8af9
commit ac27096087
6 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
interface/src/project/CustomEntitiesDialog.tsx
View File

@@ -64,8 +64,10 @@ const CustomEntitiesDialog = ({
} }
}, [open, selectedItem]); }, [open, selectedItem]);
const close = () => { const handleClose = (event: {}, reason: 'backdropClick' | 'escapeKeyDown') => {
onClose(); if (reason !== 'backdropClick') {
onClose();
}
}; };
const save = async () => { const save = async () => {
@@ -90,7 +92,7 @@ const CustomEntitiesDialog = ({
}; };
return ( return (
<Dialog sx={dialogStyle} open={open} onClose={close}> <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
<DialogTitle> <DialogTitle>
{creating ? LL.ADD(1) + ' ' + LL.NEW(1) : LL.EDIT()}&nbsp;{LL.ENTITY()} {creating ? LL.ADD(1) + ' ' + LL.NEW(1) : LL.EDIT()}&nbsp;{LL.ENTITY()}
</DialogTitle> </DialogTitle>
@@ -314,7 +316,7 @@ const CustomEntitiesDialog = ({
<Button <Button
startIcon={<CancelIcon />} startIcon={<CancelIcon />}
variant="outlined" variant="outlined"
onClick={close} onClick={onClose}
color="secondary" color="secondary"
> >
{LL.CANCEL()} {LL.CANCEL()}

12
interface/src/project/CustomizationDialog.tsx
View File

@@ -54,8 +54,10 @@ const CustomizationDialog = ({
} }
}, [open, selectedItem]); }, [open, selectedItem]);
const close = () => { const handleClose = (event: {}, reason: 'backdropClick' | 'escapeKeyDown') => {
onClose(); if (reason !== 'backdropClick') {
onClose();
}
}; };
const save = () => { const save = () => {
@@ -76,7 +78,7 @@ const CustomizationDialog = ({
}; };
return ( return (
<Dialog sx={dialogStyle} open={open} onClose={close}> <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
<DialogTitle>{LL.EDIT() + ' ' + LL.ENTITY()}</DialogTitle> <DialogTitle>{LL.EDIT() + ' ' + LL.ENTITY()}</DialogTitle>
<DialogContent dividers> <DialogContent dividers>
<Grid container direction="row"> <Grid container direction="row">
@@ -115,7 +117,7 @@ const CustomizationDialog = ({
name="cn" name="cn"
label={LL.NEW_NAME_OF(LL.ENTITY())} label={LL.NEW_NAME_OF(LL.ENTITY())}
value={editItem.cn} value={editItem.cn}
autoFocus // autoFocus
sx={{ width: '30ch' }} sx={{ width: '30ch' }}
onChange={updateFormValue} onChange={updateFormValue}
/> />
@@ -155,7 +157,7 @@ const CustomizationDialog = ({
<Button <Button
startIcon={<CancelIcon />} startIcon={<CancelIcon />}
variant="outlined" variant="outlined"
onClick={close} onClick={onClose}
color="secondary" color="secondary"
> >
{LL.CANCEL()} {LL.CANCEL()}

4
interface/src/project/DevicesDialog.tsx
View File

@@ -120,7 +120,7 @@ const DevicesDialog = ({
label={LL.VALUE(0)} label={LL.VALUE(0)}
value={editItem.v} value={editItem.v}
disabled={!writeable} disabled={!writeable}
autoFocus // autoFocus
sx={{ width: '30ch' }} sx={{ width: '30ch' }}
select select
onChange={updateFormValue} onChange={updateFormValue}
@@ -162,7 +162,7 @@ const DevicesDialog = ({
label={LL.VALUE(0)} label={LL.VALUE(0)}
value={editItem.v} value={editItem.v}
disabled={!writeable} disabled={!writeable}
autoFocus // autoFocus
sx={{ width: '30ch' }} sx={{ width: '30ch' }}
multiline={editItem.u ? false : true} multiline={editItem.u ? false : true}
onChange={updateFormValue} onChange={updateFormValue}

16
interface/src/project/SchedulerDialog.tsx
View File

@@ -62,10 +62,6 @@ const SchedulerDialog = ({
} }
}, [open, selectedItem]); }, [open, selectedItem]);
const close = () => {
onClose();
};
const save = async () => { const save = async () => {
try { try {
setFieldErrors(undefined); setFieldErrors(undefined);
@@ -151,8 +147,14 @@ const SchedulerDialog = ({
</Typography> </Typography>
); );
const handleClose = (event: {}, reason: 'backdropClick' | 'escapeKeyDown') => {
if (reason !== 'backdropClick') {
onClose();
}
};
return ( return (
<Dialog sx={dialogStyle} open={open} onClose={close}> <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
<DialogTitle> <DialogTitle>
{creating ? LL.ADD(1) + ' ' + LL.NEW(0) : LL.EDIT()}&nbsp; {creating ? LL.ADD(1) + ' ' + LL.NEW(0) : LL.EDIT()}&nbsp;
{LL.SCHEDULE(1)} {LL.SCHEDULE(1)}
@@ -294,6 +296,7 @@ const SchedulerDialog = ({
<TextField <TextField
name="time" name="time"
label={isCondition ? 'Condition' : 'On Change Value'} label={isCondition ? 'Condition' : 'On Change Value'}
multiline
fullWidth fullWidth
value={ value={
editItem.time == '00:00' ? (editItem.time = '') : editItem.time editItem.time == '00:00' ? (editItem.time = '') : editItem.time
@@ -327,6 +330,7 @@ const SchedulerDialog = ({
fieldErrors={fieldErrors} fieldErrors={fieldErrors}
name="cmd" name="cmd"
label={LL.COMMAND(0)} label={LL.COMMAND(0)}
multiline
fullWidth fullWidth
value={editItem.cmd} value={editItem.cmd}
margin="normal" margin="normal"
@@ -369,7 +373,7 @@ const SchedulerDialog = ({
<Button <Button
startIcon={<CancelIcon />} startIcon={<CancelIcon />}
variant="outlined" variant="outlined"
onClick={close} onClick={onClose}
color="secondary" color="secondary"
> >
{LL.CANCEL()} {LL.CANCEL()}

10
interface/src/project/SensorsAnalogDialog.tsx
View File

@@ -57,8 +57,10 @@ const SensorsAnalogDialog = ({
} }
}, [open, selectedItem]); }, [open, selectedItem]);
const close = () => { const handleClose = (event: {}, reason: 'backdropClick' | 'escapeKeyDown') => {
onClose(); if (reason !== 'backdropClick') {
onClose();
}
}; };
const save = async () => { const save = async () => {
@@ -77,7 +79,7 @@ const SensorsAnalogDialog = ({
}; };
return ( return (
<Dialog sx={dialogStyle} open={open} onClose={close}> <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
<DialogTitle> <DialogTitle>
{creating ? LL.ADD(1) + ' ' + LL.NEW(0) : LL.EDIT()}&nbsp; {creating ? LL.ADD(1) + ' ' + LL.NEW(0) : LL.EDIT()}&nbsp;
{LL.ANALOG_SENSOR(0)} {LL.ANALOG_SENSOR(0)}
@@ -318,7 +320,7 @@ const SensorsAnalogDialog = ({
<Button <Button
startIcon={<CancelIcon />} startIcon={<CancelIcon />}
variant="outlined" variant="outlined"
onClick={close} onClick={onClose}
color="secondary" color="secondary"
> >
{LL.CANCEL()} {LL.CANCEL()}

12
interface/src/project/SensorsTemperatureDialog.tsx
View File

@@ -52,8 +52,10 @@ const SensorsTemperatureDialog = ({
} }
}, [open, selectedItem]); }, [open, selectedItem]);
const close = () => { const handleClose = (event: {}, reason: 'backdropClick' | 'escapeKeyDown') => {
onClose(); if (reason !== 'backdropClick') {
onClose();
}
}; };
const save = async () => { const save = async () => {
@@ -67,7 +69,7 @@ const SensorsTemperatureDialog = ({
}; };
return ( return (
<Dialog sx={dialogStyle} open={open} onClose={close}> <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
<DialogTitle> <DialogTitle>
{LL.EDIT()}&nbsp;{LL.TEMP_SENSOR()} {LL.EDIT()}&nbsp;{LL.TEMP_SENSOR()}
</DialogTitle> </DialogTitle>
@@ -84,7 +86,7 @@ const SensorsTemperatureDialog = ({
name="n" name="n"
label={LL.NAME(0)} label={LL.NAME(0)}
value={editItem.n} value={editItem.n}
autoFocus // autoFocus
sx={{ width: '30ch' }} sx={{ width: '30ch' }}
onChange={updateFormValue} onChange={updateFormValue}
/> />
@@ -110,7 +112,7 @@ const SensorsTemperatureDialog = ({
<Button <Button
startIcon={<CancelIcon />} startIcon={<CancelIcon />}
variant="outlined" variant="outlined"
onClick={close} onClick={onClose}
color="secondary" color="secondary"
> >
{LL.CANCEL()} {LL.CANCEL()}