@etsoo/react 1.4.1 → 1.4.2

package/lib/mu/DnDList.d.ts

@@ -6,7 +6,7 @@ export interface DnDListProps<D extends {}, E extends React.ElementType> {
     /**
      * Item renderer
      */
-    children: (item: D, index: number, deleteItem: (index: number) => void, editItem: (newItem: D, indexOrLabel: number | string) => void) => React.ReactNode;
+    children: (item: D, index: number, deleteItem: (index: number) => void, editItem: (newItem: D, index: number) => boolean) => React.ReactNode;
     /**
      * List container component
      * https://javascript.plainenglish.io/building-a-polymorphic-component-in-react-and-typescript-d9f236950af4

package/lib/mu/DnDList.js

@@ -30,7 +30,7 @@ export function DnDList(props) {
     // Add item
     const addItem = (newItem) => {
         // Existence check
-        if (items.some((item) => item[labelField] == newItem[labelField])) {
+        if (items.some((item) => item[labelField] === newItem[labelField])) {
             return false;
         }
         // Clone
@@ -40,19 +40,18 @@ export function DnDList(props) {
         return true;
     };
     // Edit item
-    const editItem = (newItem, indexOrLabel) => {
-        const index = typeof indexOrLabel === 'number'
-            ? indexOrLabel
-            : items.findIndex((item) => DataTypes.convert(item[labelField], 'string') ==
-                indexOrLabel);
-        if (index === -1)
-            return;
+    const editItem = (newItem, index) => {
+        // Existence check
+        if (items.some((item) => item[labelField] === newItem[labelField])) {
+            return false;
+        }
         // Clone
         const newItems = [...items];
         // Remove the item
         newItems.splice(index, 1, newItem);
         // Update the state
         setItems(newItems);
+        return true;
     };
     // Add items
     const addItems = (inputItems) => {

package/lib/mu/NotifierMU.js

@@ -176,13 +176,10 @@ export class NotificationMU extends NotificationReact {
                 input === null || input === void 0 ? void 0 : input.focus();
                 return;
             }
-            if (Array.isArray(v)) {
-                if (!v[0]) {
-                    const error = v[1];
-                    setError(error);
-                    input === null || input === void 0 ? void 0 : input.focus();
-                    return;
-                }
+            if (typeof v === 'string') {
+                setError(v);
+                input === null || input === void 0 ? void 0 : input.focus();
+                return;
             }
             this.dismiss();
         };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.4.1",
+    "version": "1.4.2",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,8 +50,8 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.2.12",
-        "@etsoo/notificationbase": "^1.0.96",
+        "@etsoo/appscript": "^1.2.15",
+        "@etsoo/notificationbase": "^1.1.0",
         "@etsoo/shared": "^1.0.97",
         "@mui/icons-material": "^5.2.5",
         "@mui/material": "^5.2.6",

package/src/mu/DnDList.tsx

@@ -18,7 +18,7 @@ export interface DnDListProps<D extends {}, E extends React.ElementType> {
         item: D,
         index: number,
         deleteItem: (index: number) => void,
-        editItem: (newItem: D, indexOrLabel: number | string) => void
+        editItem: (newItem: D, index: number) => boolean
     ) => React.ReactNode;
 
     /**
@@ -116,7 +116,7 @@ export function DnDList<
     // Add item
     const addItem = (newItem: D) => {
         // Existence check
-        if (items.some((item) => item[labelField] == newItem[labelField])) {
+        if (items.some((item) => item[labelField] === newItem[labelField])) {
             return false;
         }
 
@@ -130,16 +130,11 @@ export function DnDList<
     };
 
     // Edit item
-    const editItem = (newItem: D, indexOrLabel: number | string) => {
-        const index =
-            typeof indexOrLabel === 'number'
-                ? indexOrLabel
-                : items.findIndex(
-                      (item) =>
-                          DataTypes.convert(item[labelField], 'string') ==
-                          indexOrLabel
-                  );
-        if (index === -1) return;
+    const editItem = (newItem: D, index: number) => {
+        // Existence check
+        if (items.some((item) => item[labelField] === newItem[labelField])) {
+            return false;
+        }
 
         // Clone
         const newItems = [...items];
@@ -149,6 +144,8 @@ export function DnDList<
 
         // Update the state
         setItems(newItems);
+
+        return true;
     };
 
     // Add items

package/src/mu/NotifierMU.tsx

@@ -253,10 +253,9 @@ export class NotificationMU extends NotificationReact {
             // Result
             let result:
                 | boolean
-                | [boolean, string | undefined]
+                | string
                 | void
-                | PromiseLike<boolean | [boolean, string | undefined] | void> =
-                undefined;
+                | PromiseLike<boolean | string | void> = undefined;
 
             const input = inputRef.current;
 
@@ -302,13 +301,10 @@ export class NotificationMU extends NotificationReact {
                 input?.focus();
                 return;
             }
-            if (Array.isArray(v)) {
-                if (!v[0]) {
-                    const error = v[1];
-                    setError(error);
-                    input?.focus();
-                    return;
-                }
+            if (typeof v === 'string') {
+                setError(v);
+                input?.focus();
+                return;
             }
 
             this.dismiss();