From f9573588452337f695ef54b6fc3770378b3c6537 Mon Sep 17 00:00:00 2001 From: gitstart-sourcegraph Date: Tue, 21 Jun 2022 16:10:07 +0000 Subject: [PATCH 1/7] feat: keep MenuList in DOM when Menu is hidden --- .../DashboardsContentPage.test.tsx | 20 +++++++++---------- client/web/src/nav/NavBar/NavDropdown.tsx | 4 ++-- .../src/components/Menu/MenuItem.module.scss | 13 ++++++++++++ .../wildcard/src/components/Menu/MenuItem.tsx | 2 +- .../wildcard/src/components/Menu/MenuLink.tsx | 6 ++++-- .../wildcard/src/components/Menu/MenuList.tsx | 1 + .../floating-panel/FloatingPanel.tsx | 5 +++++ .../popover-content/PopoverContent.tsx | 8 ++++++-- .../Popover/tether/services/tether-render.ts | 2 +- .../Popover/tether/services/types.ts | 2 ++ 10 files changed, 44 insertions(+), 19 deletions(-) diff --git a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx index 1f44196a2b917..f3ca7391fade4 100644 --- a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx +++ b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx @@ -165,15 +165,14 @@ const renderDashboardsContent = ( const triggerDashboardMenuItem = async (screen: RenderWithBrandedContextResult & { user: UserEvent }, name: RegExp) => { const { user } = screen - const dashboardMenu = await waitFor(() => screen.getByRole('button', { name: /dashboard context menu/ })) - user.click(dashboardMenu) - const dashboardMenuItem = screen.getByRole('menuitem', { name }) + const dashboardMenu = await screen.findByRole('button', { name: /dashboard context menu/ }) + userEvent.click(dashboardMenu) // We're simulating keyboard navigation here to circumvent a bug in ReachUI // does not respond to programmatic click events on menu items - dashboardMenuItem.focus() - user.keyboard(' ') + screen.getByText(name).closest('[role="menuitem"]')?.focus() + user.keyboard('{enter}') } beforeEach(() => { @@ -218,7 +217,7 @@ describe('DashboardsContent', () => { const { history } = screen - await triggerDashboardMenuItem(screen, /configure dashboard/) + await triggerDashboardMenuItem(screen, /configure dashboard/i) expect(history.location.pathname).toEqual('/insights/dashboards/foo/edit') }) @@ -238,18 +237,17 @@ describe('DashboardsContent', () => { it('opens delete dashboard modal', async () => { const screen = renderDashboardsContent() - await triggerDashboardMenuItem(screen, /Delete/) + await triggerDashboardMenuItem(screen, /delete/i) - const addInsightHeader = await waitFor(() => screen.getByRole('heading', { name: /Delete/ })) - expect(addInsightHeader).toBeInTheDocument() + await waitFor(() => expect(screen.getByRole('heading', { name: /Delete/ })).toBeInTheDocument()) }) // copies dashboard url it('copies dashboard url', async () => { const screen = renderDashboardsContent() - await triggerDashboardMenuItem(screen, /Copy link/) + await triggerDashboardMenuItem(screen, /copy link/i) - sinon.assert.calledOnce(mockCopyURL) + await waitFor(() => sinon.assert.calledOnce(mockCopyURL)) }) }) diff --git a/client/web/src/nav/NavBar/NavDropdown.tsx b/client/web/src/nav/NavBar/NavDropdown.tsx index f0a26dd51736f..a65564014e55a 100644 --- a/client/web/src/nav/NavBar/NavDropdown.tsx +++ b/client/web/src/nav/NavBar/NavDropdown.tsx @@ -184,8 +184,8 @@ export const NavDropdown: React.FunctionComponent {mobileHomeItem.content} - {items.map(item => ( - + {items.map((item, index) => ( + {item.content} ))} diff --git a/client/wildcard/src/components/Menu/MenuItem.module.scss b/client/wildcard/src/components/Menu/MenuItem.module.scss index d829e94e308ce..f391bdac777ac 100644 --- a/client/wildcard/src/components/Menu/MenuItem.module.scss +++ b/client/wildcard/src/components/Menu/MenuItem.module.scss @@ -38,9 +38,22 @@ background-color: unset; color: unset; } + &[data-selected]:not(:active) { background-color: var(--dropdown-link-hover-bg); color: unset; } + + &[data-selected]:not(:hover) { + outline: none; + box-shadow: none; + + > .dropdown-item-content { + width: 100%; + display: inline-block; + outline: 0; + box-shadow: var(--focus-box-shadow); + } + } } } diff --git a/client/wildcard/src/components/Menu/MenuItem.tsx b/client/wildcard/src/components/Menu/MenuItem.tsx index d4d8bf9352c23..30c9b106cef04 100644 --- a/client/wildcard/src/components/Menu/MenuItem.tsx +++ b/client/wildcard/src/components/Menu/MenuItem.tsx @@ -18,6 +18,6 @@ export type MenuItemProps = ReachMenuItemProps */ export const MenuItem = React.forwardRef(({ children, className, ...props }, reference) => ( - {children} + {children} )) as ForwardReferenceComponent<'div', MenuItemProps> diff --git a/client/wildcard/src/components/Menu/MenuLink.tsx b/client/wildcard/src/components/Menu/MenuLink.tsx index b5d1c37b3bd80..c9ef9727ed08b 100644 --- a/client/wildcard/src/components/Menu/MenuLink.tsx +++ b/client/wildcard/src/components/Menu/MenuLink.tsx @@ -17,6 +17,8 @@ export type MenuLinkProps = ReachMenuLinkProps * * @see — Docs https://reach.tech/menu-button#menulink */ -export const MenuLink = React.forwardRef(({ className, ...props }, reference) => ( - +export const MenuLink = React.forwardRef(({ className, children, ...props }, reference) => ( + + {children} + )) as ForwardReferenceComponent<'a', MenuLinkProps> diff --git a/client/wildcard/src/components/Menu/MenuList.tsx b/client/wildcard/src/components/Menu/MenuList.tsx index f0e026f523ddd..1eee4800e6606 100644 --- a/client/wildcard/src/components/Menu/MenuList.tsx +++ b/client/wildcard/src/components/Menu/MenuList.tsx @@ -46,5 +46,6 @@ const Popover = React.forwardRef(({ popoverPosition, ...props }, reference) => ( position={popoverPosition} focusLocked={false} className={classNames('py-1', props.className)} + keepInDOM={true} /> )) as ForwardReferenceComponent<'div', PopoverProps> diff --git a/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx b/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx index bac6ec7c49fad..12ecaa3281768 100644 --- a/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx +++ b/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx @@ -22,6 +22,8 @@ export interface FloatingPanelProps extends Omit, * outside the dom tree. */ rootRender?: HTMLElement | null + + forceHidden?: boolean } /** @@ -45,6 +47,7 @@ export const FloatingPanel = forwardRef((props, reference) => { targetPadding, constraint, rootRender, + forceHidden, ...otherProps } = props @@ -72,6 +75,7 @@ export const FloatingPanel = forwardRef((props, reference) => { constrainToScrollParents, overflowToScrollParents, flipping, + forceHidden, }) return unsubscribe @@ -90,6 +94,7 @@ export const FloatingPanel = forwardRef((props, reference) => { constrainToScrollParents, overflowToScrollParents, flipping, + forceHidden, ]) if (strategy === Strategy.Absolute) { diff --git a/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx b/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx index 290581102eed8..f9fcc889384f5 100644 --- a/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx +++ b/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx @@ -17,6 +17,7 @@ export interface PopoverContentProps extends Omit { @@ -28,9 +29,11 @@ export const PopoverContent = forwardRef((props, reference) => { as: Component = 'div', role = 'dialog', 'aria-modal': ariaModel = true, + keepInDOM = false, + // we should let FloatingPanel to control its `hidden` attribute + hidden, ...otherProps } = props - const { isOpen: isOpenContext, targetElement, tailElement, anchor, setOpen } = useContext(PopoverContext) const { renderRoot } = useContext(PopoverRoot) @@ -68,7 +71,7 @@ export const PopoverContent = forwardRef((props, reference) => { return () => setFocusLock(false) }, [autoFocus, focusLocked, tooltipElement]) - if (!isOpenContext && !isOpen) { + if (!keepInDOM && !isOpenContext && !isOpen) { return null } @@ -83,6 +86,7 @@ export const PopoverContent = forwardRef((props, reference) => { aria-modal={ariaModel} rootRender={renderRoot} className={classNames(styles.popover, otherProps.className)} + forceHidden={keepInDOM && !isOpenContext && !isOpen} > {focusLocked ? ( diff --git a/client/wildcard/src/components/Popover/tether/services/tether-render.ts b/client/wildcard/src/components/Popover/tether/services/tether-render.ts index a7a1ce863c460..bfeffd57a03cf 100644 --- a/client/wildcard/src/components/Popover/tether/services/tether-render.ts +++ b/client/wildcard/src/components/Popover/tether/services/tether-render.ts @@ -36,7 +36,7 @@ export function render(tether: Tether, eventTarget: HTMLElement | null, preserve const layout = getLayout(tether) const state = getState(layout) - if (state === null || !isVisible(tether.target)) { + if (state === null || !isVisible(tether.target) || tether.forceHidden) { setVisibility(tether.element, false) setVisibility((tether.marker as HTMLElement) ?? null, false) diff --git a/client/wildcard/src/components/Popover/tether/services/types.ts b/client/wildcard/src/components/Popover/tether/services/types.ts index 9ea82509d2742..1b7fb6aedef5b 100644 --- a/client/wildcard/src/components/Popover/tether/services/types.ts +++ b/client/wildcard/src/components/Popover/tether/services/types.ts @@ -55,6 +55,8 @@ export interface Tether { overflowToScrollParents?: boolean constrainToScrollParents?: boolean + + forceHidden?: boolean } export type MarkerElement = HTMLElement | SVGElement From 8b8f81076e42a290eb4fccdecd5dfcc475ef22b2 Mon Sep 17 00:00:00 2001 From: gitstart-sourcegraph Date: Tue, 21 Jun 2022 23:40:39 +0700 Subject: [PATCH 2/7] chore: update snapshot --- .../__snapshots__/NavMenu.test.tsx.snap | 54 +++++++++++++++---- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/client/wildcard/src/components/NavMenu/__snapshots__/NavMenu.test.tsx.snap b/client/wildcard/src/components/NavMenu/__snapshots__/NavMenu.test.tsx.snap index 28025123e1243..7010fe41f8ac1 100644 --- a/client/wildcard/src/components/NavMenu/__snapshots__/NavMenu.test.tsx.snap +++ b/client/wildcard/src/components/NavMenu/__snapshots__/NavMenu.test.tsx.snap @@ -41,7 +41,11 @@ exports[` Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - Settings + + Settings + Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - Your repositories + + Your repositories + Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - Saved searches + + Saved searches +
@@ -87,7 +99,11 @@ exports[` Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - Sourcegraph + + Sourcegraph + Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - Gitstart + + Gitstart +
@@ -114,7 +134,11 @@ exports[` Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - Keyboard shortcuts + + Keyboard shortcuts +
Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - Help + + Help +
@@ -143,7 +171,11 @@ exports[` Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - About Sourcegraph + + About Sourcegraph + Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - Browser Extension + + Browser Extension +
From ab6917f98a5c7d76dbde3b07c27bffae7214b347 Mon Sep 17 00:00:00 2001 From: gitstart-sourcegraph Date: Mon, 27 Jun 2022 07:35:35 +0100 Subject: [PATCH 3/7] chore: Reverts menu item focus shadow --- client/wildcard/src/components/Menu/MenuItem.tsx | 2 +- client/wildcard/src/components/Menu/MenuLink.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/wildcard/src/components/Menu/MenuItem.tsx b/client/wildcard/src/components/Menu/MenuItem.tsx index 347e94515e0c4..60543db294ec4 100644 --- a/client/wildcard/src/components/Menu/MenuItem.tsx +++ b/client/wildcard/src/components/Menu/MenuItem.tsx @@ -23,7 +23,7 @@ export const MenuItem = React.forwardRef(({ children, className, disabled, ...pr return ( - {children} + {children} ) }) as ForwardReferenceComponent<'div', MenuItemProps> diff --git a/client/wildcard/src/components/Menu/MenuLink.tsx b/client/wildcard/src/components/Menu/MenuLink.tsx index 377ace4eccb3a..68c4ea64ec023 100644 --- a/client/wildcard/src/components/Menu/MenuLink.tsx +++ b/client/wildcard/src/components/Menu/MenuLink.tsx @@ -24,7 +24,7 @@ export const MenuLink = React.forwardRef(({ className, disabled, children, ...pr return ( - {children} + {children} ) }) as ForwardReferenceComponent<'a', MenuLinkProps> From f790f1266b7dcbea6925f8039b3308881e77c651 Mon Sep 17 00:00:00 2001 From: gitstart-sourcegraph Date: Mon, 27 Jun 2022 07:36:53 +0100 Subject: [PATCH 4/7] chore: Update snapshot --- .../__snapshots__/NavMenu.test.tsx.snap | 54 ++++--------------- 1 file changed, 9 insertions(+), 45 deletions(-) diff --git a/client/wildcard/src/components/NavMenu/__snapshots__/NavMenu.test.tsx.snap b/client/wildcard/src/components/NavMenu/__snapshots__/NavMenu.test.tsx.snap index 1efd361e20a0a..65c66f090c420 100644 --- a/client/wildcard/src/components/NavMenu/__snapshots__/NavMenu.test.tsx.snap +++ b/client/wildcard/src/components/NavMenu/__snapshots__/NavMenu.test.tsx.snap @@ -41,11 +41,7 @@ exports[` Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - - Settings - + Settings Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - - Your repositories - + Your repositories Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - - Saved searches - + Saved searches
@@ -99,11 +87,7 @@ exports[` Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - - Sourcegraph - + Sourcegraph Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - - Gitstart - + Gitstart
@@ -134,11 +114,7 @@ exports[` Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - - Keyboard shortcuts - + Keyboard shortcuts
Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - - Help - + Help
@@ -170,11 +142,7 @@ exports[` Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - - About Sourcegraph - + About Sourcegraph Should render Menu Items Correctly 1`] = ` role="menuitem" tabindex="-1" > - - Browser Extension - + Browser Extension
From 3ac5ec908adf82456a2e50f0fd37a8713c0d1aa0 Mon Sep 17 00:00:00 2001 From: gitstart-sourcegraph Date: Tue, 28 Jun 2022 09:40:13 +0700 Subject: [PATCH 5/7] chore: revert changes --- .../src/components/Menu/MenuItem.module.scss | 13 ------------- client/wildcard/src/components/Menu/MenuLink.tsx | 8 ++------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/client/wildcard/src/components/Menu/MenuItem.module.scss b/client/wildcard/src/components/Menu/MenuItem.module.scss index f391bdac777ac..d829e94e308ce 100644 --- a/client/wildcard/src/components/Menu/MenuItem.module.scss +++ b/client/wildcard/src/components/Menu/MenuItem.module.scss @@ -38,22 +38,9 @@ background-color: unset; color: unset; } - &[data-selected]:not(:active) { background-color: var(--dropdown-link-hover-bg); color: unset; } - - &[data-selected]:not(:hover) { - outline: none; - box-shadow: none; - - > .dropdown-item-content { - width: 100%; - display: inline-block; - outline: 0; - box-shadow: var(--focus-box-shadow); - } - } } } diff --git a/client/wildcard/src/components/Menu/MenuLink.tsx b/client/wildcard/src/components/Menu/MenuLink.tsx index 68c4ea64ec023..bdf10efc83c69 100644 --- a/client/wildcard/src/components/Menu/MenuLink.tsx +++ b/client/wildcard/src/components/Menu/MenuLink.tsx @@ -19,12 +19,8 @@ export type MenuLinkProps = ReachMenuLinkProps * * @see — Docs https://reach.tech/menu-button#menulink */ -export const MenuLink = React.forwardRef(({ className, disabled, children, ...props }, reference) => { +export const MenuLink = React.forwardRef(({ className, disabled, ...props }, reference) => { const Component = disabled ? MenuDisabledLink : ReachMenuLink - return ( - - {children} - - ) + return }) as ForwardReferenceComponent<'a', MenuLinkProps> From 8d292376b89c4e6b5141f5ea8ad2e15cf05ac9ca Mon Sep 17 00:00:00 2001 From: gitstart-sourcegraph Date: Fri, 1 Jul 2022 16:18:23 +0000 Subject: [PATCH 6/7] chore: update docs for new prop --- .../dashboards/dashboard-page/DashboardsContentPage.test.tsx | 2 +- client/wildcard/src/components/Menu/MenuList.tsx | 2 +- client/wildcard/src/components/Popover/README.md | 2 ++ .../Popover/components/floating-panel/FloatingPanel.tsx | 2 +- .../Popover/components/popover-content/PopoverContent.tsx | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx index f3ca7391fade4..8480100b19cc0 100644 --- a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx +++ b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx @@ -250,4 +250,4 @@ describe('DashboardsContent', () => { await waitFor(() => sinon.assert.calledOnce(mockCopyURL)) }) -}) +}); diff --git a/client/wildcard/src/components/Menu/MenuList.tsx b/client/wildcard/src/components/Menu/MenuList.tsx index 1eee4800e6606..3d60f9ecab185 100644 --- a/client/wildcard/src/components/Menu/MenuList.tsx +++ b/client/wildcard/src/components/Menu/MenuList.tsx @@ -48,4 +48,4 @@ const Popover = React.forwardRef(({ popoverPosition, ...props }, reference) => ( className={classNames('py-1', props.className)} keepInDOM={true} /> -)) as ForwardReferenceComponent<'div', PopoverProps> +)) as ForwardReferenceComponent<'div', PopoverProps>; diff --git a/client/wildcard/src/components/Popover/README.md b/client/wildcard/src/components/Popover/README.md index edf32af4a1079..bfb596a219f64 100644 --- a/client/wildcard/src/components/Popover/README.md +++ b/client/wildcard/src/components/Popover/README.md @@ -226,3 +226,5 @@ enum Strategy { ``` - **_targetPadding_** (optional) - Adds space/padding between target and popover elements + +- **_keepInDOM_** (optional) - By default `PopoverContent` element is removed from DOM when tooltip is hidden. If it's `true`, `PopoverContent` element will be kept in DOM but is hidden with CSS rule `visibility=hidden`. This prop is useful when `PopoverContent` children need this behavior to work. Ex: `@sourcegraph/wildcard` `MenuList` component need this to fix [focus state issue](https://github.com/sourcegraph/sourcegraph/issues/36350). diff --git a/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx b/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx index 12ecaa3281768..304d9e6a5f07d 100644 --- a/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx +++ b/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx @@ -115,4 +115,4 @@ export const FloatingPanel = forwardRef((props, reference) => { , rootRender ?? document.body ) -}) as ForwardReferenceComponent<'div', PropsWithChildren> +}) as ForwardReferenceComponent<'div', PropsWithChildren>; diff --git a/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx b/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx index f9fcc889384f5..9b56fae11a1a3 100644 --- a/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx +++ b/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx @@ -97,4 +97,4 @@ export const PopoverContent = forwardRef((props, reference) => { )} ) -}) as ForwardReferenceComponent<'div', PopoverContentProps> +}) as ForwardReferenceComponent<'div', PopoverContentProps>; From bc1d22f4697cbbc2af5995172ea9a0478a589645 Mon Sep 17 00:00:00 2001 From: gitstart-sourcegraph Date: Fri, 1 Jul 2022 16:24:18 +0000 Subject: [PATCH 7/7] fix: lint issue --- .../dashboards/dashboard-page/DashboardsContentPage.test.tsx | 2 +- client/wildcard/src/components/Menu/MenuList.tsx | 2 +- .../Popover/components/floating-panel/FloatingPanel.tsx | 2 +- .../Popover/components/popover-content/PopoverContent.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx index 8480100b19cc0..f3ca7391fade4 100644 --- a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx +++ b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/DashboardsContentPage.test.tsx @@ -250,4 +250,4 @@ describe('DashboardsContent', () => { await waitFor(() => sinon.assert.calledOnce(mockCopyURL)) }) -}); +}) diff --git a/client/wildcard/src/components/Menu/MenuList.tsx b/client/wildcard/src/components/Menu/MenuList.tsx index 3d60f9ecab185..1eee4800e6606 100644 --- a/client/wildcard/src/components/Menu/MenuList.tsx +++ b/client/wildcard/src/components/Menu/MenuList.tsx @@ -48,4 +48,4 @@ const Popover = React.forwardRef(({ popoverPosition, ...props }, reference) => ( className={classNames('py-1', props.className)} keepInDOM={true} /> -)) as ForwardReferenceComponent<'div', PopoverProps>; +)) as ForwardReferenceComponent<'div', PopoverProps> diff --git a/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx b/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx index 304d9e6a5f07d..12ecaa3281768 100644 --- a/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx +++ b/client/wildcard/src/components/Popover/components/floating-panel/FloatingPanel.tsx @@ -115,4 +115,4 @@ export const FloatingPanel = forwardRef((props, reference) => { , rootRender ?? document.body ) -}) as ForwardReferenceComponent<'div', PropsWithChildren>; +}) as ForwardReferenceComponent<'div', PropsWithChildren> diff --git a/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx b/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx index 9b56fae11a1a3..f9fcc889384f5 100644 --- a/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx +++ b/client/wildcard/src/components/Popover/components/popover-content/PopoverContent.tsx @@ -97,4 +97,4 @@ export const PopoverContent = forwardRef((props, reference) => { )} ) -}) as ForwardReferenceComponent<'div', PopoverContentProps>; +}) as ForwardReferenceComponent<'div', PopoverContentProps>