@etsoo/react 1.4.6 → 1.4.10

package/lib/mu/DnDList.js

@@ -49,7 +49,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

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

@@ -3,18 +3,25 @@ import { RouteComponentProps } from '@reach/router';
 /**
  * Add / Edit page router props, include 'id' (/:id) or none when adding query parameter
  */
-export declare type EditPageRouterProps<T extends DataTypes.IdType = number> = IdRouterProps<T> & WildcardRouterProps<T>;
+export declare type EditPageRouterProps = IdRouterProps & WildcardRouterProps;
+/**
+ * Get edit page id
+ * @param props Route props
+ * @param type Target data type
+ * @returns Data
+ */
+export declare function getEditPageId<T extends DataTypes.BasicNames>(props: EditPageRouterProps, type: T): DataTypes.BasicConditional<T> | undefined;
 /**
  * Id router props, include 'id' (/:id) query parameter
  */
-export declare type IdRouterProps<T extends DataTypes.IdType = number> = RouteComponentProps<{
-    id: T;
+export declare type IdRouterProps = RouteComponentProps<{
+    id: string;
 }>;
 /**
  * Wildcard router props, (/*) query parameter
  */
-export declare type WildcardRouterProps<T extends DataTypes.Basic = string> = RouteComponentProps<{
-    '*': T;
+export declare type WildcardRouterProps = RouteComponentProps<{
+    '*': string;
 }>;
 /**
  * Id state router props, include 'id' in location.state

package/lib/states/RouterProps.js

@@ -1 +1,14 @@
-export {};
+import { DataTypes } from '@etsoo/shared';
+/**
+ * Get edit page id
+ * @param props Route props
+ * @param type Target data type
+ * @returns Data
+ */
+export function getEditPageId(props, type) {
+    var _a;
+    const id = (_a = props.id) !== null && _a !== void 0 ? _a : props['*'];
+    if (id == null || id === '')
+        return undefined;
+    return DataTypes.convertByType(id, type);
+}

package/package.json

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

package/src/mu/DnDList.tsx

@@ -146,7 +146,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;
         }
 

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

@@ -1,23 +1,36 @@
 import { DataTypes } from '@etsoo/shared';
 import { RouteComponentProps } from '@reach/router';
+import { Props } from 'react-input-mask';
 
 /**
  * Add / Edit page router props, include 'id' (/:id) or none when adding query parameter
  */
-export type EditPageRouterProps<T extends DataTypes.IdType = number> =
-    IdRouterProps<T> & WildcardRouterProps<T>;
+export type EditPageRouterProps = IdRouterProps & WildcardRouterProps;
+
+/**
+ * Get edit page id
+ * @param props Route props
+ * @param type Target data type
+ * @returns Data
+ */
+export function getEditPageId<T extends DataTypes.BasicNames>(
+    props: EditPageRouterProps,
+    type: T
+): DataTypes.BasicConditional<T> | undefined {
+    const id = props.id ?? props['*'];
+    if (id == null || id === '') return undefined;
+    return DataTypes.convertByType(id, type);
+}
 
 /**
  * Id router props, include 'id' (/:id) query parameter
  */
-export type IdRouterProps<T extends DataTypes.IdType = number> =
-    RouteComponentProps<{ id: T }>;
+export type IdRouterProps = RouteComponentProps<{ id: string }>;
 
 /**
  * Wildcard router props, (/*) query parameter
  */
-export type WildcardRouterProps<T extends DataTypes.Basic = string> =
-    RouteComponentProps<{ '*': T }>;
+export type WildcardRouterProps = RouteComponentProps<{ '*': string }>;
 
 /**
  * Id state router props, include 'id' in location.state