The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
GDGT-2615 Replace deprecated TippyPopover component (#75668)
Egor Grushinf44a41ead475
diff --git a/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js b/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.jsindex ab2e8a5fbbf..978c4158243 100644--- a/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js+++ b/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js@@ -473,7 +473,7 @@ const MODEL_NAME = "Test Action Model";cy.findByLabelText("Required").uncheck();});- cy.findByRole("dialog").within(() => {+ H.modal().within(() => {cy.findByText("Save").click();});@@ -532,7 +532,7 @@ const MODEL_NAME = "Test Action Model";cy.findByLabelText("Required").check();});- cy.findByRole("dialog").within(() => {+ H.modal().within(() => {cy.findByText("Update").click();});diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsxindex 05f6c98f484..03420e70ada 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx@@ -1,12 +1,13 @@+import { useDisclosure } from "@mantine/hooks";import type { ChangeEvent } from "react";import { useMemo } from "react";import { t } from "ttag";import { getInputTypes } from "metabase/actions/constants";-import { TippyPopoverWithTrigger } from "metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger";import { Radio } from "metabase/common/components/Radio";import { Toggle } from "metabase/common/components/Toggle";import { useUniqueId } from "metabase/common/hooks/use-unique-id";+import { Popover, UnstyledButton } from "metabase/ui";import { TextInput } from "metabase/ui/components/inputs/TextInput";import type {FieldSettings,@@ -32,25 +33,36 @@ export function FieldSettingsPopover({fieldSettings,onChange,}: FieldSettingsPopoverProps) {+ const [isOpened, { open, close, toggle }] = useDisclosure(false);+return (- <TippyPopoverWithTrigger- placement="bottom-end"- triggerContent={- <SettingsTriggerIcon- name="gear"- size={16}- tooltip={t`Change field settings`}- aria-label={t`Field settings`}- />- }- maxWidth={400}- popoverContent={() => (+ <Popover+ opened={isOpened}+ onChange={(nextOpened) => (nextOpened ? open() : close())}+ position="bottom-end"+ trapFocus+ >+ <Popover.Target>+ <UnstyledButton onClick={toggle}>+ <SettingsTriggerIcon+ name="gear"+ size={16}+ tooltip={t`Change field settings`}+ aria-label={t`Field settings`}+ />+ </UnstyledButton>+ </Popover.Target>+ <Popover.Dropdown+ // TODO: remove when the legacy Modal / RENDERED_POPOVERS stack is no longer used (GDGT-2575)+ setupSequencedCloseHandler={close}+ maw={400}+ ><FormCreatorPopoverBodyfieldSettings={fieldSettings}onChange={onChange}/>- )}- />+ </Popover.Dropdown>+ </Popover>);}diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.unit.spec.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.unit.spec.tsxindex e076a1cf5cb..54ed2b290b2 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.unit.spec.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.unit.spec.tsx@@ -112,7 +112,7 @@ describe("FormFieldEditor", () => {const { onChange } = setup({ fieldSettings: TEST_STRING_FIELD_SETTINGS });await userEvent.click(screen.getByLabelText("Field settings"));await userEvent.unhover(screen.getByLabelText("Field settings"));- const popover = await screen.findByRole("tooltip");+ const popover = await screen.findByRole("dialog");await userEvent.click(within(popover).getByRole("radio", { name: "Text" }),@@ -171,7 +171,7 @@ describe("FormFieldEditor", () => {await userEvent.click(screen.getByLabelText("Field settings"));await userEvent.unhover(screen.getByLabelText("Field settings"));- expect(await screen.findByRole("tooltip")).toBeInTheDocument();+ expect(await screen.findByRole("dialog")).toBeInTheDocument();await userEvent.click(screen.getByRole("radio", { name: "Long text" }));@@ -193,7 +193,7 @@ describe("FormFieldEditor", () => {const { onChange } = setup({ fieldSettings });await userEvent.click(screen.getByLabelText("Field settings"));await userEvent.unhover(screen.getByLabelText("Field settings"));- expect(await screen.findByRole("tooltip")).toBeInTheDocument();+ expect(await screen.findByRole("dialog")).toBeInTheDocument();await userEvent.click(screen.getByText("Number"));expect(onChange).toHaveBeenLastCalledWith({diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsxindex 628e31fae4d..f0a61a50f04 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx@@ -1,8 +1,8 @@+import { useDisclosure } from "@mantine/hooks";import { useEffect, useState } from "react";import { t } from "ttag";-import { TippyPopoverWithTrigger } from "metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger";-import { Button, Icon } from "metabase/ui";+import { Button, Icon, Popover, UnstyledButton } from "metabase/ui";import type { FieldType, FieldValueOptions } from "metabase-types/api";import {@@ -58,6 +58,7 @@ export const OptionPopover = ({}: OptionEditorProps) => {const [text, setText] = useState(optionsToText(options));const [error, setError] = useState<string | null>(null);+ const [isOpened, { open, close, toggle }] = useDisclosure(false);const hasOptions = text.length > 0;const isDirty = text !== optionsToText(options);@@ -81,7 +82,7 @@ export const OptionPopover = ({}};- const handleSave = (closePopover: () => void) => {+ const handleSave = () => {setError(null);const nextOptions = transformOptionsIfNeeded(@@ -94,18 +95,27 @@ export const OptionPopover = ({setError(error);} else {onChange(nextOptions);- closePopover();+ close();}};return (- <TippyPopoverWithTrigger- placement="bottom-end"- triggerContent={- <Icon name="list" size={20} tooltip={t`Change options`} />- }- maxWidth={400}- popoverContent={({ closePopover }) => (+ <Popover+ opened={isOpened}+ onChange={(nextOpened) => (nextOpened ? open() : close())}+ position="bottom-end"+ trapFocus+ >+ <Popover.Target>+ <UnstyledButton onClick={toggle}>+ <Icon name="list" size={20} tooltip={t`Change options`} />+ </UnstyledButton>+ </Popover.Target>+ <Popover.Dropdown+ // TODO: remove when the legacy Modal / RENDERED_POPOVERS stack is no longer used (GDGT-2575)+ setupSequencedCloseHandler={close}+ maw={400}+ ><OptionEditorContainer><TextAreavalue={text}@@ -116,15 +126,11 @@ export const OptionPopover = ({{t`Press enter to add another option`}</AddMorePrompt>{hasError && <ErrorMessage>{error}</ErrorMessage>}- <Button- disabled={!canSave}- onClick={() => handleSave(closePopover)}- size="sm"- >+ <Button disabled={!canSave} onClick={handleSave} size="sm">{t`Save`}</Button></OptionEditorContainer>- )}- />+ </Popover.Dropdown>+ </Popover>);};diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.unit.spec.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.unit.spec.tsxindex 0aa792777d3..c4cdb1ca4a6 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.unit.spec.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.unit.spec.tsx@@ -30,7 +30,7 @@ async function baseSetup({await userEvent.click(getIcon("list"));await userEvent.unhover(getIcon("list"));- await screen.findByRole("tooltip");+ await screen.findByRole("dialog");const input = screen.getByPlaceholderText("Enter one option per line");const saveButton = screen.getByRole("button", { name: "Save" });@@ -69,9 +69,15 @@ describe("OptionEditor", () => {await userEvent.type(input, options.join("\n"));await userEvent.click(saveButton);- expect(input).toHaveValue(options.join("\n"));- expect(saveButton).toBeDisabled();expect(onChange).toHaveBeenCalledWith(options);++ await userEvent.click(getIcon("list"));+ await screen.findByRole("dialog");++ expect(+ screen.getByPlaceholderText("Enter one option per line"),+ ).toHaveValue(options.join("\n"));+ expect(screen.getByRole("button", { name: "Save" })).toBeDisabled();});it("should close popover on save", async () => {@@ -81,7 +87,7 @@ describe("OptionEditor", () => {await userEvent.click(saveButton);await waitFor(() =>- expect(screen.queryByRole("tooltip")).not.toBeInTheDocument(),+ expect(screen.queryByRole("dialog")).not.toBeInTheDocument(),);});});diff --git a/frontend/src/metabase/common/components/AccordionList/AccordionList.unit.spec.tsx b/frontend/src/metabase/common/components/AccordionList/AccordionList.unit.spec.tsxindex b58589f54a8..cfc08d23b0b 100644--- a/frontend/src/metabase/common/components/AccordionList/AccordionList.unit.spec.tsx+++ b/frontend/src/metabase/common/components/AccordionList/AccordionList.unit.spec.tsx@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";import type { ReactNode } from "react";import { fireEvent, render, screen } from "__support__/ui";-import { TippyPopover } from "metabase/common/components/Popover/TippyPopover";+import { HoverCard } from "metabase/ui";import { AccordionList } from "./AccordionList";@@ -160,9 +160,12 @@ describe("AccordionList", () => {it("should be able to wrap the list items in components like popovers", async () => {const renderItemWrapper = (itemContent: ReactNode) => {return (- <TippyPopover content={<div>popover</div>}>- <div>{itemContent}</div>- </TippyPopover>+ <HoverCard>+ <HoverCard.Target>+ <div>{itemContent}</div>+ </HoverCard.Target>+ <HoverCard.Dropdown>popover</HoverCard.Dropdown>+ </HoverCard>);};diff --git a/frontend/src/metabase/common/components/AutocompleteInput/AutocompleteInput.tsx b/frontend/src/metabase/common/components/AutocompleteInput/AutocompleteInput.tsxindex f67ce44cf4b..3f2af12cc5f 100644--- a/frontend/src/metabase/common/components/AutocompleteInput/AutocompleteInput.tsx+++ b/frontend/src/metabase/common/components/AutocompleteInput/AutocompleteInput.tsx@@ -1,8 +1,9 @@+import { useDisclosure } from "@mantine/hooks";import { useMemo, useRef } from "react";-import { TippyPopoverWithTrigger } from "metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger";import { SelectList } from "metabase/common/components/SelectList";import { useListKeyboardNavigation } from "metabase/common/hooks/use-list-keyboard-navigation";+import { Popover } from "metabase/ui";import type { VisualizationSettings } from "metabase-types/api";import type { InputProps } from "../Input";@@ -46,6 +47,7 @@ export const AutocompleteInput = ({}: AutocompleteInputProps) => {const optionsListRef = useRef<HTMLUListElement>(null);const inputRef = useRef<HTMLDivElement | null>(null);+ const [isOpened, { open, close }] = useDisclosure(false);const filteredOptions = useMemo(() => {return filterOptions(String(value), options);}, [value, options, filterOptions]);@@ -60,6 +62,10 @@ export const AutocompleteInput = ({const handleListMouseDown = (event: React.MouseEvent<HTMLElement>) => {if (optionsListRef.current?.contains(event.target as Node)) {event.preventDefault();+ // also stops the native event before it reaches document, where the+ // click-outside handler of a parent popover would treat a click on the+ // portaled options list as an outside click and close that popover+ event.stopPropagation();}};@@ -75,56 +81,66 @@ export const AutocompleteInput = ({onChange(e.target.value);};+ const isDropdownOpened = isOpened && filteredOptions.length > 0;+return (- <TippyPopoverWithTrigger- sizeToFit- renderTrigger={({ onClick: handleShowPopover, closePopover }) => (+ <Popover+ opened={isDropdownOpened}+ onClose={close}+ position="bottom-start"+ // with roles enabled Popover.Target overrides the input id with its own+ // generated one, breaking the <label htmlFor> association+ withRoles={false}+ >+ <Popover.Target><Inputref={inputRef}role="combobox"aria-autocomplete="list"+ aria-expanded={isDropdownOpened}{...rest}value={value}- onClick={handleShowPopover}+ onClick={open}onFocus={(evt) => {onFocus?.(evt);- handleShowPopover();+ open();}}onChange={(evt) => {handleChange(evt);- handleShowPopover();+ open();}}onBlur={(evt) => {onBlur?.(evt);- closePopover();+ close();+ }}+ onKeyDown={(evt) => {+ if (evt.key === "Escape") {+ close();+ }}}/>- )}- placement="bottom-start"- popoverContent={({ closePopover }) => {- if (filteredOptions.length === 0) {- return null;- }-- return (- <OptionsList ref={optionsListRef} onMouseDown={handleListMouseDown}>- {filteredOptions.map((item, index) => (- <SelectList.Item- isSelected={cursorIndex === index}- key={item}- id={item}- name={item}- onSelect={(item) => {- handleOptionSelect(String(item));- closePopover();- }}- >- {item}- </SelectList.Item>- ))}- </OptionsList>- );- }}- />+ </Popover.Target>+ <Popover.Dropdown+ // TODO: remove when the legacy Modal / RENDERED_POPOVERS stack is no longer used (GDGT-2575)+ setupSequencedCloseHandler={close}+ >+ <OptionsList ref={optionsListRef} onMouseDown={handleListMouseDown}>+ {filteredOptions.map((item, index) => (+ <SelectList.Item+ isSelected={cursorIndex === index}+ key={item}+ id={item}+ name={item}+ onSelect={(item) => {+ handleOptionSelect(String(item));+ close();+ }}+ >+ {item}+ </SelectList.Item>+ ))}+ </OptionsList>+ </Popover.Dropdown>+ </Popover>);};diff --git a/frontend/src/metabase/common/components/ColorPicker/ColorPicker.tsx b/frontend/src/metabase/common/components/ColorPicker/ColorPicker.tsxindex ced153ff707..4a9e2308bf5 100644--- a/frontend/src/metabase/common/components/ColorPicker/ColorPicker.tsx+++ b/frontend/src/metabase/common/components/ColorPicker/ColorPicker.tsx@@ -1,7 +1,8 @@+import { useDisclosure } from "@mantine/hooks";import type { HTMLAttributes, Ref } from "react";import { forwardRef } from "react";-import { TippyPopoverWithTrigger } from "metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger";+import { Popover } from "metabase/ui";import { ColorPickerContent } from "./ColorPickerContent";import { ColorPickerTrigger } from "./ColorPickerTrigger";@@ -22,21 +23,27 @@ export const ColorPicker = forwardRef(function ColorPicker({ value, placeholder, isAuto, onChange, ...props }: ColorPickerProps,ref: Ref<HTMLDivElement>,) {+ const [opened, { open, close }] = useDisclosure(false);+return (- <TippyPopoverWithTrigger- disableContentSandbox- renderTrigger={({ onClick }) => (+ <Popover opened={opened} onClose={close} position="bottom-start">+ <Popover.Target><ColorPickerTrigger{...props}ref={ref}value={value}placeholder={placeholder}isAuto={isAuto}- onClick={onClick}+ onClick={open}onChange={onChange}/>- )}- popoverContent={<ColorPickerContent value={value} onChange={onChange} />}- />+ </Popover.Target>+ <Popover.Dropdown+ // TODO: remove when the legacy Modal / RENDERED_POPOVERS stack is no longer used (GDGT-2575)+ setupSequencedCloseHandler={close}+ >+ <ColorPickerContent value={value} onChange={onChange} />+ </Popover.Dropdown>+ </Popover>);});diff --git a/frontend/src/metabase/common/components/ColorPicker/ColorPicker.unit.spec.tsx b/frontend/src/metabase/common/components/ColorPicker/ColorPicker.unit.spec.tsxindex f3cfef26c5c..1816f38a91f 100644--- a/frontend/src/metabase/common/components/ColorPicker/ColorPicker.unit.spec.tsx+++ b/frontend/src/metabase/common/components/ColorPicker/ColorPicker.unit.spec.tsx@@ -31,8 +31,8 @@ describe("ColorPicker", () => {await userEvent.click(screen.getByLabelText("white"));const color = Color.rgb(0, 0, 0);- const tooltip = await screen.findByRole("tooltip");- const input = within(tooltip).getByRole("textbox");+ const popover = await screen.findByRole("dialog");+ const input = within(popover).getByRole("textbox");await userEvent.clear(input);await userEvent.type(input, color.hex());diff --git a/frontend/src/metabase/common/components/ColorPicker/ColorPillPicker.tsx b/frontend/src/metabase/common/components/ColorPicker/ColorPillPicker.tsxindex 8d226bff5d0..0c489fbb167 100644--- a/frontend/src/metabase/common/components/ColorPicker/ColorPillPicker.tsx+++ b/frontend/src/metabase/common/components/ColorPicker/ColorPillPicker.tsx@@ -1,8 +1,7 @@-import { useDebouncedCallback } from "@mantine/hooks";+import { useDebouncedCallback, useDisclosure } from "@mantine/hooks";import { type Ref, forwardRef } from "react";-import { TippyPopoverWithTrigger } from "metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger";-import { Group } from "metabase/ui";+import { Group, Popover } from "metabase/ui";import { ColorPill } from "../ColorPill";@@ -45,16 +44,20 @@ export const ColorPillPicker = forwardRef(function ColorPillPicker() {const debouncedUpdate = useDebouncedCallback(onChange, debounceMs);const color = previewValue ?? originalColor;+ const [isOpened, { open, close }] = useDisclosure(false);return (- <TippyPopoverWithTrigger- disableContentSandbox- renderTrigger={({ onClick }) => (+ <Popover opened={isOpened} onClose={close} position="bottom-start">+ <Popover.Target><Group {...props} ref={ref} wrap="nowrap">- <ColorPill color={color} onClick={onClick} />+ <ColorPill color={color} onClick={open} /></Group>- )}- popoverContent={+ </Popover.Target>+ <Popover.Dropdown+ // TODO: remove when the legacy Modal / RENDERED_POPOVERS stack is no longer used (GDGT-2575)+ setupSequencedCloseHandler={close}+ className={S.ColorPillPicker}+ ><ColorPickerContentvalue={color}onChange={(nextColor) => {@@ -65,8 +68,7 @@ export const ColorPillPicker = forwardRef(function ColorPillPicker(debouncedUpdate(colorWithDefault);}}/>- }- className={S.ColorPillPicker}- />+ </Popover.Dropdown>+ </Popover>);});diff --git a/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.tsx b/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.tsxindex 55979e7fc39..ec9279860db 100644--- a/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/Popover/Popover.tsx@@ -4,6 +4,8 @@ import { useCallback, useState } from "react";import Animation from "metabase/css/core/animation.module.css";import type { HoverCardProps } from "metabase/ui";import { HoverCard, useDelayGroup } from "metabase/ui";+// TODO: drop the close-handler registration below when the legacy Modal /+// RENDERED_POPOVERS stack is no longer used (GDGT-2575)import { useSequencedContentCloseHandler } from "metabase/ui/hooks/use-sequenced-content-close-handler";// Initially, the user will have to hover for this long to open the popoverdiff --git a/frontend/src/metabase/common/components/OnClickOutsideWrapper/OnClickOutsideWrapper.tsx b/frontend/src/metabase/common/components/OnClickOutsideWrapper/OnClickOutsideWrapper.tsxindex f6e92c509ed..524fd11c0c3 100644--- a/frontend/src/metabase/common/components/OnClickOutsideWrapper/OnClickOutsideWrapper.tsx+++ b/frontend/src/metabase/common/components/OnClickOutsideWrapper/OnClickOutsideWrapper.tsx@@ -1,3 +1,6 @@+// TODO: delete together with the legacy Modal when it is migrated to Modal+// from metabase/ui (GDGT-2575, this is the legacy Modal's registration in the+// RENDERED_POPOVERS stack)import type { ReactNode } from "react";import { Children, Component, createRef } from "react";diff --git a/frontend/src/metabase/common/components/Popover/SizeToFitModifier.ts b/frontend/src/metabase/common/components/Popover/SizeToFitModifier.tsdeleted file mode 100644index 5c4c31674ff..00000000000--- a/frontend/src/metabase/common/components/Popover/SizeToFitModifier.ts+++ /dev/null@@ -1,65 +0,0 @@-import * as popper from "@popperjs/core";--const PAGE_PADDING = 10;-const SIZE_TO_FIT_MIN_HEIGHT = 200;--export type SizeToFitOptions = {- minHeight: number;-};--export function sizeToFitModifierFn({- state,- options,-}: popper.ModifierArguments<SizeToFitOptions>) {- const {- placement,- rects: {- popper: { height },- reference: { height: targetHeight },- },- } = state;- const { minHeight = SIZE_TO_FIT_MIN_HEIGHT } = options;-- const topPlacement = placement.startsWith("top");- const bottomPlacement = placement.startsWith("bottom");-- if (topPlacement || bottomPlacement) {- const overflow = popper.detectOverflow(state);- const distanceFromEdge = placement.startsWith("top")- ? overflow.top- : overflow.bottom;-- const maxHeight = height - distanceFromEdge - PAGE_PADDING;- const minnedMaxHeight = Math.max(maxHeight, minHeight);-- const oppositeSpace = window.innerHeight - targetHeight - maxHeight;-- if (- maxHeight < minHeight &&- oppositeSpace > minHeight &&- !state.modifiersData.sizeToFit.flipped- ) {- state.placement = getAltPlacement(placement);- state.modifiersData.sizeToFit.flipped = true;- state.reset = true;- } else {- state.styles.popper.maxHeight = `${minnedMaxHeight}px`;- }- }-}--export function getAltPlacement(- placementStr: popper.Placement,-): popper.Placement {- const [targetPlacement, horizontalPlacement] = placementStr.split("-") as- | [string]- | [string, string];- const newPlacement = [- targetPlacement === "top" ? "bottom" : "top",- horizontalPlacement,- ]- .filter((str): str is string => Boolean(str))- .join("-");-- return newPlacement as popper.Placement;-}diff --git a/frontend/src/metabase/common/components/Popover/TippyPopover.tsx b/frontend/src/metabase/common/components/Popover/TippyPopover.tsxdeleted file mode 100644index 1a42e32cfda..00000000000--- a/frontend/src/metabase/common/components/Popover/TippyPopover.tsx+++ /dev/null@@ -1,153 +0,0 @@-import * as TippyReact from "@tippyjs/react";-import cx from "classnames";-import { merge } from "icepick";-import { useCallback, useMemo, useState } from "react";-import type * as tippy from "tippy.js";--import { EventSandbox } from "metabase/common/components/EventSandbox";-import { getPortalRootElement } from "metabase/common/utils/portal";-import ZIndex from "metabase/css/core/z-index.module.css";-import { isCypressActive } from "metabase/env";-import { useSequencedContentCloseHandler } from "metabase/ui/hooks/use-sequenced-content-close-handler";-import { isReducedMotionPreferred } from "metabase/utils/dom";--import type { SizeToFitOptions } from "./SizeToFitModifier";-import { sizeToFitModifierFn } from "./SizeToFitModifier";-import "./Popover.module.css";--const TippyComponent = TippyReact.default;-type TippyProps = TippyReact.TippyProps;-type TippyInstance = tippy.Instance;--export interface ITippyPopoverProps extends TippyProps {- disableContentSandbox?: boolean;- lazy?: boolean;- flip?: boolean;- sizeToFit?: boolean | SizeToFitOptions;- onClose?: () => void;-}--const OFFSET: [number, number] = [0, 5];--function getPopperOptions({- flip,- sizeToFit,- popperOptions = {},-}: Pick<ITippyPopoverProps, "flip" | "sizeToFit" | "popperOptions">) {- return merge(- {- modifiers: [- {- name: "flip",- enabled: flip && !sizeToFit,- },- {- name: "sizeToFit",- phase: "beforeWrite",- enabled: sizeToFit !== false,- requiresIfExists: ["offset"],- fn: sizeToFitModifierFn,- options: typeof sizeToFit === "object" ? sizeToFit : undefined,- },- ],- },- popperOptions,- );-}--/**- * @deprecated prefer Popover from "metabase/ui" instead- */-export function TippyPopover({- className,- disableContentSandbox,- content,- delay,- lazy = true,- interactive = true,- flip = true,- sizeToFit = false,- popperOptions,- onShow,- onHide,- onClose,- ...props-}: ITippyPopoverProps) {- delay = isCypressActive ? 0 : delay;- const animationDuration = isReducedMotionPreferred() ? 0 : undefined;- const [mounted, setMounted] = useState(!lazy);- const shouldShowContent = mounted && content != null;- const isControlled = props.visible != null;-- const { setupCloseHandler, removeCloseHandler } =- useSequencedContentCloseHandler();-- const handleShow = useCallback(- (instance: TippyInstance) => {- setupCloseHandler(instance.popper, () =>- isControlled ? onClose?.() : instance.hide(),- );-- if (typeof onShow === "function") {- return onShow(instance);- }- },- [setupCloseHandler, onShow, isControlled, onClose],- );-- const handleHide = useCallback(- (instance: TippyInstance) => {- removeCloseHandler();-- if (typeof onHide === "function") {- return onHide(instance);- }- },- [onHide, removeCloseHandler],- );-- const lazyPlugin = useMemo(- () => ({- name: "lazy",- fn: () => ({- onMount: () => setMounted(true),- onHidden: () => setMounted(!lazy),- }),- }),- [lazy],- );-- const plugins = useMemo(() => [lazyPlugin], [lazyPlugin]);-- const computedPopperOptions = useMemo(- () => getPopperOptions({ flip, sizeToFit, popperOptions }),- [flip, sizeToFit, popperOptions],- );-- return (- <TippyComponent- className={cx("popover", ZIndex.Overlay, className)}- theme="popover"- // Tippy's type definition does not support string z-index values- zIndex={"var(--mb-overlay-z-index)" as unknown as number}- arrow={false}- offset={OFFSET}- appendTo={getPortalRootElement}- plugins={plugins}- {...props}- popperOptions={computedPopperOptions}- interactive={interactive}- duration={animationDuration}- delay={delay}- content={- shouldShowContent ? (- <EventSandbox disabled={disableContentSandbox}>- {content}- </EventSandbox>- ) : null- }- onShow={handleShow}- onHide={handleHide}- />- );-}diff --git a/frontend/src/metabase/common/components/Popover/TippyPopover.unit.spec.tsx b/frontend/src/metabase/common/components/Popover/TippyPopover.unit.spec.tsxdeleted file mode 100644index af099f1243d..00000000000--- a/frontend/src/metabase/common/components/Popover/TippyPopover.unit.spec.tsx+++ /dev/null@@ -1,101 +0,0 @@-import userEvent from "@testing-library/user-event";-import React, { useEffect } from "react";--import { render, screen } from "__support__/ui";--import { type ITippyPopoverProps, TippyPopover } from "./TippyPopover";--const defaultTarget = (- <div id="child-target" style={{ width: 100, height: 100 }}>- child target element- </div>-);--function Content({ fn }: { fn?: jest.Mock }) {- useEffect(() => {- fn?.();- // eslint-disable-next-line react-hooks/exhaustive-deps- }, []);-- return <div>popover content</div>;-}--function setup({- contentFn,- target = defaultTarget,- parentOnClick,- ...otherProps-}: {- contentFn?: jest.Mock;- target?: JSX.Element;- parentOnClick?: jest.Mock;-} & ITippyPopoverProps = {}) {- return render(- <div onClick={parentOnClick}>- <TippyPopover content={<Content fn={contentFn} />} {...otherProps}>- {target}- </TippyPopover>- </div>,- );-}--describe("Popover", () => {- it("should be visible on hover of child target element", async () => {- setup();- await userEvent.hover(screen.getByText("child target element"));- expect(await screen.findByText("popover content")).toBeVisible();- });-- it("should be themed as a popover", () => {- setup({ visible: true });- expect(screen.getByRole("tooltip")).toHaveAttribute(- "data-theme",- "popover",- );- });-- describe("lazy", () => {- it("should by default lazily render content", async () => {- const contentFn = jest.fn();- setup({ contentFn });- expect(contentFn).not.toHaveBeenCalled();- await userEvent.hover(screen.getByText("child target element"));-- await screen.findByText("popover content");- expect(contentFn).toHaveBeenCalled();- });-- it("should be configurable to allow for immediate rendering", () => {- const contentFn = jest.fn();- setup({ contentFn, lazy: false });- expect(contentFn).toHaveBeenCalled();- expect(screen.queryByText("popover content")).not.toBeInTheDocument();- });- });-- describe("disableContentSandbox", () => {- it("should by default prevent the bubbling of events from content", async () => {- const parentOnClick = jest.fn();- setup({ visible: true, parentOnClick });-- const popover = await screen.findByText("popover content");- popover.click();-- expect(parentOnClick).not.toHaveBeenCalled();- });-- it("should be configurable to allow events to bubble", async () => {- const parentOnClick = jest.fn();- setup({- visible: true,- disableContentSandbox: true,- parentOnClick,- });-- const popover = await screen.findByText("popover content");- popover.click();-- expect(parentOnClick).toHaveBeenCalled();- });- });-});diff --git a/frontend/src/metabase/common/components/PopoverWithTrigger/ControlledPopoverWithTrigger.styled.tsx b/frontend/src/metabase/common/components/PopoverWithTrigger/ControlledPopoverWithTrigger.styled.tsxdeleted file mode 100644index 5f45631f58b..00000000000--- a/frontend/src/metabase/common/components/PopoverWithTrigger/ControlledPopoverWithTrigger.styled.tsx+++ /dev/null@@ -1,13 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Button } from "metabase/common/components/Button";--export const TriggerButton = styled(Button)`- padding: 0;- border: none;-- &:hover {- background: unset;- }-`;diff --git a/frontend/src/metabase/common/components/PopoverWithTrigger/ControlledPopoverWithTrigger.tsx b/frontend/src/metabase/common/components/PopoverWithTrigger/ControlledPopoverWithTrigger.tsxdeleted file mode 100644index 3fa62b74672..00000000000--- a/frontend/src/metabase/common/components/PopoverWithTrigger/ControlledPopoverWithTrigger.tsx+++ /dev/null@@ -1,109 +0,0 @@-import cx from "classnames";-import _ from "underscore";--import type { ITippyPopoverProps } from "metabase/common/components/Popover/TippyPopover";-import { TippyPopover } from "metabase/common/components/Popover/TippyPopover";--import { TriggerButton } from "./ControlledPopoverWithTrigger.styled";--export type ControlledPopoverWithTriggerProps = Omit<- ITippyPopoverProps,- // this is explicitly a "controlled" component, so we need to remove TippyPopover's optional `visible` prop and make it required- "children" | "visible"-> &- OptionalTriggerStyleProps & {- renderTrigger?: RenderTrigger;- triggerContent?: React.ReactNode;- popoverContent: PopoverWithTriggerContent;- visible: boolean;- onOpen: () => void;- onClose: () => void;- };--type OptionalTriggerStyleProps = {- triggerClasses?: string;- triggerStyle?: React.CSSProperties;- triggerClassesOpen?: string;- triggerClassesClose?: string;-};--export type PopoverWithTriggerContent =- | React.ReactNode- | ((args: PopoverWithTriggerContentArgs) => React.ReactNode);-type PopoverWithTriggerContentArgs = {- closePopover: () => void;-};--export type RenderTrigger = (- args: RenderTriggerArgs,-) => React.ReactElement<any, string | React.JSXElementConstructor<any>>;-type RenderTriggerArgs = {- visible: boolean;- onClick: () => void;- closePopover: () => void;-};--/**- * @deprecated prefer Popover from "metabase/ui" instead- */-export function ControlledPopoverWithTrigger({- triggerClasses,- triggerStyle,- triggerClassesOpen,- triggerClassesClose,- renderTrigger,- triggerContent,- popoverContent,- disabled,- visible,- onOpen,- onClose,- ...popoverProps-}: ControlledPopoverWithTriggerProps) {- const handleTriggerClick = () => {- if (!disabled) {- onOpen();- }- };-- const computedTrigger = _.isFunction(renderTrigger) ? (- renderTrigger({- visible,- onClick: handleTriggerClick,- closePopover: onClose,- })- ) : (- <TriggerButton- type="button"- disabled={disabled}- className={cx(- triggerClasses,- visible && triggerClassesOpen,- !visible && triggerClassesClose,- )}- aria-disabled={disabled}- style={triggerStyle}- onClick={handleTriggerClick}- >- {triggerContent}- </TriggerButton>- );-- const computedPopoverContent = _.isFunction(popoverContent)- ? popoverContent({ closePopover: onClose })- : popoverContent;-- return (- <TippyPopover- interactive- placement="bottom-start"- {...popoverProps}- visible={visible}- disabled={disabled}- content={computedPopoverContent}- onClose={onClose}- >- {computedTrigger}- </TippyPopover>- );-}diff --git a/frontend/src/metabase/common/components/PopoverWithTrigger/ControlledPopoverWithTrigger.unit.spec.tsx b/frontend/src/metabase/common/components/PopoverWithTrigger/ControlledPopoverWithTrigger.unit.spec.tsxdeleted file mode 100644index 472e9f0c0b4..00000000000--- a/frontend/src/metabase/common/components/PopoverWithTrigger/ControlledPopoverWithTrigger.unit.spec.tsx+++ /dev/null@@ -1,148 +0,0 @@-import userEvent from "@testing-library/user-event";--import { render, screen } from "__support__/ui";--import type {- ControlledPopoverWithTriggerProps,- PopoverWithTriggerContent,- RenderTrigger,-} from "./ControlledPopoverWithTrigger";-import { ControlledPopoverWithTrigger } from "./ControlledPopoverWithTrigger";--console.error = jest.fn();--type SetupProps = Partial<ControlledPopoverWithTriggerProps> & {- visible: ControlledPopoverWithTriggerProps["visible"];-};--function setup({- triggerContent = "trigger content",- popoverContent = <div>popover content</div>,- onClose = jest.fn(),- onOpen = jest.fn(),- ...props-}: SetupProps) {- const utils = render(- <div>- <div>something outside of the popover</div>- <ControlledPopoverWithTrigger- {...props}- triggerContent={triggerContent}- popoverContent={popoverContent}- onOpen={onOpen}- onClose={onClose}- />- </div>,- );- return {- ...utils,- onOpen,- onClose,- props: {- triggerContent,- popoverContent,- onClose,- onOpen,- ...props,- },- };-}--describe("ControlledPopoverWithTrigger", () => {- describe("renderTrigger", () => {- const renderTrigger: RenderTrigger = ({ visible, onClick }) => (- <button onClick={onClick} data-visible={visible}>- custom trigger- </button>- );-- it("the component should accept a function that returns a trigger", () => {- setup({ visible: false, renderTrigger });- expect(screen.getByText("custom trigger")).toBeInTheDocument();- expect(screen.getByText("custom trigger")).toHaveAttribute(- "data-visible",- "false",- );- });-- it("should be clickable via the onClick prop the function receives as an argument", async () => {- const { onOpen } = setup({ visible: false, renderTrigger });- await userEvent.click(screen.getByText("custom trigger"));- expect(onOpen).toHaveBeenCalled();- });- });-- describe("triggerContent", () => {- it("should render a trigger button with the given content", () => {- setup({ visible: false });- expect(screen.getByRole("button")).toBeInTheDocument();- expect(screen.getByRole("button")).toHaveTextContent("trigger content");- });-- it("should be clickable and trigger the onOpen prop of the component", async () => {- const { onOpen } = setup({ visible: false });- await userEvent.click(screen.getByText("trigger content"));- expect(onOpen).toHaveBeenCalled();- });- });-- describe("visible", () => {- it("should be openable/closable via the visible prop", async () => {- const { rerender, props } = setup({ visible: true });-- expect(await screen.findByText("popover content")).toBeVisible();-- rerender(<ControlledPopoverWithTrigger {...props} visible={false} />);-- expect(screen.queryByText("popover content")).not.toBeInTheDocument();- });- });-- describe("when the popover is open", () => {- it("should show the popover content", async () => {- setup({ visible: true });- expect(await screen.findByText("popover content")).toBeVisible();- });-- it("should be able to trigger an onClose event via an outside click", async () => {- const { onClose } = setup({ visible: true });- await userEvent.click(- screen.getByText("something outside of the popover"),- );- expect(onClose).toHaveBeenCalled();- });-- it("should be able to trigger an onClose event via an Esc press", async () => {- const { onClose } = setup({ visible: true });- await userEvent.type(document.body, "{Escape}");- expect(onClose).toHaveBeenCalled();- });- });-- describe("popoverContent fn prop", () => {- const popoverContent: PopoverWithTriggerContent = ({ closePopover }) => (- <button onClick={closePopover}>popover content</button>- );-- it("should pass the onClose prop to the popoverContent fn", async () => {- const { onClose } = setup({ visible: true, popoverContent });- await userEvent.click(await screen.findByText("popover content"));- expect(onClose).toHaveBeenCalled();- });- });-- describe("disabled true, visible false", () => {- it("should prevent the triggering of the onOpen fn", async () => {- const { onOpen } = setup({ disabled: true, visible: false });- await userEvent.click(screen.getByText("trigger content"));- expect(onOpen).not.toHaveBeenCalled();- });- });-- describe("disabled true, visible true", () => {- it("should not render the popover", () => {- setup({ disabled: true, visible: true });- expect(screen.queryByText("popover content")).not.toBeInTheDocument();- });- });-});diff --git a/frontend/src/metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger.tsx b/frontend/src/metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger.tsxdeleted file mode 100644index ff62b72ac20..00000000000--- a/frontend/src/metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger.tsx+++ /dev/null@@ -1,48 +0,0 @@-import type { RefObject } from "react";-import { useCallback, useImperativeHandle, useState } from "react";--import type { ControlledPopoverWithTriggerProps } from "./ControlledPopoverWithTrigger";-import { ControlledPopoverWithTrigger } from "./ControlledPopoverWithTrigger";--export type TippyPopoverWithTriggerRef = {- open: () => void;- close: () => void;-};--export type TippyPopoverWithTriggerProps = {- isInitiallyVisible?: boolean;- popoverRef?: RefObject<TippyPopoverWithTriggerRef>;- onClose?: () => void;-} & Omit<ControlledPopoverWithTriggerProps, "visible" | "onClose" | "onOpen">;--/**- * @deprecated prefer Popover from "metabase/ui" instead- */-export function TippyPopoverWithTrigger({- isInitiallyVisible,- popoverRef,- onClose,- ...props-}: TippyPopoverWithTriggerProps) {- const [visible, setVisible] = useState(isInitiallyVisible || false);-- const handleOpen = useCallback(() => setVisible(true), []);- const handleClose = useCallback(() => {- setVisible(false);- onClose?.();- }, [onClose]);-- useImperativeHandle(popoverRef, () => ({- open: handleOpen,- close: handleClose,- }));-- return (- <ControlledPopoverWithTrigger- {...props}- visible={visible}- onOpen={handleOpen}- onClose={handleClose}- />- );-}diff --git a/frontend/src/metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger.unit.spec.tsx b/frontend/src/metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger.unit.spec.tsxdeleted file mode 100644index e7752d1b551..00000000000--- a/frontend/src/metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger.unit.spec.tsx+++ /dev/null@@ -1,47 +0,0 @@-import userEvent from "@testing-library/user-event";--import { render, screen } from "__support__/ui";--import { TippyPopoverWithTrigger } from "./TippyPopoverWithTrigger";--function setup() {- return render(- <div>- <div>something outside of the popover</div>- <TippyPopoverWithTrigger- popoverContent={<div>popover content</div>}- triggerContent="trigger content"- />- </div>,- );-}--describe("TippyPopoverWithTrigger", () => {- beforeEach(() => {- jest.clearAllMocks();- });-- it("should show the popover when user clicks the trigger", async () => {- setup();- await userEvent.click(screen.getByText("trigger content"));- expect(await screen.findByText("popover content")).toBeVisible();- });-- it("should hide the popover if the user clicks outside of the popover", async () => {- setup();- await userEvent.click(screen.getByText("trigger content"));- expect(await screen.findByText("popover content")).toBeVisible();-- await userEvent.click(screen.getByText("something outside of the popover"));- expect(await screen.findByText("popover content")).not.toBeVisible();- });-- it("should hide the popover if the user presses the escape key while the popover is open", async () => {- setup();- await userEvent.click(screen.getByText("trigger content"));- expect(await screen.findByText("popover content")).toBeVisible();-- await userEvent.type(document.body, "{Escape}");- expect(await screen.findByText("popover content")).not.toBeVisible();- });-});diff --git a/frontend/src/metabase/common/components/TabButton/TabButton.tsx b/frontend/src/metabase/common/components/TabButton/TabButton.tsxindex 11d2af9f6dd..84455e0daa8 100644--- a/frontend/src/metabase/common/components/TabButton/TabButton.tsx+++ b/frontend/src/metabase/common/components/TabButton/TabButton.tsx@@ -21,8 +21,8 @@ import {} from "react";import { t } from "ttag";-import { ControlledPopoverWithTrigger } from "metabase/common/components/PopoverWithTrigger/ControlledPopoverWithTrigger";import { useTranslateContent } from "metabase/i18n/hooks";+import { Popover } from "metabase/ui";import type { TabContextType } from "../Tab";import {@@ -156,29 +156,34 @@ const _TabButton = forwardRef(function TabButton(/></TabButtonInputWrapper>{showMenu && (- <ControlledPopoverWithTrigger- visible={isMenuOpen}- onOpen={() => setIsMenuOpen(true)}- onClose={() => setIsMenuOpen(false)}- renderTrigger={({ onClick }) => (+ <Popover+ opened={isMenuOpen}+ onChange={setIsMenuOpen}+ position="bottom-start"+ trapFocus+ >+ <Popover.Target><MenuButtonicon="chevrondown"iconSize={10}isSelected={isSelected}isOpen={isMenuOpen}- onClick={onClick}+ onClick={() => setIsMenuOpen(true)}ref={menuButtonRef}disabled={disabled}/>- )}- popoverContent={({ closePopover }) => (+ </Popover.Target>+ <Popover.Dropdown+ // TODO: remove when the legacy Modal / RENDERED_POPOVERS stack is no longer used (GDGT-2575)+ setupSequencedCloseHandler={() => setIsMenuOpen(false)}+ ><TabButtonMenumenuItems={menuItems}value={value}- closePopover={closePopover}+ closePopover={() => setIsMenuOpen(false)}/>- )}- />+ </Popover.Dropdown>+ </Popover>)}</TabButtonRoot>);diff --git a/frontend/src/metabase/common/components/TabButton/TabButtonMenu.tsx b/frontend/src/metabase/common/components/TabButton/TabButtonMenu.tsxindex 83cd5d430d5..921cee7caf6 100644--- a/frontend/src/metabase/common/components/TabButton/TabButtonMenu.tsx+++ b/frontend/src/metabase/common/components/TabButton/TabButtonMenu.tsx@@ -1,4 +1,5 @@import type { UniqueIdentifier } from "@dnd-kit/core";+import type { MouseEvent } from "react";import { useContext } from "react";import { TabContext } from "../Tab/TabContext";@@ -20,7 +21,8 @@ export function TabButtonMenu({}: TabButtonMenuProps) {const context = useContext(TabContext);- const clickHandler = (action: TabButtonMenuAction) => () => {+ const clickHandler = (action: TabButtonMenuAction) => (event: MouseEvent) => {+ event.stopPropagation();action(context, value);closePopover();};diff --git a/frontend/src/metabase/common/components/TokenField/TokenField.tsx b/frontend/src/metabase/common/components/TokenField/TokenField.tsxindex 143610e1561..3949d2d5e87 100644--- a/frontend/src/metabase/common/components/TokenField/TokenField.tsx+++ b/frontend/src/metabase/common/components/TokenField/TokenField.tsx@@ -2,10 +2,9 @@ import cx from "classnames";import { Component, createRef } from "react";import _ from "underscore";-import { TippyPopover } from "metabase/common/components/Popover/TippyPopover";import FormS from "metabase/css/components/form.module.css";import CS from "metabase/css/core/index.css";-import { Icon } from "metabase/ui";+import { Icon, Popover } from "metabase/ui";import { isObscured } from "metabase/utils/dom";import {KEYCODE_BACKSPACE,@@ -680,13 +679,14 @@ const DefaultTokenFieldLayout = ({isFocused,}: DefaultTokenFieldLayoutProps) => (<div>- <TippyPopover- visible={isFocused && !!optionsList}- content={<div data-testid="token-field-popover">{optionsList}</div>}- placement="bottom-start"- >- <div>{valuesList}</div>- </TippyPopover>+ <Popover opened={Boolean(isFocused && optionsList)} position="bottom-start">+ <Popover.Target>+ <div>{valuesList}</div>+ </Popover.Target>+ <Popover.Dropdown data-testid="token-field-popover">+ {optionsList}+ </Popover.Dropdown>+ </Popover></div>);diff --git a/frontend/src/metabase/common/components/Tooltip/Tooltip.tsx b/frontend/src/metabase/common/components/Tooltip/Tooltip.tsxindex cd714da8d4f..a0d29c7832d 100644--- a/frontend/src/metabase/common/components/Tooltip/Tooltip.tsx+++ b/frontend/src/metabase/common/components/Tooltip/Tooltip.tsx@@ -8,6 +8,8 @@ import { EMBEDDING_SDK_PORTAL_ROOT_ELEMENT_ID } from "metabase/embedding-sdk/conimport { isReducedMotionPreferred } from "metabase/utils/dom";import { isReactDOMTypeElement } from "metabase-types/guards";+import "./tippy.module.css";+const TippyComponent = Tippy.default;export interface TooltipProps extends Partial<@@ -93,7 +95,7 @@ export function Tooltip({[preventOverflow],);- // themes styles come from frontend/src/metabase/common/components/Popover/Popover.css+ // themes styles come from ./tippy.module.css// Tippy theming API: https://atomiks.github.io/tippyjs/v6/themes/const theme = `tooltip ${isPadded ? "" : "no-padding"}`;diff --git a/frontend/src/metabase/common/components/Popover/Popover.module.css b/frontend/src/metabase/common/components/Tooltip/tippy.module.csssimilarity index 56%rename from frontend/src/metabase/common/components/Popover/Popover.module.cssrename to frontend/src/metabase/common/components/Tooltip/tippy.module.cssindex 6929f4b4b6c..731c7ec58ec 100644--- a/frontend/src/metabase/common/components/Popover/Popover.module.css+++ b/frontend/src/metabase/common/components/Tooltip/tippy.module.css@@ -30,25 +30,3 @@:global(.tippy-box[data-theme~="no-padding"] .tippy-content) {padding: 0;}--:global(.tippy-box[data-theme~="popover"]) {- font-size: inherit;- border: 1px solid var(--mb-color-border);- box-shadow: 0 4px 10px var(--mb-color-shadow);- background-color: var(--mb-color-background-primary);- border-radius: 6px;- overflow: auto;-}--:global(.tippy-box[data-theme~="popover"] .tippy-content) {- padding: 0;-}--/* Global id for an element used for positioning tooltips.- * Check usage in metabase/utils/dom.ts when removing this component. */-:global(#popover-event-target) {- position: fixed;- width: 6px;- height: 6px;- pointer-events: none;-}diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsxindex d1094956676..ca31f9f7048 100644--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx@@ -2,11 +2,11 @@ import { useEffect, useMemo, useState } from "react";import { usePrevious } from "react-use";import _ from "underscore";-import { TippyPopover } from "metabase/common/components/Popover/TippyPopover";import { useToggle } from "metabase/common/hooks/use-toggle";import { getParameterValues } from "metabase/dashboard/selectors";import { SearchResults } from "metabase/nav/components/search/SearchResults";import { useSelector } from "metabase/redux";+import { Popover } from "metabase/ui";import { modelToUrl } from "metabase/urls";import { getUrlTarget } from "metabase/visualizations/lib/open-url";import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";@@ -154,10 +154,23 @@ function LinkVizInner({if (isEditing) {return (<EditLinkCardWrapper data-testid="custom-edit-text-link">- <TippyPopover- visible={inputIsFocused && !isUrlString(url)}- content={- !interpolatedUrl?.trim?.().length && !entity ? (+ <Popover opened={inputIsFocused && !isUrlString(url)} position="bottom">+ <Popover.Target>+ <StyledInput+ fullWidth+ value={url ?? ""}+ autoFocus={autoFocus}+ placeholder={"https://example.com"}+ onChange={(e) => handleLinkChange(e.target.value)}+ onFocus={onFocusInput}+ // we need to debounce this or it may close the popover before the click event can fire+ onBlur={_.debounce(onBlurInput, 100)}+ // the dashcard really wants to turn all mouse events into drag events+ onMouseDown={(e) => e.stopPropagation()}+ />+ </Popover.Target>+ <Popover.Dropdown>+ {!interpolatedUrl?.trim?.().length && !entity ? (<StyledRecentsList onClick={handleEntitySelect} />) : (<SearchResultsContainer>@@ -169,23 +182,9 @@ function LinkVizInner({context="entity-picker"/></SearchResultsContainer>- )- }- placement="bottom"- >- <StyledInput- fullWidth- value={url ?? ""}- autoFocus={autoFocus}- placeholder={"https://example.com"}- onChange={(e) => handleLinkChange(e.target.value)}- onFocus={onFocusInput}- // we need to debounce this or it may close the popover before the click event can fire- onBlur={_.debounce(onBlurInput, 100)}- // the dashcard really wants to turn all mouse events into drag events- onMouseDown={(e) => e.stopPropagation()}- />- </TippyPopover>+ )}+ </Popover.Dropdown>+ </Popover></EditLinkCardWrapper>);}diff --git a/frontend/src/metabase/ui/components/overlays/Menu/MenuDropdown/MenuDropdown.tsx b/frontend/src/metabase/ui/components/overlays/Menu/MenuDropdown/MenuDropdown.tsxindex 09297d6a288..3eed4a3f6a4 100644--- a/frontend/src/metabase/ui/components/overlays/Menu/MenuDropdown/MenuDropdown.tsx+++ b/frontend/src/metabase/ui/components/overlays/Menu/MenuDropdown/MenuDropdown.tsx@@ -6,8 +6,9 @@ import { forwardRef, useEffect } from "react";import { PreventEagerPortal } from "metabase/ui";import { useSequencedContentCloseHandler } from "metabase/ui/hooks/use-sequenced-content-close-handler";-// hack to prevent parent TippyPopover from closing when selecting a Menu.Item-// remove when TippyPopover is no longer used+// hack to prevent a parent registered in the RENDERED_POPOVERS stack (legacy+// Modal via OnClickOutsideWrapper) from closing when selecting a Menu.Item+// remove when the legacy Modal / RENDERED_POPOVERS stack is no longer used (GDGT-2575)export const MenuDropdown = forwardRef(function MenuDropdown({ children, ...props }: MenuDropdownProps,ref: Ref<HTMLDivElement>,diff --git a/frontend/src/metabase/ui/components/overlays/Popover/PopoverWithRef.tsx b/frontend/src/metabase/ui/components/overlays/Popover/PopoverWithRef.tsxindex 1fff42c7b27..fca066c8499 100644--- a/frontend/src/metabase/ui/components/overlays/Popover/PopoverWithRef.tsx+++ b/frontend/src/metabase/ui/components/overlays/Popover/PopoverWithRef.tsx@@ -4,7 +4,6 @@ import {forwardRef,useLayoutEffect,useMemo,- useRef,} from "react";import { Popover, type PopoverProps } from "./index";@@ -22,28 +21,31 @@ export const PopoverWithRef = ({anchorEl: Element | null;popoverContentTestId?: string;}) => {- const anchorRef = useRef(anchorEl);- anchorRef.current = anchorEl;-const Target = useMemo(() => {return forwardRef(function Target(- _props: unknown,+ { anchorEl }: { anchorEl: Element | null },ref: Ref<Element> | null,) {useLayoutEffect(() => {if (typeof ref === "function") {- ref(anchorRef.current);+ ref(anchorEl);}- }, [ref]);+ }, [ref, anchorEl]);return null;});- }, []); // should use ref to prevent new components being created+ }, []);++ // A Mantine Popover mounted with a null reference is never positioned, even+ // if the reference is wired later — mount it only once the anchor exists+ if (!anchorEl) {+ return null;+ }return (<Popover {...popoverProps}><Popover.Target>- <Target />+ <Target anchorEl={anchorEl} /></Popover.Target><Popover.Dropdown data-testid={popoverContentTestId}>{children}diff --git a/frontend/src/metabase/ui/components/overlays/Popover/PopoverWithRef.unit.spec.tsx b/frontend/src/metabase/ui/components/overlays/Popover/PopoverWithRef.unit.spec.tsxnew file mode 100644index 00000000000..8e9fa6176e5--- /dev/null+++ b/frontend/src/metabase/ui/components/overlays/Popover/PopoverWithRef.unit.spec.tsx@@ -0,0 +1,64 @@+import userEvent from "@testing-library/user-event";+import { useState } from "react";++import { fireEvent, render, screen } from "__support__/ui";++import { PopoverWithRef } from "./PopoverWithRef";++interface TestAppProps {+ onChange: (opened: boolean) => void;+}++const TestApp = ({ onChange }: TestAppProps) => {+ const [anchorEl, setAnchorEl] = useState<HTMLDivElement | null>(null);+ const [isAnchorMounted, setIsAnchorMounted] = useState(false);++ return (+ <div>+ <button onClick={() => setIsAnchorMounted(true)}>mount anchor</button>+ {isAnchorMounted && (+ <div ref={setAnchorEl} data-testid="anchor">+ anchor+ </div>+ )}+ <PopoverWithRef+ anchorEl={anchorEl}+ opened={anchorEl !== null}+ onChange={onChange}+ >+ popover content+ </PopoverWithRef>+ </div>+ );+};++const setup = () => {+ const onChange = jest.fn();+ render(<TestApp onChange={onChange} />);+ return { onChange };+};++describe("PopoverWithRef", () => {+ it("renders dropdown content for an anchor that appears after mount", async () => {+ setup();++ expect(screen.queryByText("popover content")).not.toBeInTheDocument();++ await userEvent.click(screen.getByText("mount anchor"));++ expect(await screen.findByText("popover content")).toBeInTheDocument();+ });++ it("wires a late-appearing anchor as the popover target for outside clicks", async () => {+ const { onChange } = setup();++ await userEvent.click(screen.getByText("mount anchor"));+ await screen.findByText("popover content");++ fireEvent.mouseDown(screen.getByTestId("anchor"));+ expect(onChange).not.toHaveBeenCalled();++ fireEvent.mouseDown(document.body);+ expect(onChange).toHaveBeenCalledWith(false);+ });+});diff --git a/frontend/src/metabase/ui/components/overlays/Popover/index.tsx b/frontend/src/metabase/ui/components/overlays/Popover/index.tsxindex 0302d12b3ba..e125de2bd50 100644--- a/frontend/src/metabase/ui/components/overlays/Popover/index.tsx+++ b/frontend/src/metabase/ui/components/overlays/Popover/index.tsx@@ -1,7 +1,9 @@import type { PopoverDropdownProps } from "@mantine/core";import { Popover as MantinePopover } from "@mantine/core";+import { useMergedRef } from "@mantine/hooks";import cx from "classnames";-import { type Ref, forwardRef, useEffect } from "react";+import { type Ref, type RefObject, forwardRef, useEffect, useRef } from "react";+import { useLatest } from "react-use";import ZIndex from "metabase/css/core/z-index.module.css";import { PreventEagerPortal } from "metabase/ui";@@ -13,25 +15,56 @@ export { popoverOverrides } from "./Popover.config";const MantinePopoverDropdown = MantinePopover.Dropdown;type ExtendedPopoverDropdownProps = PopoverDropdownProps & {- // Prevent parent TippyPopover from closing when selecting an item- // TODO: remove when TippyPopover is no longer used- setupSequencedCloseHandler?: boolean;+ // Registers the dropdown in the RENDERED_POPOVERS stack while it is open, so+ // that a parent registered there (legacy Modal via OnClickOutsideWrapper)+ // does not react to Esc/outside clicks meant for this dropdown. The callback+ // must actually close the popover: inside a legacy Modal the EventSandbox+ // swallows mousedown before it reaches Mantine's document-level+ // closeOnClickOutside listener, so the stack (window capture) is the only+ // thing that can close the popover on an outside click there.+ // TODO: remove when the legacy Modal / RENDERED_POPOVERS stack is no longer used (GDGT-2575)+ setupSequencedCloseHandler?: () => void;};-const PopoverDropdown = forwardRef(function PopoverDropdown(- props: ExtendedPopoverDropdownProps,- ref: Ref<HTMLDivElement>,-) {+type SequencedCloseHandlerSetupProps = {+ dropdownRef: RefObject<HTMLDivElement>;+ onClose: () => void;+};++// Rendered inside the dropdown so that it is mounted only while the popover is+// open — registering on the wrapper itself would permanently occupy the top of+// the stack and block the parent modal from ever closing.+// TODO: remove when the legacy Modal / RENDERED_POPOVERS stack is no longer+// used (GDGT-2575, together with the setupSequencedCloseHandler prop and the+// dropdownRef/useMergedRef wiring below)+const SequencedCloseHandlerSetup = ({+ dropdownRef,+ onClose,+}: SequencedCloseHandlerSetupProps) => {const { setupCloseHandler, removeCloseHandler } =useSequencedContentCloseHandler();+ const onCloseRef = useLatest(onClose);useEffect(() => {- if (!props.setupSequencedCloseHandler) {- return;- }- setupCloseHandler(document.body, () => undefined);+ const dropdownEl = dropdownRef.current;+ // the target element, same exclusion as in Mantine's own useClickOutside —+ // a click on the trigger must toggle the popover, not close-and-reopen it+ const targetEl = dropdownEl?.id+ ? document.querySelector(`[aria-controls="${dropdownEl.id}"]`)+ : null;+ setupCloseHandler(dropdownEl, () => onCloseRef.current(), targetEl);return () => removeCloseHandler();- }, [setupCloseHandler, removeCloseHandler, props.setupSequencedCloseHandler]);+ }, [setupCloseHandler, removeCloseHandler, dropdownRef, onCloseRef]);++ return null;+};++const PopoverDropdown = forwardRef(function PopoverDropdown(+ { setupSequencedCloseHandler, ...props }: ExtendedPopoverDropdownProps,+ ref: Ref<HTMLDivElement>,+) {+ const dropdownRef = useRef<HTMLDivElement>(null);+ const mergedRef = useMergedRef(ref, dropdownRef);return (<PreventEagerPortal {...props}>@@ -39,16 +72,23 @@ const PopoverDropdown = forwardRef(function PopoverDropdown({...props}className={cx(props.className, ZIndex.Overlay)}data-element-id="mantine-popover"- ref={ref}- />+ ref={mergedRef}+ >+ {setupSequencedCloseHandler && (+ <SequencedCloseHandlerSetup+ dropdownRef={dropdownRef}+ onClose={setupSequencedCloseHandler}+ />+ )}+ {props.children}+ </MantinePopoverDropdown></PreventEagerPortal>);});-// @ts-expect-error -- our types are better-PopoverDropdown.displayName = MantinePopoverDropdown.displayName;-// @ts-expect-error -- our types are better-MantinePopover.Dropdown = PopoverDropdown;--export const Popover = MantinePopover;+export const Popover = Object.assign(MantinePopover, {+ Dropdown: Object.assign(PopoverDropdown, {+ displayName: MantinePopoverDropdown.displayName,+ }),+});export { DEFAULT_POPOVER_Z_INDEX } from "./Popover.config";diff --git a/frontend/src/metabase/ui/hooks/use-sequenced-content-close-handler.ts b/frontend/src/metabase/ui/hooks/use-sequenced-content-close-handler.tsindex 3231e91e774..b80b8c1e9e0 100644--- a/frontend/src/metabase/ui/hooks/use-sequenced-content-close-handler.ts+++ b/frontend/src/metabase/ui/hooks/use-sequenced-content-close-handler.ts@@ -1,3 +1,7 @@+// TODO: delete this file entirely (the RENDERED_POPOVERS stack and all its+// registrations) when the legacy Modal is migrated to Modal from metabase/ui+// (GDGT-2575) — grep for useSequencedContentCloseHandler and+// setupSequencedCloseHandler to find the consumers to clean upimport { useCallback, useRef } from "react";import _ from "underscore";@@ -17,6 +21,23 @@ function isEventInsideElement(e: Event, el: Element) {return isElement(target) && el.contains(target);}+// An Escape originating inside a Mantine dropdown is handled by Mantine itself+// (onKeyDownCapture on the dropdown element). It must not also close a stack+// entry: Mantine closes the dropdown synchronously during the capture phase,+// so by the time the event bubbles to this stack's document listener the+// dropdown is already unregistered and a parent modal would wrongly become the+// topmost entry. composedPath() is frozen at dispatch time, so the origin is+// still detectable here.+// TODO: goes away together with this file when the legacy Modal /+// RENDERED_POPOVERS stack is no longer used (GDGT-2575)+function isEventInsideMantinePopover(e: Event) {+ const target = e.composedPath()[0];+ return (+ isElement(target) &&+ target.closest('[data-element-id="mantine-popover"]') !== null+ );+}+export function removePopoverData(popoverData: PopoverData) {const index = RENDERED_POPOVERS.indexOf(popoverData);if (index >= 0) {@@ -45,7 +66,8 @@ export function shouldClosePopover(return (mostRecentPopover &&mostRecentPopover === popoverData &&- e.key === "Escape"+ e.key === "Escape" &&+ !isEventInsideMantinePopover(e));}@@ -76,11 +98,15 @@ export function useSequencedContentCloseHandler() {}, [handleEvent]);const setupCloseHandler = useCallback(- (contentEl: Element | null, close: () => void) => {+ (+ contentEl: Element | null,+ close: () => void,+ ignoreEl?: Element | null,+ ) => {removeCloseHandler();if (isElement(contentEl)) {- const popover = { contentEl, close };+ const popover = { contentEl, close, ignoreEl: ignoreEl ?? undefined };RENDERED_POPOVERS.push(popover);popoverDataRef.current = popover;diff --git a/frontend/src/metabase/utils/dom.ts b/frontend/src/metabase/utils/dom.tsindex 14c230edade..61c3b0dc9da 100644--- a/frontend/src/metabase/utils/dom.ts+++ b/frontend/src/metabase/utils/dom.ts@@ -198,6 +198,13 @@ export const getEventTarget = (if (!target) {target = document.createElement("div");target.id = "popover-event-target";+ // This node is the virtual anchor a Mantine Popover attaches to. Position it+ // as a tiny, click-through box at the cursor (left/top set below from the+ // event's viewport coords) so the popover opens at the pointer location.+ target.style.position = "fixed";+ target.style.width = "6px";+ target.style.height = "6px";+ target.style.pointerEvents = "none";document.body.appendChild(target);}diff --git a/frontend/src/metabase/visualizations/components/ChartSettingsWidgetPopover.tsx b/frontend/src/metabase/visualizations/components/ChartSettingsWidgetPopover.tsxindex f889af50d9d..c30de7f2988 100644--- a/frontend/src/metabase/visualizations/components/ChartSettingsWidgetPopover.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettingsWidgetPopover.tsx@@ -1,9 +1,10 @@import { useEffect, useRef, useState } from "react";import _ from "underscore";-import { TippyPopover } from "metabase/common/components/Popover/TippyPopover";import CS from "metabase/css/core/index.css";+import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { Box, Space, Tabs } from "metabase/ui";+import { PopoverWithRef } from "metabase/ui/components/overlays/Popover/PopoverWithRef";import type { Widget } from "../types";@@ -44,64 +45,52 @@ export const ChartSettingsWidgetPopover = ({};return (- <TippyPopover- reference={anchor}- content={- widgets.length > 0 ? (- <Box- pt={hasMultipleSections ? 0 : undefined}- ref={contentRef}- mah="40rem"- miw="336px"- className={CS.overflowYAuto}+ <PopoverWithRef+ anchorEl={anchor}+ opened={!!anchor && widgets.length > 0}+ onDismiss={onClose}+ position="right"+ offset={{ mainAxis: 10, crossAxis: 10 }}+ middlewares={{+ shift: { padding: 16 },+ flip: { fallbackStrategy: "initialPlacement" },+ size: { padding: 5 },+ }}+ {...(isEmbeddingSdk() && {+ withinPortal: false,+ floatingStrategy: "fixed",+ })}+ >+ <Box+ pt={hasMultipleSections ? 0 : undefined}+ ref={contentRef}+ mah="40rem"+ miw="336px"+ className={CS.overflowYAuto}+ >+ {hasMultipleSections && (+ <Tabs+ px="md"+ pt="xs"+ value={currentSection}+ onChange={(section) => setCurrentSection(String(section))}>- {hasMultipleSections && (- <Tabs- px="md"- pt="xs"- value={currentSection}- onChange={(section) => setCurrentSection(String(section))}- >- <Tabs.List grow>- {sections.current.map((sectionName) => (- <Tabs.Tab- key={sectionName}- value={String(sectionName)}- p="md"- >- {sectionName}- </Tabs.Tab>- ))}- </Tabs.List>- </Tabs>- )}- <Space py="sm"></Space>- {widgets- .filter((widget) => widget.section === currentSection)- ?.map((widget) => (- <ChartSettingsWidget- key={widget.id}- {...widget}- hidden={false}- />+ <Tabs.List grow>+ {sections.current.map((sectionName) => (+ <Tabs.Tab key={sectionName} value={String(sectionName)} p="md">+ {sectionName}+ </Tabs.Tab>))}- </Box>- ) : null- }- visible={!!anchor}- onClose={onClose}- placement="right"- offset={[10, 10]}- popperOptions={{- modifiers: [- {- name: "preventOverflow",- options: {- padding: 16,- },- },- ],- }}- />+ </Tabs.List>+ </Tabs>+ )}+ <Space py="sm"></Space>+ {widgets+ .filter((widget) => widget.section === currentSection)+ ?.map((widget) => (+ <ChartSettingsWidget key={widget.id} {...widget} hidden={false} />+ ))}+ </Box>+ </PopoverWithRef>);};diff --git a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.dashboard.stories.tsx b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.dashboard.stories.tsxindex 3aa328f864b..fb7af14940b 100644--- a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.dashboard.stories.tsx+++ b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.dashboard.stories.tsx@@ -9,9 +9,6 @@ import { getStore } from "__support__/entities-store";import { getNextId } from "__support__/utils";import { AppColorSchemeProvider } from "metabase/AppColorSchemeProvider";import { Api } from "metabase/api";-// Side-effect import: provides the `#popover-event-target { position: fixed }`-// rule that ChartTooltip relies on to anchor near the hovered cell.-import "metabase/common/components/Popover/Popover.module.css";import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { PublicOrEmbeddedDashboardView } from "metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView";import { publicReducers } from "metabase/reducers-public";diff --git a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsx b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsxindex b8ee9fd6d5a..89b6db6b43f 100644--- a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsx+++ b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsx@@ -14,9 +14,6 @@ import {import { getNextId } from "__support__/utils";import { AppColorSchemeProvider } from "metabase/AppColorSchemeProvider";import { Api } from "metabase/api";-// Side-effect import: provides the `#popover-event-target { position: fixed }`-// rule that ChartTooltip relies on to anchor near the hovered cell.-import "metabase/common/components/Popover/Popover.module.css";import { Editor } from "metabase/documents/components/Editor/Editor";import { commonReducers } from "metabase/reducers-common";import { MetabaseReduxProvider } from "metabase/redux";diff --git a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.question.stories.tsx b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.question.stories.tsxindex d189cfd5f8b..7e7bfd826b6 100644--- a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.question.stories.tsx+++ b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.question.stories.tsx@@ -8,9 +8,6 @@ import { createMockMetadata } from "__support__/metadata";import { getNextId } from "__support__/utils";import { AppColorSchemeProvider } from "metabase/AppColorSchemeProvider";import { Api } from "metabase/api";-// Side-effect import: provides the `#popover-event-target { position: fixed }`-// rule that ChartTooltip relies on to anchor near the hovered cell.-import "metabase/common/components/Popover/Popover.module.css";import {PublicOrEmbeddedQuestionView,type PublicOrEmbeddedQuestionViewProps,