From 5d9098e234795506b1054e8c33bd29217185cac2 Mon Sep 17 00:00:00 2001 From: Melloware Date: Sun, 29 Sep 2024 12:02:01 -0400 Subject: [PATCH] Fix #7269: TreeTable ignore size attribute (#7273) --- components/lib/treetable/TreeTable.js | 6 +++--- components/lib/treetable/treetable.d.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/lib/treetable/TreeTable.js b/components/lib/treetable/TreeTable.js index fc6d5a8b7e..dd0b8d0bfa 100644 --- a/components/lib/treetable/TreeTable.js +++ b/components/lib/treetable/TreeTable.js @@ -1,8 +1,9 @@ import * as React from 'react'; +import { getStorage } from '../../utils/utils'; import PrimeReact, { FilterMatchMode, FilterService, PrimeReactContext } from '../api/Api'; import { ColumnBase } from '../column/ColumnBase'; import { useHandleStyle } from '../componentbase/ComponentBase'; -import { useEventListener, useUpdateEffect, useMergeProps, useMountEffect } from '../hooks/Hooks'; +import { useEventListener, useMergeProps, useMountEffect, useUpdateEffect } from '../hooks/Hooks'; import { ArrowDownIcon } from '../icons/arrowdown'; import { ArrowUpIcon } from '../icons/arrowup'; import { SpinnerIcon } from '../icons/spinner'; @@ -13,7 +14,6 @@ import { TreeTableBody } from './TreeTableBody'; import { TreeTableFooter } from './TreeTableFooter'; import { TreeTableHeader } from './TreeTableHeader'; import { TreeTableScrollableView } from './TreeTableScrollableView'; -import { getStorage } from '../../utils/utils'; export const TreeTable = React.forwardRef((inProps, ref) => { const mergeProps = useMergeProps(); @@ -1439,7 +1439,7 @@ export const TreeTable = React.forwardRef((inProps, ref) => { style: props.style, 'data-scrollselectors': '.p-treetable-wrapper' }, - ObjectUtils.findDiffKeys(props, TreeTable.defaultProps), + TreeTableBase.getOtherProps(props), ptCallbacks.ptm('root') ); diff --git a/components/lib/treetable/treetable.d.ts b/components/lib/treetable/treetable.d.ts index 560965101d..0dd00bc979 100644 --- a/components/lib/treetable/treetable.d.ts +++ b/components/lib/treetable/treetable.d.ts @@ -580,7 +580,7 @@ interface TreeTableColReorderEvent { * Defines valid properties in TreeTable component. In addition to these, all properties of HTMLDivElement can be used in this component. * @group Properties */ -export interface TreeTableProps extends Omit, HTMLDivElement>, 'onContextMenu' | 'onSelect' | 'ref' | 'value'> { +export interface TreeTableProps extends Omit, HTMLDivElement>, 'size' | 'onContextMenu' | 'onSelect' | 'ref' | 'value'> { /** * Whether to show it even there is only one page. * @defaultValue true