@etsoo/materialui 1.1.5 → 1.1.6

package/lib/OptionGroup.d.ts

@@ -1,6 +1,6 @@
-import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from '@etsoo/shared';
-import { FormControlProps } from '@mui/material';
-import React from 'react';
+import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from "@etsoo/shared";
+import { FormControlProps } from "@mui/material";
+import React from "react";
 /**
  * OptionGroup methods ref
  */
@@ -14,7 +14,7 @@ export interface OptionGroupRef {
 /**
  * OptionGroup props
  */
-export type OptionGroupProps<T extends object, D extends DataTypes.Keys<T>, L extends DataTypes.Keys<T, string>> = Omit<FormControlProps<'fieldset'>, 'defaultValue'> & {
+export type OptionGroupProps<T extends object, D extends DataTypes.Keys<T>, L extends DataTypes.Keys<T, string>> = Omit<FormControlProps<"fieldset">, "defaultValue"> & {
     /**
      * Default value
      */
@@ -66,7 +66,7 @@ export type OptionGroupProps<T extends object, D extends DataTypes.Keys<T>, L ex
     /**
      * Item size
      */
-    itemSize?: 'small' | 'medium';
+    itemSize?: "small" | "medium";
     /**
      * Helper text
      */

package/lib/OptionGroup.js

@@ -1,7 +1,7 @@
-import { DataTypes, Utils } from '@etsoo/shared';
-import { Box, Checkbox, FormControl, FormControlLabel, FormGroup, FormHelperText, InputLabel, Radio, RadioGroup, useTheme } from '@mui/material';
-import NotchedOutline from '@mui/material/OutlinedInput';
-import React from 'react';
+import { DataTypes, Utils } from "@etsoo/shared";
+import { Box, Checkbox, FormControl, FormControlLabel, FormGroup, FormHelperText, InputLabel, Radio, RadioGroup, useTheme } from "@mui/material";
+import NotchedOutline from "@mui/material/OutlinedInput";
+import React from "react";
 /**
  * OptionGroup
  * @param props Props
@@ -10,7 +10,7 @@ import React from 'react';
 export function OptionGroup(props) {
     var _a;
     // Destruct
-    const { getOptionLabel, defaultValue, idField = 'id', label, labelField = 'label', multiple = false, mRef, name, onValueChange, options, readOnly, row, itemSize, helperText, variant, required, ...rest } = props;
+    const { getOptionLabel, defaultValue, idField = "id", label, labelField = "label", multiple = false, mRef, name, onValueChange, options, readOnly, row, itemSize, helperText, variant, required, fullWidth, ...rest } = props;
     // Theme
     const theme = useTheme();
     // Get option value
@@ -75,16 +75,14 @@ export function OptionGroup(props) {
                 setValues(changedValues);
             } })) : (React.createElement(Radio, { disabled: disabledIds === null || disabledIds === void 0 ? void 0 : disabledIds.includes(ov), size: itemSize, readOnly: readOnly }));
         // Label
-        const label = getOptionLabel == null
-            ? `${option[labelField]}`
-            : getOptionLabel(option);
+        const label = getOptionLabel == null ? `${option[labelField]}` : getOptionLabel(option);
         // Value, convert to string
         // Will fail when type is number
         const value = getOptionValue(option);
         return (React.createElement(FormControlLabel, { key: value, control: control, value: value, label: label }));
     });
     // Group
-    const group = multiple ? (React.createElement(FormGroup, { row: row }, list)) : (React.createElement(RadioGroup, { row: row, name: name, value: (_a = values[0]) !== null && _a !== void 0 ? _a : '', onChange: (_event, value) => {
+    const group = multiple ? (React.createElement(FormGroup, { row: row }, list)) : (React.createElement(RadioGroup, { row: row, name: name, value: (_a = values[0]) !== null && _a !== void 0 ? _a : "", onChange: (_event, value) => {
             if (firstOptionValue == null)
                 return;
             const typeValue = Utils.parseString(value, firstOptionValue);
@@ -94,9 +92,13 @@ export function OptionGroup(props) {
         } }, list));
     // Layout
     return (React.createElement(React.Fragment, null,
-        React.createElement(FormControl, { component: "fieldset", ...rest },
+        React.createElement(FormControl, { component: "fieldset", fullWidth: fullWidth, ...rest },
             label && (React.createElement(InputLabel, { required: required, variant: variant, shrink: true }, label)),
             React.createElement(Box, { paddingLeft: 2, paddingY: "7px" }, group),
-            variant === 'outlined' && (React.createElement(NotchedOutline, { label: label && required ? label + ' *' : label, notched: true, style: { borderRadius: theme.shape.borderRadius } }))),
+            variant === "outlined" && (React.createElement(NotchedOutline, { label: label && required ? label + " *" : label, notched: true, style: {
+                    position: "absolute",
+                    borderRadius: theme.shape.borderRadius,
+                    width: fullWidth ? "100%" : "auto"
+                } }))),
         helperText && React.createElement(FormHelperText, null, helperText)));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,10 +50,10 @@
     "@emotion/css": "^11.10.5",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
-    "@etsoo/appscript": "^1.3.57",
-    "@etsoo/notificationbase": "^1.1.22",
-    "@etsoo/react": "^1.6.40",
-    "@etsoo/shared": "^1.1.87",
+    "@etsoo/appscript": "^1.3.58",
+    "@etsoo/notificationbase": "^1.1.23",
+    "@etsoo/react": "^1.6.41",
+    "@etsoo/shared": "^1.1.88",
     "@mui/icons-material": "^5.11.0",
     "@mui/material": "^5.11.4",
     "@types/pica": "^9.0.1",

package/src/OptionGroup.tsx

@@ -1,114 +1,114 @@
 import {
-    DataTypes,
-    IdDefaultType,
-    LabelDefaultType,
-    ListType,
-    Utils
-} from '@etsoo/shared';
+  DataTypes,
+  IdDefaultType,
+  LabelDefaultType,
+  ListType,
+  Utils
+} from "@etsoo/shared";
 import {
-    Box,
-    Checkbox,
-    FormControl,
-    FormControlLabel,
-    FormControlProps,
-    FormGroup,
-    FormHelperText,
-    InputLabel,
-    Radio,
-    RadioGroup,
-    useTheme
-} from '@mui/material';
-import NotchedOutline from '@mui/material/OutlinedInput';
-import React from 'react';
+  Box,
+  Checkbox,
+  FormControl,
+  FormControlLabel,
+  FormControlProps,
+  FormGroup,
+  FormHelperText,
+  InputLabel,
+  Radio,
+  RadioGroup,
+  useTheme
+} from "@mui/material";
+import NotchedOutline from "@mui/material/OutlinedInput";
+import React from "react";
 
 /**
  * OptionGroup methods ref
  */
 export interface OptionGroupRef {
-    /**
-     * Disable specific items with their ids
-     * @param ids Ids
-     */
-    disable(ids: unknown[]): void;
+  /**
+   * Disable specific items with their ids
+   * @param ids Ids
+   */
+  disable(ids: unknown[]): void;
 }
 
 /**
  * OptionGroup props
  */
 export type OptionGroupProps<
-    T extends object,
-    D extends DataTypes.Keys<T>,
-    L extends DataTypes.Keys<T, string>
-> = Omit<FormControlProps<'fieldset'>, 'defaultValue'> & {
-    /**
-     * Default value
-     */
-    defaultValue?: T[D] | T[D][];
-
-    /**
-     * Get option label function
-     */
-    getOptionLabel?: (option: T) => string;
-
-    /**
-     * Id field
-     */
-    idField?: D;
-
-    /**
-     * Label
-     */
-    label?: string;
-
-    /**
-     * Label field
-     */
-    labelField?: L;
-
-    /**
-     * Methods
-     */
-    mRef?: React.Ref<OptionGroupRef>;
-
-    /**
-     * Multiple choose item
-     */
-    multiple?: boolean;
-
-    /**
-     * Field name
-     */
-    name: string;
-
-    /**
-     * On value change handler
-     */
-    onValueChange?: (value: T[D] | T[D][] | undefined) => void;
-
-    /**
-     * Array of options.
-     */
-    options: ReadonlyArray<T>;
-
-    /**
-     * Is the field read only?
-     */
-    readOnly?: boolean;
-
-    /**
-     * Display group of elements in a compact row
-     */
-    row?: boolean;
-
-    /**
-     * Item size
-     */
-    itemSize?: 'small' | 'medium';
-
-    /**
-     * Helper text
-     */
-    helperText?: React.ReactNode;
+  T extends object,
+  D extends DataTypes.Keys<T>,
+  L extends DataTypes.Keys<T, string>
+> = Omit<FormControlProps<"fieldset">, "defaultValue"> & {
+  /**
+   * Default value
+   */
+  defaultValue?: T[D] | T[D][];
+
+  /**
+   * Get option label function
+   */
+  getOptionLabel?: (option: T) => string;
+
+  /**
+   * Id field
+   */
+  idField?: D;
+
+  /**
+   * Label
+   */
+  label?: string;
+
+  /**
+   * Label field
+   */
+  labelField?: L;
+
+  /**
+   * Methods
+   */
+  mRef?: React.Ref<OptionGroupRef>;
+
+  /**
+   * Multiple choose item
+   */
+  multiple?: boolean;
+
+  /**
+   * Field name
+   */
+  name: string;
+
+  /**
+   * On value change handler
+   */
+  onValueChange?: (value: T[D] | T[D][] | undefined) => void;
+
+  /**
+   * Array of options.
+   */
+  options: ReadonlyArray<T>;
+
+  /**
+   * Is the field read only?
+   */
+  readOnly?: boolean;
+
+  /**
+   * Display group of elements in a compact row
+   */
+  row?: boolean;
+
+  /**
+   * Item size
+   */
+  itemSize?: "small" | "medium";
+
+  /**
+   * Helper text
+   */
+  helperText?: React.ReactNode;
 };
 
 /**
@@ -117,186 +117,187 @@ export type OptionGroupProps<
  * @returns Component
  */
 export function OptionGroup<
-    T extends object = ListType,
-    D extends DataTypes.Keys<T> = IdDefaultType<T>,
-    L extends DataTypes.Keys<T, string> = LabelDefaultType<T>
+  T extends object = ListType,
+  D extends DataTypes.Keys<T> = IdDefaultType<T>,
+  L extends DataTypes.Keys<T, string> = LabelDefaultType<T>
 >(props: OptionGroupProps<T, D, L>) {
-    // Destruct
-    const {
-        getOptionLabel,
-        defaultValue,
-        idField = 'id' as D,
-        label,
-        labelField = 'label' as L,
-        multiple = false,
-        mRef,
-        name,
-        onValueChange,
-        options,
-        readOnly,
-        row,
-        itemSize,
-        helperText,
-        variant,
-        required,
-        ...rest
-    } = props;
-
-    // Theme
-    const theme = useTheme();
-
-    // Get option value
-    // D type should be the source id type
-    const getOptionValue = (option: T): T[D] | null => {
-        const value = DataTypes.getValue(option, idField);
-        if (value == null) return null;
-        return value as T[D];
-    };
-
-    // Checkbox values
-    const [values, setValues] = React.useState<T[D][]>([]);
-
-    // Values
-    const dv = React.useMemo(
-        () =>
-            defaultValue == null
-                ? []
-                : Array.isArray(defaultValue)
-                ? defaultValue
-                : [defaultValue],
-        [defaultValue]
-    );
-
-    React.useEffect(() => {
-        setValues(dv);
-    }, [dv]);
-
-    // Disabled ids
-    const [disabledIds, setDisabledIds] = React.useState<unknown[]>();
-
-    // Item checked
-    const itemChecked = (option: T) => {
-        // Value
-        const value = getOptionValue(option);
-        if (value == null) return false;
-
-        return values.includes(value);
-    };
-
-    React.useImperativeHandle(mRef, () => ({
-        disable(ids: unknown[]) {
-            setDisabledIds(ids);
-        }
-    }));
-
-    // First item value
-    const firstOptionValue = getOptionValue(options[0]);
-
-    // Items
-    const list = options.map((option) => {
-        // Value
-        const ov = getOptionValue(option);
-
-        // Control
-        const control = multiple ? (
-            <Checkbox
-                name={name}
-                readOnly={readOnly}
-                size={itemSize}
-                checked={itemChecked(option)}
-                disabled={disabledIds?.includes(ov)}
-                onChange={(event) => {
-                    if (firstOptionValue == null) return;
-
-                    const typeValue = Utils.parseString(
-                        event.target.value,
-                        firstOptionValue
-                    );
-
-                    const changedValues = [...values];
-                    if (event.target.checked) {
-                        if (changedValues.includes(typeValue)) return;
-                        changedValues.push(typeValue);
-                    } else {
-                        const index = changedValues.findIndex(
-                            (v) => v === typeValue
-                        );
-                        if (index === -1) return;
-                        changedValues.splice(index, 1);
-                    }
-
-                    if (onValueChange) onValueChange(changedValues);
-                    setValues(changedValues);
-                }}
-            />
-        ) : (
-            <Radio
-                disabled={disabledIds?.includes(ov)}
-                size={itemSize}
-                readOnly={readOnly}
-            />
-        );
-
-        // Label
-        const label =
-            getOptionLabel == null
-                ? `${option[labelField]}`
-                : getOptionLabel(option);
-
-        // Value, convert to string
-        // Will fail when type is number
-        const value = getOptionValue(option) as unknown as React.Key;
-
-        return (
-            <FormControlLabel
-                key={value}
-                control={control}
-                value={value}
-                label={label}
-            />
-        );
-    });
-
-    // Group
-    const group = multiple ? (
-        <FormGroup row={row}>{list}</FormGroup>
+  // Destruct
+  const {
+    getOptionLabel,
+    defaultValue,
+    idField = "id" as D,
+    label,
+    labelField = "label" as L,
+    multiple = false,
+    mRef,
+    name,
+    onValueChange,
+    options,
+    readOnly,
+    row,
+    itemSize,
+    helperText,
+    variant,
+    required,
+    fullWidth,
+    ...rest
+  } = props;
+
+  // Theme
+  const theme = useTheme();
+
+  // Get option value
+  // D type should be the source id type
+  const getOptionValue = (option: T): T[D] | null => {
+    const value = DataTypes.getValue(option, idField);
+    if (value == null) return null;
+    return value as T[D];
+  };
+
+  // Checkbox values
+  const [values, setValues] = React.useState<T[D][]>([]);
+
+  // Values
+  const dv = React.useMemo(
+    () =>
+      defaultValue == null
+        ? []
+        : Array.isArray(defaultValue)
+        ? defaultValue
+        : [defaultValue],
+    [defaultValue]
+  );
+
+  React.useEffect(() => {
+    setValues(dv);
+  }, [dv]);
+
+  // Disabled ids
+  const [disabledIds, setDisabledIds] = React.useState<unknown[]>();
+
+  // Item checked
+  const itemChecked = (option: T) => {
+    // Value
+    const value = getOptionValue(option);
+    if (value == null) return false;
+
+    return values.includes(value);
+  };
+
+  React.useImperativeHandle(mRef, () => ({
+    disable(ids: unknown[]) {
+      setDisabledIds(ids);
+    }
+  }));
+
+  // First item value
+  const firstOptionValue = getOptionValue(options[0]);
+
+  // Items
+  const list = options.map((option) => {
+    // Value
+    const ov = getOptionValue(option);
+
+    // Control
+    const control = multiple ? (
+      <Checkbox
+        name={name}
+        readOnly={readOnly}
+        size={itemSize}
+        checked={itemChecked(option)}
+        disabled={disabledIds?.includes(ov)}
+        onChange={(event) => {
+          if (firstOptionValue == null) return;
+
+          const typeValue = Utils.parseString(
+            event.target.value,
+            firstOptionValue
+          );
+
+          const changedValues = [...values];
+          if (event.target.checked) {
+            if (changedValues.includes(typeValue)) return;
+            changedValues.push(typeValue);
+          } else {
+            const index = changedValues.findIndex((v) => v === typeValue);
+            if (index === -1) return;
+            changedValues.splice(index, 1);
+          }
+
+          if (onValueChange) onValueChange(changedValues);
+          setValues(changedValues);
+        }}
+      />
     ) : (
-        <RadioGroup
-            row={row}
-            name={name}
-            value={values[0] ?? ''}
-            onChange={(_event, value) => {
-                if (firstOptionValue == null) return;
-                const typeValue = Utils.parseString(value, firstOptionValue);
-                if (onValueChange) onValueChange(typeValue);
-                setValues([typeValue]);
-            }}
-        >
-            {list}
-        </RadioGroup>
+      <Radio
+        disabled={disabledIds?.includes(ov)}
+        size={itemSize}
+        readOnly={readOnly}
+      />
     );
 
-    // Layout
+    // Label
+    const label =
+      getOptionLabel == null ? `${option[labelField]}` : getOptionLabel(option);
+
+    // Value, convert to string
+    // Will fail when type is number
+    const value = getOptionValue(option) as unknown as React.Key;
+
     return (
-        <React.Fragment>
-            <FormControl component="fieldset" {...rest}>
-                {label && (
-                    <InputLabel required={required} variant={variant} shrink>
-                        {label}
-                    </InputLabel>
-                )}
-                <Box paddingLeft={2} paddingY="7px">
-                    {group}
-                </Box>
-                {variant === 'outlined' && (
-                    <NotchedOutline
-                        label={label && required ? label + ' *' : label}
-                        notched
-                        style={{ borderRadius: theme.shape.borderRadius }}
-                    />
-                )}
-            </FormControl>
-            {helperText && <FormHelperText>{helperText}</FormHelperText>}
-        </React.Fragment>
+      <FormControlLabel
+        key={value}
+        control={control}
+        value={value}
+        label={label}
+      />
     );
+  });
+
+  // Group
+  const group = multiple ? (
+    <FormGroup row={row}>{list}</FormGroup>
+  ) : (
+    <RadioGroup
+      row={row}
+      name={name}
+      value={values[0] ?? ""}
+      onChange={(_event, value) => {
+        if (firstOptionValue == null) return;
+        const typeValue = Utils.parseString(value, firstOptionValue);
+        if (onValueChange) onValueChange(typeValue);
+        setValues([typeValue]);
+      }}
+    >
+      {list}
+    </RadioGroup>
+  );
+
+  // Layout
+  return (
+    <React.Fragment>
+      <FormControl component="fieldset" fullWidth={fullWidth} {...rest}>
+        {label && (
+          <InputLabel required={required} variant={variant} shrink>
+            {label}
+          </InputLabel>
+        )}
+        <Box paddingLeft={2} paddingY="7px">
+          {group}
+        </Box>
+        {variant === "outlined" && (
+          <NotchedOutline
+            label={label && required ? label + " *" : label}
+            notched
+            style={{
+              position: "absolute",
+              borderRadius: theme.shape.borderRadius,
+              width: fullWidth ? "100%" : "auto"
+            }}
+          />
+        )}
+      </FormControl>
+      {helperText && <FormHelperText>{helperText}</FormHelperText>}
+    </React.Fragment>
+  );
 }