qbs-react-grid 2.0.1 → 2.0.2

package/es/qbsTable/CustomTableCell.js

@@ -112,7 +112,7 @@ export var CustomTableCell = /*#__PURE__*/React.memo(function (_ref4) {
     path = _ref4.path,
     link = _ref4.link,
     props = _objectWithoutPropertiesLoose(_ref4, _excluded3);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cell, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(Cell, _extends({}, props, {
     dataKey: dataKey
   }), link && !path && !(hideLink !== null && hideLink !== void 0 && hideLink(rowData)) ? /*#__PURE__*/React.createElement("a", {
     onClick: function onClick() {
@@ -122,7 +122,7 @@ export var CustomTableCell = /*#__PURE__*/React.memo(function (_ref4) {
   }, renderCell ? (_renderCell = renderCell(rowData)) === null || _renderCell === void 0 ? void 0 : _renderCell.cell : handleCellFormat(rowData[dataKey], type)) : path && !(hideLink !== null && hideLink !== void 0 && hideLink(rowData)) ? /*#__PURE__*/React.createElement(Link, {
     to: (_path = path === null || path === void 0 ? void 0 : path(rowData)) != null ? _path : '',
     className: "qbs-table-row-link"
-  }, renderCell ? (_renderCell2 = renderCell(rowData)) === null || _renderCell2 === void 0 ? void 0 : _renderCell2.cell : handleCellFormat(rowData[dataKey], type)) : /*#__PURE__*/React.createElement(React.Fragment, null, renderCell ? (_renderCell3 = renderCell(rowData)) === null || _renderCell3 === void 0 ? void 0 : _renderCell3.cell : handleCellFormat(rowData[dataKey], type))));
+  }, renderCell ? (_renderCell2 = renderCell(rowData)) === null || _renderCell2 === void 0 ? void 0 : _renderCell2.cell : handleCellFormat(rowData[dataKey], type)) : renderCell ? (_renderCell3 = renderCell(rowData)) === null || _renderCell3 === void 0 ? void 0 : _renderCell3.cell : handleCellFormat(rowData[dataKey], type));
 });
 export var CustomRowStatus = /*#__PURE__*/React.memo(function (_ref5) {
   var _path2;
@@ -154,7 +154,7 @@ export var CustomRowStatus = /*#__PURE__*/React.memo(function (_ref5) {
       }
     }
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cell, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(Cell, _extends({}, props, {
     dataKey: dataKey,
     style: {
       padding: 0,
@@ -190,5 +190,5 @@ export var CustomRowStatus = /*#__PURE__*/React.memo(function (_ref5) {
     style: {
       position: 'fixed'
     }
-  }, getToolTip === null || getToolTip === void 0 ? void 0 : getToolTip(rowData)))));
+  }, getToolTip === null || getToolTip === void 0 ? void 0 : getToolTip(rowData))));
 });

package/es/qbsTable/QbsTable.js

@@ -538,11 +538,11 @@ var QbsTable = function QbsTable(_ref) {
         dataKey: field,
         dataTheme: dataTheme,
         className: " " + classes.cellClass
-      })) : /*#__PURE__*/React.createElement(React.Fragment, null);
+      })) : null;
     } // ✅ Fix: Return `null` instead of `false`
     ).filter(Boolean);
   },
