@etsoo/react 1.4.7 → 1.4.11

package/lib/mu/DnDList.d.ts

@@ -36,6 +36,10 @@ export interface DnDListProps<D extends {}, E extends React.ElementType> {
      * Data change handler
      */
     onChange?: (items: D[]) => void;
+    /**
+     * Drag end handler
+     */
+    onDragEnd?: (items: D[]) => void;
     /**
      * Top and bottom sides renderer
      */

package/lib/mu/DnDList.js

@@ -9,7 +9,7 @@ import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
  */
 export function DnDList(props) {
     // Destruct
-    const { children, Component = 'div', componentProps, getItemStyle = (_isDragging) => ({}), getListStyle = () => undefined, labelField, loadData, name, onChange, sideRenderer } = props;
+    const { children, Component = 'div', componentProps, getItemStyle = (_isDragging) => ({}), getListStyle = () => undefined, labelField, loadData, name, onChange, onDragEnd, sideRenderer } = props;
     // State
     const [items, setItems] = React.useState([]);
     const changeItems = (items) => {
@@ -20,7 +20,7 @@ export function DnDList(props) {
         setItems(items);
     };
     // Drag end handler
-    const onDragEnd = (result) => {
+    const onDragEndLocal = (result) => {
         // Dropped outside the list
         if (!result.destination) {
             return;
@@ -33,6 +33,9 @@ export function DnDList(props) {
         newItems.splice(result.destination.index, 0, removed);
         // Update the state
         changeItems(newItems);
+        // Drag end handler
+        if (onDragEnd)
+            onDragEnd(newItems);
     };
     // Add item
     const addItem = (newItem) => {
@@ -49,7 +52,9 @@ export function DnDList(props) {
     // Edit item
     const editItem = (newItem, index) => {
         // Existence check
-        if (items.some((item) => item[labelField] === newItem[labelField])) {
+        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
@@ -93,7 +98,7 @@ export function DnDList(props) {
     return (React.createElement(React.Fragment, null,
         sideRenderer && sideRenderer(true, addItem, addItems),
         React.createElement(Component, { ...componentProps },
-            React.createElement(DragDropContext, { onDragEnd: onDragEnd },
+            React.createElement(DragDropContext, { onDragEnd: onDragEndLocal },
                 React.createElement(Droppable, { droppableId: name }, (provided, snapshot) => (React.createElement("div", { ...provided.droppableProps, ref: provided.innerRef, style: getListStyle(snapshot.isDraggingOver) },
                     items.map((item, index) => {
                         // Id

package/lib/mu/TooltipClick.d.ts

@@ -3,8 +3,9 @@ import React from 'react';
 /**
  * Tooltip with click visibility props
  */
-export interface TooltipClickProps extends Omit<TooltipProps, 'children' | 'open' | 'disableFocusListener' | 'disableHoverListener' | 'disableTouchListener'> {
+export interface TooltipClickProps extends Omit<TooltipProps, 'children' | 'open' | 'disableFocusListener' | 'disableTouchListener'> {
     children: (openTooltip: (newTitle?: string) => void) => React.ReactElement<any, any>;
+    disableHoverListener?: boolean;
 }
 /**
  * Tooltip with click visibility

package/lib/mu/TooltipClick.js

@@ -8,7 +8,7 @@ import React from 'react';
 export function TooltipClick(props) {
     // Destruct
     // leaveDelay set to 5 seconds to hide the tooltip automatically
-    const { children, leaveDelay = 5000, onClose, title, ...rest } = props;
+    const { children, disableHoverListener = true, leaveDelay = 5000, onClose, title, ...rest } = props;
     // State
     const [localTitle, setTitle] = React.useState(title);
     const [open, setOpen] = React.useState(false);
@@ -42,5 +42,5 @@ export function TooltipClick(props) {
                 setOpen(false);
                 if (onClose)
                     onClose(event);
-            }, title: localTitle, open: open, disableFocusListener: true, disableHoverListener: true, disableTouchListener: true, ...rest }, children(openTooltip))));
+            }, title: localTitle, open: open, disableFocusListener: true, disableTouchListener: true, disableHoverListener: disableHoverListener, onMouseOver: disableHoverListener ? undefined : () => setOpen(true), ...rest }, children(openTooltip))));
 }

package/lib/states/RouterProps.d.ts

@@ -10,7 +10,7 @@ export declare type EditPageRouterProps = IdRouterProps & WildcardRouterProps;
  * @param type Target data type
  * @returns Data
  */
-export declare function getEditPageId<T extends DataTypes.BasicNames = 'number'>(props: EditPageRouterProps, type: T): DataTypes.BasicConditional<T> | undefined;
+export declare function getEditPageId<T extends DataTypes.BasicNames>(props: EditPageRouterProps, type: T): DataTypes.BasicConditional<T> | undefined;
 /**
  * Id router props, include 'id' (/:id) query parameter
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.4.7",
+    "version": "1.4.11",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/mu/DnDList.tsx

@@ -57,6 +57,11 @@ export interface DnDListProps<D extends {}, E extends React.ElementType> {
      */
     onChange?: (items: D[]) => void;
 
+    /**
+     * Drag end handler
+     */
+    onDragEnd?: (items: D[]) => void;
+
     /**
      * Top and bottom sides renderer
      */
@@ -93,6 +98,7 @@ export function DnDList<
         loadData,
         name,
         onChange,
+        onDragEnd,
         sideRenderer
     } = props;
 
@@ -108,7 +114,7 @@ export function DnDList<
     };
 
     // Drag end handler
-    const onDragEnd = (result: DropResult) => {
+    const onDragEndLocal = (result: DropResult) => {
         // Dropped outside the list
         if (!result.destination) {
             return;
@@ -125,6 +131,9 @@ export function DnDList<
 
         // Update the state
         changeItems(newItems);
+
+        // Drag end handler
+        if (onDragEnd) onDragEnd(newItems);
     };
 
     // Add item
@@ -146,7 +155,11 @@ export function DnDList<
     // Edit item
     const editItem = (newItem: D, index: number) => {
         // Existence check
-        if (items.some((item) => item[labelField] === newItem[labelField])) {
+        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;
         }
 
@@ -207,7 +220,7 @@ export function DnDList<
         <React.Fragment>
             {sideRenderer && sideRenderer(true, addItem, addItems)}
             <Component {...componentProps}>
-                <DragDropContext onDragEnd={onDragEnd}>
+                <DragDropContext onDragEnd={onDragEndLocal}>
                     <Droppable droppableId={name}>
                         {(provided, snapshot) => (
                             <div

package/src/mu/TooltipClick.tsx

@@ -7,15 +7,13 @@ import React from 'react';
 export interface TooltipClickProps
     extends Omit<
         TooltipProps,
-        | 'children'
-        | 'open'
-        | 'disableFocusListener'
-        | 'disableHoverListener'
-        | 'disableTouchListener'
+        'children' | 'open' | 'disableFocusListener' | 'disableTouchListener'
     > {
     children: (
         openTooltip: (newTitle?: string) => void
     ) => React.ReactElement<any, any>;
+
+    disableHoverListener?: boolean;
 }
 
 /**
@@ -26,7 +24,14 @@ export interface TooltipClickProps
 export function TooltipClick(props: TooltipClickProps) {
     // Destruct
     // leaveDelay set to 5 seconds to hide the tooltip automatically
-    const { children, leaveDelay = 5000, onClose, title, ...rest } = props;
+    const {
+        children,
+        disableHoverListener = true,
+        leaveDelay = 5000,
+        onClose,
+        title,
+        ...rest
+    } = props;
 
     // State
     const [localTitle, setTitle] = React.useState(title);
@@ -74,8 +79,11 @@ export function TooltipClick(props: TooltipClickProps) {
                 title={localTitle}
                 open={open}
                 disableFocusListener
-                disableHoverListener
                 disableTouchListener
+                disableHoverListener={disableHoverListener}
+                onMouseOver={
+                    disableHoverListener ? undefined : () => setOpen(true)
+                }
                 {...rest}
             >
                 {children(openTooltip)}

package/src/states/RouterProps.ts

@@ -13,7 +13,7 @@ export type EditPageRouterProps = IdRouterProps & WildcardRouterProps;
  * @param type Target data type
  * @returns Data
  */
-export function getEditPageId<T extends DataTypes.BasicNames = 'number'>(
+export function getEditPageId<T extends DataTypes.BasicNames>(
     props: EditPageRouterProps,
     type: T
 ): DataTypes.BasicConditional<T> | undefined {