From b4db94e561ed2eb7686689a6cd2b7304e542bdbf Mon Sep 17 00:00:00 2001 From: ANTONA09 Date: Wed, 15 Jan 2025 13:53:02 +0530 Subject: [PATCH 1/2] fix: #7605, Tree: Remove Depreciated code --- components/lib/panelmenu/PanelMenu.js | 7 --- components/lib/tree/Tree.js | 2 - components/lib/tree/TreeBase.js | 70 ------------------------ components/lib/treetable/TreeTable.js | 1 - components/lib/treetable/TreeTableRow.js | 6 -- 5 files changed, 86 deletions(-) diff --git a/components/lib/panelmenu/PanelMenu.js b/components/lib/panelmenu/PanelMenu.js index 0a26b933cb..8339de981c 100644 --- a/components/lib/panelmenu/PanelMenu.js +++ b/components/lib/panelmenu/PanelMenu.js @@ -18,7 +18,6 @@ export const PanelMenu = React.memo( const [idState, setIdState] = React.useState(props.id); const [activeItemState, setActiveItemState] = React.useState(null); const [activeItemsState, setActiveItemsState] = React.useState([]); - const [animationDisabled, setAnimationDisabled] = React.useState(false); const elementRef = React.useRef(null); const { ptm, cx, isUnstyled } = PanelMenuBase.setMetaData({ @@ -250,7 +249,6 @@ export const PanelMenu = React.memo( }); React.useEffect(() => { - setAnimationDisabled(true); props.model && props.model.forEach((item) => { @@ -261,10 +259,6 @@ export const PanelMenu = React.memo( // eslint-disable-next-line react-hooks/exhaustive-deps }, [props.model]); - const onEnter = () => { - setAnimationDisabled(false); - }; - const createPanel = (item, index) => { if (!isItemVisible(item)) { return null; @@ -389,7 +383,6 @@ export const PanelMenu = React.memo( { classNames: cx('transition'), timeout: { enter: 1000, exit: 450 }, - onEnter: onEnter, in: active, unmountOnExit: true, options: props.transitionOptions diff --git a/components/lib/tree/Tree.js b/components/lib/tree/Tree.js index 2bc75e0faa..f4326c4136 100644 --- a/components/lib/tree/Tree.js +++ b/components/lib/tree/Tree.js @@ -316,8 +316,6 @@ export const Tree = React.memo( setFilterValueState(ObjectUtils.isNotEmpty(value) ? value : ''); }; - const childNodeFocus = (node) => {}; - const _filter = () => { if (!filterChanged.current) return; diff --git a/components/lib/tree/TreeBase.js b/components/lib/tree/TreeBase.js index 33c24ee0b1..db74dd67dd 100644 --- a/components/lib/tree/TreeBase.js +++ b/components/lib/tree/TreeBase.js @@ -38,76 +38,6 @@ const classes = { footer: 'p-tree-footer' }; -const styles = ` - .p-tree-container { - margin: 0; - padding: 0; - list-style-type: none; - overflow: auto; - } - - .p-treenode-children { - margin: 0; - padding: 0; - list-style-type: none; - } - - .p-treenode-selectable { - cursor: pointer; - user-select: none; - } - - .p-tree-toggler { - cursor: pointer; - user-select: none; - display: inline-flex; - align-items: center; - justify-content: center; - flex-shrink: 0; - overflow: hidden; - position: relative; - } - - .p-treenode-leaf > .p-treenode-content .p-tree-toggler { - visibility: hidden; - } - - .p-treenode-content { - display: flex; - align-items: center; - } - - .p-tree-filter { - width: 100%; - } - - .p-tree-filter-container { - position: relative; - display: block; - width: 100%; - } - - .p-tree-filter-icon { - position: absolute; - top: 50%; - margin-top: -.5rem; - } - - .p-tree-loading { - position: relative; - min-height: 4rem; - } - - .p-tree .p-tree-loading-overlay { - position: absolute; - z-index: 1; - display: flex; - align-items: center; - justify-content: center; - } - -`; - export const TreeBase = ComponentBase.extend({ defaultProps: { __TYPE: 'Tree', diff --git a/components/lib/treetable/TreeTable.js b/components/lib/treetable/TreeTable.js index a955a8058c..595117d8a1 100644 --- a/components/lib/treetable/TreeTable.js +++ b/components/lib/treetable/TreeTable.js @@ -740,7 +740,6 @@ export const TreeTable = React.forwardRef((inProps, ref) => { if (draggedColumnEl.current !== dropHeader) { let targetLeft = dropHeaderOffset.left - containerOffset.left; - //let targetTop = containerOffset.top - dropHeaderOffset.top; let columnCenter = dropHeaderOffset.left + dropHeader.offsetWidth / 2; reorderIndicatorUpRef.current.style.top = dropHeaderOffset.top - containerOffset.top - (iconHeight.current - 1) + 'px'; diff --git a/components/lib/treetable/TreeTableRow.js b/components/lib/treetable/TreeTableRow.js index 6f7e81c669..02eda86deb 100644 --- a/components/lib/treetable/TreeTableRow.js +++ b/components/lib/treetable/TreeTableRow.js @@ -74,10 +74,6 @@ export const TreeTableRow = React.memo((props) => { return ptm(key, rowMetadata); }; - const isLeaf = () => { - return props.node.leaf === false ? false : !(props.node.children && props.node.children.length); - }; - const onTogglerClick = (event) => { expanded ? collapse(event) : expand(event); @@ -336,7 +332,6 @@ export const TreeTableRow = React.memo((props) => { const onArrowRightKey = (event) => { const ishiddenIcon = DomHandler.findSingle(event.currentTarget, 'button').style.visibility === 'hidden'; - const togglerElement = DomHandler.findSingle(elementRef.current, '[data-pc-section="rowtoggler"]'); if (ishiddenIcon) { return; @@ -354,7 +349,6 @@ export const TreeTableRow = React.memo((props) => { const currentTarget = event.currentTarget; const ishiddenIcon = DomHandler.findSingle(currentTarget, 'button').style.visibility === 'hidden'; - const togglerElement = DomHandler.findSingle(currentTarget, '[data-pc-section="rowtoggler"]'); if (expanded && !ishiddenIcon) { collapse(event); From d072cf7e28db9cc294a897f4a6235741694ff7c1 Mon Sep 17 00:00:00 2001 From: ANTONA09 Date: Wed, 15 Jan 2025 13:56:29 +0530 Subject: [PATCH 2/2] fix: #7605, Tree: Remove Depreciated code --- components/lib/panelmenu/PanelMenu.js | 1 - 1 file changed, 1 deletion(-) diff --git a/components/lib/panelmenu/PanelMenu.js b/components/lib/panelmenu/PanelMenu.js index 8339de981c..d45e44fac9 100644 --- a/components/lib/panelmenu/PanelMenu.js +++ b/components/lib/panelmenu/PanelMenu.js @@ -249,7 +249,6 @@ export const PanelMenu = React.memo( }); React.useEffect(() => { - props.model && props.model.forEach((item) => { if (item.expanded) {