kelt-ui-kit-react 2.0.1 → 2.0.3

package/src/dataTable/DataTable.view.tsx

@@ -1,37 +1,53 @@
-import { useMemo } from "react";
-import { DataTable } from "./DataTable";
-import { dataTableActionsInterface } from "./dataTable.interface";
+import { useMemo, useState } from "react";
+import { TypeInputEnum } from "../form/form.enum";
+import { DataTable, DataTableFilterState } from "./DataTable";
+import {
+  DataTableActionsInterface,
+  DataTableColumnsInterface,
+} from "./dataTable.interface";
 
 export const DataTableView = () => {
-  const dataTableColumns = useMemo(() => {
+  const dataTableColumns: DataTableColumnsInterface<{}>[] = useMemo(() => {
     return [
-      { id: "id", label: "ID", minWidth: 50, type: "number" },
+      {
+        id: "id",
+        label: "ID",
+        minWidth: 50,
+        type: "number",
+        filterable: true,
+        filterType: TypeInputEnum.CHECKBOX,
+        filterDataEnum: [
+          { label: "1", value: "1" },
+          { label: "2", value: "2" },
+          { label: "3", value: "3" },
+        ],
+      },
       {
         id: "name",
         label: "Name",
+        field: "name",
         minWidth: 100,
-        editable: true,
-        enterToNextColumn: true,
+        filterable: true,
         type: "text",
+        displayOverlay: true,
+        openClickCell: true,
+        filterType: TypeInputEnum.TEXT,
+        filterDataEnum: [
+          { label: "John Doe", value: "John Doe" },
+          { label: "Jane Smith", value: "Jane Smith" },
+          { label: "Alice Johnson", value: "Alice Johnson" },
+        ],
       },
-      {
-        id: "age",
-        label: "Age",
-        minWidth: 50,
-        editable: true,
-        enterToNextColumn: true,
-        type: "number",
-      },
-    ];
-  }, []);
-  const data = useMemo(() => {
-    return [
-      { id: 1, name: "John Doe", age: 28 },
-      { id: 2, name: "Jane Smith", age: 34 },
-      { id: 3, name: "Alice Johnson", age: 45 },
+      { id: "age", label: "Age", minWidth: 50, type: "number" },
     ];
   }, []);
-  const actions: dataTableActionsInterface<{
+  const [data, setData] = useState([
+    { id: 1, name: "John Doe", age: 28 },
+    { id: 2, name: "Jane Smith", age: 34 },
+    { id: 3, name: "Alice Johnson", age: 45 },
+  ]);
+
+  const actions: DataTableActionsInterface<{
     id: number;
     name: string;
     age: number;
@@ -55,14 +71,22 @@ export const DataTableView = () => {
       },
     ];
   }, []);
+  const onFiltersChange = (filters: DataTableFilterState) => {
+    console.log("Filters changed: ", filters);
+  };
   return (
     <DataTable
       data={data}
       actions={actions}
       columns={dataTableColumns}
+      onFiltersChange={onFiltersChange}
+      onEditColumnByOverlay={(newRow) => {
+        setData((prevData) =>
+          prevData.map((row) => (row.id === newRow.id ? newRow : row)),
+        );
+      }}
       id="datatable-example"
       name={"DataTable"}
-      mobileCardView
       onSelectionChange={(selectedRows) => {
         console.log("Selected Rows: ", selectedRows);
       }}

package/src/dataTable/dataTable.css

@@ -1,110 +1,25 @@
-.data-table-footer-action {
-  position: fixed;
-  left: 5px;
-  right: 5px;
-  bottom: 5px;
-  border-radius: 4px;
-  z-index: 1000;
-  overflow: hidden;
-  background: #fff;
-  border-top: 1px solid #e5e5e5;
-  box-shadow: 0 -10px 30px rgba(0, 0, 0, 0.18);
-  animation: data-table-footer-action-enter 180ms ease-out;
-
-  & .data-table-footer-action__content {
-    position: relative;
-    padding: 0.75rem 1rem;
-  }
-
-  & .data-table-footer-action__close {
-    position: absolute;
-    top: 5px;
-    right: 5px;
-    cursor: pointer;
-
-    .bi {
-      color: #333;
-    }
-  }
-}
-
-
-
-
-@keyframes data-table-footer-action-enter {
-  from {
-    opacity: 0;
-    transform: translateY(100%);
-  }
-
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
 .data-table-container {
   overflow: auto;
-  position: relative;
-
-  .data-table-mobile-cards {
-    display: grid;
-    gap: 0.75rem;
-
-    .data-table-mobile-card {
-      width: 100%;
-      max-width: none;
-      height: auto;
-      padding: 0;
-      border-radius: 8px;
-    }
 
-    .data-table-mobile-card__content {
-      width: 100%;
-      min-width: 0;
-    }
-
-    .data-table-mobile-card__field {
-      display: grid;
-      grid-template-columns: minmax(90px, 35%) minmax(0, 1fr);
-      gap: 0.75rem;
-      align-items: center;
-      padding: 0.625rem 0.75rem;
-      border-bottom: 1px solid #e5e5e5;
-    }
-
-    .data-table-mobile-card__label {
-      color: var(--tertiary-color);
-      font-size: 0.875rem;
-      font-weight: 600;
-      overflow-wrap: anywhere;
-    }
-
-    .data-table-mobile-card__actions {
-      display: flex;
-      gap: 0.5rem;
-      align-items: center;
-      justify-content: flex-end;
-      padding: 0.75rem;
-    }
-
-    .data-table-mobile-cards__empty {
-      padding: 1rem;
-      text-align: center;
-      color: #666;
-    }
-  }
-
-  &.data-table-container--with-footer-action {
-    scroll-padding-bottom: 80px;
+  .data-table-empty-state-content {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 1rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
 
   .data-table {
     width: 100%;
-    border-spacing: 0;
-    font-size: 16px;
+    border-spacing: 5px 0;
+    font-size: 14px;
     color: #333;
 
+    /*   .data-table-sticky-cell {
+      box-shadow: 2px 0 0 #f1f3f8;
+    } */
+
     .select-cell {
       min-width: 40px !important;
 
@@ -119,90 +34,150 @@
       }
     }
 
-
     thead {
       margin-bottom: 1rem;
-      position: sticky;
-      top: 0;
-      z-index: 1;
-      background-color: #fff;
+      background-color: inherit;
 
       th {
-        position: sticky;
-        top: 0;
-        z-index: 2;
-        background-color: #fff;
-        color: var(--tertiary-color);
+        color: #bdbaba;
         min-width: 100px;
-        padding: .5rem;
-      }
-    }
+        position: relative;
+        z-index: 11;
+        background-color: inherit;
+        background-clip: padding-box;
+
+        .data-table-column-sort {
+          .bi-arrow-down-up {
+            font-size: 1rem;
+          }
+        }
+
+        .data-table-column-filter {
+          visibility: hidden;
+          margin-left: 4px;
 
-    tbody {
-      td {
-        padding: 0.5rem;
+          &.active {
+            visibility: visible;
+          }
 
-        &:not(:first-child) {
-          padding-left: 0 !important;
+          .data-table-column-filter-active {
+            color: var(--tertiary-color);
+          }
         }
-      }
 
-      tr.even {
-        background-color: #ffffff;
-      }
+        .data-table-column-sort {
+          visibility: hidden;
+          margin-left: 4px;
+
+          &.active {
+            visibility: visible;
+          }
 
-      tr.odd {
-        background-color: #f5f5f5;
+          .data-table-column-sort-active {
+            color: var(--tertiary-color);
+          }
+        }
+
+        &:hover,
+        &:focus {
+
+          .data-table-column-filter,
+          .data-table-column-sort {
+            visibility: visible;
+          }
+        }
       }
 
-      .data-table-input-number-wrapper {
-        display: inline-flex;
-        align-items: center;
-        gap: 4px;
-
-        button.data-table-step-btn {
-          min-width: 28px !important;
-          width: 28px !important;
-          height: 28px !important;
-          max-height: 28px !important;
-          padding: 0 !important;
-          display: inline-flex !important;
-          align-items: center !important;
-          justify-content: center !important;
-          border-radius: 4px;
-          border: 1px solid #dcdcdc;
-          background-color: #f8f9fa;
-          color: #333;
-          font-size: 16px;
-          line-height: 1;
-          cursor: pointer;
-          transition: background-color 0.15s, border-color 0.15s;
+      .data-table-filter-row {
+        th {
+          padding-top: 6px;
+          padding-bottom: 6px;
+          overflow: visible;
+        }
+
+        .data-table-filter-select {
+          width: 100%;
+          max-width: 100%;
+
+          button {
+            width: 100%;
+            max-width: 100%;
+            overflow: hidden;
+            padding: 4px 6px;
+            border: 1px solid #dedede;
+          }
+
+          .select-container-value {
+            display: block;
+            min-width: 0;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            font-size: 0.7rem;
+          }
+        }
+
+        .data-table-filter-input-wrapper {
+          width: 100%;
+          max-width: 100%;
+          overflow: visible;
+          box-sizing: border-box;
 
-          &:hover:not(:disabled) {
-            background-color: #e9ecef;
-            border-color: #adb5bd;
+          .input-clear-icon,
+          .clear-btn {
+            right: 5px;
+
+            .bi {
+              font-size: 0.8rem;
+            }
           }
 
-          &:active:not(:disabled) {
-            background-color: #dee2e6;
+          .input-container {
+            min-width: 0;
+            width: 100%;
           }
 
-          &:disabled {
-            opacity: 0.4;
-            cursor: not-allowed;
-            background-color: #f8f9fa;
+          .select-container {
+            max-width: 100%;
+            min-width: 0;
           }
 
-          .bi {
-            font-size: 13px;
-            line-height: 1;
+          .select-container-button {
+            max-width: 100%;
+            min-width: 0;
           }
         }
 
-        input {
-          margin: 0;
+        .data-table-filter-input {
+          width: 100%;
+          max-width: 100%;
+          min-width: 0;
+          box-sizing: border-box;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          border: 1px solid #c9cfdb;
+          border-radius: 6px;
+          padding: 4px 6px;
+          font-size: 12px;
+          background-color: #fff;
+          color: #333;
+        }
+      }
+
+      .data-table-header-row {
+        th {
+          position: sticky;
+          top: 0;
+          z-index: 12;
+          background-color: #f9fbfc;
         }
       }
     }
   }
-}
+}
+.data-table-action-icon {
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+}

package/src/dataTable/dataTable.interface.ts

@@ -1,45 +1,51 @@
 import { HTMLInputTypeAttribute } from "react";
+import { EnumerableType } from "../_core/type/generiqueType";
+import { TypeInputEnum } from "../form/form.enum";
 
-export interface dataTableColumnsInterface<T> {
+export interface DataTableColumnsInterface<T> {
   id: string;
   label: string;
+  key?: string;
+  name?: string;
+  sticky?: boolean;
   minWidth?: number;
   maxWidth?: number;
   width?: number;
   align?: "right" | "left" | "center";
+  alignText?: "right" | "left" | "center";
   format?: (value: any) => string;
   sortable?: boolean;
   filterable?: boolean;
-  filterValue?: string;
+  filterDataEnum?: EnumerableType[];
+  filterType?: TypeInputEnum;
   editable?: boolean;
-  enterToNextColumn?: boolean;
+  isUpdatable?: boolean;
   options?: { label: string; value: string }[];
+  displayOverlay?: boolean;
+  onEditable?: (value: any, row: T) => boolean;
+  onChange?: (value: any, row: T) => void;
+  onEditByOverlay?: (value: any, row: T) => void;
   onEdit?: (value: any, row: T) => void;
-  onEnter?: (value: any, row: T) => void;
   onDisable?: (row: T) => boolean;
+  onEditTrigger?: "change" | "enter";
   onRowStyle?: (row: T) => React.CSSProperties;
-  type: HTMLInputTypeAttribute | "select" | "image";
-  imageAlt?: (row: T) => string;
-  imageStyle?: React.CSSProperties;
-  imageSrc?: (row: T) => string;
-  showStepButtons?: boolean | ((row: T) => boolean);
-  stepControls?: boolean | ((row: T) => boolean);
-  withStepControls?: boolean | ((row: T) => boolean);
-  step?: number;
-  min?: number;
-  max?: number;
+  renderComponent?: (value: any, row: T) => JSX.Element;
+  openClickCell?: boolean;
+  handleClickCell?: (e: React.MouseEvent<HTMLTableCellElement>, row: T) => void;
+  renderClickCellComponent?: (value: any, row: T) => JSX.Element;
+  type: HTMLInputTypeAttribute | "select";
+  children?: DataTableColumnsInterface<T>[];
 }
-export interface dataTableActionsInterface<T> {
+export interface DataTableActionsInterface<T> {
   id: string;
   label: string;
   type: "button" | "link" | "icon";
   classIcon?: string;
-  onClick: (row: T, rowIndex?: number) => void;
+  onClick: (row: T) => void;
   shouldDisplay?: (row: T) => boolean;
   disabled?: boolean;
   labelButton?: (row: T) => string;
   visible?: boolean;
-  width?: string | number;
-  minWidth?: string | number;
-  focusNextRow?: boolean;
+  // Largeur (px) réservée à l'action ; la colonne des actions fait la somme des largeurs
+  width?: number;
 }

package/src/dataTable/dataTableActions/DataTableAction.tsx

@@ -1,19 +1,15 @@
 import { Button } from "../../button/Button";
 import { Icon } from "../../icon/Icon";
-import { dataTableActionsInterface } from "../dataTable.interface";
+import { DataTableActionsInterface } from "../dataTable.interface";
 type DataTableActionProps = {
-  action: dataTableActionsInterface<any>;
+  action: DataTableActionsInterface<any>;
   row: any;
-  rowIndex?: number;
   index?: number;
-  onFocusNextRow?: (rowIndex: number) => void;
 };
 export const DataTableAction = ({
   action,
   row,
-  rowIndex,
   index,
-  onFocusNextRow,
 }: DataTableActionProps) => {
   let title = action.label;
   const display = action.shouldDisplay ? action.shouldDisplay(row) : true;
@@ -21,27 +17,18 @@ export const DataTableAction = ({
   if (action.labelButton) {
     title = action.labelButton ? action.labelButton(row) : action.label;
   }
-
-  const handleClick = (e?: React.MouseEvent) => {
-    e?.stopPropagation();
-    action.onClick(row, rowIndex);
-    if (action.focusNextRow && rowIndex !== undefined) {
-      onFocusNextRow?.(rowIndex);
-    }
-  };
-
   return (
     <>
       {action.type === "button" && (
         <Button
           title={title}
           key={`button-action-${action.id}-${index}`}
-          onClick={handleClick}
-          disabled={action.disabled}
-          style={{
-            minWidth: action.minWidth,
-            width: action.width,
+          onClick={(e) => {
+            // évite de déclencher le onRowClick de la ligne
+            e?.stopPropagation?.();
+            action.onClick(row);
           }}
+          disabled={action.disabled}
           className={`data-table-action button--tertiary mr-2 w-100 ${
             action.classIcon ? action.classIcon : ""
           }`}
@@ -50,11 +37,13 @@ export const DataTableAction = ({
       {action.type === "icon" && (
         <div
           key={`icon-action-${action.id}-${index}`}
-          className={`mr-2 `}
-          onClick={handleClick}
-          style={{
-            minWidth: action.minWidth,
-            width: action.width,
+          className={`mr-2 data-table-action-icon`}
+          title={title}
+          role="button"
+          onClick={(e) => {
+            // évite de déclencher le onRowClick de la ligne
+            e.stopPropagation();
+            action.onClick(row);
           }}
         >
           <Icon classIcon={action.classIcon ?? ""} key={action.id} />

package/src/dataTable/dataTableColumn/DataTableColumn.tsx

@@ -1,27 +1,77 @@
-import { dataTableColumnsInterface } from "../dataTable.interface";
+import { DataTableSortDirection } from "../DataTable";
+import { DataTableColumnsInterface } from "../dataTable.interface";
+import { DataTableColumnFilter } from "./dataTableColumnFilter/DataTableColumnFilter";
+import { DataTableColumnSort } from "./dataTableColumnSort/DataTableColumnSort";
 
-type DataTableColumnProps = {
-  column: dataTableColumnsInterface<any>;
-  idx: number;
-  onColumnClick?: (column: dataTableColumnsInterface<any>) => void;
-};
-export const DataTableColumn = ({
+export function DataTableColumn<T>({
   column,
   idx,
   onColumnClick,
-}: DataTableColumnProps) => {
+  hasNestedColumns,
+  isFilterVisible,
+  onToggleFilterVisibility,
+  currentSortDirection,
+  onToggleSort,
+  stickyLeft,
+  stickyTop,
+}: {
+  hasNestedColumns: boolean;
+  column: DataTableColumnsInterface<T>;
+  idx: number;
+  onColumnClick?: (column: DataTableColumnsInterface<T>) => void;
+  isFilterVisible?: boolean;
+  onToggleFilterVisibility?: (column: DataTableColumnsInterface<T>) => void;
+  currentSortDirection?: DataTableSortDirection | null;
+  onToggleSort?: (column: DataTableColumnsInterface<T>) => void;
+  stickyLeft?: number;
+  stickyTop?: number;
+}) {
+  const hasChildren = !!column.children?.length;
+  const isSticky = stickyLeft !== undefined;
+
   return (
     <th
       key={`colonne-${column.id}-${idx}`}
       style={{
-        minWidth: column.minWidth,
-        maxWidth: column.maxWidth,
-        width: column.width,
-        textAlign: column.align || "left",
+        minWidth: hasChildren ? undefined : column.minWidth,
+        maxWidth: hasChildren ? undefined : column.maxWidth,
+        width: hasChildren ? undefined : column.width,
+        textAlign: column.align ?? "left",
+        alignContent: column.children ? "center" : "flex-end",
+        top: stickyTop,
+        ...(isSticky
+          ? {
+              position: "sticky",
+              left: stickyLeft,
+              zIndex: 13,
+              backgroundColor: "#f9fbfc",
+            }
+          : {}),
       }}
+      className={`${column.children ? "has-children" : ""} ${
+        isSticky ? "data-table-sticky-cell" : ""
+      }`.trim()}
+      colSpan={column.children?.length ?? 1}
+      rowSpan={!column.children?.length && hasNestedColumns ? 2 : 1}
       onClick={() => onColumnClick?.(column)}
     >
-      {column.label}
+      <div className="d-flex align-items-center">
+        <div className="flex-1">{column.label}</div>
+        {column.filterable && (
+          <DataTableColumnFilter
+            column={column}
+            isFilterVisible={isFilterVisible}
+            onToggleVisibility={onToggleFilterVisibility}
+          />
+        )}
+        {column.sortable && (
+          <DataTableColumnSort
+            column={column}
+            sortDirection={currentSortDirection}
+            onToggleSort={onToggleSort}
+          />
+        )}
+      </div>
     </th>
   );
-};
+}