ish-ui 1.0.26 → 1.0.28

package/dist/dialog/message/Message.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
-declare const _default: React.JSXElementConstructor<Omit<any, "classes"> & (import("@mui/styles").StyledComponentProps<any> | (import("@mui/styles").StyledComponentProps<any> & object))>;
-export default _default;
+import { MessageProps } from '../../model/Message';
+declare const Message: ({ opened, text, clearMessage, success, persist }: MessageProps) => React.JSX.Element;
+export default Message;

package/dist/dialog/message/Message.js

@@ -4,12 +4,12 @@
  */
 import React from 'react';
 import clsx from 'clsx';
-import { withStyles } from '@mui/styles';
 import Snackbar from '@mui/material/Snackbar';
 import IconButton from '@mui/material/IconButton';
 import Alert from '@mui/material/Alert';
 import CloseIcon from '@mui/icons-material/Close';
-const styles = theme => ({
+import { makeAppStyles } from '../../styles';
+const useStyles = makeAppStyles((theme) => ({
     close: {
         color: theme.palette.primary.contrastText,
         width: theme.spacing(4),
@@ -38,54 +38,34 @@ const styles = theme => ({
         marginRight: theme.spacing(-2),
         paddingRight: theme.spacing(2)
     }
-});
-class Message extends React.Component {
-    constructor(props) {
-        super(props);
-        this.handleClose = () => {
-            if (!this.state.persist) {
-                this.props.clearMessage();
-            }
-        };
-        this.state = {
-            success: props.isSuccess,
-            text: props.text,
-            persist: props.persist
-        };
-    }
-    componentDidUpdate(prevProps) {
-        if (this.props.opened !== prevProps.opened) {
-            this.setState({
-                success: this.props.opened ? this.props.isSuccess : this.state.success,
-                text: this.props.opened ? this.props.text : this.state.text,
-                persist: this.props.opened ? this.props.persist : this.state.persist
-            });
+}));
+const Message = ({ opened, text, clearMessage, success, persist }) => {
+    const classes = useStyles();
+    const handleClose = () => {
+        if (!persist && clearMessage) {
+            clearMessage();
         }
-    }
-    render() {
-        const { classes, opened, clearMessage } = this.props;
-        const { success, text, persist } = this.state;
-        return (React.createElement(Snackbar, { open: opened, anchorOrigin: {
-                vertical: 'bottom',
-                horizontal: 'left'
-            }, classes: {
-                root: classes.autoWidthRoot
-            }, ContentProps: {
-                classes: {
-                    root: clsx(classes.autoWidth, {
-                        [classes.success]: success
-                    }),
-                    message: persist ? classes.fullScreenMessage : undefined
-                }
-            }, ClickAwayListenerProps: {
-                onClickAway: this.handleClose
-            }, autoHideDuration: persist ? null : 6000, onClose: this.handleClose, disableWindowBlurListener: persist },
-            React.createElement(Alert, { variant: "filled", severity: success ? 'success' : 'error', classes: {
-                    message: 'text-pre-wrap',
-                    standardError: 'errorBackgroundColor',
-                    standardSuccess: 'successBackgroundColor'
-                }, action: (React.createElement(IconButton, { key: "close", "aria-label": "Close", color: "inherit", className: classes.close, onClick: clearMessage },
-                    React.createElement(CloseIcon, null))) }, text)));
-    }
-}
-export default withStyles(styles)(Message);
+    };
+    return (React.createElement(Snackbar, { open: opened, anchorOrigin: {
+            vertical: 'bottom',
+            horizontal: 'left'
+        }, classes: {
+            root: classes.autoWidthRoot
+        }, ContentProps: {
+            classes: {
+                root: clsx(classes.autoWidth, {
+                    [classes.success]: success
+                }),
+                message: persist ? classes.fullScreenMessage : undefined
+            }
+        }, ClickAwayListenerProps: {
+            onClickAway: handleClose
+        }, autoHideDuration: persist ? null : 6000, onClose: handleClose, disableWindowBlurListener: persist },
+        React.createElement(Alert, { variant: "filled", severity: success ? 'success' : 'error', classes: {
+                message: 'text-pre-wrap',
+                standardError: 'errorBackgroundColor',
+                standardSuccess: 'successBackgroundColor'
+            }, action: (React.createElement(IconButton, { key: "close", "aria-label": "Close", color: "inherit", className: classes.close, onClick: clearMessage },
+                React.createElement(CloseIcon, null))) }, text)));
+};
+export default Message;

package/dist/formFields/EditInPlaceSearchSelect.js

@@ -208,7 +208,7 @@ function EditInPlaceSearchSelect({ label, disabled, className, labelAdornment, i
     const getOptionLabel = option => (selectLabelCondition ? selectLabelCondition(option) : option && option[selectLabelMark]) || '';
     const getOptionSelected = (option, value) => {
         if (multiple || returnType === 'object') {
-            return option[selectValueMark] === value[selectValueMark];
+            return value && (option[selectValueMark] === value[selectValueMark]);
         }
         return option[selectValueMark] === value;
     };

package/dist/model/Message.d.ts

@@ -0,0 +1,8 @@
+import { AnyArgFunction } from '../model/CommonFunctions';
+export interface MessageProps {
+    opened: boolean;
+    text: string;
+    clearMessage: AnyArgFunction;
+    success?: boolean;
+    persist?: boolean;
+}

package/dist/model/Message.js

@@ -0,0 +1,8 @@
+/*
+ * Copyright ish group pty ltd 2023.
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License version 3 as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+ */
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ish-ui",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "UI elements for onCourse and other ish apps",
   "main": "main.ts",
   "devDependencies": {