@addev-be/ui 0.15.0 → 0.16.0

package/src/components/data/DataGrid/DataGridHeaderCell.tsx

@@ -1,115 +1,111 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unnecessary-type-constraint */
-
-import * as styles from './styles';
-
-import { useCallback, useMemo, useRef, useState } from 'react';
-
-import { ChevronDownIcon } from '../../../Icons';
-import { DataGridFilterMenu } from './DataGridFilterMenu';
-import { DataGridHeaderCellProps } from './types';
-import { Dropdown } from '../../layout';
-import { IconButton } from '../../forms/IconButton';
-import { useDataGridContext } from './hooks';
-import { useUi } from '../../../providers';
-
-export const DataGridHeaderCell = <R,>({
-  columnKey,
-  columnIndex,
-  column,
-  context,
-}: DataGridHeaderCellProps<R>) => {
-  const { getElementScreenRect } = useUi();
-  const contextValue = useDataGridContext(context);
-  const {
-    filters = {},
-    headerColor,
-    resizingColumnKey,
-    startResizing,
-  } = contextValue;
-  const filterButtonRef = useRef<HTMLButtonElement | null>(null);
-
-  /** RESIZING */
-
-  const [isFilterDropdownVisible, setIsFilterDropdownVisible] = useState(false);
-  const filterDropdown = useMemo(() => {
-    if (
-      !isFilterDropdownVisible ||
-      !filterButtonRef.current ||
-      !columnKey ||
-      !column.filter
-    ) {
-      return null;
-    }
-    const filterButtonRect = getElementScreenRect(filterButtonRef.current);
-    filterButtonRect.x += window.scrollX;
-    filterButtonRect.y += window.scrollY;
-    return (
-      <Dropdown
-        $sourceRect={filterButtonRect}
-        onClose={() => setIsFilterDropdownVisible(false)}
-        $width={320}
-        $height={[350, 500]}
-        $autoPositionX
-      >
-        <DataGridFilterMenu
-          column={column}
-          columnKey={columnKey}
-          columnIndex={columnIndex}
-          context={context}
-          onClose={() => setIsFilterDropdownVisible(false)}
-        />
-      </Dropdown>
-    );
-  }, [
-    column,
-    columnIndex,
-    columnKey,
-    context,
-    getElementScreenRect,
-    isFilterDropdownVisible,
-  ]);
-
-  const onFilterButtonClicked = useCallback(() => {
-    setIsFilterDropdownVisible(true);
-  }, []);
-
-  const isResizing = resizingColumnKey === columnKey;
-  const hasFilters = filters[columnKey]?.values.length > 0;
-
-  return (
-    <styles.DataGridHeaderCellContainer
-      $headerColor={column.color ?? headerColor}
-      $isResizing={isResizing}
-    >
-      {filterDropdown}
-
-      {typeof column.name === 'string' ? (
-        <span>{column.name}</span>
-      ) : (
-        <styles.DataGridHeaderTextContainer>
-          {column.name}
-        </styles.DataGridHeaderTextContainer>
-      )}
-      {!!column.filter && (
-        <IconButton
-          size="small"
-          className={hasFilters ? 'danger' : ''}
-          ref={filterButtonRef}
-          icon={ChevronDownIcon}
-          color={hasFilters ? 'danger' : headerColor}
-          onClick={onFilterButtonClicked}
-        />
-      )}
-      {column.resizable !== false && (
-        <>
-          <styles.DataGridResizeGrip
-            className={isResizing ? 'active' : ''}
-            $headerColor={headerColor}
-            onMouseDown={(e) => startResizing(e, columnKey)}
-          />
-        </>
-      )}
-    </styles.DataGridHeaderCellContainer>
-  );
-};
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unnecessary-type-constraint */
+
+import * as styles from './styles';
+
+import { useCallback, useMemo, useRef, useState } from 'react';
+
+import { ChevronDownIcon } from '../../../Icons';
+import { DataGridFilterMenu } from './DataGridFilterMenu';
+import { DataGridHeaderCellProps } from './types';
+import { Dropdown } from '../../layout';
+import { IconButton } from '../../forms/IconButton';
+import { useDataGridContext } from './hooks';
+import { useUi } from '../../../providers';
+
+export const DataGridHeaderCell = <R,>({
+  columnKey,
+  column,
+  context,
+}: DataGridHeaderCellProps<R>) => {
+  const { getElementScreenRect } = useUi();
+  const contextValue = useDataGridContext(context);
+  const {
+    filters = {},
+    headerColor,
+    resizingColumnKey,
+    startResizing,
+  } = contextValue;
+  const filterButtonRef = useRef<HTMLButtonElement | null>(null);
+
+  /** RESIZING */
+
+  const [isFilterDropdownVisible, setIsFilterDropdownVisible] = useState(false);
+  const filterDropdown = useMemo(() => {
+    if (
+      !isFilterDropdownVisible ||
+      !filterButtonRef.current ||
+      !columnKey ||
+      !column.filter
+    ) {
+      return null;
+    }
+    const filterButtonRect = getElementScreenRect(filterButtonRef.current);
+    filterButtonRect.x += window.scrollX;
+    filterButtonRect.y += window.scrollY;
+    return (
+      <Dropdown
+        $sourceRect={filterButtonRect}
+        onClose={() => setIsFilterDropdownVisible(false)}
+        $width={320}
+        $height={[350, 500]}
+        $autoPositionX
+      >
+        <DataGridFilterMenu
+          column={column as any}
+          context={context}
+          onClose={() => setIsFilterDropdownVisible(false)}
+        />
+      </Dropdown>
+    );
+  }, [
+    column,
+    columnKey,
+    context,
+    getElementScreenRect,
+    isFilterDropdownVisible,
+  ]);
+
+  const onFilterButtonClicked = useCallback(() => {
+    setIsFilterDropdownVisible(true);
+  }, []);
+
+  const isResizing = resizingColumnKey === columnKey;
+  const hasFilters = filters[columnKey]?.values.length > 0;
+
+  return (
+    <styles.DataGridHeaderCellContainer
+      $headerColor={column.color ?? headerColor}
+      $isResizing={isResizing}
+    >
+      {filterDropdown}
+
+      {typeof column.name === 'string' ? (
+        <span>{column.name}</span>
+      ) : (
+        <styles.DataGridHeaderTextContainer>
+          {column.name}
+        </styles.DataGridHeaderTextContainer>
+      )}
+      {!!column.filter && (
+        <IconButton
+          size="small"
+          className={hasFilters ? 'danger' : ''}
+          ref={filterButtonRef}
+          icon={ChevronDownIcon}
+          color={hasFilters ? 'danger' : headerColor}
+          onClick={onFilterButtonClicked}
+        />
+      )}
+      {column.resizable !== false && (
+        <>
+          <styles.DataGridResizeGrip
+            className={isResizing ? 'active' : ''}
+            $headerColor={headerColor}
+            onMouseDown={(e) => startResizing(e, columnKey)}
+          />
+        </>
+      )}
+    </styles.DataGridHeaderCellContainer>
+  );
+};

