qbs-react-grid 1.1.14 → 1.1.15

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.
Files changed (4) hide show
  1. package/es/qbsTable/QbsTable.js +16 -2
  2. package/lib/qbsTable/QbsTable.js +16 -2
  3. package/package.json +1 -1
  4. package/src/qbsTable/QbsTable.tsx +27 -10
package/es/qbsTable/QbsTable.js CHANGED
@@ -458,7 +458,21 @@ var QbsTable = function QbsTable(_ref) {
458
458
  className: "" + classes.tableCheckBoxClass,
459
459
  onChange: handleCheck,
460
460
  dataTheme: dataTheme
461
- })), columnsRendered, (actionProps && (actionProps === null || actionProps === void 0 ? void 0 : actionProps.length) > 0 || columnToggle) && /*#__PURE__*/React.createElement(Column, {
461
+ })), columnsRendered, !actionProps || (actionProps === null || actionProps === void 0 ? void 0 : actionProps.length) === 0 && columnToggle && /*#__PURE__*/React.createElement(Column, {
462
+ width: 40,
463
+ fixed: "right"
464
+ }, /*#__PURE__*/React.createElement(HeaderCell, {
465
+ verticalAlign: findGrouped() ? 'middle' : undefined,
466
+ className: " " + classes.headerlClass,
467
+ dataTheme: dataTheme
468
+ }, /*#__PURE__*/React.createElement(ColumToggle, {
469
+ columns: columns,
470
+ onToggle: handleToggle,
471
+ onReorder: onReorder,
472
+ isOpen: isOpen,
473
+ setIsOpen: setIsOpen,
474
+ handleResetColumns: handleResetColumns
475
+ })), /*#__PURE__*/React.createElement(Cell, null)), actionProps && (actionProps === null || actionProps === void 0 ? void 0 : actionProps.length) > 0 && /*#__PURE__*/React.createElement(Column, {
462
476
  width: 40,
463
477
  fixed: "right"
464
478
  }, /*#__PURE__*/React.createElement(HeaderCell, {
@@ -472,7 +486,7 @@ var QbsTable = function QbsTable(_ref) {
472
486
  isOpen: isOpen,
473
487
  setIsOpen: setIsOpen,
474
488
  handleResetColumns: handleResetColumns
475
- })), actionProps && (actionProps === null || actionProps === void 0 ? void 0 : actionProps.length) > 0 && /*#__PURE__*/React.createElement(ActionCell, {
489
+ })), /*#__PURE__*/React.createElement(ActionCell, {
476
490
  actionProps: actionProps,
477
491
  className: classes.cellClass + " " + classes.actionCellClass,
478
492
  handleMenuActions: handleMenuActions,
package/lib/qbsTable/QbsTable.js CHANGED
@@ -465,7 +465,21 @@ var QbsTable = function QbsTable(_ref) {
465
465
  className: "" + classes.tableCheckBoxClass,
466
466
  onChange: handleCheck,
467
467
  dataTheme: dataTheme
468
- })), columnsRendered, (actionProps && (actionProps === null || actionProps === void 0 ? void 0 : actionProps.length) > 0 || columnToggle) && /*#__PURE__*/_react["default"].createElement(_Column["default"], {
468
+ })), columnsRendered, !actionProps || (actionProps === null || actionProps === void 0 ? void 0 : actionProps.length) === 0 && columnToggle && /*#__PURE__*/_react["default"].createElement(_Column["default"], {
469
+ width: 40,
470
+ fixed: "right"
471
+ }, /*#__PURE__*/_react["default"].createElement(_HeaderCell["default"], {
472
+ verticalAlign: findGrouped() ? 'middle' : undefined,
473
+ className: " " + classes.headerlClass,
474
+ dataTheme: dataTheme
475
+ }, /*#__PURE__*/_react["default"].createElement(_ColumShowHide["default"], {
476
+ columns: columns,
477
+ onToggle: handleToggle,
478
+ onReorder: onReorder,
479
+ isOpen: isOpen,
480
+ setIsOpen: setIsOpen,
481
+ handleResetColumns: handleResetColumns
482
+ })), /*#__PURE__*/_react["default"].createElement(_Cell["default"], null)), actionProps && (actionProps === null || actionProps === void 0 ? void 0 : actionProps.length) > 0 && /*#__PURE__*/_react["default"].createElement(_Column["default"], {
469
483
  width: 40,
470
484
  fixed: "right"
471
485
  }, /*#__PURE__*/_react["default"].createElement(_HeaderCell["default"], {
@@ -479,7 +493,7 @@ var QbsTable = function QbsTable(_ref) {
479
493
  isOpen: isOpen,
480
494
  setIsOpen: setIsOpen,
481
495
  handleResetColumns: handleResetColumns
482
- })), actionProps && (actionProps === null || actionProps === void 0 ? void 0 : actionProps.length) > 0 && /*#__PURE__*/_react["default"].createElement(_CustomTableCell.ActionCell, {
496
+ })), /*#__PURE__*/_react["default"].createElement(_CustomTableCell.ActionCell, {
483
497
  actionProps: actionProps,
484
498
  className: classes.cellClass + " " + classes.actionCellClass,
485
499
  handleMenuActions: handleMenuActions,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "qbs-react-grid",
3
- "version": "1.1.14",
3
+ "version": "1.1.15",
4
4
  "description": "A React table component",
5
5
  "main": "lib/index.js",
6
6
  "typings": "lib/index.d.ts",
package/src/qbsTable/QbsTable.tsx CHANGED
@@ -497,8 +497,27 @@ const QbsTable: React.FC<QbsTableProps> = ({
497
497
  </Column>
498
498
  )}
499
499
  {columnsRendered}
500
-
501
- {((actionProps && actionProps?.length > 0) || columnToggle) && (
500
+ {!actionProps ||
501
+ (actionProps?.length === 0 && columnToggle && (
502
+ <Column width={40} fixed="right">
503
+ <HeaderCell
504
+ verticalAlign={findGrouped() ? 'middle' : undefined}
505
+ className={` ${classes.headerlClass}`}
506
+ dataTheme={dataTheme}
507
+ >
508
+ <ColumToggle
509
+ columns={columns}
510
+ onToggle={handleToggle}
511
+ onReorder={onReorder}
512
+ isOpen={isOpen}
513
+ setIsOpen={setIsOpen}
514
+ handleResetColumns={handleResetColumns}
515
+ />
516
+ </HeaderCell>
517
+ <Cell />
518
+ </Column>
519
+ ))}
520
+ {actionProps && actionProps?.length > 0 && (
502
521
  <Column width={40} fixed="right">
503
522
  <HeaderCell
504
523
  verticalAlign={findGrouped() ? 'middle' : undefined}
@@ -518,14 +537,12 @@ const QbsTable: React.FC<QbsTableProps> = ({
518
537
  />
519
538
  )}
520
539
  </HeaderCell>
521
- {actionProps && actionProps?.length > 0 && (
522
- <ActionCell
523
- actionProps={actionProps}
524
- className={`${classes.cellClass} ${classes.actionCellClass}`}
525
- handleMenuActions={handleMenuActions}
526
- dataTheme={dataTheme}
527
- />
528
- )}
540
+ <ActionCell
541
+ actionProps={actionProps}
542
+ className={`${classes.cellClass} ${classes.actionCellClass}`}
543
+ handleMenuActions={handleMenuActions}
544
+ dataTheme={dataTheme}
545
+ />
529
546
  </Column>
530
547
  )}
531
548
  </Table>