Skip to content

Commit

Permalink
Fix #7269: TreeTable ignore size attribute (#7273)
Browse files Browse the repository at this point in the history
  • Loading branch information
melloware authored Sep 29, 2024
1 parent aa99a96 commit 5d9098e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions components/lib/treetable/TreeTable.js
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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();
Expand Down Expand Up @@ -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')
);

Expand Down
2 changes: 1 addition & 1 deletion components/lib/treetable/treetable.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'onContextMenu' | 'onSelect' | 'ref' | 'value'> {
export interface TreeTableProps extends Omit<React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'size' | 'onContextMenu' | 'onSelect' | 'ref' | 'value'> {
/**
* Whether to show it even there is only one page.
* @defaultValue true
Expand Down

0 comments on commit 5d9098e

Please sign in to comment.