From 8918598a0a8825766defaace8aebebe7271d17e6 Mon Sep 17 00:00:00 2001 From: William Grant Date: Thu, 23 May 2024 20:44:31 +1000 Subject: [PATCH] fix: clear search when change left pane modes --- ts/components/buttons/MenuButton.tsx | 5 ++++- ts/components/leftpane/LeftPaneSectionHeader.tsx | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ts/components/buttons/MenuButton.tsx b/ts/components/buttons/MenuButton.tsx index d12c0eace..6b7f128a0 100644 --- a/ts/components/buttons/MenuButton.tsx +++ b/ts/components/buttons/MenuButton.tsx @@ -1,5 +1,6 @@ import { useDispatch, useSelector } from 'react-redux'; import styled from 'styled-components'; +import { clearSearch } from '../../state/ducks/search'; import { resetLeftOverlayMode, setLeftOverlayMode } from '../../state/ducks/section'; import { getLeftOverlayMode } from '../../state/selectors/section'; import { SessionIcon } from '../icon'; @@ -40,8 +41,10 @@ export const MenuButton = () => { const isToggled = Boolean(leftOverlayMode); - const onClickFn = () => + const onClickFn = () => { + dispatch(clearSearch()); dispatch(isToggled ? resetLeftOverlayMode() : setLeftOverlayMode('choose-action')); + }; return ( diff --git a/ts/components/leftpane/LeftPaneSectionHeader.tsx b/ts/components/leftpane/LeftPaneSectionHeader.tsx index bbec30bed..317b2c0fb 100644 --- a/ts/components/leftpane/LeftPaneSectionHeader.tsx +++ b/ts/components/leftpane/LeftPaneSectionHeader.tsx @@ -1,5 +1,6 @@ import { useDispatch, useSelector } from 'react-redux'; import styled from 'styled-components'; +import { clearSearch } from '../../state/ducks/search'; import { SectionType, setLeftOverlayMode, @@ -135,6 +136,9 @@ export const LeftPaneSectionHeader = () => { const dispatch = useDispatch(); const returnToActionChooser = () => { + if (leftOverlayMode === 'closed-group') { + dispatch(clearSearch()); + } dispatch(setLeftOverlayMode('choose-action')); };