dce-reactkit 3.2.2-beta.34 → 3.2.2-beta.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/index.js +20 -4
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/index.js +20 -4
- package/dist/esm/index.js.map +1 -1
- package/package.json +1 -1
- package/src/components/IntelliTable.tsx +27 -1
package/dist/esm/index.js
CHANGED
|
@@ -2387,13 +2387,13 @@ const IntelliTable = (props) => {
|
|
|
2387
2387
|
dispatch({
|
|
2388
2388
|
type: ActionType$1.ToggleColVisCusModalVisibility,
|
|
2389
2389
|
});
|
|
2390
|
-
} }, columns.map((column) => {
|
|
2391
|
-
return (React.createElement(CheckboxButton, { key: column.param, id: `IntelliTable-${id}-toggle-visibility-${column.param}`, text: column.title, onChanged: () => {
|
|
2390
|
+
}, okayVariant: Variant$1.Light }, columns.map((column) => {
|
|
2391
|
+
return (React.createElement(CheckboxButton, { key: column.param, id: `IntelliTable-${id}-toggle-visibility-${column.param}`, className: "mb-2", text: column.title, onChanged: () => {
|
|
2392
2392
|
dispatch({
|
|
2393
2393
|
type: ActionType$1.ToggleColumnVisibility,
|
|
2394
2394
|
param: column.param,
|
|
2395
2395
|
});
|
|
2396
|
-
}, checked: columnVisibilityMap[column.param], ariaLabel: `show "${column.title}" column
|
|
2396
|
+
}, checked: columnVisibilityMap[column.param], ariaLabel: `show "${column.title}" column`, checkedVariant: Variant$1.Light, uncheckedVariant: Variant$1.Secondary }));
|
|
2397
2397
|
})));
|
|
2398
2398
|
}
|
|
2399
2399
|
/*----------------------------------------*/
|
|
@@ -2438,7 +2438,7 @@ const IntelliTable = (props) => {
|
|
|
2438
2438
|
borderRight: '0.05rem solid #555',
|
|
2439
2439
|
borderLeft: '0.05rem solid #555',
|
|
2440
2440
|
} },
|
|
2441
|
-
React.createElement("div", { className: "d-flex align-items-center justify-content-
|
|
2441
|
+
React.createElement("div", { className: "d-flex align-items-center justify-content-start flex-row h-100" },
|
|
2442
2442
|
React.createElement("span", { className: "text-nowrap" }, column.title),
|
|
2443
2443
|
React.createElement("div", null,
|
|
2444
2444
|
React.createElement("button", { type: "button", id: `IntelliTable-${id}-sort-by-${column.param}-button`, className: `btn btn-${sortingByThisColumn ? 'light' : 'secondary'} btn-sm ms-1 ps-1 pe-1 pt-0 pb-0`, "aria-label": sortButtonAriaLabel, onClick: () => {
|
|
@@ -2461,6 +2461,22 @@ const IntelliTable = (props) => {
|
|
|
2461
2461
|
sortedData.sort((a, b) => {
|
|
2462
2462
|
const aVal = a[sortColumnParam];
|
|
2463
2463
|
const bVal = b[sortColumnParam];
|
|
2464
|
+
// Auto-sort undefined and null to end of list
|
|
2465
|
+
if ((aVal === undefined || aVal === null)
|
|
2466
|
+
|| (bVal === undefined || bVal === null)) {
|
|
2467
|
+
// At least one was undefined
|
|
2468
|
+
if ((aVal === undefined || aVal === null)
|
|
2469
|
+
&& (bVal === undefined || bVal === null)) {
|
|
2470
|
+
// Both undefined
|
|
2471
|
+
return 0;
|
|
2472
|
+
}
|
|
2473
|
+
if (aVal === undefined || aVal === null) {
|
|
2474
|
+
// First was undefined
|
|
2475
|
+
return 1;
|
|
2476
|
+
}
|
|
2477
|
+
// Second was undefined
|
|
2478
|
+
return -1;
|
|
2479
|
+
}
|
|
2464
2480
|
// Sort differently based on the data type
|
|
2465
2481
|
// > Boolean
|
|
2466
2482
|
if (paramType === ParamType$1.Boolean) {
|