5htp-core 0.4.9-1 → 0.4.9-2

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.4.9-1",
+	"version": "0.4.9-2",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/client/assets/css/components/table.less

@@ -32,6 +32,7 @@ table {
     th {
         font-weight: 500;
         color: var(--cTxtDesc);
+        white-space: break-spaces;
     }
 
     td, th {

package/src/client/components/Table/index.tsx

@@ -29,7 +29,8 @@ export type Props<TRow> = {
     empty?: ComponentChild | false,
     className?: string,
 
-    actions?: TAction<TRow>[]
+    selection?: [TRow[], React.SetStateAction<TRow[]>],
+    maxSelection?: number,
 }
 
 export type TColumn = JSX.HTMLAttributes<HTMLElement> & {
@@ -39,24 +40,26 @@ export type TColumn = JSX.HTMLAttributes<HTMLElement> & {
     stick?: boolean,
 }
 
-export type TAction<TRow> = Omit<TButtonProps, 'onClick'> & {
-    onClick: (row: TRow) => void,
-    label: ComponentChild,
-    multi?: boolean,
-    default?: boolean,
-}
-
 /*----------------------------------
 - COMPOSANTS
 ----------------------------------*/
 export default function Liste<TRow extends TDonneeInconnue>({
     stickyHeader,
     data: rows, setData, empty,
-    columns, actions, ...props
+    selection: selectionState, maxSelection,
+    columns, ...props
 }: Props<TRow>) {
 
     const { modal } = useContext();
 
+    // Selection
+    const selection = selectionState ? {
+        current: selectionState[0],
+        set: selectionState[1],
+        isMultiple: maxSelection === undefined || maxSelection > 1
+    } : undefined;
+
+    // Empty data
     if (rows.length === 0)
         return empty === false ? null : (
             <div class={"pd-2 col al-center " + (props.className || '')}>
@@ -67,32 +70,28 @@ export default function Liste<TRow extends TDonneeInconnue>({
             </div>
         );
 
-    const [selection, setSelection] = React.useState<number[]>([]);
-    const selectionMultiple = actions && actions.some((action) => action.multi);
-
-    const defaultAction = actions && actions.find((action) => action.default);
-
     /*----------------------------------
     - RENDU COLONNES / LIGNES
     ----------------------------------*/
     let renduColonnes: ComponentChild[] = [];
     
     const renduLignes = rows.map((row: TRow, iDonnee: number) => (
-        <tr {...defaultAction ? {
-            onClick: () => defaultAction.onClick(row),
+        <tr {...(maxSelection === 1 && selection) ? {
+            onClick: () => selection.set([row]),
             class: 'clickable'
         } : {}}>
-            {selectionMultiple && (
+
+            {selection?.isMultiple && (
                 <td>
                     <Checkbox
                         id={"selectionner" + iDonnee}
-                        value={selection.includes(row.id)}
-                        onChange={(selectionner: boolean) => {
-                            setSelection(current => selectionner
+                        value={selection.current.some(s => s.id === row.id)}
+                        onChange={(isSelected: boolean) => {
+                            selection.set(current => isSelected
                                 // Ajoute
-                                ? [...current, row.id]
+                                ? [...current, row]
                                 // Retire
-                                : current.filter((currentId, i) => currentId !== row.id))
+                                : current.filter((currentElem) => currentElem.id !== row.id))
                         }}
                     />
                 </td>
@@ -164,27 +163,6 @@ export default function Liste<TRow extends TDonneeInconnue>({
                     </td>
                 )
             })}
-
-            {actions !== undefined && (
-                <td class="stickyColumn">
-                    <Popover content={(
-                        <ul class="col menu card bg white">
-                            {actions.map(({ label, onClick, ...props }: TAction<TRow>) => (
-                                <li>
-                                    <Button {...props}
-                                        onClick={() => onClick && onClick(row)}
-                                        
-                                    >
-                                        {label}
-                                    </Button>
-                                </li>
-                            ))}
-                        </ul>
-                    )}>
-                        <Button size="s" icon="solid/ellipsis-h" />
-                    </Popover>
-                </td>
-            )}
         </tr>
     ));
 
@@ -202,57 +180,24 @@ export default function Liste<TRow extends TDonneeInconnue>({
             <table>
                 <thead className={stickyHeader ? 'stickyHeader' : undefined}>
                     <tr>
-                        {selectionMultiple && (
+                        {selection?.isMultiple && (
                             <th>
                                 <Checkbox
-                                    value={selection.length >= rows.length}
+                                    value={selection.current.length >= rows.length}
                                     onChange={(status: boolean) => {
-                                        setSelection(status ? rows.map(r => r.id) : []);
+                                        selection.set(status ? rows : []);
                                     }}
                                 />
                             </th>
                         )}
 
                         {renduColonnes}
-
-                        {actions !== undefined && (
-                            <th>Actions</th>
-                        )}
                     </tr>
                 </thead>
                 <tbody>
                     {renduLignes}
                 </tbody>
             </table>
-
-            {(selection.length !== 0 && actions) && (
-                <footer>
-                    <div className="card pdv-05 row inline pos_bottom">
-                        <strong>{selection.length} selected items</strong>
-
-                        {actions.map(({ label, multi, onClick, ...props }: TAction<TRow>) => {
-
-                            if (!multi)
-                                return;
-
-                            const selectedRows = selection.map((index: number) => rows[index]);
-
-                            return (
-                                <Button
-                                    {...props}
-                                    onClick={() => onClick && onClick(selectedRows)}
-                                >
-                                    {label}
-                                </Button>
-                            )
-                        })}
-
-                        <Button onClick={() => setSelection([])}>
-                            Cancel
-                        </Button>
-                    </div>
-                </footer>
-            )}
         </div>
     </>
 }

package/src/client/components/inputv3/base.tsx

@@ -69,7 +69,7 @@ export function useInput<TValue>(
         if (state.changed === false)
             return;
 
-        //console.log(`[input] Commit value:`, state.value, externalValue);
+        console.log(`[input] Commit value:`, state.value, externalValue);
         if (onChange !== undefined)
             onChange(state.value);
     }
@@ -78,7 +78,7 @@ export function useInput<TValue>(
     React.useEffect(() => {
 
         if (externalValue !== undefined && externalValue !== state.value) {
-            //console.log("External value change", externalValue);
+            console.log("External value change", externalValue);
             setState({ value: externalValue, valueSource: 'external', changed: true })
         }
         

package/src/client/components/inputv3/index.tsx

@@ -64,7 +64,7 @@ export default (props: Props & InputBaseProps<string> & TInputElementProps) => {
     - INIT
     ----------------------------------*/
 
-    const [{ value, focus, fieldProps }, setValue, commitValue, setState] = useInput(props, '' );
+    const [{ value, focus, fieldProps }, setValue, commitValue, setState] = useInput(props, '');
 
     // Trigger onchange oly when finished typing
     const refCommit = React.useRef<NodeJS.Timeout | null>(null);

package/src/common/validation/schema.ts

@@ -14,7 +14,7 @@ import defaultValidators, { SchemaValidators, getFieldValidator } from './valida
 ----------------------------------*/
 
 export type TSchemaFields = { 
-    [fieldName: string]: TSchemaFields | Schema<{}> | TValidatorDefinition
+    [fieldName: string]: TSchemaFields | Schema<{}> | Validator<any> | TValidatorDefinition
 }
 
 type TSchemaOptions = {
@@ -42,9 +42,15 @@ export type TSchemaData<TSchema extends Schema<{}>> =
 
 export type TValidatedData<TFields extends TSchemaFields> = {
     // For each field, the values returned by validator.validate()
-    [name in keyof TFields]: ReturnType<TFields[name]["validate"]>
+    [name in keyof TFields]: TFieldReturnType<TFields[name]>
 }
 
+type TFieldReturnType<TField> = TField extends TValidatorDefinition
+    ? TField[2]
+    : TField extends Schema<infer T>
+    ? TValidatedData<T>
+    : never
+
 /*----------------------------------
 - CONST
 ----------------------------------*/

package/src/common/validation/validator.ts

@@ -18,9 +18,9 @@ import type { InputBaseProps } from '@client/components/inputv3/base';
 ----------------------------------*/
 
 export type TValidatorDefinition<K extends keyof SchemaValidators = keyof SchemaValidators> = [
-    type: K, 
-    args: Parameters<SchemaValidators[K]>, 
-    returnType: ReturnType<SchemaValidators[K]> 
+    type: string, 
+    args: any[], 
+    returnType: string
 ]
 
 // TODO: remove

package/src/server/services/router/request/index.ts

@@ -44,7 +44,7 @@ export default class ServerRequest<
 
     // Requete
     public method: HttpMethod;
-    public ip: string;
+    public ip?: string;
     public locale: string;
     public domain: string;
     public headers: HttpHeaders = {};