qbs-react-grid 1.3.16 → 2.0.1

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 (47) hide show
  1. package/es/ColumnGroup.js +1 -1
  2. package/es/ColumnResizeHandler.js +2 -2
  3. package/es/Scrollbar.js +1 -1
  4. package/es/Table.d.ts +1 -1
  5. package/es/qbsTable/QbsTable.js +120 -8
  6. package/es/qbsTable/TableCardList.js +1 -1
  7. package/es/utils/getTableColumns.js +10 -10
  8. package/es/utils/useAffix.d.ts +4 -4
  9. package/es/utils/useAffix.js +5 -5
  10. package/es/utils/useCellDescriptor.d.ts +2 -2
  11. package/es/utils/usePosition.d.ts +5 -5
  12. package/es/utils/usePosition.js +3 -3
  13. package/es/utils/useScrollListener.d.ts +4 -4
  14. package/es/utils/useScrollListener.js +15 -15
  15. package/es/utils/useTableDimension.d.ts +11 -11
  16. package/es/utils/useTableDimension.js +2 -2
  17. package/es/utils/useTableRows.d.ts +1 -1
  18. package/lib/ColumnGroup.js +1 -1
  19. package/lib/ColumnResizeHandler.js +2 -2
  20. package/lib/Scrollbar.js +1 -1
  21. package/lib/Table.d.ts +1 -1
  22. package/lib/qbsTable/QbsTable.js +120 -8
  23. package/lib/qbsTable/TableCardList.js +1 -1
  24. package/lib/utils/getTableColumns.js +10 -10
  25. package/lib/utils/useAffix.d.ts +4 -4
  26. package/lib/utils/useAffix.js +5 -5
  27. package/lib/utils/useCellDescriptor.d.ts +2 -2
  28. package/lib/utils/usePosition.d.ts +5 -5
  29. package/lib/utils/usePosition.js +3 -3
  30. package/lib/utils/useScrollListener.d.ts +4 -4
  31. package/lib/utils/useScrollListener.js +14 -14
  32. package/lib/utils/useTableDimension.d.ts +11 -11
  33. package/lib/utils/useTableDimension.js +2 -2
  34. package/lib/utils/useTableRows.d.ts +1 -1
  35. package/package.json +7 -7
  36. package/src/ColumnGroup.tsx +25 -11
  37. package/src/ColumnResizeHandler.tsx +2 -2
  38. package/src/Scrollbar.tsx +1 -1
  39. package/src/Table.tsx +4 -4
  40. package/src/qbsTable/QbsTable.tsx +222 -116
  41. package/src/qbsTable/TableCardList.tsx +2 -2
  42. package/src/utils/getTableColumns.ts +4 -4
  43. package/src/utils/useAffix.ts +11 -11
  44. package/src/utils/useCellDescriptor.ts +4 -4
  45. package/src/utils/usePosition.ts +9 -9
  46. package/src/utils/useScrollListener.ts +19 -19
  47. package/src/utils/useTableDimension.ts +4 -4
@@ -129,7 +129,7 @@ var QbsTable = function QbsTable(_ref) {
129
129
  var _useState4 = (0, _react.useState)(false),
130
130
  isOpen = _useState4[0],
131
131
  setIsOpen = _useState4[1];
132
- var prevColumns = (0, _react.useRef)();
132
+ var prevColumns = (0, _react.useRef)(null);
133
133
  var _useState5 = (0, _react.useState)(tableView),
134
134
  tableViewToggle = _useState5[0],
135
135
  setTableViewToggle = _useState5[1];
@@ -353,6 +353,115 @@ var QbsTable = function QbsTable(_ref) {
353
353
  return item.grouped;
354
354
  }) ? true : false;
355
355
  };
