Commit4a54802

authored

fix: close popover when notification settings are clicked (#17001)

When a user clicks in the notification settings does not make sense tokeep the popover open, instead, we want to close it.

1 parent86d9071 commit4a54802Copy full SHA for 4a54802

File tree

-4

lines changed

site/src/modules/notifications/NotificationsInbox
- InboxPopover.tsx
- NotificationsInbox.tsx

-4

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import {`
`8`	`8`	`import{ScrollArea}from"components/ScrollArea/ScrollArea";`
`9`	`9`	`import{Spinner}from"components/Spinner/Spinner";`
`10`	`10`	`import{RefreshCwIcon,SettingsIcon}from"lucide-react";`
`11`		`-importtype{FC}from"react";`
	`11`	`+import{typeFC,useState}from"react";`
`12`	`12`	`import{LinkasRouterLink}from"react-router-dom";`
`13`	`13`	`import{cn}from"utils/cn";`
`14`	`14`	`import{InboxButton}from"./InboxButton";`
`@@ -34,8 +34,10 @@ export const InboxPopover: FC<InboxPopoverProps> = ({`
`34`	`34`	`onMarkAllAsRead,`
`35`	`35`	`onMarkNotificationAsRead,`
`36`	`36`	`})=>{`
	`37`	`+const[isOpen,setIsOpen]=useState(defaultOpen);`
	`38`	`+`
`37`	`39`	`return(`
`38`		`-<PopoverdefaultOpen={defaultOpen}>`
	`40`	`+<Popoveropen={isOpen}onOpenChange={setIsOpen}>`
`39`	`41`	`<PopoverTriggerasChild>`
`40`	`42`	`<InboxButtonunreadCount={unreadCount}/>`
`41`	`43`	`</PopoverTrigger>`
`@@ -61,7 +63,10 @@ export const InboxPopover: FC<InboxPopoverProps> = ({`
`61`	`63`	`Mark all as read`
`62`	`64`	`</Button>`
`63`	`65`	`<Buttonvariant="outline"size="icon"asChild>`
`64`		`-<RouterLinkto="/settings/notifications">`
	`66`	`+<RouterLink`
	`67`	`+to="/settings/notifications"`
	`68`	`+onClick={()=>setIsOpen(false)}`
	`69`	`+>`
`65`	`70`	`<SettingsIcon/>`
`66`	`71`	`<spanclassName="sr-only">Notification settings</span>`
`67`	`72`	`</RouterLink>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import type {`
`6`	`6`	`}from"api/typesGenerated";`
`7`	`7`	`import{displayError}from"components/GlobalSnackbar/utils";`
`8`	`8`	`import{useEffectEvent}from"hooks/hookPolyfills";`
`9`		`-import{typeFC,useEffect,useRef}from"react";`
	`9`	`+import{typeFC,useEffect}from"react";`
`10`	`10`	`import{useMutation,useQuery,useQueryClient}from"react-query";`
`11`	`11`	`import{InboxPopover}from"./InboxPopover";`
`12`	`12`

Comments

(0)