-  // ✅ Fix: Remove `undefined` and `false` elements
+  // ✅ Fix: Type assertion to ReactElement[]
   [columns, dataTheme]);
   return /*#__PURE__*/React.createElement("div", {
     className: "qbs-table " + classes.tableContainerClass,

package/es/utils/useCellDescriptor.js

@@ -151,6 +151,7 @@ var useCellDescriptor = function useCellDescriptor(props) {
       if (treeCol) {
         hasCustomTreeCol = true;
       }
+      console.log(columns);
       if ((columnChildren === null || columnChildren === void 0 ? void 0 : columnChildren.length) !== 2) {
         throw new Error("Component <HeaderCell> and <Cell> is required, column index: " + index + " ");
       }

package/lib/qbsTable/CustomTableCell.js

@@ -122,7 +122,7 @@ var CustomTableCell = /*#__PURE__*/_react["default"].memo(function (_ref4) {
     path = _ref4.path,
     link = _ref4.link,
     props = (0, _objectWithoutPropertiesLoose2["default"])(_ref4, _excluded3);
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Cell["default"], (0, _extends2["default"])({}, props, {
+  return /*#__PURE__*/_react["default"].createElement(_Cell["default"], (0, _extends2["default"])({}, props, {
     dataKey: dataKey
   }), link && !path && !(hideLink !== null && hideLink !== void 0 && hideLink(rowData)) ? /*#__PURE__*/_react["default"].createElement("a", {
     onClick: function onClick() {
@@ -132,7 +132,7 @@ var CustomTableCell = /*#__PURE__*/_react["default"].memo(function (_ref4) {
   }, renderCell ? (_renderCell = renderCell(rowData)) === null || _renderCell === void 0 ? void 0 : _renderCell.cell : (0, _handleFormatCell.handleCellFormat)(rowData[dataKey], type)) : path && !(hideLink !== null && hideLink !== void 0 && hideLink(rowData)) ? /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
     to: (_path = path === null || path === void 0 ? void 0 : path(rowData)) != null ? _path : '',
     className: "qbs-table-row-link"
-  }, renderCell ? (_renderCell2 = renderCell(rowData)) === null || _renderCell2 === void 0 ? void 0 : _renderCell2.cell : (0, _handleFormatCell.handleCellFormat)(rowData[dataKey], type)) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, renderCell ? (_renderCell3 = renderCell(rowData)) === null || _renderCell3 === void 0 ? void 0 : _renderCell3.cell : (0, _handleFormatCell.handleCellFormat)(rowData[dataKey], type))));
+  }, renderCell ? (_renderCell2 = renderCell(rowData)) === null || _renderCell2 === void 0 ? void 0 : _renderCell2.cell : (0, _handleFormatCell.handleCellFormat)(rowData[dataKey], type)) : renderCell ? (_renderCell3 = renderCell(rowData)) === null || _renderCell3 === void 0 ? void 0 : _renderCell3.cell : (0, _handleFormatCell.handleCellFormat)(rowData[dataKey], type));
 });
 exports.CustomTableCell = CustomTableCell;
 var CustomRowStatus = /*#__PURE__*/_react["default"].memo(function (_ref5) {
@@ -165,7 +165,7 @@ var CustomRowStatus = /*#__PURE__*/_react["default"].memo(function (_ref5) {
       }
     }
   };
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Cell["default"], (0, _extends2["default"])({}, props, {
+  return /*#__PURE__*/_react["default"].createElement(_Cell["default"], (0, _extends2["default"])({}, props, {
     dataKey: dataKey,
     style: {
       padding: 0,
@@ -201,6 +201,6 @@ var CustomRowStatus = /*#__PURE__*/_react["default"].memo(function (_ref5) {
     style: {
       position: 'fixed'
     }
-  }, getToolTip === null || getToolTip === void 0 ? void 0 : getToolTip(rowData)))));
+  }, getToolTip === null || getToolTip === void 0 ? void 0 : getToolTip(rowData))));
 });
 exports.CustomRowStatus = CustomRowStatus;

package/lib/qbsTable/QbsTable.js

@@ -544,11 +544,11 @@ var QbsTable = function QbsTable(_ref) {
         dataKey: field,
         dataTheme: dataTheme,
         className: " " + classes.cellClass
-      })) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null);
+      })) : null;
     } // ✅ Fix: Return `null` instead of `false`
     ).filter(Boolean);
   },
-  // ✅ Fix: Remove `undefined` and `false` elements
+  // ✅ Fix: Type assertion to ReactElement[]
   [columns, dataTheme]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "qbs-table " + classes.tableContainerClass,

package/lib/utils/useCellDescriptor.js

