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
Fix aria-expanded on dashboard filter trigger button (#70543) (#70973)
Andersond2406bf64b00
diff --git a/frontend/src/metabase/parameters/components/ParameterValueWidget.tsx b/frontend/src/metabase/parameters/components/ParameterValueWidget.tsxindex 00d11c1fcaa..53695840c20 100644--- a/frontend/src/metabase/parameters/components/ParameterValueWidget.tsx+++ b/frontend/src/metabase/parameters/components/ParameterValueWidget.tsx@@ -9,7 +9,7 @@ import FormattedParameterValue from "metabase/parameters/components/FormattedParimport S from "metabase/parameters/components/ParameterValueWidget.module.css";import { ParameterValueWidgetTrigger } from "metabase/parameters/components/ParameterValueWidgetTrigger";import { getParameterIconName } from "metabase/parameters/utils/ui";-import { Box, Icon, Popover, type PopoverProps } from "metabase/ui";+import { Icon, Popover, type PopoverProps } from "metabase/ui";import type { UiParameter } from "metabase-lib/v1/parameters/types";import {isBooleanParameter,@@ -240,88 +240,83 @@ export const ParameterValueWidget = ({}return (- <Popover- opened={isOpen}- onChange={toggle}- position="bottom-start"- trapFocus- middlewares={{ flip: true, shift: true }}- clickOutsideEvents={["mousedown", "touchstart", "pointerdown"]}- {...popoverProps}+ <Sortable+ id={parameter.id}+ draggingStyle={{ opacity: 0.5 }}+ disabled={!isSortable}+ role="listitem">- <Popover.Target>- <Box- data-testid="parameter-value-widget-target"- onClick={toggle}- className={CS.cursorPointer}- maw="100%"- >- <Sortable- id={parameter.id}- draggingStyle={{ opacity: 0.5 }}- disabled={!isSortable}- role="listitem"+ <Popover+ opened={isOpen}+ onChange={toggle}+ position="bottom-start"+ trapFocus+ middlewares={{ flip: true, shift: true }}+ clickOutsideEvents={["mousedown", "touchstart", "pointerdown"]}+ {...popoverProps}+ >+ <Popover.Target>+ <ParameterValueWidgetTrigger+ data-testid="parameter-value-widget-target"+ onClick={toggle}+ hasValue={hasValue}+ className={cx(CS.cursorPointer, className)}+ ariaLabel={placeholder}+ mimicMantine={mimicMantine}+ hasPopover>- <ParameterValueWidgetTrigger- hasValue={hasValue}- className={className}- ariaLabel={placeholder}- mimicMantine={mimicMantine}- hasPopover+ {typeIcon}+ {prefix && <div className={S.Prefix}>{prefix}</div>}+ <div+ className={CS.mr1}+ style={+ isStringParameter(parameter)+ ? { maxWidth: "190px" }+ : {+ overflow: "hidden",+ textOverflow: "ellipsis",+ }+ }>- {typeIcon}- {prefix && <div className={S.Prefix}>{prefix}</div>}- <div- className={CS.mr1}- style={- isStringParameter(parameter)- ? { maxWidth: "190px" }- : {- overflow: "hidden",- textOverflow: "ellipsis",- }- }- >- <FormattedParameterValue- parameter={parameter}- value={value}- cardId={cardId}- dashboardId={dashboardId}- placeholder={translatedPlaceholder}- isPopoverOpen={isOpen}- />- </div>- {getActionIcon()}- </ParameterValueWidgetTrigger>- </Sortable>- </Box>- </Popover.Target>- <Popover.Dropdown- // Removes `maxWidth` so that `floating-ui` can detect the new element size. See metabase#52918 for details.- // Use `size` middleware options when we upgrade to mantine v7.- maw={isDateParameter(parameter) ? "100vw !important" : undefined}- data-testid="parameter-value-dropdown"- >- <ParameterDropdownWidget- parameter={parameter}- parameters={parameters}- cardId={cardId}- dashboardId={dashboardId}- value={value}- setValue={setValue}- isEditing={isEditing}- placeholder={placeholder}- focusChanged={setIsFocused}- isFullscreen={isFullscreen}- commitImmediately={commitImmediately}- setParameterValueToDefault={setParameterValueToDefault}- enableRequiredBehavior={enableRequiredBehavior}- isSortable={isSortable}- onFocusChanged={onFocusChanged}- onPopoverClose={close}- />- </Popover.Dropdown>- </Popover>+ <FormattedParameterValue+ parameter={parameter}+ value={value}+ cardId={cardId}+ dashboardId={dashboardId}+ placeholder={translatedPlaceholder}+ isPopoverOpen={isOpen}+ />+ </div>+ {getActionIcon()}+ </ParameterValueWidgetTrigger>+ </Popover.Target>+ <Popover.Dropdown+ // Removes `maxWidth` so that `floating-ui` can detect the new element size. See metabase#52918 for details.+ // Use `size` middleware options when we upgrade to mantine v7.+ maw={isDateParameter(parameter) ? "100vw !important" : undefined}+ data-testid="parameter-value-dropdown"+ >+ <ParameterDropdownWidget+ parameter={parameter}+ parameters={parameters}+ cardId={cardId}+ dashboardId={dashboardId}+ value={value}+ setValue={setValue}+ isEditing={isEditing}+ placeholder={placeholder}+ focusChanged={setIsFocused}+ isFullscreen={isFullscreen}+ commitImmediately={commitImmediately}+ setParameterValueToDefault={setParameterValueToDefault}+ enableRequiredBehavior={enableRequiredBehavior}+ isSortable={isSortable}+ onFocusChanged={onFocusChanged}+ onPopoverClose={close}+ />+ </Popover.Dropdown>+ </Popover>+ </Sortable>);};diff --git a/frontend/src/metabase/parameters/components/ParameterValueWidget.unit.spec.tsx b/frontend/src/metabase/parameters/components/ParameterValueWidget.unit.spec.tsxnew file mode 100644index 00000000000..a49373ca360--- /dev/null+++ b/frontend/src/metabase/parameters/components/ParameterValueWidget.unit.spec.tsx@@ -0,0 +1,53 @@+import userEvent from "@testing-library/user-event";++import { renderWithProviders, screen } from "__support__/ui";+import type { UiParameter } from "metabase-lib/v1/parameters/types";+import { createMockParameter } from "metabase-types/api/mocks";++import { ParameterValueWidget } from "./ParameterValueWidget";++function setup({ parameter }: { parameter?: Partial<UiParameter> } = {}) {+ const defaultParameter: UiParameter = {+ ...createMockParameter({+ id: "test-param",+ type: "string/=",+ slug: "text",+ name: "Text",+ }),+ fields: [],+ ...parameter,+ } as UiParameter;++ const setValue = jest.fn();++ renderWithProviders(+ <ParameterValueWidget+ parameter={defaultParameter}+ setValue={setValue}+ value={null}+ placeholder="Enter a value"+ />,+ );++ return { setValue };+}++describe("ParameterValueWidget", () => {+ it("should apply aria-expanded=true on the trigger button element (#70543)", async () => {+ setup();++ const triggerButton = screen.getByTestId("parameter-value-widget-target");++ // The trigger should be a button element (rendered via UnstyledButton when hasPopover is true)+ expect(triggerButton.tagName).toBe("BUTTON");++ // Before opening, aria-expanded should be false+ expect(triggerButton).toHaveAttribute("aria-expanded", "false");++ // Open the popover+ await userEvent.click(triggerButton);++ // After opening, aria-expanded should be true on the same button+ expect(triggerButton).toHaveAttribute("aria-expanded", "true");+ });+});diff --git a/frontend/src/metabase/parameters/components/ParameterValueWidgetTrigger.tsx b/frontend/src/metabase/parameters/components/ParameterValueWidgetTrigger.tsxindex f2ffca88f95..bc0dfbaa0e9 100644--- a/frontend/src/metabase/parameters/components/ParameterValueWidgetTrigger.tsx+++ b/frontend/src/metabase/parameters/components/ParameterValueWidgetTrigger.tsx@@ -1,5 +1,10 @@import cx from "classnames";-import { type ReactNode, type Ref, forwardRef } from "react";+import {+ type HTMLAttributes,+ type ReactNode,+ type Ref,+ forwardRef,+} from "react";import { Box, Flex, UnstyledButton } from "metabase/ui";@@ -9,6 +14,15 @@ export const ParameterValueWidgetTrigger = forwardRef(ParameterValueWidgetTriggerInner,);+type ParameterValueWidgetTriggerProps = {+ children: ReactNode;+ hasValue: boolean;+ ariaLabel?: string;+ className?: string;+ mimicMantine?: boolean;+ hasPopover?: boolean;+} & Omit<HTMLAttributes<HTMLElement>, "children">;+function ParameterValueWidgetTriggerInner({children,@@ -17,14 +31,8 @@ function ParameterValueWidgetTriggerInner(className,mimicMantine = false,hasPopover = false,- }: {- children: ReactNode;- hasValue: boolean;- ariaLabel?: string;- className?: string;- mimicMantine?: boolean;- hasPopover?: boolean;- },+ ...htmlProps+ }: ParameterValueWidgetTriggerProps,ref: Ref<HTMLButtonElement | HTMLButtonElement>,) {const attributes = hasPopover@@ -52,6 +60,7 @@ function ParameterValueWidgetTriggerInner([S.hasValue]: hasValue,})}aria-label={ariaLabel}+ {...htmlProps}{...attributes}>{children}@@ -66,6 +75,7 @@ function ParameterValueWidgetTriggerInner(})}aria-label={ariaLabel}maw="100%"+ {...htmlProps}{...attributes}>{children}diff --git a/frontend/src/metabase/parameters/components/ParametersList/ParametersList.tsx b/frontend/src/metabase/parameters/components/ParametersList/ParametersList.tsxindex 48cef44da66..a8768883617 100644--- a/frontend/src/metabase/parameters/components/ParametersList/ParametersList.tsx+++ b/frontend/src/metabase/parameters/components/ParametersList/ParametersList.tsx@@ -112,6 +112,7 @@ export const ParametersList = forwardRef<HTMLDivElement, ParametersListProps>(return visibleValuePopulatedParameters.length > 0 ? (<Flex+ role="list"display="flex"direction={vertical ? "column" : "row"}align="end"