356
+ // const columnsRendered: React.ReactElement[] = useMemo(
357
+ // () =>
358
+ // (columns ?? []).map(
359
+ // ({
360
+ // title,
361
+ // field,
362
+ // resizable,
363
+ // sortable,
364
+ // colWidth,
365
+ // align,
366
+ // grouped,
367
+ // groupHeader,
368
+ // fixed,
369
+ // children,
370
+ // customCell,
371
+ // renderCell,
372
+ // isVisible,
373
+ // link,
374
+ // getPath,
375
+ // rowClick,
376
+ // sortKey,
377
+ // type,
378
+ // hideLink
379
+ // }) =>
380
+ // isVisible &&
381
+ // (grouped ? (
382
+ // <ColumnGroup
383
+ // header={groupHeader}
384
+ // fixed={fixed}
385
+ // align={align}
386
+ // verticalAlign="middle"
387
+ // groupHeaderHeight={40}
388
+ // >
389
+ // {children?.map(child => (
390
+ // <Column
391
+ // key={child.title}
392
+ // sortable={child.sortable}
393
+ // width={child.colWidth ?? COLUMN_WIDTH}
394
+ // resizable={child.resizable}
395
+ // align={child.align}
396
+ // onResize={handleColumnWidth}
397
+ // fixed={child.fixed}
398
+ // >
399
+ // <HeaderCell
400
+ // dataTheme={dataTheme}
401
+ // verticalAlign={'middle'}
402
+ // className={` ${classes.headerClass}`}
403
+ // sortKey={child.sortKey}
404
+ // renderSortIcon={renderSortIcon}
405
+ // >
406
+ // {child.title}
407
+ // </HeaderCell>
408
+ // {child.customCell || child.link ? (
409
+ // <CustomTableCell
410
+ // renderCell={child.renderCell}
411
+ // dataKey={child.field}
412
+ // dataTheme={dataTheme}
413
+ // type={child.type}
414
+ // path={child.getPath}
415
+ // link={child.link}
416
+ // />
417
+ // ) : (
418
+ // <Cell
419
+ // className={` ${classes.cellClass}`}
420
+ // dataKey={child.field}
421
+ // dataTheme={dataTheme}
422
+ // />
423
+ // )}
424
+ // </Column>
425
+ // ))}
426
+ // </ColumnGroup>
427
+ // ) : (
428
+ // <Column
429
+ // key={title}
430
+ // sortable={sortable}
431
+ // width={colWidth ?? COLUMN_WIDTH}
432
+ // resizable={resizable}
433
+ // align={align}
434
+ // fixed={fixed}
435
+ // onResize={handleColumnWidth}
436
+ // >
437
+ // <HeaderCell
438
+ // dataTheme={dataTheme}
439
+ // verticalAlign={findGrouped() ? 'middle' : undefined}
440
+ // className={` ${classes.headerClass}`}
441
+ // sortKey={sortKey}
442
+ // renderSortIcon={renderSortIcon}
443
+ // >
444
+ // {title}
445
+ // </HeaderCell>
446
+ // {customCell || link ? (
447
+ // <CustomTableCell
448
+ // renderCell={renderCell}
449
+ // dataKey={field}
450
+ // rowClick={rowClick}
451
+ // type={type}
452
+ // hideLink={hideLink}
453
+ // path={getPath}
454
+ // dataTheme={dataTheme}
455
+ // link={link}
456
+ // />
457
+ // ) : (
458
+ // <Cell dataKey={field} dataTheme={dataTheme} className={` ${classes.cellClass}`} />
459
+ // )}
460
+ // </Column>
461
+ // ))
462
+ // ),
463
+ // [columns, dataTheme]
464
+ // );
356
465
  var columnsRendered = (0, _react.useMemo)(function () {
357
466
  return (columns != null ? columns : []).map(function (_ref3) {
358
467
  var title = _ref3.title,
@@ -374,13 +483,13 @@ var QbsTable = function QbsTable(_ref) {
374
483
  sortKey = _ref3.sortKey,
375
484
  type = _ref3.type,
376
485
  hideLink = _ref3.hideLink;
377
- return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, isVisible && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, grouped ? /*#__PURE__*/_react["default"].createElement(_ColumnGroup["default"], {
486
+ return isVisible ? grouped ? /*#__PURE__*/_react["default"].createElement(_ColumnGroup["default"], {
378
487
  header: groupHeader,
379
488
  fixed: fixed,
380
489
  align: align,
381
490
  verticalAlign: "middle",
382
491
  groupHeaderHeight: 40
383
- }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, children === null || children === void 0 ? void 0 : children.map(function (child) {
492
+ }, children === null || children === void 0 ? void 0 : children.map(function (child) {
384
493
  var _child$colWidth;
385
494
  return /*#__PURE__*/_react["default"].createElement(_Column["default"], {
386
495
  key: child.title,
@@ -392,7 +501,7 @@ var QbsTable = function QbsTable(_ref) {
392
501
  fixed: child.fixed
393
502
  }, /*#__PURE__*/_react["default"].createElement(_HeaderCell["default"], {
394
503
  dataTheme: dataTheme,
395
- verticalAlign: 'middle',
504
+ verticalAlign: "middle",
396
505
  className: " " + classes.headerClass,
397
506
  sortKey: child.sortKey,
398
507
  renderSortIcon: renderSortIcon
@@ -408,7 +517,7 @@ var QbsTable = function QbsTable(_ref) {
408
517
  dataKey: child.field,
409
518
  dataTheme: dataTheme
410
519
  }));
411
- }))) : /*#__PURE__*/_react["default"].createElement(_Column["default"], {
520
+ })) : /*#__PURE__*/_react["default"].createElement(_Column["default"], {
412
521
  key: title,
413
522
  sortable: sortable,
414
523
  width: colWidth != null ? colWidth : COLUMN_WIDTH,
@@ -435,9 +544,12 @@ var QbsTable = function QbsTable(_ref) {
435
544
  dataKey: field,
436
545
  dataTheme: dataTheme,
437
546
  className: " " + classes.cellClass
438
- }))));
439
- });
440
- }, [columns, dataTheme]);
547
+ })) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null);
548
+ } // ✅ Fix: Return `null` instead of `false`
549
+ ).filter(Boolean);
550
+ },
551
+ // ✅ Fix: Remove `undefined` and `false` elements
552
+ [columns, dataTheme]);
441
553
  return /*#__PURE__*/_react["default"].createElement("div", {
442
554
  className: "qbs-table " + classes.tableContainerClass,
443
555
  "data-theme": dataTheme
@@ -114,7 +114,7 @@ var QbsTable = function QbsTable(_ref) {
114
114
  var _useState4 = (0, _react.useState)(false),
115
115
  isOpen = _useState4[0],
116
116
  setIsOpen = _useState4[1];
117
- var prevColumns = (0, _react.useRef)();
117
+ var prevColumns = (0, _react.useRef)(null);
118
118
  var tableBodyRef = (0, _react.useRef)(null);
119
119
  var handleSortColumn = (0, _react.useCallback)(function (sortColumn, sortType) {
120
120
  setLoading(true);
@@ -4,9 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  exports.__esModule = true;
5
5
  exports["default"] = void 0;
6
6
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
7
+ var _flatten = _interopRequireDefault(require("lodash/flatten"));
7
8
  var _react = _interopRequireDefault(require("react"));
8
9
  var ReactIs = _interopRequireWildcard(require("react-is"));
9
- var _flatten = _interopRequireDefault(require("lodash/flatten"));
10
10
  var _ColumnGroup = _interopRequireDefault(require("../ColumnGroup"));
11
11
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
12
12
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -20,13 +20,13 @@ function getTableColumns(children) {
20
20
  var flattenColumns = (0, _flatten["default"])(childrenArray).map(function (column) {
21
21
  // If the column is a group, we need to get the columns from the children.
22
22
  if ((column === null || column === void 0 ? void 0 : column.type) === _ColumnGroup["default"]) {
23
- var _column$props = column === null || column === void 0 ? void 0 : column.props,
24
- header = _column$props.header,
25
- groupChildren = _column$props.children,
26
- align = _column$props.align,
27
- fixed = _column$props.fixed,
28
- verticalAlign = _column$props.verticalAlign,
29
- groupHeaderHeight = _column$props.groupHeaderHeight;
23
+ var _ref = column === null || column === void 0 ? void 0 : column.props,
24
+ header = _ref.header,
25
+ groupChildren = _ref.children,
26
+ align = _ref.align,
27
+ fixed = _ref.fixed,
28
+ verticalAlign = _ref.verticalAlign,
29
+ groupHeaderHeight = _ref.groupHeaderHeight;
30
30
  var childColumns = getTableColumns(groupChildren);
31
31
  return childColumns.map(function (childColumn, index) {
32
32
  // Overwrite the props set by ColumnGroup to Column.
@@ -55,9 +55,9 @@ function getTableColumns(children) {
55
55
  return /*#__PURE__*/_react["default"].cloneElement(childColumn, groupCellProps);
56
56
  });
57
57
  } else if (ReactIs.isFragment(column)) {
58
- var _column$props2;
58
+ var _column$props;
59
59
  // If the column is a fragment, we need to get the columns from the children.
60
- return getTableColumns((_column$props2 = column.props) === null || _column$props2 === void 0 ? void 0 : _column$props2.children);
60
+ return getTableColumns((_column$props = column.props) === null || _column$props === void 0 ? void 0 : _column$props.children);
61
61
  } else if (Array.isArray(column)) {
62
62
  // If the column is an array, need check item in the array.
63
63
  return getTableColumns(column);
@@ -6,11 +6,11 @@ interface AffixProps {
6
6
  contentHeight: React.MutableRefObject<number>;
7
7
  affixHeader?: boolean | number;
8
8
  affixHorizontalScrollbar?: boolean | number;
9
- tableOffset: React.RefObject<ElementOffset>;
10
- headerOffset: React.RefObject<ElementOffset>;
9
+ tableOffset: React.RefObject<ElementOffset | null>;
10
+ headerOffset: React.RefObject<ElementOffset | null>;
11
11
  headerHeight: number;
12
- scrollbarXRef: React.RefObject<ScrollbarInstance>;
13
- affixHeaderWrapperRef: React.RefObject<HTMLDivElement>;
12
+ scrollbarXRef: React.RefObject<ScrollbarInstance | null>;
13
+ affixHeaderWrapperRef: React.RefObject<HTMLDivElement | null>;
14
14
  }
15
15
  declare const useAffix: (props: AffixProps) => void;
16
16
  export default useAffix;
@@ -3,13 +3,13 @@
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
  exports.__esModule = true;
5
5
  exports["default"] = void 0;
6
- var _react = require("react");
7
- var _getHeight = _interopRequireDefault(require("dom-lib/getHeight"));
8
6
  var _addStyle = _interopRequireDefault(require("dom-lib/addStyle"));
9
- var _removeStyle = _interopRequireDefault(require("dom-lib/removeStyle"));
7
+ var _getHeight = _interopRequireDefault(require("dom-lib/getHeight"));
10
8
  var _on = _interopRequireDefault(require("dom-lib/on"));
11
- var _toggleClass = _interopRequireDefault(require("./toggleClass"));
9
+ var _removeStyle = _interopRequireDefault(require("dom-lib/removeStyle"));
10
+ var _react = require("react");
12
11
  var _isNumberOrTrue = _interopRequireDefault(require("./isNumberOrTrue"));
12
+ var _toggleClass = _interopRequireDefault(require("./toggleClass"));
13
13
  var _useUpdateEffect = _interopRequireDefault(require("./useUpdateEffect"));
14
14
  var useAffix = function useAffix(props) {
15
15
  var getTableHeight = props.getTableHeight,
@@ -21,7 +21,7 @@ var useAffix = function useAffix(props) {
21
21
  headerHeight = props.headerHeight,
22
22
  scrollbarXRef = props.scrollbarXRef,
23
23
  affixHeaderWrapperRef = props.affixHeaderWrapperRef;
24
- var scrollListener = (0, _react.useRef)();
24
+ var scrollListener = (0, _react.useRef)(null);
25
25
  var handleAffixHorizontalScrollbar = (0, _react.useCallback)(function () {
26
26
  var _tableOffset$current, _scrollbarXRef$curren;
27
27
  var scrollY = window.scrollY || window.pageYOffset;
@@ -15,8 +15,8 @@ interface CellDescriptorProps<Row> {
15
15
  onSortColumn?: (dataKey: string, sortType?: SortType) => void;
16
16
  onHeaderCellResize?: (width: number, dataKey: string) => void;
17
17
  rowHeight?: number | ((rowData?: Row) => number);
18
- mouseAreaRef: React.RefObject<HTMLDivElement>;
19
- tableRef: React.RefObject<HTMLDivElement>;
18
+ mouseAreaRef: React.RefObject<HTMLDivElement | null>;
19
+ tableRef: React.RefObject<HTMLDivElement | null>;
20
20
  }
21
21
  interface CellDescriptor {
22
22
  columns: React.ReactNode[];
@@ -4,13 +4,13 @@ interface PositionProps {
4
4
  data: readonly RowDataType[];
5
5
  height: number;
6
6
  tableWidth: React.MutableRefObject<number>;
7
- tableRef: React.RefObject<HTMLDivElement>;
7
+ tableRef: React.RefObject<HTMLDivElement | null>;
8
8
  prefix: (str: string) => string;
9
9
  translateDOMPositionXY: React.MutableRefObject<any>;
10
- wheelWrapperRef: React.RefObject<HTMLDivElement>;
11
- headerWrapperRef: React.RefObject<HTMLDivElement>;
12
- affixHeaderWrapperRef: React.RefObject<HTMLDivElement>;
13
- tableHeaderRef: React.RefObject<HTMLDivElement>;
10
+ wheelWrapperRef: React.RefObject<HTMLDivElement | null>;
11
+ headerWrapperRef: React.RefObject<HTMLDivElement | null>;
12
+ affixHeaderWrapperRef: React.RefObject<HTMLDivElement | null>;
13
+ tableHeaderRef: React.RefObject<HTMLDivElement | null>;
14
14
  scrollX: React.MutableRefObject<number>;
15
15
  scrollY: React.MutableRefObject<number>;
16
16
  contentWidth: React.MutableRefObject<number>;
@@ -3,13 +3,13 @@
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
  exports.__esModule = true;
5
5
  exports["default"] = void 0;
6
- var _react = require("react");
7
6
  var _addStyle = _interopRequireDefault(require("dom-lib/addStyle"));
7
+ var _react = require("react");
8
8
  var _constants = require("../constants");
9
+ var _defer = _interopRequireDefault(require("./defer"));
10
+ var _isSupportTouchEvent = _interopRequireDefault(require("./isSupportTouchEvent"));
9
11
  var _toggleClass = _interopRequireDefault(require("./toggleClass"));
10
12
  var _useUpdateEffect = _interopRequireDefault(require("./useUpdateEffect"));
11
- var _isSupportTouchEvent = _interopRequireDefault(require("./isSupportTouchEvent"));
12
- var _defer = _interopRequireDefault(require("./defer"));
13
13
  /**
14
14
  * Update the position of the table according to the scrolling information of the table.
15
15
  * @param props
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
- import type { ScrollbarInstance } from '../Scrollbar';
3
2
  import type { RowDataType } from '../@types/common';
3
+ import type { ScrollbarInstance } from '../Scrollbar';
4
4
  interface ScrollListenerProps {
5
5
  rtl: boolean;
6
6
  data: readonly RowDataType[];
@@ -10,11 +10,11 @@ interface ScrollListenerProps {
10
10
  headerHeight: number;
11
11
  autoHeight?: boolean;
12
12
  tableBodyRef: React.RefObject<HTMLDivElement>;
13
- scrollbarXRef: React.RefObject<ScrollbarInstance>;
14
- scrollbarYRef: React.RefObject<ScrollbarInstance>;
13
+ scrollbarXRef: React.RefObject<ScrollbarInstance | null>;
14
+ scrollbarYRef: React.RefObject<ScrollbarInstance | null>;
15
15
  disabledScroll?: boolean;
16
16
  loading?: boolean;
17
- tableRef: React.RefObject<HTMLDivElement>;
17
+ tableRef: React.RefObject<HTMLDivElement | null>;
18
18
  contentWidth: React.MutableRefObject<number>;
19
19
  tableWidth: React.MutableRefObject<number>;
20
20
  scrollY: React.MutableRefObject<number>;
@@ -3,19 +3,19 @@
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
  exports.__esModule = true;
5
5
  exports["default"] = void 0;
6
- var _react = require("react");
7
- var _WheelHandler = _interopRequireDefault(require("dom-lib/WheelHandler"));
8
- var _scrollLeft = _interopRequireDefault(require("dom-lib/scrollLeft"));
9
- var _scrollTop = _interopRequireDefault(require("dom-lib/scrollTop"));
10
6
  var _on = _interopRequireDefault(require("dom-lib/on"));
11
7
  var _removeStyle = _interopRequireDefault(require("dom-lib/removeStyle"));
12
- var _requestAnimationTimeout = require("./requestAnimationTimeout");
13
- var _useUpdateEffect = _interopRequireDefault(require("./useUpdateEffect"));
14
- var _useMount = _interopRequireDefault(require("./useMount"));
8
+ var _scrollLeft = _interopRequireDefault(require("dom-lib/scrollLeft"));
9
+ var _scrollTop = _interopRequireDefault(require("dom-lib/scrollTop"));
10
+ var _WheelHandler = _interopRequireDefault(require("dom-lib/WheelHandler"));
11
+ var _react = require("react");
15
12
  var _constants = require("../constants");
16
- var _isSupportTouchEvent = _interopRequireDefault(require("./isSupportTouchEvent"));
17
- var _flushSync = _interopRequireDefault(require("./flushSync"));
18
13
  var _defer = _interopRequireDefault(require("./defer"));
14
+ var _flushSync = _interopRequireDefault(require("./flushSync"));
15
+ var _isSupportTouchEvent = _interopRequireDefault(require("./isSupportTouchEvent"));
16
+ var _requestAnimationTimeout = require("./requestAnimationTimeout");
17
+ var _useMount = _interopRequireDefault(require("./useMount"));
18
+ var _useUpdateEffect = _interopRequireDefault(require("./useUpdateEffect"));
19
19
  // Inertial sliding start time threshold
20
20
  var momentumTimeThreshold = 300;
21
21
 
@@ -73,10 +73,10 @@ var useScrollListener = function useScrollListener(props) {
73
73
  headerHeight = props.headerHeight,
74
74
  rtl = props.rtl,
75
75
  tableKey = props.tableKey;
76
- var wheelListener = (0, _react.useRef)();
77
- var touchStartListener = (0, _react.useRef)();
78
- var touchMoveListener = (0, _react.useRef)();
79
- var touchEndListener = (0, _react.useRef)();
76
+ var wheelListener = (0, _react.useRef)(null);
77
+ var touchStartListener = (0, _react.useRef)(null);
78
+ var touchMoveListener = (0, _react.useRef)(null);
79
+ var touchEndListener = (0, _react.useRef)(null);
80
80
  var _useState = (0, _react.useState)(false),
81
81
  isChildFocused = _useState[0],
82
82
  setIsChildFocused = _useState[1];
@@ -168,7 +168,7 @@ var useScrollListener = function useScrollListener(props) {
168
168
  (_scrollbarXRef$curren = scrollbarXRef.current) === null || _scrollbarXRef$curren === void 0 ? void 0 : (_scrollbarXRef$curren2 = _scrollbarXRef$curren.onWheelScroll) === null || _scrollbarXRef$curren2 === void 0 ? void 0 : _scrollbarXRef$curren2.call(_scrollbarXRef$curren, deltaX);
169
169
  (_scrollbarYRef$curren = scrollbarYRef.current) === null || _scrollbarYRef$curren === void 0 ? void 0 : (_scrollbarYRef$curren2 = _scrollbarYRef$curren.onWheelScroll) === null || _scrollbarYRef$curren2 === void 0 ? void 0 : _scrollbarYRef$curren2.call(_scrollbarYRef$curren, deltaY, momentumOptions !== null && momentumOptions !== void 0 && momentumOptions.duration ? true : false);
170
170
  }, [handleWheel, scrollbarXRef, scrollbarYRef]);
171
- var wheelHandler = (0, _react.useRef)();
171
+ var wheelHandler = (0, _react.useRef)(null);
172
172
 
173
173
  // Stop unending scrolling and remove transition
174
174
  var stopScroll = (0, _react.useCallback)(function () {
@@ -5,8 +5,8 @@ interface TableDimensionProps<Row, Key> {
5
5
  rowHeight: number | ((rowData?: Row) => number);
6
6
  height: number;
7
7
  minHeight: number;
8
- tableRef?: React.RefObject<HTMLDivElement>;
9
- headerWrapperRef?: React.RefObject<HTMLDivElement>;
8
+ tableRef?: React.RefObject<HTMLDivElement | null>;
9
+ headerWrapperRef?: React.RefObject<HTMLDivElement | null>;
10
10
  width?: number;
11
11
  prefix: (str: string) => string;
12
12
  affixHeader?: boolean | number;
@@ -31,15 +31,15 @@ interface TableDimensionProps<Row, Key> {
31
31
  * @returns
32
32
  */
33
33
  declare const useTableDimension: <Row extends RowDataType<never>, Key>(props: TableDimensionProps<Row, Key>) => {
34
- contentHeight: React.MutableRefObject<number>;
35
- contentWidth: React.MutableRefObject<number>;
36
- minScrollY: React.MutableRefObject<number>;
37
- minScrollX: React.MutableRefObject<number>;
38
- scrollY: React.MutableRefObject<number>;
39
- scrollX: React.MutableRefObject<number>;
40
- tableWidth: React.MutableRefObject<number>;
41
- headerOffset: React.MutableRefObject<ElementOffset | null>;
42
- tableOffset: React.MutableRefObject<ElementOffset | null>;
34
+ contentHeight: React.RefObject<number>;
35
+ contentWidth: React.RefObject<number>;
36
+ minScrollY: React.RefObject<number>;
37
+ minScrollX: React.RefObject<number>;
38
+ scrollY: React.RefObject<number>;
39
+ scrollX: React.RefObject<number>;
40
+ tableWidth: React.RefObject<number>;
41
+ headerOffset: React.RefObject<ElementOffset | null>;
42
+ tableOffset: React.RefObject<ElementOffset | null>;
43
43
  getTableHeight: () => number;
44
44
  setScrollY: (value: number) => void;
45
45
  setScrollX: (value: number) => void;
@@ -48,8 +48,8 @@ var useTableDimension = function useTableDimension(props) {
48
48
  var tableWidth = (0, _react.useRef)(widthProp || 0);
49
49
  var tableHeight = (0, _react.useRef)(heightProp || 0);
50
50
  var columnCount = (0, _react.useRef)(0);
51
- var resizeObserver = (0, _react.useRef)();
52
- var containerResizeObserver = (0, _react.useRef)();
51
+ var resizeObserver = (0, _react.useRef)(null);
52
+ var containerResizeObserver = (0, _react.useRef)(null);
53
53
  var headerOffset = (0, _react.useRef)(null);
54
54
  var tableOffset = (0, _react.useRef)(null);
55
55
  var getRowHeight = (0, _react.useCallback)(function (rowData) {
@@ -14,7 +14,7 @@ interface TableRowsProps<Row, Key> {
14
14
  declare const useTableRows: <Row extends RowDataType<never>, Key>(props: TableRowsProps<Row, Key>) => {
15
15
  bindTableRowsRef: (index: number | string, rowData: any) => (ref: HTMLElement) => void;
16
16
  tableRowsMaxHeight: number[];
17
- tableRows: import("react").MutableRefObject<{
17
+ tableRows: import("react").RefObject<{
18
18
  [key: string]: [HTMLElement, any];
19
19
  }>;
20
20
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "qbs-react-grid",
3
- "version": "1.3.16",
3
+ "version": "2.0.1",
4
4
  "description": "A React table component",
5
5
  "main": "lib/index.js",
6
6
  "typings": "lib/index.d.ts",
@@ -51,8 +51,8 @@
51
51
  },
52
52
  "peerDependencies": {
53
53
  "prop-types": "^15.7.1",
54
- "react": "^18.2.0",
55
- "react-dom": "^18.2.0",
54
+ "react": "^18.2.0 || ^19.0.0",
55
+ "react-dom": "^18.2.0 || ^19.0.0",
56
56
  "react-router-dom": "^6.21.0",
57
57
  "rsuite": "^5.21.0"
58
58
  },
@@ -75,8 +75,8 @@
75
75
  "@testing-library/react": "^13.4.0",
76
76
  "@types/lodash": "^4.14.165",
77
77
  "@types/prop-types": "^15.7.1",
78
- "@types/react": "^18.0.17",
79
- "@types/react-dom": "^18.0.6",
78
+ "@types/react": "^19.0.11",
79
+ "@types/react-dom": "^19.0.4",
80
80
  "@typescript-eslint/eslint-plugin": "^4.28.2",
81
81
  "@typescript-eslint/parser": "^4.28.2",
82
82
  "autoprefixer": "^10.4.20",
@@ -128,11 +128,11 @@
128
128
  "postcss-loader": "^8.1.1",
129
129
  "prettier": "^2.3.2",
130
130
  "prop-types": "^15.8.1",
131
- "react": "^18.2.0",
131
+ "react": "^19.0.0",
132
132
  "react-code-view": "^2.2.1",
133
133
  "react-dnd": "^16.0.1",
134
134
  "react-dnd-html5-backend": "^16.0.1",
135
- "react-dom": "^18.2.0",
135
+ "react-dom": "^19.0.0",
136
136
  "rsuite": "^5.21.0",
137
137
  "sinon": "^11.1.2",
138
138
  "sinon-chai": "^3.7.0",
@@ -1,7 +1,7 @@
1
- import React from 'react';
2
1
  import PropTypes from 'prop-types';
3
- import { useClassNames } from './utils';
2
+ import React from 'react';
4
3
  import { StandardProps } from './@types/common';
4
+ import { useClassNames } from './utils';
5
5
 
6
6
  export interface ColumnGroupProps extends StandardProps {
7
7
  /** Alignment */
@@ -49,7 +49,18 @@ const ColumnGroup = React.forwardRef((props: ColumnGroupProps, ref: React.Ref<HT
49
49
  const { withClassPrefix, merge, prefix } = useClassNames(classPrefix);
50
50
  const classes = merge(className, withClassPrefix());
51
51
  const contentStyles = { ...styles, textAlign: align, verticalAlign };
52
+ interface NodeProps {
53
+ verticalAlign?: string;
54
+ children?: React.ReactNode;
55
+ }
52
56
 
57
+ interface MyComponentProps {
58
+ className?: string;
59
+ predefinedStyle?: React.CSSProperties;
60
+ headerHeight: number;
61
+ verticalAlign?: any;
62
+ children: any;
63
+ }
53
64
  return (
54
65
  <div ref={ref} className={classes} {...rest}>
55
66
  <div className={prefix('header')} style={styles}>
@@ -59,15 +70,18 @@ const ColumnGroup = React.forwardRef((props: ColumnGroupProps, ref: React.Ref<HT
59
70
  </div>
60
71
 
61
72
  {children
62
- ? React.Children.map(children as React.ReactElement[], (node: React.ReactElement) => {
63
- return React.cloneElement(node, {
64
- className: prefix('cell'),
65
- predefinedStyle: { height: restHeight, top: styles.height },
66
- headerHeight: restHeight,
67
- verticalAlign: node.props.verticalAlign || verticalAlign,
68
- children: <span className={prefix('cell-content')}>{node.props.children}</span>
69
- });
70
- })
73
+ ? React.Children.map(
74
+ children as React.ReactElement<NodeProps>[],
75
+ (node: React.ReactElement<NodeProps>) => {
76
+ return React.cloneElement(node as React.ReactElement<MyComponentProps>, {
77
+ className: prefix('cell'),
78
+ predefinedStyle: { height: restHeight, top: styles.height },
79
+ headerHeight: restHeight,
80
+ verticalAlign: node.props.verticalAlign || verticalAlign,
81
+ children: <span className={prefix('cell-content')}>{node.props.children}</span>
82
+ });
83
+ }
84
+ )
71
85
  : null}
72
86
  </div>
73
87
  );
@@ -46,8 +46,8 @@ const ColumnResizeHandler = React.forwardRef(
46
46
  const classes = merge(className, withClassPrefix());
47
47
 
48
48
  const columnWidth = useRef(defaultColumnWidth || 0);
49
- const mouseMoveTracker = useRef<DOMMouseMoveTracker | null>();
50
- const isKeyDown = useRef<boolean>();
49
+ const mouseMoveTracker = useRef<DOMMouseMoveTracker | null>(null);
50
+ const isKeyDown = useRef<boolean>(false);
51
51
  const cursorDelta = useRef<number>(0);
52
52
 
53
53
  const handleMove = useCallback(
package/src/Scrollbar.tsx CHANGED
@@ -51,7 +51,7 @@ const Scrollbar = React.forwardRef((props: ScrollbarProps, ref) => {
51
51
  const scrollRange = useRef(scrollLength);
52
52
  const barRef = useRef<HTMLDivElement>(null);
53
53
  const handleRef = useRef<HTMLDivElement>(null);
54
- const mouseMoveTracker = useRef<DOMMouseMoveTracker | null>();
54
+ const mouseMoveTracker = useRef<DOMMouseMoveTracker | null>(null);
55
55
 
56
56
  const { withClassPrefix, merge, prefix } = useClassNames(classPrefix);
57
57
  const classes = merge(
package/src/Table.tsx CHANGED
@@ -49,12 +49,12 @@ import {
49
49
  } from './utils';
50
50
 
51
51
  import type {
52
- StandardProps,
53
- SortType,
52
+ RowDataType,
54
53
  RowKeyType,
54
+ SortType,
55
+ StandardProps,
55
56
  TableLocaleType,
56
- TableSizeChangeEventName,
57
- RowDataType
57
+ TableSizeChangeEventName
58
58
  } from './@types/common';
59
59
  /**
60
60
  * Filter those expanded nodes.