Exclude width from DOM props.

umami-software · Oct 12, 2023 · 4d74836 · 4d74836
1 parent 58b2dd5
commit 4d74836
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-basics",
-  "version": "0.102.0",
+  "version": "0.103.0",
   "description": "Everyday components for React",
   "license": "MIT",
   "repository": {

diff --git a/src/components/table/GridTable.tsx b/src/components/table/GridTable.tsx
@@ -14,12 +14,6 @@ export interface GridTableProps extends CommonProps {
 export function GridTable(props: GridTableProps) {
   const { data, className, style, children, cardMode, ...domProps } = props;
 
-  const gridTemplateColumns = mapChildren(children, ({ props }) => {
-    return props.hidden ? '' : props.width ?? defaultWidth;
-  })
-    .join(' ')
-    .trim();
-
   if (cardMode) {
     return (
       <div className={classNames(styles.cards, className)}>
@@ -33,6 +27,8 @@ export function GridTable(props: GridTableProps) {
                 hidden,
                 label,
                 alignment = 'start',
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                width,
                 ...domProps
               } = child.props;
 
@@ -59,6 +55,12 @@ export function GridTable(props: GridTableProps) {
     );
   }
 
+  const gridTemplateColumns = mapChildren(children, ({ props }) => {
+    return props.hidden ? '' : props.width ?? defaultWidth;
+  })
+    .join(' ')
+    .trim();
+
   return (
     <table
       {...domProps}
@@ -95,6 +97,8 @@ export function GridTable(props: GridTableProps) {
                 className,
                 hidden,
                 alignment = 'start',
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                width,
                 ...domProps
               } = child.props;