From 44409a60bba940786d40df5bb6ae3c6516a29286 Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Fri, 7 Jun 2024 10:05:33 -0400 Subject: [PATCH] 21762: fixed sidepanel props Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- .../src/views-components/side-panel-tree/side-panel-tree.tsx | 5 ++++- .../src/views-components/side-panel/side-panel.tsx | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/workbench2/src/views-components/side-panel-tree/side-panel-tree.tsx b/services/workbench2/src/views-components/side-panel-tree/side-panel-tree.tsx index cc1b57da48..b8fc052c71 100644 --- a/services/workbench2/src/views-components/side-panel-tree/side-panel-tree.tsx +++ b/services/workbench2/src/views-components/side-panel-tree/side-panel-tree.tsx @@ -21,7 +21,10 @@ import { setSelectedResourceUuid } from "store/selected-resource/selected-resour export interface SidePanelTreeProps { onItemActivation: (id: string) => void; sidePanelProgress?: boolean; - isCollapsed?: boolean + isCollapsed?: boolean; + currentSideWidth?: number; + currentRoute?: string; + isDetailsPanelTransitioning?: boolean; setCurrentSideWidth: (width: number) => void } diff --git a/services/workbench2/src/views-components/side-panel/side-panel.tsx b/services/workbench2/src/views-components/side-panel/side-panel.tsx index dc8b43e995..fe3edc0016 100644 --- a/services/workbench2/src/views-components/side-panel/side-panel.tsx +++ b/services/workbench2/src/views-components/side-panel/side-panel.tsx @@ -45,12 +45,13 @@ const mapDispatchToProps = (dispatch: Dispatch): SidePanelTreeProps => ({ const mapStateToProps = ({ router, sidePanel, detailsPanel }: RootState) => ({ currentRoute: router.location ? router.location.pathname : '', isCollapsed: sidePanel.collapsedState, + currentSideWidth: sidePanel.currentSideWidth, isDetailsPanelTransitioning: detailsPanel.isTransitioning }); export const SidePanel = withStyles(styles)( connect(mapStateToProps, mapDispatchToProps)( - ({ classes, ...props }: WithStyles & SidePanelTreeProps & { currentRoute: string, isDetailsPanelTransitioning: boolean }) =>{ + ({ classes, ...props }: WithStyles & SidePanelTreeProps ) =>{ const splitPaneRef = useRef(null) @@ -63,7 +64,7 @@ export const SidePanel = withStyles(styles)( //entries[0] targets the left side of the split pane const width = entries[0].contentRect.width if (width === props.currentSideWidth) return; - + //prevents potential infinite resize triggers window.requestAnimationFrame((): void | undefined => { if (!Array.isArray(entries) || !entries.length) { -- 2.30.2