package/src/components/data/DataGrid/DataGridRowTemplate.tsx

@@ -1,78 +1,80 @@
-import * as styles from './styles';
-
-import { DataGridCell } from './DataGridCell';
-import { DataGridRowTemplateProps } from './types';
-import { VirtualScrollerTemplateProps } from '../VirtualScroller/types';
-import { useContext } from 'react';
-
-export const DataGridRowTemplate = <R,>({
-  item,
-  index: rowIndex,
-  context,
-}: VirtualScrollerTemplateProps<R, DataGridRowTemplateProps<R>>) => {
-  const {
-    visibleColumns,
-    rowKeyGetter,
-    toggleSelection,
-    addedRows: editedRows,
-    ...props
-  } = useContext(context);
-
-  if (!item) {
-    return (
-      <styles.DataGridRow key={`loading-row-${rowIndex}`}>
-        {!!props.selectable && (
-          <styles.LoadingCell className="animate-pulse">
-            <div />
-          </styles.LoadingCell>
-        )}
-        {visibleColumns.map((_, colIndex) => (
-          <styles.LoadingCell
-            className="animate-pulse"
-            key={`loading-${rowIndex}-${colIndex}`}
-          >
-            <div />
-          </styles.LoadingCell>
-        ))}
-      </styles.DataGridRow>
-    );
-  }
-  const rowKey = rowKeyGetter(item);
-  const selected = props.selectedKeys.includes(rowKey);
-  const { className, style } = props.rowClassNameGetter?.(item) ?? {
-    className: '',
-    style: undefined,
-  };
-  const isEdited = rowKey in editedRows;
-
-  return (
-    <styles.DataGridRow key={rowKey} $edited={isEdited}>
-      {!!props.selectable && (
-        <styles.SelectionCell
-          key="__select_checkbox__"
-          onClick={() => toggleSelection(rowKey)}
-        >
-          <input
-            type="checkbox"
-            value={rowKey as string}
-            checked={selected}
-            readOnly
-          />
-        </styles.SelectionCell>
-      )}
-      {visibleColumns.map((col, colIndex) => (
-        <DataGridCell
-          key={`loading-${colIndex}-${colIndex}`}
-          {...(colIndex === 0 ? { className, style } : {})}
-          row={item}
-          rowIndex={rowIndex}
-          column={col}
-          columnIndex={colIndex}
-          context={context}
-          columnKey={col.key}
-          color={col.color}
-        />
-      ))}
-    </styles.DataGridRow>
-  );
-};
+import * as styles from './styles';
+
+import { DataGridCell } from './DataGridCell';
+import { DataGridRowTemplateProps } from './types';
+import { VirtualScrollerTemplateProps } from '../VirtualScroller/types';
+import { useContext } from 'react';
+
+export const DataGridRowTemplate = <R,>({
+  item,
+  index: rowIndex,
+  context,
+}: VirtualScrollerTemplateProps<R, DataGridRowTemplateProps<R>>) => {
+  const {
+    visibleColumns,
+    rowKeyGetter,
+    toggleSelection,
+    updatedRows,
+    addedRows,
+    ...props
+  } = useContext(context);
+
+  if (!item) {
+    return (
+      <styles.DataGridRow key={`loading-row-${rowIndex}`}>
+        {!!props.selectable && (
+          <styles.LoadingCell className="animate-pulse">
+            <div />
+          </styles.LoadingCell>
+        )}
+        {visibleColumns.map((_, colIndex) => (
+          <styles.LoadingCell
+            className="animate-pulse"
+            key={`loading-${rowIndex}-${colIndex}`}
+          >
+            <div />
+          </styles.LoadingCell>
+        ))}
+      </styles.DataGridRow>
+    );
+  }
+  const rowKey = rowKeyGetter(item);
+  const selected = props.selectedKeys.includes(rowKey);
+  const { className, style } = props.rowClassNameGetter?.(item) ?? {
+    className: '',
+    style: undefined,
+  };
+  const isAdded = rowKey in addedRows;
+  const isUpdated = rowKey in updatedRows;
+
+  return (
+    <styles.DataGridRow key={rowKey} $edited={isAdded || isUpdated}>
+      {!!props.selectable && (
+        <styles.SelectionCell
+          key="__select_checkbox__"
+          onClick={() => toggleSelection(rowKey)}
+        >
+          <input
+            type="checkbox"
+            value={rowKey as string}
+            checked={selected}
+            readOnly
+          />
+        </styles.SelectionCell>
+      )}
+      {visibleColumns.map((col, colIndex) => (
+        <DataGridCell
+          key={`loading-${colIndex}-${colIndex}`}
+          {...(colIndex === 0 ? { className, style } : {})}
+          row={item}
+          rowIndex={rowIndex}
+          column={col}
+          columnIndex={colIndex}
+          context={context}
+          columnKey={col.key}
+          color={col.color}
+        />
+      ))}
+    </styles.DataGridRow>
+  );
+};

