@etsoo/materialui 1.1.11 → 1.1.13

package/lib/DnDList.d.ts

@@ -17,7 +17,7 @@ export declare const DnDItemStyle: (index: number, isDragging: boolean, theme: T
 /**
  * DnD list forward ref
  */
-export interface DnDListRef<D extends object, K extends DataTypes.Keys<D>> {
+export interface DnDListRef<D extends object> {
     /**
      * Add item
      * @param item New item
@@ -39,10 +39,6 @@ export interface DnDListRef<D extends object, K extends DataTypes.Keys<D>> {
      * @param index Index
      */
     editItem(newItem: D, index: number): boolean;
-    /**
-     * Get deleted ids
-     */
-    getDeletedIds(): D[K][];
     /**
      * Get all items
      */
@@ -75,7 +71,7 @@ export interface DnDListPros<D extends object, K extends DataTypes.Keys<D>> {
     /**
      * Methods ref
      */
-    mRef?: React.Ref<DnDListRef<D, K>>;
+    mRef?: React.Ref<DnDListRef<D>>;
     /**
      * Data change handler
      */

package/lib/DnDList.js

@@ -57,7 +57,6 @@ export function DnDList(props) {
     // States
     const [items, setItems] = React.useState([]);
     const [activeId, setActiveId] = React.useState();
-    const deletedIds = React.useRef([]);
     const doFormChange = (newItems) => {
         if (onFormChange)
             onFormChange(newItems !== null && newItems !== void 0 ? newItems : items);
@@ -142,18 +141,10 @@ export function DnDList(props) {
                 // Clone
                 const newItems = [...items];
                 // Remove the item
-                const deleted = newItems.splice(index, 1);
-                deleted.forEach((d) => {
-                    const id = d[keyField];
-                    if (!deletedIds.current.includes(id))
-                        deletedIds.current.push(id);
-                });
+                newItems.splice(index, 1);
                 // Update the state
                 changeItems(newItems);
             },
-            getDeletedIds() {
-                return deletedIds.current;
-            },
             getItems() {
                 return items;
             }
@@ -175,7 +166,6 @@ export function DnDList(props) {
     };
     React.useEffect(() => {
         setItems(props.items);
-        deletedIds.current = [];
     }, [props.items]);
     const children = (React.createElement(DndContext, { onDragStart: handleDragStart, onDragEnd: handleDragEnd },
         React.createElement(SortableContext, { items: items, strategy: verticalListSortingStrategy }, items.map((item, index) => {

package/lib/OptionGroup.js

@@ -93,7 +93,7 @@ export function OptionGroup(props) {
     // Layout
     return (React.createElement(React.Fragment, null,
         React.createElement(FormControl, { component: "fieldset", fullWidth: fullWidth, ...rest },
-            label && (React.createElement(InputLabel, { required: required, variant: variant, shrink: true }, label)),
+            label && variant !== "outlined" && (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: {
                     position: "absolute",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -55,10 +55,10 @@
     "@etsoo/react": "^1.6.42",
     "@etsoo/shared": "^1.1.88",
     "@mui/icons-material": "^5.11.0",
-    "@mui/material": "^5.11.5",
+    "@mui/material": "^5.11.6",
     "@types/pica": "^9.0.1",
     "@types/pulltorefreshjs": "^0.1.5",
-    "@types/react": "^18.0.26",
+    "@types/react": "^18.0.27",
     "@types/react-avatar-editor": "^13.0.0",
     "@types/react-dom": "^18.0.10",
     "@types/react-input-mask": "^3.0.2",
@@ -70,7 +70,7 @@
     "react-dom": "^18.2.0",
     "react-draggable": "^4.4.5",
     "react-imask": "^6.4.3",
-    "react-router-dom": "^6.6.2",
+    "react-router-dom": "^6.7.0",
     "react-window": "^1.8.8"
   },
   "devDependencies": {
@@ -80,14 +80,14 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
-    "@babel/runtime-corejs3": "^7.20.7",
+    "@babel/runtime-corejs3": "^7.20.13",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
-    "@types/jest": "^29.2.5",
-    "@typescript-eslint/eslint-plugin": "^5.48.2",
-    "@typescript-eslint/parser": "^5.48.2",
-    "jest": "^29.3.1",
-    "jest-environment-jsdom": "^29.3.1",
+    "@types/jest": "^29.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "jest": "^29.4.0",
+    "jest-environment-jsdom": "^29.4.0",
     "typescript": "^4.9.4"
   }
 }

package/src/DnDList.tsx

@@ -79,7 +79,7 @@ export const DnDItemStyle = (
 /**
  * DnD list forward ref
  */
-export interface DnDListRef<D extends object, K extends DataTypes.Keys<D>> {
+export interface DnDListRef<D extends object> {
   /**
    * Add item
    * @param item New item
@@ -105,11 +105,6 @@ export interface DnDListRef<D extends object, K extends DataTypes.Keys<D>> {
    */
   editItem(newItem: D, index: number): boolean;
 
-  /**
-   * Get deleted ids
-   */
-  getDeletedIds(): D[K][];
-
   /**
    * Get all items
    */
@@ -153,7 +148,7 @@ export interface DnDListPros<D extends object, K extends DataTypes.Keys<D>> {
   /**
    * Methods ref
    */
-  mRef?: React.Ref<DnDListRef<D, K>>;
+  mRef?: React.Ref<DnDListRef<D>>;
 
   /**
    * Data change handler
@@ -205,7 +200,6 @@ export function DnDList<
   // States
   const [items, setItems] = React.useState<D[]>([]);
   const [activeId, setActiveId] = React.useState<UniqueIdentifier>();
-  const deletedIds = React.useRef<D[K][]>([]);
 
   const doFormChange = (newItems?: D[]) => {
     if (onFormChange) onFormChange(newItems ?? items);
@@ -322,20 +316,12 @@ export function DnDList<
           const newItems = [...items];
 
           // Remove the item
-          const deleted = newItems.splice(index, 1);
-          deleted.forEach((d) => {
-            const id = d[keyField];
-            if (!deletedIds.current.includes(id)) deletedIds.current.push(id);
-          });
+          newItems.splice(index, 1);
 
           // Update the state
           changeItems(newItems);
         },
 
-        getDeletedIds() {
-          return deletedIds.current;
-        },
-
         getItems() {
           return items;
         }
@@ -369,7 +355,6 @@ export function DnDList<
 
   React.useEffect(() => {
     setItems(props.items);
-    deletedIds.current = [];
   }, [props.items]);
 
   const children = (

package/src/OptionGroup.tsx

@@ -277,7 +277,7 @@ export function OptionGroup<
   return (
     <React.Fragment>
       <FormControl component="fieldset" fullWidth={fullWidth} {...rest}>
-        {label && (
+        {label && variant !== "outlined" && (
           <InputLabel required={required} variant={variant} shrink>
             {label}
           </InputLabel>