@@ -158,6 +158,7 @@ var useCellDescriptor = function useCellDescriptor(props) {
       if (treeCol) {
         hasCustomTreeCol = true;
       }
+      console.log(columns);
       if ((columnChildren === null || columnChildren === void 0 ? void 0 : columnChildren.length) !== 2) {
         throw new Error("Component <HeaderCell> and <Cell> is required, column index: " + index + " ");
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qbs-react-grid",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A React table component",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

package/src/qbsTable/CustomTableCell.tsx

@@ -110,21 +110,21 @@ export const CustomTableCell: React.FC<any> = React.memo(
     ...props
   }) => {
     return (
-      <>
-        <Cell {...props} dataKey={dataKey}>
-          {link && !path && !hideLink?.(rowData) ? (
-            <a onClick={() => rowClick?.(rowData)} className="qbs-table-row-link">
-              {renderCell ? renderCell(rowData)?.cell : handleCellFormat(rowData[dataKey], type)}
-            </a>
-          ) : path && !hideLink?.(rowData) ? (
-            <Link to={path?.(rowData) ?? ''} className="qbs-table-row-link">
-              {renderCell ? renderCell(rowData)?.cell : handleCellFormat(rowData[dataKey], type)}
-            </Link>
-          ) : (
-            <>{renderCell ? renderCell(rowData)?.cell : handleCellFormat(rowData[dataKey], type)}</>
-          )}
-        </Cell>
-      </>
+      <Cell {...props} dataKey={dataKey}>
+        {link && !path && !hideLink?.(rowData) ? (
+          <a onClick={() => rowClick?.(rowData)} className="qbs-table-row-link">
+            {renderCell ? renderCell(rowData)?.cell : handleCellFormat(rowData[dataKey], type)}
+          </a>
+        ) : path && !hideLink?.(rowData) ? (
+          <Link to={path?.(rowData) ?? ''} className="qbs-table-row-link">
+            {renderCell ? renderCell(rowData)?.cell : handleCellFormat(rowData[dataKey], type)}
+          </Link>
+        ) : renderCell ? (
+          renderCell(rowData)?.cell
+        ) : (
+          handleCellFormat(rowData[dataKey], type)
+        )}
+      </Cell>
     );
   }
 );
@@ -149,41 +149,39 @@ export const CustomRowStatus: React.FC<any> = React.memo(
     };
 
     return (
-      <>
-        <Cell
-          {...props}
-          dataKey={dataKey}
-          style={{ padding: 0, display: 'flex', justifyContent: 'center', alignItems: 'center' }}
-          onMouseEnter={() => adjustDropdownPosition()}
-        >
-          <div className="row-status">
-            {!path ? (
-              <span
-                ref={menuButtonRef}
-                style={{ height: 24, width: 24, display: 'flex' }}
-                onClick={() => rowClick?.(rowData)}
-              >
-                {getIcon?.(rowData)}
-              </span>
-            ) : (
-              <Link
-                style={{ height: 24, width: 24 }}
-                to={path?.(rowData) ?? ''}
-                className="qbs-table-row-link"
-              >
-                {getIcon?.(rowData)}
-              </Link>
-            )}
-            <div
-              ref={dropRef}
-              className={`row-status-tooltip ${dropdownPosition}`}
-              style={{ position: 'fixed' }}
+      <Cell
+        {...props}
+        dataKey={dataKey}
+        style={{ padding: 0, display: 'flex', justifyContent: 'center', alignItems: 'center' }}
+        onMouseEnter={() => adjustDropdownPosition()}
+      >
+        <div className="row-status">
+          {!path ? (
+            <span
+              ref={menuButtonRef}
+              style={{ height: 24, width: 24, display: 'flex' }}
+              onClick={() => rowClick?.(rowData)}
             >
-              {getToolTip?.(rowData)}
-            </div>
+              {getIcon?.(rowData)}
+            </span>
+          ) : (
+            <Link
+              style={{ height: 24, width: 24 }}
+              to={path?.(rowData) ?? ''}
+              className="qbs-table-row-link"
+            >
+              {getIcon?.(rowData)}
+            </Link>
+          )}
+          <div
+            ref={dropRef}
+            className={`row-status-tooltip ${dropdownPosition}`}
+            style={{ position: 'fixed' }}
+          >
+            {getToolTip?.(rowData)}
           </div>
-        </Cell>
-      </>
+        </div>
+      </Cell>
     );
   }
 );

package/src/qbsTable/QbsTable.tsx

@@ -558,11 +558,9 @@ const QbsTable: React.FC<QbsTableProps> = ({
                   )}
                 </Column>
               )
-            ) : (
-              <></>
-            ) // ✅ Fix: Return `null` instead of `false`
+            ) : null // ✅ Fix: Return `null` instead of `false`
         )
-        .filter(Boolean), // ✅ Fix: Remove `undefined` and `false` elements
+        .filter(Boolean) as React.ReactElement[], // ✅ Fix: Type assertion to ReactElement[]
     [columns, dataTheme]
   );
 

package/src/utils/useCellDescriptor.ts

@@ -202,10 +202,10 @@ const useCellDescriptor = <Row extends RowDataType>(
       const columnProps = getColumnProps(column);
 
       const { width, resizable, flexGrow, minWidth, onResize, treeCol } = columnProps;
-
       if (treeCol) {
         hasCustomTreeCol = true;
       }
+      console.log(columns);
 
       if (columnChildren?.length !== 2) {
         throw new Error(`Component <HeaderCell> and <Cell> is required, column index: ${index} `);