@etsoo/materialui 1.1.2 → 1.1.4

package/lib/ItemList.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from '@etsoo/shared';
+import React from "react";
+import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from "@etsoo/shared";
 /**
  * Item list properties
  */
@@ -35,7 +35,7 @@ export interface ItemListProps<T extends object, D extends DataTypes.Keys<T>, L
     /**
      * Button color
      */
-    color?: 'inherit' | 'primary' | 'secondary';
+    color?: "inherit" | "primary" | "secondary";
     /**
      * Close event
      */
@@ -47,7 +47,7 @@ export interface ItemListProps<T extends object, D extends DataTypes.Keys<T>, L
     /**
      * Button size
      */
-    size?: 'small' | 'medium' | 'large';
+    size?: "small" | "medium" | "large";
     /**
      * Title
      */
@@ -59,7 +59,7 @@ export interface ItemListProps<T extends object, D extends DataTypes.Keys<T>, L
     /**
      * Button variant
      */
-    variant?: 'text' | 'outlined' | 'contained';
+    variant?: "text" | "outlined" | "contained";
 }
 /**
  * Item list component

package/lib/ItemList.js

@@ -1,21 +1,21 @@
-import React from 'react';
-import { Dialog, DialogTitle, List, ListItemText, DialogContent, Button, ListItemButton } from '@mui/material';
-import { DataTypes } from '@etsoo/shared';
+import React from "react";
+import { Dialog, DialogTitle, List, ListItemText, DialogContent, Button, ListItemButton, } from "@mui/material";
+import { DataTypes, } from "@etsoo/shared";
 /**
  * Item list component
  * @param props Properties
  */
 export function ItemList(props) {
     //  properties destructure
-    const { buttonLabel, className, color = 'primary', keepClick = false, items, idField = 'id', labelField = 'label', minWidth, icon, onClose, selectedValue, size = 'medium', title, variant = 'outlined' } = props;
+    const { buttonLabel, className, color = "primary", keepClick = false, items, idField = "id", labelField = "label", minWidth, icon, onClose, selectedValue, size = "medium", title, variant = "outlined", } = props;
     // Get label
     const getLabel = (item) => {
         var _a;
-        if (typeof labelField === 'function') {
+        if (typeof labelField === "function") {
             return labelField(item);
         }
         else {
-            return (_a = DataTypes.convert(item[labelField], 'string')) !== null && _a !== void 0 ? _a : '';
+            return (_a = DataTypes.convert(item[labelField], "string")) !== null && _a !== void 0 ? _a : "";
         }
     };
     // Dialog open or not state
@@ -46,8 +46,10 @@ export function ItemList(props) {
     };
     // Close item handler
     const closeItemHandler = (item) => {
-        // Update the current item
-        setCurrentItem(item);
+        if (!keepClick) {
+            // Update the current item
+            setCurrentItem(item);
+        }
         // Close the dialog
         setOpen(false);
         // Emit close event
@@ -62,10 +64,8 @@ export function ItemList(props) {
             React.createElement(DialogContent, { sx: { minWidth } },
                 React.createElement(List, null, items.map((item) => {
                     const id = item[idField];
-                    return (React.createElement(ListItemButton, { key: id, disabled: id ===
-                            (currentItem
-                                ? currentItem[idField]
-                                : undefined) && !keepClick, onClick: () => closeItemHandler(item) },
+                    return (React.createElement(ListItemButton, { key: id, disabled: id === (currentItem ? currentItem[idField] : undefined) &&
+                            !keepClick, onClick: () => closeItemHandler(item) },
                         React.createElement(ListItemText, null, getLabel(item))));
                 }))))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -45,17 +45,17 @@
   },
   "homepage": "https://github.com/ETSOO/ReactMU#readme",
   "dependencies": {
-    "@dnd-kit/core": "^6.0.6",
-    "@dnd-kit/sortable": "^7.0.1",
+    "@dnd-kit/core": "^6.0.7",
+    "@dnd-kit/sortable": "^7.0.2",
     "@emotion/css": "^11.10.5",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
-    "@etsoo/appscript": "^1.3.50",
-    "@etsoo/notificationbase": "^1.1.20",
-    "@etsoo/react": "^1.6.37",
-    "@etsoo/shared": "^1.1.84",
+    "@etsoo/appscript": "^1.3.56",
+    "@etsoo/notificationbase": "^1.1.21",
+    "@etsoo/react": "^1.6.39",
+    "@etsoo/shared": "^1.1.87",
     "@mui/icons-material": "^5.11.0",
-    "@mui/material": "^5.11.2",
+    "@mui/material": "^5.11.4",
     "@types/pica": "^9.0.1",
     "@types/pulltorefreshjs": "^0.1.5",
     "@types/react": "^18.0.26",
@@ -70,12 +70,12 @@
     "react-dom": "^18.2.0",
     "react-draggable": "^4.4.5",
     "react-imask": "^6.4.3",
-    "react-router-dom": "^6.6.1",
+    "react-router-dom": "^6.6.2",
     "react-window": "^1.8.8"
   },
   "devDependencies": {
     "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.7",
+    "@babel/core": "^7.20.12",
     "@babel/plugin-transform-runtime": "^7.19.6",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
@@ -83,9 +83,9 @@
     "@babel/runtime-corejs3": "^7.20.7",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
-    "@types/jest": "^29.2.4",
-    "@typescript-eslint/eslint-plugin": "^5.47.1",
-    "@typescript-eslint/parser": "^5.47.1",
+    "@types/jest": "^29.2.5",
+    "@typescript-eslint/eslint-plugin": "^5.48.1",
+    "@typescript-eslint/parser": "^5.48.1",
     "jest": "^29.3.1",
     "jest-environment-jsdom": "^29.3.1",
     "typescript": "^4.9.4"

package/src/ItemList.tsx

@@ -1,97 +1,97 @@
-import React from 'react';
+import React from "react";
 import {
-    Dialog,
-    DialogTitle,
-    List,
-    ListItemText,
-    DialogContent,
-    Button,
-    ListItemButton
-} from '@mui/material';
+  Dialog,
+  DialogTitle,
+  List,
+  ListItemText,
+  DialogContent,
+  Button,
+  ListItemButton,
+} from "@mui/material";
 import {
-    DataTypes,
-    IdDefaultType,
-    LabelDefaultType,
-    ListType
-} from '@etsoo/shared';
+  DataTypes,
+  IdDefaultType,
+  LabelDefaultType,
+  ListType,
+} from "@etsoo/shared";
 
 /**
  * Item list properties
  */
 export interface ItemListProps<
-    T extends object,
-    D extends DataTypes.Keys<T>,
-    L extends DataTypes.Keys<T, string>
+  T extends object,
+  D extends DataTypes.Keys<T>,
+  L extends DataTypes.Keys<T, string>
 > {
-    /**
-     * Button label
-     */
-    buttonLabel?: React.ReactNode;
-
-    /**
-     * Style class name
-     */
-    className?: string;
-
-    /**
-     * Keep click for all items
-     */
-    keepClick?: boolean;
-
-    /**
-     * Id field name
-     */
-    idField?: D;
-
-    /**
-     * Label field name or callback
-     */
-    labelField?: L | ((item: T) => string);
-
-    /**
-     * Minimum width
-     */
-    minWidth?: number | string;
-
-    /**
-     * Button icon
-     */
-    icon?: React.ReactNode;
-
-    /**
-     * Button color
-     */
-    color?: 'inherit' | 'primary' | 'secondary';
-
-    /**
-     * Close event
-     */
-    onClose?(item: T | undefined, changed: boolean): void;
-
-    /**
-     * Current selected language
-     */
-    selectedValue?: T[D];
-
-    /**
-     * Button size
-     */
-    size?: 'small' | 'medium' | 'large';
-
-    /**
-     * Title
-     */
-    title?: string;
-
-    /**
-     * Items
-     */
-    items: T[];
-
-    /**
-     * Button variant
-     */
-    variant?: 'text' | 'outlined' | 'contained';
+  /**
+   * Button label
+   */
+  buttonLabel?: React.ReactNode;
+
+  /**
+   * Style class name
+   */
+  className?: string;
+
+  /**
+   * Keep click for all items
+   */
+  keepClick?: boolean;
+
+  /**
+   * Id field name
+   */
+  idField?: D;
+
+  /**
+   * Label field name or callback
+   */
+  labelField?: L | ((item: T) => string);
+
+  /**
+   * Minimum width
+   */
+  minWidth?: number | string;
+
+  /**
+   * Button icon
+   */
+  icon?: React.ReactNode;
+
+  /**
+   * Button color
+   */
+  color?: "inherit" | "primary" | "secondary";
+
+  /**
+   * Close event
+   */
+  onClose?(item: T | undefined, changed: boolean): void;
+
+  /**
+   * Current selected language
+   */
+  selectedValue?: T[D];
+
+  /**
+   * Button size
+   */
+  size?: "small" | "medium" | "large";
+
+  /**
+   * Title
+   */
+  title?: string;
+
+  /**
+   * Items
+   */
+  items: T[];
+
+  /**
+   * Button variant
+   */
+  variant?: "text" | "outlined" | "contained";
 }
 
 /**
@@ -99,129 +99,122 @@ export interface ItemListProps<
  * @param props Properties
  */
 export function ItemList<
-    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: ItemListProps<T, D, L>) {
-    //  properties destructure
-    const {
-        buttonLabel,
-        className,
-        color = 'primary',
-        keepClick = false,
-        items,
-        idField = 'id' as D,
-        labelField = 'label' as L,
-        minWidth,
-        icon,
-        onClose,
-        selectedValue,
-        size = 'medium',
-        title,
-        variant = 'outlined'
-    } = props;
-
-    // Get label
-    const getLabel = (item: T): string => {
-        if (typeof labelField === 'function') {
-            return labelField(item);
-        } else {
-            return DataTypes.convert(item[labelField], 'string') ?? '';
-        }
-    };
-
-    // Dialog open or not state
-    const [open, setOpen] = React.useState(false);
-
-    // Default state
-    const defaultItem: T | undefined = items.find(
-        (item) => item[idField] === selectedValue
-    );
-
-    // Current item
-    const [currentItem, setCurrentItem] = React.useState(defaultItem);
-
-    // Click handler
-    const clickHandler = () => {
-        // More than one language
-        if (items.length < 2) {
-            return;
-        }
-
-        // Open the dialog
-        setOpen(true);
-    };
-
-    // Close handler
-    const closeHandler = () => {
-        if (!open) return;
-
-        // Close the dialog
-        setOpen(false);
-
-        // Emit close event
-        if (onClose) {
-            onClose(currentItem, false);
-        }
-    };
-
-    // Close item handler
-    const closeItemHandler = (item: any) => {
-        // Update the current item
-        setCurrentItem(item);
-
-        // Close the dialog
-        setOpen(false);
-
-        // Emit close event
-        if (onClose) {
-            onClose(item, true);
-        }
-    };
-
-    return (
-        <>
-            <Button
-                className={className}
-                variant={variant}
-                startIcon={icon}
-                color={color}
-                size={size}
-                onClick={clickHandler}
-            >
-                {buttonLabel ??
-                    (currentItem ? getLabel(currentItem) : undefined)}
-            </Button>
-            <Dialog
-                aria-labelledby="dialog-title"
-                open={open}
-                onClose={closeHandler}
-            >
-                {title && <DialogTitle id="dialog-title">{title}</DialogTitle>}
-                <DialogContent sx={{ minWidth }}>
-                    <List>
-                        {items.map((item) => {
-                            const id = item[idField];
-                            return (
-                                <ListItemButton
-                                    key={id as unknown as React.Key}
-                                    disabled={
-                                        id ===
-                                            (currentItem
-                                                ? currentItem[idField]
-                                                : undefined) && !keepClick
-                                    }
-                                    onClick={() => closeItemHandler(item)}
-                                >
-                                    <ListItemText>
-                                        {getLabel(item)}
-                                    </ListItemText>
-                                </ListItemButton>
-                            );
-                        })}
-                    </List>
-                </DialogContent>
-            </Dialog>
-        </>
-    );
+  //  properties destructure
+  const {
+    buttonLabel,
+    className,
+    color = "primary",
+    keepClick = false,
+    items,
+    idField = "id" as D,
+    labelField = "label" as L,
+    minWidth,
+    icon,
+    onClose,
+    selectedValue,
+    size = "medium",
+    title,
+    variant = "outlined",
+  } = props;
+
+  // Get label
+  const getLabel = (item: T): string => {
+    if (typeof labelField === "function") {
+      return labelField(item);
+    } else {
+      return DataTypes.convert(item[labelField], "string") ?? "";
+    }
+  };
+
+  // Dialog open or not state
+  const [open, setOpen] = React.useState(false);
+
+  // Default state
+  const defaultItem: T | undefined = items.find(
+    (item) => item[idField] === selectedValue
+  );
+
+  // Current item
+  const [currentItem, setCurrentItem] = React.useState(defaultItem);
+
+  // Click handler
+  const clickHandler = () => {
+    // More than one language
+    if (items.length < 2) {
+      return;
+    }
+
+    // Open the dialog
+    setOpen(true);
+  };
+
+  // Close handler
+  const closeHandler = () => {
+    if (!open) return;
+
+    // Close the dialog
+    setOpen(false);
+
+    // Emit close event
+    if (onClose) {
+      onClose(currentItem, false);
+    }
+  };
+
+  // Close item handler
+  const closeItemHandler = (item: T) => {
+    if (!keepClick) {
+      // Update the current item
+      setCurrentItem(item);
+    }
+
+    // Close the dialog
+    setOpen(false);
+
+    // Emit close event
+    if (onClose) {
+      onClose(item, true);
+    }
+  };
+
+  return (
+    <>
+      <Button
+        className={className}
+        variant={variant}
+        startIcon={icon}
+        color={color}
+        size={size}
+        onClick={clickHandler}
+      >
+        {buttonLabel ?? (currentItem ? getLabel(currentItem) : undefined)}
+      </Button>
+      <Dialog aria-labelledby="dialog-title" open={open} onClose={closeHandler}>
+        {title && <DialogTitle id="dialog-title">{title}</DialogTitle>}
+        <DialogContent sx={{ minWidth }}>
+          <List>
+            {items.map((item) => {
+              const id = item[idField];
+              return (
+                <ListItemButton
+                  key={id as unknown as React.Key}
+                  disabled={
+                    id === (currentItem ? currentItem[idField] : undefined) &&
+                    !keepClick
+                  }
+                  onClick={() => closeItemHandler(item)}
+                >
+                  <ListItemText>{getLabel(item)}</ListItemText>
+                </ListItemButton>
+              );
+            })}
+          </List>
+        </DialogContent>
+      </Dialog>
+    </>
+  );
 }