@insticc/react-datagrid-2 1.1.18 → 1.1.20

package/build/wrapper/index.js

@@ -444,14 +444,14 @@ var DataGrid = function DataGrid(_ref) {
   /**
    * Generates all the table's properties.
    */
-  var table = (0, _materialReactTable.useMaterialReactTable)(_objectSpread(_objectSpread({
+  var table = (0, _materialReactTable.useMaterialReactTable)({
     data: createRows,
     columns: createColumns(columns),
     enableRowSelection: disableRows.length > 0 ? function (row) {
       return !disableRows.includes(row.original[rowKey]);
     } : !disableSelect,
     enableSubRowSelection: hasSubRows,
-    enableMultiRowSelection: enableMultiRowSelection,
+    enableMultiRowSelection: true,
     enableFullScreenToggle: enableFullScreenToggle,
     enableDensityToggle: enableDensityToggle,
     enableGlobalFilter: enableGlobalFilter,
@@ -743,34 +743,23 @@ var DataGrid = function DataGrid(_ref) {
         }
       };
     },
-    onRowSelectionChange: setRowSelection
-  }, !disableSelect && {
+    onRowSelectionChange: setRowSelection,
     muiTableBodyRowProps: function muiTableBodyRowProps(_ref7) {
       var row = _ref7.row;
       return {
-        onClick: function onClick(event) {
-          event.preventDefault();
-          var rowId = row.id;
-          setRowSelection(function (prev) {
-            return prev[rowId] ? {} : _defineProperty({}, rowId, true);
-          });
-        },
         sx: {
-          cursor: 'pointer',
           backgroundColor: row.depth > 0 ? '#f0f0f0' : 'white'
         }
       };
-    }
-  }), {}, {
+    },
     onSortingChange: setSorting,
     enablePagination: enablePagination,
     enableTopToolbar: enableTopToolbar,
     enableBottomToolbar: enableBottomToolbar,
     enableExpanding: enableExpanding,
-    // the subrow only affect the subrow checkbox and the parent row checkbox is not affected, the parent row checkbox is only affected by the parent row checkbox
-    muiSelectCheckboxProps: function muiSelectCheckboxProps(_ref9) {
-      var row = _ref9.row;
-      return hasSubRows && {
+    muiSelectCheckboxProps: function muiSelectCheckboxProps(_ref8) {
+      var row = _ref8.row;
+      return {
         checked: rowSelection[row.id] || false,
         indeterminate: false,
         onChange: function onChange() {
@@ -781,6 +770,7 @@ var DataGrid = function DataGrid(_ref) {
               // If the row is already selected, deselect it
               delete newSelection[rowId];
             } else {
+              if (!enableMultiRowSelection) return _defineProperty({}, rowId, true);
               // If the row is not selected, select it
               newSelection[rowId] = true;
             }
@@ -796,7 +786,7 @@ var DataGrid = function DataGrid(_ref) {
     //       Hello
     //     </div>
     // )}
-  }));
+  });
   (0, _react.useEffect)(function () {
     var rows = table.getRowModel().rows.map(function (r) {
       return r.original;

package/build/wrapper/utils/DefaultCellTypes.js

@@ -175,12 +175,26 @@ var DEFAULT_CELL_TYPES = exports.DEFAULT_CELL_TYPES = {
   persons: function persons(_ref17) {
     var cell = _ref17.cell,
       column = _ref17.column;
-    var v = cell.getValue();
-    var arr = Array.isArray(v) ? v : typeof v === "string" ? v.split(/[,;]\s*/g).filter(Boolean) : [];
-    var label = arr[0] ? "".concat(arr[0]).concat(arr.length > 1 ? " et al." : "") : "N/A";
-    var tooltip = "".concat(column.columnDef.header, ":\n\u2022 ").concat(arr.join("\n• ") || "N/A");
+    var value = cell.getValue();
+    var arr;
+
+    // Normalize to array
+    if (Array.isArray(value)) {
+      arr = value;
+    } else if (typeof value === 'string') {
+      arr = value.split(/[,;]\s*/g).map(function (v) {
+        return v.trim();
+      }).filter(function (v) {
+        return v.length > 0;
+      });
+    } else {
+      arr = [];
+    }
+    var first = arr[0];
+    var text = first ? "".concat(first).concat(arr.length > 1 ? ' et al.' : '') : 'N/A';
+    var tooltip = "".concat(column.columnDef.header, ":\n\u2022 ").concat(arr.join('\n• ') || 'N/A');
     return /*#__PURE__*/React.createElement("span", {
       title: tooltip
-    }, label);
+    }, text);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@insticc/react-datagrid-2",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "",
   "main": "build/index.js",
   "files": [