@etsoo/materialui 1.1.6 → 1.1.7

package/lib/DnDList.d.ts

@@ -1,7 +1,7 @@
-import { UniqueIdentifier } from '@dnd-kit/core';
-import { DataTypes } from '@etsoo/shared';
-import { Theme } from '@mui/material';
-import React, { CSSProperties } from 'react';
+import { UniqueIdentifier } from "@dnd-kit/core";
+import { DataTypes } from "@etsoo/shared";
+import { Theme } from "@mui/material";
+import React, { CSSProperties } from "react";
 /**
  * DnD item default style
  * @param index Item index
@@ -76,6 +76,10 @@ export interface DnDListPros<D extends object, K extends DataTypes.Keys<D>> {
      * Data change handler
      */
     onChange?: (items: D[]) => void;
+    /**
+     * Form data change handler
+     */
+    onFormChange?: (items: D[]) => void;
     /**
      * Drag end handler
      */

package/lib/DnDList.js

@@ -1,8 +1,8 @@
-import { DndContext } from '@dnd-kit/core';
-import { SortableContext, useSortable, verticalListSortingStrategy } from '@dnd-kit/sortable';
-import { CSS } from '@dnd-kit/utilities';
-import { useTheme } from '@mui/material';
-import React from 'react';
+import { DndContext } from "@dnd-kit/core";
+import { SortableContext, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
+import { useTheme } from "@mui/material";
+import React from "react";
 function SortableItem(props) {
     // Destruct
     const { id, itemRenderer, style = {} } = props;
@@ -33,7 +33,7 @@ function SortableItem(props) {
  */
 export const DnDItemStyle = (index, isDragging, theme) => ({
     padding: theme.spacing(1),
-    zIndex: isDragging ? 1 : 'auto',
+    zIndex: isDragging ? 1 : "auto",
     background: isDragging
         ? theme.palette.primary.light
         : index % 2 === 0
@@ -47,7 +47,7 @@ export const DnDItemStyle = (index, isDragging, theme) => ({
  */
 export function DnDList(props) {
     // Destruct
-    const { keyField, itemRenderer, labelField, mRef, onChange, onDragEnd } = props;
+    const { keyField, itemRenderer, labelField, mRef, onChange, onFormChange, onDragEnd } = props;
     let getItemStyle = props.getItemStyle;
     if (getItemStyle == null) {
         // Theme
@@ -61,6 +61,8 @@ export function DnDList(props) {
         // Possible to alter items with the handler
         if (onChange)
             onChange(newItems);
+        if (onFormChange)
+            onFormChange(newItems);
         // Update state
         setItems(newItems);
     };
@@ -148,9 +150,13 @@ export function DnDList(props) {
     React.useEffect(() => {
         setItems(props.items);
     }, [props.items]);
-    return (React.createElement(DndContext, { onDragStart: handleDragStart, onDragEnd: handleDragEnd },
-        React.createElement(SortableContext, { items: items, strategy: verticalListSortingStrategy }, items.map((item, index) => {
-            const id = item[keyField];
-            return (React.createElement(SortableItem, { id: id, key: id, style: getItemStyle(index, id === activeId), itemRenderer: (nodeRef, actionNodeRef) => itemRenderer(item, index, nodeRef, actionNodeRef) }));
-        }))));
+    return (React.createElement("form", { onChange: () => {
+            if (onFormChange)
+                onFormChange(items);
+        } },
+        React.createElement(DndContext, { onDragStart: handleDragStart, onDragEnd: handleDragEnd },
+            React.createElement(SortableContext, { items: items, strategy: verticalListSortingStrategy }, items.map((item, index) => {
+                const id = item[keyField];
+                return (React.createElement(SortableItem, { id: id, key: id, style: getItemStyle(index, id === activeId), itemRenderer: (nodeRef, actionNodeRef) => itemRenderer(item, index, nodeRef, actionNodeRef) }));
+            })))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/DnDList.tsx

@@ -1,58 +1,58 @@
 import {
-    DndContext,
-    DragEndEvent,
-    DragStartEvent,
-    UniqueIdentifier
-} from '@dnd-kit/core';
+  DndContext,
+  DragEndEvent,
+  DragStartEvent,
+  UniqueIdentifier
+} from "@dnd-kit/core";
 import {
-    SortableContext,
-    useSortable,
-    verticalListSortingStrategy
-} from '@dnd-kit/sortable';
-import { CSS } from '@dnd-kit/utilities';
-import { DataTypes } from '@etsoo/shared';
-import { Theme, useTheme } from '@mui/material';
-import React, { CSSProperties } from 'react';
+  SortableContext,
+  useSortable,
+  verticalListSortingStrategy
+} from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
+import { DataTypes } from "@etsoo/shared";
+import { Theme, useTheme } from "@mui/material";
+import React, { CSSProperties } from "react";
 
 function SortableItem(props: {
-    id: UniqueIdentifier;
-    itemRenderer: (
-        nodeRef: React.ComponentProps<any>,
-        actionNodeRef: React.ComponentProps<any>
-    ) => React.ReactElement;
-    style?: React.CSSProperties;
+  id: UniqueIdentifier;
+  itemRenderer: (
+    nodeRef: React.ComponentProps<any>,
+    actionNodeRef: React.ComponentProps<any>
+  ) => React.ReactElement;
+  style?: React.CSSProperties;
 }) {
-    // Destruct
-    const { id, itemRenderer, style = {} } = props;
-
-    // Use sortable
-    const {
-        attributes,
-        listeners,
-        setNodeRef,
-        transform,
-        transition,
-        setActivatorNodeRef
-    } = useSortable({ id });
-
-    const allStyle = {
-        ...style,
-        transform: CSS.Transform.toString(transform),
-        transition
-    };
-
-    const nodeRef = {
-        style: allStyle,
-        ref: setNodeRef,
-        ...attributes
-    };
-
-    const actionNodeRef = {
-        ...listeners,
-        ref: setActivatorNodeRef
-    };
-
-    return itemRenderer(nodeRef, actionNodeRef);
+  // Destruct
+  const { id, itemRenderer, style = {} } = props;
+
+  // Use sortable
+  const {
+    attributes,
+    listeners,
+    setNodeRef,
+    transform,
+    transition,
+    setActivatorNodeRef
+  } = useSortable({ id });
+
+  const allStyle = {
+    ...style,
+    transform: CSS.Transform.toString(transform),
+    transition
+  };
+
+  const nodeRef = {
+    style: allStyle,
+    ref: setNodeRef,
+    ...attributes
+  };
+
+  const actionNodeRef = {
+    ...listeners,
+    ref: setActivatorNodeRef
+  };
+
+  return itemRenderer(nodeRef, actionNodeRef);
 }
 
 /**
@@ -63,102 +63,107 @@ function SortableItem(props: {
  * @returns Style
  */
 export const DnDItemStyle = (
-    index: number,
-    isDragging: boolean,
-    theme: Theme
+  index: number,
+  isDragging: boolean,
+  theme: Theme
 ) => ({
-    padding: theme.spacing(1),
-    zIndex: isDragging ? 1 : 'auto',
-    background: isDragging
-        ? theme.palette.primary.light
-        : index % 2 === 0
-        ? theme.palette.grey[100]
-        : theme.palette.grey[50]
+  padding: theme.spacing(1),
+  zIndex: isDragging ? 1 : "auto",
+  background: isDragging
+    ? theme.palette.primary.light
+    : index % 2 === 0
+    ? theme.palette.grey[100]
+    : theme.palette.grey[50]
 });
 
 /**
  * DnD list forward ref
  */
 export interface DnDListRef<D extends object> {
-    /**
-     * Add item
-     * @param item New item
-     */
-    addItem(item: D): void;
-
-    /**
-     * Add items
-     * @param items items
-     */
-    addItems(items: D[]): void;
-
-    /**
-     * Delete item
-     * @param index Item index
-     */
-    deleteItem(index: number): void;
-
-    /**
-     * Edit item
-     * @param newItem New item
-     * @param index Index
-     */
-    editItem(newItem: D, index: number): boolean;
-
-    /**
-     * Get all items
-     */
-    getItems(): D[];
+  /**
+   * Add item
+   * @param item New item
+   */
+  addItem(item: D): void;
+
+  /**
+   * Add items
+   * @param items items
+   */
+  addItems(items: D[]): void;
+
+  /**
+   * Delete item
+   * @param index Item index
+   */
+  deleteItem(index: number): void;
+
+  /**
+   * Edit item
+   * @param newItem New item
+   * @param index Index
+   */
+  editItem(newItem: D, index: number): boolean;
+
+  /**
+   * Get all items
+   */
+  getItems(): D[];
 }
 
 /**
  * DnD sortable list properties
  */
 export interface DnDListPros<D extends object, K extends DataTypes.Keys<D>> {
-    /**
-     * Get list item style callback
-     */
-    getItemStyle?: (index: number, isDragging: boolean) => CSSProperties;
-
-    /**
-     * Item renderer
-     */
-    itemRenderer: (
-        item: D,
-        index: number,
-        nodeRef: React.ComponentProps<any>,
-        actionNodeRef: React.ComponentProps<any>
-    ) => React.ReactElement;
-
-    /**
-     * List items
-     */
-    items: D[];
-
-    /**
-     * Unique key field
-     */
-    keyField: K;
-
-    /**
-     * Label field
-     */
-    labelField: K;
-
-    /**
-     * Methods ref
-     */
-    mRef?: React.Ref<DnDListRef<D>>;
-
-    /**
-     * Data change handler
-     */
-    onChange?: (items: D[]) => void;
-
-    /**
-     * Drag end handler
-     */
-    onDragEnd?: (items: D[]) => void;
+  /**
+   * Get list item style callback
+   */
+  getItemStyle?: (index: number, isDragging: boolean) => CSSProperties;
+
+  /**
+   * Item renderer
+   */
+  itemRenderer: (
+    item: D,
+    index: number,
+    nodeRef: React.ComponentProps<any>,
+    actionNodeRef: React.ComponentProps<any>
+  ) => React.ReactElement;
+
+  /**
+   * List items
+   */
+  items: D[];
+
+  /**
+   * Unique key field
+   */
+  keyField: K;
+
+  /**
+   * Label field
+   */
+  labelField: K;
+
+  /**
+   * Methods ref
+   */
+  mRef?: React.Ref<DnDListRef<D>>;
+
+  /**
+   * Data change handler
+   */
+  onChange?: (items: D[]) => void;
+
+  /**
+   * Form data change handler
+   */
+  onFormChange?: (items: D[]) => void;
+
+  /**
+   * Drag end handler
+   */
+  onDragEnd?: (items: D[]) => void;
 }
 
 /**
@@ -167,187 +172,186 @@ export interface DnDListPros<D extends object, K extends DataTypes.Keys<D>> {
  * @returns Component
  */
 export function DnDList<
-    D extends { id: UniqueIdentifier },
-    K extends DataTypes.Keys<D, UniqueIdentifier> = DataTypes.Keys<
-        D,
-        UniqueIdentifier
-    >
+  D extends { id: UniqueIdentifier },
+  K extends DataTypes.Keys<D, UniqueIdentifier> = DataTypes.Keys<
+    D,
+    UniqueIdentifier
+  >
 >(props: DnDListPros<D, K>) {
-    // Destruct
-    const { keyField, itemRenderer, labelField, mRef, onChange, onDragEnd } =
-        props;
-
-    let getItemStyle = props.getItemStyle;
-    if (getItemStyle == null) {
-        // Theme
-        const theme = useTheme();
-        getItemStyle = (index, isDragging) =>
-            DnDItemStyle(index, isDragging, theme);
+  // Destruct
+  const {
+    keyField,
+    itemRenderer,
+    labelField,
+    mRef,
+    onChange,
+    onFormChange,
+    onDragEnd
+  } = props;
+
+  let getItemStyle = props.getItemStyle;
+  if (getItemStyle == null) {
+    // Theme
+    const theme = useTheme();
+    getItemStyle = (index, isDragging) =>
+      DnDItemStyle(index, isDragging, theme);
+  }
+
+  // States
+  const [items, setItems] = React.useState<D[]>([]);
+  const [activeId, setActiveId] = React.useState<UniqueIdentifier>();
+
+  const changeItems = (newItems: D[]) => {
+    // Possible to alter items with the handler
+    if (onChange) onChange(newItems);
+    if (onFormChange) onFormChange(newItems);
+
+    // Update state
+    setItems(newItems);
+  };
+
+  // Drag event handlers
+  function handleDragStart(event: DragStartEvent) {
+    const { active } = event;
+    setActiveId(active.id);
+  }
+
+  function handleDragEnd(event: DragEndEvent) {
+    const { active, over } = event;
+
+    if (over && active.id !== over.id) {
+      // Indices
+      const oldIndex = items.findIndex((item) => item.id === active.id);
+      const newIndex = items.findIndex((item) => item.id === over.id);
+
+      // Clone
+      const newItems = [...items];
+
+      // Removed item
+      const [removed] = newItems.splice(oldIndex, 1);
+
+      // Insert to the destination index
+      newItems.splice(newIndex, 0, removed);
+
+      changeItems(newItems);
+
+      // Drag end handler
+      if (onDragEnd) onDragEnd(newItems);
     }
 
-    // States
-    const [items, setItems] = React.useState<D[]>([]);
-    const [activeId, setActiveId] = React.useState<UniqueIdentifier>();
+    setActiveId(undefined);
+  }
 
-    const changeItems = (newItems: D[]) => {
-        // Possible to alter items with the handler
-        if (onChange) onChange(newItems);
+  // Methods
+  React.useImperativeHandle(
+    mRef,
+    () => {
+      return {
+        addItem(newItem: D) {
+          // Existence check
+          if (items.some((item) => item[labelField] === newItem[labelField])) {
+            return false;
+          }
 
-        // Update state
-        setItems(newItems);
-    };
+          // Clone
+          const newItems = [newItem, ...items];
 
-    // Drag event handlers
-    function handleDragStart(event: DragStartEvent) {
-        const { active } = event;
-        setActiveId(active.id);
-    }
+          // Update the state
+          changeItems(newItems);
 
-    function handleDragEnd(event: DragEndEvent) {
-        const { active, over } = event;
+          return true;
+        },
 
-        if (over && active.id !== over.id) {
-            // Indices
-            const oldIndex = items.findIndex((item) => item.id === active.id);
-            const newIndex = items.findIndex((item) => item.id === over.id);
+        addItems(inputItems: D[]) {
+          // Clone
+          const newItems = [...items];
 
-            // Clone
-            const newItems = [...items];
+          // Insert items
+          inputItems.forEach((newItem) => {
+            // Existence check
+            if (
+              newItems.some((item) => item[labelField] === newItem[labelField])
+            ) {
+              return;
+            }
 
-            // Removed item
-            const [removed] = newItems.splice(oldIndex, 1);
+            newItems.push(newItem);
+          });
 
-            // Insert to the destination index
-            newItems.splice(newIndex, 0, removed);
+          // Update the state
+          changeItems(newItems);
 
-            changeItems(newItems);
+          return newItems.length - items.length;
+        },
 
-            // Drag end handler
-            if (onDragEnd) onDragEnd(newItems);
-        }
+        editItem(newItem: D, index: number) {
+          // Existence check
+          const newIndex = items.findIndex(
+            (item) => item[labelField] === newItem[labelField]
+          );
+          if (newIndex >= 0 && newIndex !== index) {
+            // Label field is the same with a different item
+            return false;
+          }
 
-        setActiveId(undefined);
-    }
+          // Clone
+          const newItems = [...items];
 
-    // Methods
-    React.useImperativeHandle(
-        mRef,
-        () => {
-            return {
-                addItem(newItem: D) {
-                    // Existence check
-                    if (
-                        items.some(
-                            (item) => item[labelField] === newItem[labelField]
-                        )
-                    ) {
-                        return false;
-                    }
-
-                    // Clone
-                    const newItems = [newItem, ...items];
-
-                    // Update the state
-                    changeItems(newItems);
-
-                    return true;
-                },
-
-                addItems(inputItems: D[]) {
-                    // Clone
-                    const newItems = [...items];
-
-                    // Insert items
-                    inputItems.forEach((newItem) => {
-                        // Existence check
-                        if (
-                            newItems.some(
-                                (item) =>
-                                    item[labelField] === newItem[labelField]
-                            )
-                        ) {
-                            return;
-                        }
-
-                        newItems.push(newItem);
-                    });
-
-                    // Update the state
-                    changeItems(newItems);
-
-                    return newItems.length - items.length;
-                },
-
-                editItem(newItem: D, index: number) {
-                    // Existence check
-                    const newIndex = items.findIndex(
-                        (item) => item[labelField] === newItem[labelField]
-                    );
-                    if (newIndex >= 0 && newIndex !== index) {
-                        // Label field is the same with a different item
-                        return false;
-                    }
-
-                    // Clone
-                    const newItems = [...items];
-
-                    // Remove the item
-                    newItems.splice(index, 1, newItem);
-
-                    // Update the state
-                    changeItems(newItems);
-
-                    return true;
-                },
-
-                deleteItem(index: number) {
-                    // Clone
-                    const newItems = [...items];
-
-                    // Remove the item
-                    newItems.splice(index, 1);
-
-                    // Update the state
-                    changeItems(newItems);
-                },
-
-                getItems() {
-                    return items;
-                }
-            };
+          // Remove the item
+          newItems.splice(index, 1, newItem);
+
+          // Update the state
+          changeItems(newItems);
+
+          return true;
+        },
+
+        deleteItem(index: number) {
+          // Clone
+          const newItems = [...items];
+
+          // Remove the item
+          newItems.splice(index, 1);
+
+          // Update the state
+          changeItems(newItems);
         },
-        [items]
-    );
-
-    React.useEffect(() => {
-        setItems(props.items);
-    }, [props.items]);
-
-    return (
-        <DndContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
-            <SortableContext
-                items={items}
-                strategy={verticalListSortingStrategy}
-            >
-                {items.map((item, index) => {
-                    const id = item[keyField] as unknown as UniqueIdentifier;
-                    return (
-                        <SortableItem
-                            id={id}
-                            key={id}
-                            style={getItemStyle!(index, id === activeId)}
-                            itemRenderer={(nodeRef, actionNodeRef) =>
-                                itemRenderer(
-                                    item,
-                                    index,
-                                    nodeRef,
-                                    actionNodeRef
-                                )
-                            }
-                        />
-                    );
-                })}
-            </SortableContext>
-        </DndContext>
-    );
+
+        getItems() {
+          return items;
+        }
+      };
+    },
+    [items]
+  );
+
+  React.useEffect(() => {
+    setItems(props.items);
+  }, [props.items]);
+
+  return (
+    <form
+      onChange={() => {
+        if (onFormChange) onFormChange(items);
+      }}
+    >
+      <DndContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
+        <SortableContext items={items} strategy={verticalListSortingStrategy}>
+          {items.map((item, index) => {
+            const id = item[keyField] as unknown as UniqueIdentifier;
+            return (
+              <SortableItem
+                id={id}
+                key={id}
+                style={getItemStyle!(index, id === activeId)}
+                itemRenderer={(nodeRef, actionNodeRef) =>
+                  itemRenderer(item, index, nodeRef, actionNodeRef)
+                }
+              />
+            );
+          })}
+        </SortableContext>
+      </DndContext>
+    </form>
+  );
 }