@etsoo/react 1.4.47 → 1.4.51

package/lib/index.d.ts

@@ -65,6 +65,7 @@ export * from './mu/SearchField';
 export * from './mu/SearchOptionGroup';
 export * from './mu/SelectEx';
 export * from './mu/Switch';
+export * from './mu/SwitchAnt';
 export * from './mu/TabBox';
 export * from './mu/TableEx';
 export * from './mu/TextFieldEx';

package/lib/index.js

@@ -68,6 +68,7 @@ export * from './mu/SearchField';
 export * from './mu/SearchOptionGroup';
 export * from './mu/SelectEx';
 export * from './mu/Switch';
+export * from './mu/SwitchAnt';
 export * from './mu/TabBox';
 export * from './mu/TableEx';
 export * from './mu/TextFieldEx';

package/lib/mu/ComboBox.js

@@ -10,16 +10,19 @@ import { SearchField } from './SearchField';
  */
 export function ComboBox(props) {
     // Destruct
-    const { search = false, idField = 'id', idValue, inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputVariant, defaultValue, label, labelField = 'label', loadData, onLoadData, name, inputAutoComplete = 'off', options = [], readOnly = true, onChange, value, getOptionLabel = (option) => String(Reflect.get(option, labelField)), sx = { minWidth: '150px' }, ...rest } = props;
+    const { search = false, idField = 'id', idValue, inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputVariant, defaultValue, label, labelField = 'label', loadData, onLoadData, name, inputAutoComplete = 'off', options, readOnly = true, onChange, value, getOptionLabel = (option) => String(Reflect.get(option, labelField)), sx = { minWidth: '150px' }, ...rest } = props;
     // Value input ref
     const inputRef = React.createRef();
     // Options state
-    const [localOptions, setOptions] = React.useState(options);
+    const [localOptions, setOptions] = React.useState(options !== null && options !== void 0 ? options : []);
     const isMounted = React.useRef(true);
     // When options change
+    // [options] will cause infinite loop
+    const propertyWay = loadData == null;
     React.useEffect(() => {
-        setOptions(options);
-    }, [options]);
+        if (propertyWay && options != null)
+            setOptions(options);
+    }, [JSON.stringify(options), propertyWay]);
     // Local default value
     let localValue = idValue != null
         ? localOptions.find((o) => Reflect.get(o, idField) === idValue)

package/lib/mu/SelectEx.js

@@ -16,9 +16,12 @@ export function SelectEx(props) {
     const [localOptions, setOptions] = React.useState(options);
     const isMounted = React.useRef(true);
     // When options change
+    // [options] will cause infinite loop
+    const propertyWay = loadData == null;
     React.useEffect(() => {
-        setOptions(options);
-    }, [options]);
+        if (propertyWay && options != null)
+            setOptions(options);
+    }, [JSON.stringify(options), propertyWay]);
     // Local value
     const valueSource = (_a = defaultValue !== null && defaultValue !== void 0 ? defaultValue : value) !== null && _a !== void 0 ? _a : '';
     let localValue;

package/lib/mu/Switch.js