package/src/components/data/DataGrid/FilterModalContent/index.tsx

@@ -1,136 +1,136 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unnecessary-type-constraint */
-
-import * as styles from './styles';
-
-import {
-  DataGridFilter,
-  DataGridFilterOperator,
-  DataGridFilterType,
-} from '../types';
-import { Input, Select } from '../../../forms';
-import { useEffect, useRef } from 'react';
-
-// import { Select } from '../../Select';
-// import clx from 'classnames';
-
-const filterOperators: {
-  [K in DataGridFilterType]: Partial<{
-    [K2 in DataGridFilterOperator<K>]: string;
-  }>;
-} = {
-  date: {
-    after: 'Après',
-    before: 'Avant',
-    equals: 'Égal à',
-    notEquals: 'Différent de',
-    inRange: "Dans l'intervalle",
-  },
-  number: {
-    equals: 'Égal à',
-    notEquals: 'Différent de',
-    greaterThan: 'Supérieur à',
-    greaterThanOrEqual: 'Supérieur ou égal à',
-    lessThan: 'Inférieur à',
-    lessThanOrEqual: 'Inférieur ou égal à',
-    inRange: "Dans l'intervalle",
-  },
-  text: {
-    equals: 'Égal à',
-    notEquals: 'Différent de',
-    contains: 'Contient',
-    notContains: 'Ne contient pas',
-    startsWith: 'Commence par',
-    endsWith: 'Finit par',
-  },
-};
-
-type FilterModalContentProps = {
-  filter: DataGridFilter;
-  onFilterChanged: (filter: DataGridFilter) => void;
-};
-
-export const FilterModalContent = ({
-  filter,
-  onFilterChanged,
-}: FilterModalContentProps) => {
-  const value1Ref = useRef<HTMLInputElement>(null);
-  useEffect(() => {
-    setTimeout(() => value1Ref.current?.focus(), 100);
-  }, []);
-
-  if (!filter) return null;
-
-  const { operator, type, values } = filter;
-  return (
-    <styles.FilterModalContentContainer>
-      <label htmlFor="filterOperator">
-        <span>Opérateur :</span>
-        <Select
-          name="filterOperator"
-          items={Object.entries(filterOperators[filter.type])}
-          itemKey={0}
-          itemLabel={1}
-          value={String(operator)}
-          className="text-sm"
-          onChange={(e) =>
-            onFilterChanged({ ...filter, operator: e.target.value as any })
-          }
-        />
-      </label>
-      <label htmlFor="filterValue1">
-        <span>{operator === 'inRange' ? 'Entre' : 'Valeur'} :</span>
-        <Input
-          ref={value1Ref}
-          name="filterValue1"
-          type={filter.type}
-          value={values[0] ?? ''}
-          onChange={(e) => {
-            if (type === 'number') {
-              const newValues = [...values];
-              newValues[0] = Number(e.target.value);
-              onFilterChanged({
-                ...filter,
-                values: newValues,
-              });
-            } else {
-              const newValues = [...values];
-              newValues[0] = String(e.target.value) as any;
-              onFilterChanged({
-                ...filter,
-                values: newValues,
-              });
-            }
-          }}
-        />
-      </label>
-      {operator === 'inRange' && (
-        <label htmlFor="filterValue2">
-          <span>et</span>
-          <Input
-            name="filterValue2"
-            type={filter.type}
-            value={values[1] ?? ''}
-            onChange={(e) => {
-              if (type === 'number') {
-                const newValues = [...values];
-                newValues[1] = Number(e.target.value);
-                onFilterChanged({
-                  ...filter,
-                  values: newValues,
-                });
-              } else {
-                const newValues = [...values];
-                newValues[1] = String(e.target.value) as any;
-                onFilterChanged({
-                  ...filter,
-                  values: newValues,
-                });
-              }
-            }}
-          />
-        </label>
-      )}
-    </styles.FilterModalContentContainer>
-  );
-};
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unnecessary-type-constraint */
+
+import * as styles from './styles';
+
+import {
+  DataGridFilter,
+  DataGridFilterOperator,
+  DataGridFilterType,
+} from '../types';
+import { Input, Select } from '../../../forms';
+import { useEffect, useRef } from 'react';
+
+// import { Select } from '../../Select';
+// import clx from 'classnames';
+
+const filterOperators: {
+  [K in DataGridFilterType]: Partial<{
+    [K2 in DataGridFilterOperator<K>]: string;
+  }>;
+} = {
+  date: {
+    after: 'Après',
+    before: 'Avant',
+    equals: 'Égal à',
+    notEquals: 'Différent de',
+    inRange: "Dans l'intervalle",
+  },
+  number: {
+    equals: 'Égal à',
+    notEquals: 'Différent de',
+    greaterThan: 'Supérieur à',
+    greaterThanOrEqual: 'Supérieur ou égal à',
+    lessThan: 'Inférieur à',
+    lessThanOrEqual: 'Inférieur ou égal à',
+    inRange: "Dans l'intervalle",
+  },
+  text: {
+    equals: 'Égal à',
+    notEquals: 'Différent de',
+    contains: 'Contient',
+    notContains: 'Ne contient pas',
+    startsWith: 'Commence par',
+    endsWith: 'Finit par',
+  },
+};
+
+type FilterModalContentProps = {
+  filter: DataGridFilter;
+  onFilterChanged: (filter: DataGridFilter) => void;
+};
+
+export const FilterModalContent = ({
+  filter,
+  onFilterChanged,
+}: FilterModalContentProps) => {
+  const value1Ref = useRef<HTMLInputElement>(null);
+  useEffect(() => {
+    setTimeout(() => value1Ref.current?.focus(), 100);
+  }, []);
+
+  if (!filter) return null;
+
+  const { operator, type, values } = filter;
+  return (
+    <styles.FilterModalContentContainer>
+      <label htmlFor="filterOperator">
+        <span>Opérateur :</span>
+        <Select
+          name="filterOperator"
+          items={Object.entries(filterOperators[filter.type])}
+          itemKey={(item) => item[0]}
+          itemLabel={(item) => item[1]}
+          value={String(operator)}
+          className="text-sm"
+          onChange={(e) =>
+            onFilterChanged({ ...filter, operator: e.target.value as any })
+          }
+        />
+      </label>
+      <label htmlFor="filterValue1">
+        <span>{operator === 'inRange' ? 'Entre' : 'Valeur'} :</span>
+        <Input
+          ref={value1Ref}
+          name="filterValue1"
+          type={filter.type}
+          value={values[0] ?? ''}
+          onChange={(e) => {
+            if (type === 'number') {
+              const newValues = [...values];
+              newValues[0] = Number(e.target.value);
+              onFilterChanged({
+                ...filter,
+                values: newValues,
+              });
+            } else {
+              const newValues = [...values];
+              newValues[0] = String(e.target.value) as any;
+              onFilterChanged({
+                ...filter,
+                values: newValues,
+              });
+            }
+          }}
+        />
+      </label>
+      {operator === 'inRange' && (
+        <label htmlFor="filterValue2">
+          <span>et</span>
+          <Input
+            name="filterValue2"
+            type={filter.type}
+            value={values[1] ?? ''}
+            onChange={(e) => {
+              if (type === 'number') {
+                const newValues = [...values];
+                newValues[1] = Number(e.target.value);
+                onFilterChanged({
+                  ...filter,
+                  values: newValues,
+                });
+              } else {
+                const newValues = [...values];
+                newValues[1] = String(e.target.value) as any;
+                onFilterChanged({
+                  ...filter,
+                  values: newValues,
+                });
+              }
+            }}
+          />
+        </label>
+      )}
+    </styles.FilterModalContentContainer>
+  );
+};