diff --git a/src/react-components/room/ObjectsSidebarContainer.js b/src/react-components/room/ObjectsSidebarContainer.js index 4f69ee2eda..a404d27793 100644 --- a/src/react-components/room/ObjectsSidebarContainer.js +++ b/src/react-components/room/ObjectsSidebarContainer.js @@ -6,7 +6,7 @@ import { useObjectList } from "./hooks/useObjectList"; export function ObjectsSidebarContainer({ onClose, hubChannel }) { const listRef = useRef(); - const { objects, selectedObject, selectObject, unfocusObject, focusObject } = useObjectList(); + const { objects, selectedObject, selectObject, deselectObject, unfocusObject, focusObject } = useObjectList(); const onUnfocusListItem = useCallback( e => { @@ -17,8 +17,13 @@ export function ObjectsSidebarContainer({ onClose, hubChannel }) { [unfocusObject, listRef] ); + const onCloseWrapper = useCallback(() => { + deselectObject(); + onClose(); + }, [deselectObject, onClose]); + return ( - + {objects.length > 0 ? ( {objects.map(object => (