Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #7269: TreeTable ignore size attribute #7273

Merged
merged 1 commit into from
Sep 29, 2024
Merged

Fix #7269: TreeTable ignore size attribute #7273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions components/lib/treetable/TreeTable.js
View file
Open in desktop
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
View file
Open in desktop
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
Loading