@@ -8,13 +8,20 @@ import MuiSwitch from '@mui/material/Switch';
  * @returns Component
  */
 export function Switch(props) {
+    var _a;
     // Destruct
-    const { defaultChecked, defaultValue, readOnly, size, checkbox = false, value = 'true', ...rest } = props;
+    const { checked, defaultChecked, defaultValue, onChange, readOnly, size, checkbox = false, value = 'true', ...rest } = props;
     // Checked state
-    const [controlChecked, setControlChecked] = React.useState(defaultChecked !== null && defaultChecked !== void 0 ? defaultChecked : defaultValue == value);
+    const [controlChecked, setControlChecked] = React.useState((_a = checked !== null && checked !== void 0 ? checked : defaultChecked) !== null && _a !== void 0 ? _a : defaultValue == value);
+    React.useEffect(() => {
+        if (checked)
+            setControlChecked(checked);
+    }, [checked]);
     // Handle change
-    const handleChange = (event) => {
-        setControlChecked(event.target.checked);
+    const handleChange = (event, checked) => {
+        if (onChange)
+            onChange(event, checked);
+        setControlChecked(checked);
     };
     // Control
     const control = checkbox ? (React.createElement(MuiCheckbox, { readOnly: readOnly, checked: controlChecked, onChange: handleChange, size: size, value: value })) : (React.createElement(MuiSwitch, { readOnly: readOnly, checked: controlChecked, onChange: handleChange, size: size, value: value }));

package/lib/mu/SwitchAnt.d.ts

@@ -0,0 +1,25 @@
+/// <reference types="react" />
+import { SwitchProps } from '@mui/material/Switch';
+/**
+ * Ant style switch props
+ */
+export interface SwitchAntProps extends SwitchProps {
+    /**
+     *
+     */
+    activeColor?: string;
+    /**
+     * Start label
+     */
+    startLabel: string;
+    /**
+     * End label
+     */
+    endLabel: string;
+}
+/**
+ * Ant style switch
+ * @param props Props
+ * @returns Component
+ */
+export declare function SwitchAnt(props: SwitchAntProps): JSX.Element;

package/lib/mu/SwitchAnt.js

@@ -0,0 +1,40 @@
+import { Stack, Typography } from '@mui/material';
+import Switch from '@mui/material/Switch';
+import React from 'react';
+/**
+ * Ant style switch
+ * @param props Props
+ * @returns Component
+ */
+export function SwitchAnt(props) {
+    var _a;
+    // Destruct
+    const { activeColor, checked, defaultChecked, defaultValue, endLabel, startLabel, onChange, value = 'true', ...rest } = props;
+    // Checked state
+    const [controlChecked, setControlChecked] = React.useState((_a = checked !== null && checked !== void 0 ? checked : defaultChecked) !== null && _a !== void 0 ? _a : defaultValue == value);
+    React.useEffect(() => {
+        if (checked)
+            setControlChecked(checked);
+    }, [checked]);
+    // On change
+    const onChangeLocal = (event, checked) => {
+        if (onChange)
+            onChange(event, checked);
+        setControlChecked(checked);
+    };
+    // Layout
+    return (React.createElement(Stack, { direction: "row", spacing: 1, alignItems: "center" },
+        React.createElement(Typography, { onClick: () => setControlChecked(false), sx: {
+                cursor: 'pointer',
+                color: controlChecked
+                    ? undefined
+                    : (theme) => activeColor !== null && activeColor !== void 0 ? activeColor : theme.palette.warning.main
+            } }, startLabel),
+        React.createElement(Switch, { checked: controlChecked, value: value, onChange: onChangeLocal, ...rest }),
+        React.createElement(Typography, { onClick: () => setControlChecked(true), sx: {
+                cursor: 'pointer',
+                color: controlChecked
+                    ? (theme) => activeColor !== null && activeColor !== void 0 ? activeColor : theme.palette.warning.main
+                    : undefined
+            } }, endLabel)));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.4.47",
+    "version": "1.4.51",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,11 +50,11 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.2.24",
+        "@etsoo/appscript": "^1.2.25",
         "@etsoo/notificationbase": "^1.1.0",
-        "@etsoo/shared": "^1.1.3",
-        "@mui/icons-material": "^5.2.5",
-        "@mui/material": "^5.2.8",
+        "@etsoo/shared": "^1.1.5",
+        "@mui/icons-material": "^5.3.0",
+        "@mui/material": "^5.3.0",
         "@reach/router": "^1.3.4",
         "@types/pica": "^5.1.3",
         "@types/pulltorefreshjs": "^0.1.5",
@@ -83,8 +83,8 @@
         "@babel/runtime-corejs3": "^7.16.8",
         "@types/jest": "^27.4.0",
         "@types/react-test-renderer": "^17.0.1",
-        "@typescript-eslint/eslint-plugin": "^5.9.1",
-        "@typescript-eslint/parser": "^5.9.1",
+        "@typescript-eslint/eslint-plugin": "^5.10.0",
+        "@typescript-eslint/parser": "^5.10.0",
         "eslint": "^8.7.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.4",

package/src/index.ts

@@ -72,6 +72,7 @@ export * from './mu/SearchField';
 export * from './mu/SearchOptionGroup';
 export * from './mu/SelectEx';
 export * from './mu/Switch';
+export * from './mu/SwitchAnt';
 export * from './mu/TabBox';
 export * from './mu/TableEx';
 export * from './mu/TextFieldEx';

package/src/mu/ComboBox.tsx

@@ -56,7 +56,7 @@ export function ComboBox<T extends {} = IdLabelDto>(props: ComboBoxProps<T>) {
         onLoadData,
         name,
         inputAutoComplete = 'off',
-        options = [],
+        options,
         readOnly = true,
         onChange,
         value,
@@ -69,13 +69,15 @@ export function ComboBox<T extends {} = IdLabelDto>(props: ComboBoxProps<T>) {
     const inputRef = React.createRef<HTMLInputElement>();
 
     // Options state
-    const [localOptions, setOptions] = React.useState(options);
+    const [localOptions, setOptions] = React.useState(options ?? []);
     const isMounted = React.useRef(true);
 
     // When options change
+    // [options] will cause infinite loop
+    const propertyWay = loadData == null;
     React.useEffect(() => {
-        setOptions(options);
-    }, [options]);
+        if (propertyWay && options != null) setOptions(options);
+    }, [JSON.stringify(options), propertyWay]);
 
     // Local default value
     let localValue =

package/src/mu/SelectEx.tsx

@@ -91,9 +91,11 @@ export function SelectEx<T extends {} = IdLabelDto>(props: SelectExProps<T>) {
     const isMounted = React.useRef(true);
 
     // When options change
+    // [options] will cause infinite loop
+    const propertyWay = loadData == null;
     React.useEffect(() => {
-        setOptions(options);
-    }, [options]);
+        if (propertyWay && options != null) setOptions(options);
+    }, [JSON.stringify(options), propertyWay]);
 
     // Local value
     const valueSource = defaultValue ?? value ?? '';

package/src/mu/Switch.tsx

@@ -36,8 +36,10 @@ export interface SwitchProps extends Omit<FormControlLabelProps, 'control'> {
 export function Switch(props: SwitchProps) {
     // Destruct
     const {
+        checked,
         defaultChecked,
         defaultValue,
+        onChange,
         readOnly,
         size,
         checkbox = false,
@@ -47,12 +49,20 @@ export function Switch(props: SwitchProps) {
 
     // Checked state
     const [controlChecked, setControlChecked] = React.useState(
-        defaultChecked ?? defaultValue == value
+        checked ?? defaultChecked ?? defaultValue == value
     );
 
+    React.useEffect(() => {
+        if (checked) setControlChecked(checked);
+    }, [checked]);
+
     // Handle change
-    const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-        setControlChecked(event.target.checked);
+    const handleChange = (
+        event: React.ChangeEvent<HTMLInputElement>,
+        checked: boolean
+    ) => {
+        if (onChange) onChange(event, checked);
+        setControlChecked(checked);
     };
 
     // Control

package/src/mu/SwitchAnt.tsx

@@ -0,0 +1,95 @@
+import { Stack, Typography } from '@mui/material';
+import Switch, { SwitchProps } from '@mui/material/Switch';
+import React from 'react';
+
+/**
+ * Ant style switch props
+ */
+export interface SwitchAntProps extends SwitchProps {
+    /**
+     *
+     */
+    activeColor?: string;
+
+    /**
+     * Start label
+     */
+    startLabel: string;
+
+    /**
+     * End label
+     */
+    endLabel: string;
+}
+
+/**
+ * Ant style switch
+ * @param props Props
+ * @returns Component
+ */
+export function SwitchAnt(props: SwitchAntProps) {
+    // Destruct
+    const {
+        activeColor,
+        checked,
+        defaultChecked,
+        defaultValue,
+        endLabel,
+        startLabel,
+        onChange,
+        value = 'true',
+        ...rest
+    } = props;
+
+    // Checked state
+    const [controlChecked, setControlChecked] = React.useState(
+        checked ?? defaultChecked ?? defaultValue == value
+    );
+
+    React.useEffect(() => {
+        if (checked) setControlChecked(checked);
+    }, [checked]);
+
+    // On change
+    const onChangeLocal = (
+        event: React.ChangeEvent<HTMLInputElement>,
+        checked: boolean
+    ) => {
+        if (onChange) onChange(event, checked);
+        setControlChecked(checked);
+    };
+
+    // Layout
+    return (
+        <Stack direction="row" spacing={1} alignItems="center">
+            <Typography
+                onClick={() => setControlChecked(false)}
+                sx={{
+                    cursor: 'pointer',
+                    color: controlChecked
+                        ? undefined
+                        : (theme) => activeColor ?? theme.palette.warning.main
+                }}
+            >
+                {startLabel}
+            </Typography>
+            <Switch
+                checked={controlChecked}
+                value={value}
+                onChange={onChangeLocal}
+                {...rest}
+            />
+            <Typography
+                onClick={() => setControlChecked(true)}
+                sx={{
+                    cursor: 'pointer',
+                    color: controlChecked
+                        ? (theme) => activeColor ?? theme.palette.warning.main
+                        : undefined
+                }}
+            >
+                {endLabel}
+            </Typography>
+        </Stack>
+    );
+}