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-3284: Built-in tooltips for icon-only SegmentedControl segments (#83746)
Will Fryab4afe86909d
diff --git a/.loki/reference/chrome_laptop_Components_Inputs_SegmentedControl_Overview.png b/.loki/reference/chrome_laptop_Components_Inputs_SegmentedControl_Overview.pngindex ee172d2d555..c77d8331b26 100644Binary files a/.loki/reference/chrome_laptop_Components_Inputs_SegmentedControl_Overview.png and b/.loki/reference/chrome_laptop_Components_Inputs_SegmentedControl_Overview.png differdiff --git a/frontend/src/metabase/common/components/UndoListing.tsx b/frontend/src/metabase/common/components/UndoListing.tsxindex 94412650800..4219c135bc3 100644--- a/frontend/src/metabase/common/components/UndoListing.tsx+++ b/frontend/src/metabase/common/components/UndoListing.tsx@@ -34,6 +34,7 @@ import {Progress,Stack,} from "metabase/ui";+import { isFocusVisible } from "metabase/utils/dom";import { capitalize, inflect } from "metabase/utils/formatting";import S from "./UndoListing.module.css";@@ -109,7 +110,7 @@ function UndoToast({};const handleFocus = (event: FocusEvent<HTMLDivElement>) => {- if (event.target.matches(":focus-visible")) {+ if (isFocusVisible(event.target)) {updateInteraction({ isFocused: true });}};diff --git a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsx b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsxindex 8479f333b42..257ab769383 100644--- a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsx+++ b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsx@@ -309,7 +309,8 @@ function getSidebarTabItem({? {value,ariaLabel: label,- icon: <Icon name={iconName} tooltip={label} />,+ icon: iconName,+ withTooltip: true,}: { value, label };}diff --git a/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.tsx b/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.tsxindex fe01d64a393..31096823df5 100644--- a/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.tsx+++ b/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.tsx@@ -2,7 +2,6 @@ import { useEffect, useMemo, useState } from "react";import { t } from "ttag";import {- Icon,SegmentedControl,type SegmentedControlItem,type SegmentedControlProps,@@ -82,6 +81,7 @@ function getIconOnlyItem({return {value,ariaLabel: label,- icon: <Icon name={iconName} tooltip={label} />,+ icon: iconName,+ withTooltip: true,};}diff --git a/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.unit.spec.tsx b/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.unit.spec.tsxindex 78714ac3b8e..e7a2083024a 100644--- a/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.unit.spec.tsx+++ b/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.unit.spec.tsx@@ -1,6 +1,6 @@import userEvent from "@testing-library/user-event";-import { renderWithProviders, screen, waitFor, within } from "__support__/ui";+import { renderWithProviders, screen, waitFor } from "__support__/ui";import type { TableFieldOrder } from "metabase-types/api";import { FieldOrderPicker } from "./FieldOrderPicker";@@ -38,8 +38,7 @@ describe("FieldOrderPicker", () => {setup();for (const label of TOOLTIP_LABELS) {- const option = screen.getByLabelText(label);- await userEvent.hover(within(option).getByRole("img"));+ await userEvent.hover(screen.getByRole("img", { name: label }));await waitFor(() => {expect(diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.mdx b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.mdxindex 96776f3fdd4..14f80c10c11 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.mdx+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.mdx@@ -21,12 +21,14 @@ Each item in `data` is text only, icon + text, or icon only. The component owns{ value: "code", label: "Code" },{ value: "preview", label: "Preview", icon: "eye_filled" },{ value: "settings", ariaLabel: "Settings", icon: "gear" },+ { value: "help", ariaLabel: "Help", icon: "info", withTooltip: true },]}/>```- `label` is the visible text. Add `icon` to show an icon before it.- Leave out `label` and pass `ariaLabel` with `icon` for an icon-only item. `ariaLabel` is required so the item has an accessible name.+- Add `withTooltip` to an icon-only item to show its `ariaLabel` as a tooltip. It opens when the pointer is anywhere over the segment or the segment has keyboard focus, and pressing Escape closes it. Use it when the icon alone doesn't make the option clear.- `icon` is usually an icon name. Pass an element only when the icon can't be expressed as a name; the element is then responsible for its own size.## Examples@@ -43,6 +45,10 @@ Each item in `data` is text only, icon + text, or icon only. The component owns<Canvas of={SegmentedControlStories.IconOnly} />+### Icon only with tooltip++<Canvas of={SegmentedControlStories.IconOnlyWithTooltip} />+### Full width<Canvas of={SegmentedControlStories.FullWidth} />diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.css b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.cssindex d1dcbf9bf89..d99bc62c0be 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.css+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.css@@ -40,6 +40,10 @@&[data-active] {color: var(--mb-color-text-primary);}++ &:has(.SegmentedControlTooltipTarget) {+ padding: 0;+ }}.SegmentedControlInnerLabel {@@ -50,6 +54,14 @@min-height: 1rem;}+.SegmentedControlTooltipTarget {+ display: flex;+ flex: 1;+ align-items: center;+ justify-content: center;+ padding: var(--mantine-spacing-xxs) var(--mantine-spacing-md);+}+.SegmentedControlIconElement {display: flex;}diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsx b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsxindex 1909f4b29f8..97895598d5e 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsx+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsx@@ -1,6 +1,7 @@import type { StoryFn } from "@storybook/react";-import { Fragment } from "react";+import { Fragment, useEffect, useRef } from "react";+import { createWaitForResizeToStopDecorator } from "__support__/storybook";import {Box,Icon,@@ -32,6 +33,16 @@ const ICON_DATA = [{ ariaLabel: "Preview", icon: "eye_filled", value: "preview" },] satisfies SegmentedControlItem<string>[];+const ICON_TOOLTIP_DATA = [+ { ariaLabel: "Code", icon: "embed", value: "code", withTooltip: true },+ {+ ariaLabel: "Preview",+ icon: "eye_filled",+ value: "preview",+ withTooltip: true,+ },+] satisfies SegmentedControlItem<string>[];+const ICON_ELEMENT_DATA = [{ ariaLabel: "Code", icon: <Icon name="embed" />, value: "code" },{ ariaLabel: "Preview", icon: <Icon name="eye_filled" />, value: "preview" },@@ -57,6 +68,11 @@ export const IconOnly = {args: { data: ICON_DATA },};+export const IconOnlyWithTooltip = {+ name: "Icon only with tooltip",+ args: { data: ICON_TOOLTIP_DATA },+};+export const FullWidth = {name: "Full width",args: { data: TEXT_AND_ICON_DATA, fullWidth: true },@@ -113,6 +129,23 @@ const withSecondItemDisabled = (data: SegmentedControlItem<string>[]) =>const labelSelectorFor = (id: string) =>`[data-state-row="${id}"] .${S.SegmentedControlLabel}`;+function HoveredTooltipExample() {+ const ref = useRef<HTMLDivElement>(null);++ useEffect(() => {+ const targets = ref.current?.querySelectorAll(+ `.${S.SegmentedControlTooltipTarget}`,+ );+ targets?.[1]?.dispatchEvent(new MouseEvent("mouseover", { bubbles: true }));+ }, []);++ return (+ <Box ref={ref}>+ <SegmentedControl data={ICON_TOOLTIP_DATA} defaultValue="code" />+ </Box>+ );+}+const gridStyle = {display: "grid",gridTemplateColumns: `9rem repeat(${CONTENT_KINDS.length}, max-content)`,@@ -155,6 +188,17 @@ const OverviewTemplate: StoryFn = () => (</Box></StorySection>+ <StorySection title="Tooltip">+ <StoryJsx>+ {+ '<SegmentedControl data={[{ ariaLabel: "Preview", icon: "eye_filled", withTooltip: true }, …]} />'+ }+ </StoryJsx>+ <Box mt="3rem">+ <HoveredTooltipExample />+ </Box>+ </StorySection>+<StorySection title="Full width"><Box w="24rem"><StoryJsx>{"<SegmentedControl fullWidth />"}</StoryJsx>@@ -171,6 +215,9 @@ const OverviewTemplate: StoryFn = () => (export const Overview = {render: OverviewTemplate,+ // The tooltip fades in over 200ms (Tooltip config); wait well past that+ // before Loki captures, with margin for slow CI runners.+ decorators: [createWaitForResizeToStopDecorator(500)],parameters: {pseudo: {hover: [labelSelectorFor("hover")],diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.unit.spec.tsx b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.unit.spec.tsxindex 1648961ffb1..8823f08a150 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.unit.spec.tsx+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.unit.spec.tsx@@ -1,11 +1,17 @@import userEvent from "@testing-library/user-event";-import { render, screen, within } from "__support__/ui";+import { act, render, screen, waitFor, within } from "__support__/ui";+import { isFocusVisible } from "metabase/utils/dom";import { Icon } from "../../icons";import { SegmentedControl, type SegmentedControlItem } from "./index";+jest.mock("metabase/utils/dom", () => ({+ ...jest.requireActual("metabase/utils/dom"),+ isFocusVisible: jest.fn(() => false),+}));+type Value = "code" | "preview";interface SetupOpts {@@ -13,6 +19,16 @@ interface SetupOpts {value?: Value;}+const TOOLTIP_DATA: SegmentedControlItem<Value>[] = [+ { value: "code", ariaLabel: "Code", icon: "embed", withTooltip: true },+ {+ value: "preview",+ ariaLabel: "Preview",+ icon: "eye_filled",+ withTooltip: true,+ },+];+const setup = ({ data, value = "code" }: SetupOpts) => {const onChange = jest.fn();@@ -143,4 +159,167 @@ describe("SegmentedControl", () => {expect(screen.getByRole("radio", { name: "Code" })).toBeEnabled();expect(screen.getByRole("radio", { name: "Preview" })).toBeDisabled();});++ describe("tooltips", () => {+ beforeEach(() => {+ jest.mocked(isFocusVisible).mockReturnValue(false);+ });++ it("should not show a tooltip for icon-only items without withTooltip", async () => {+ setup({+ data: [+ { value: "code", ariaLabel: "Code", icon: "embed" },+ { value: "preview", ariaLabel: "Preview", icon: "eye_filled" },+ ],+ });++ await userEvent.hover(screen.getByRole("img", { name: "Code" }));++ await expect(+ screen.findByRole("tooltip", {}, { timeout: 500 }),+ ).rejects.toThrow();+ });++ it("should show the ariaLabel as a tooltip on hover", async () => {+ setup({ data: TOOLTIP_DATA });++ await userEvent.hover(screen.getByRole("img", { name: "Preview" }));+ expect(+ await screen.findByRole("tooltip", { name: "Preview" }),+ ).toBeInTheDocument();++ await userEvent.unhover(screen.getByRole("img", { name: "Preview" }));+ await waitFor(() =>+ expect(screen.queryByRole("tooltip")).not.toBeInTheDocument(),+ );+ });++ it("should show the tooltip for the keyboard-focused item and follow arrow keys", async () => {+ jest.mocked(isFocusVisible).mockReturnValue(true);+ setup({ data: TOOLTIP_DATA });++ await userEvent.tab();+ expect(+ await screen.findByRole("tooltip", { name: "Code" }),+ ).toBeInTheDocument();++ await userEvent.keyboard("{ArrowRight}");+ expect(+ await screen.findByRole("tooltip", { name: "Preview" }),+ ).toBeInTheDocument();+ await waitFor(() =>+ expect(+ screen.queryByRole("tooltip", { name: "Code" }),+ ).not.toBeInTheDocument(),+ );++ await userEvent.tab();+ await waitFor(() =>+ expect(screen.queryByRole("tooltip")).not.toBeInTheDocument(),+ );+ });++ it("should not show the tooltip when focus doesn't come from the keyboard", async () => {+ setup({ data: TOOLTIP_DATA });++ act(() => screen.getByRole("radio", { name: "Preview" }).focus());++ // The tooltip mounts asynchronously, so wait to be sure it never shows.+ await expect(+ screen.findByRole("tooltip", {}, { timeout: 500 }),+ ).rejects.toThrow();+ });++ it("should keep the keyboard-focused tooltip after hovering another item", async () => {+ jest.mocked(isFocusVisible).mockReturnValue(true);+ setup({ data: TOOLTIP_DATA });++ await userEvent.tab();+ await screen.findByRole("tooltip", { name: "Code" });++ const previewIcon = screen.getByRole("img", { name: "Preview" });+ await userEvent.hover(previewIcon);+ await screen.findByRole("tooltip", { name: "Preview" });+ await userEvent.unhover(previewIcon);++ expect(+ await screen.findByRole("tooltip", { name: "Code" }),+ ).toBeInTheDocument();+ await waitFor(() =>+ expect(+ screen.queryByRole("tooltip", { name: "Preview" }),+ ).not.toBeInTheDocument(),+ );+ });++ it("should show the keyboard-focused tooltip over a hovered item", async () => {+ jest.mocked(isFocusVisible).mockReturnValue(true);+ setup({ data: TOOLTIP_DATA });++ await userEvent.hover(screen.getByRole("img", { name: "Code" }));+ await userEvent.tab();+ await screen.findByRole("tooltip", { name: "Code" });++ await userEvent.keyboard("{ArrowRight}");+ expect(+ await screen.findByRole("tooltip", { name: "Preview" }),+ ).toBeInTheDocument();+ await waitFor(() =>+ expect(+ screen.queryByRole("tooltip", { name: "Code" }),+ ).not.toBeInTheDocument(),+ );+ });++ it("should hide a hovered tooltip when keyboard focus moves to an item without one", async () => {+ jest.mocked(isFocusVisible).mockReturnValue(true);+ setup({+ data: [+ {+ value: "code",+ ariaLabel: "Code",+ icon: "embed",+ withTooltip: true,+ },+ { value: "preview", label: "Preview" },+ ],+ value: "preview",+ });++ await userEvent.hover(screen.getByRole("img", { name: "Code" }));+ await screen.findByRole("tooltip", { name: "Code" });++ await userEvent.tab();+ expect(screen.getByRole("radio", { name: "Preview" })).toHaveFocus();+ await waitFor(() =>+ expect(screen.queryByRole("tooltip")).not.toBeInTheDocument(),+ );+ });++ it("should hide a hovered tooltip on Escape", async () => {+ setup({ data: TOOLTIP_DATA });++ await userEvent.click(screen.getByRole("radio", { name: "Preview" }));+ await userEvent.hover(screen.getByRole("img", { name: "Code" }));+ await screen.findByRole("tooltip", { name: "Code" });++ await userEvent.keyboard("{Escape}");+ await waitFor(() =>+ expect(screen.queryByRole("tooltip")).not.toBeInTheDocument(),+ );+ });++ it("should hide a keyboard-focused tooltip on Escape", async () => {+ jest.mocked(isFocusVisible).mockReturnValue(true);+ setup({ data: TOOLTIP_DATA });++ await userEvent.tab();+ await screen.findByRole("tooltip", { name: "Code" });++ await userEvent.keyboard("{Escape}");+ await waitFor(() =>+ expect(screen.queryByRole("tooltip")).not.toBeInTheDocument(),+ );+ });+ });});diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/index.tsx b/frontend/src/metabase/ui/components/inputs/SegmentedControl/index.tsxindex 3a095e78629..1d5cda6e294 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/index.tsx+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/index.tsx@@ -1,12 +1,14 @@import type { SegmentedControlProps as MantineSegmentedControlProps } from "@mantine/core";import { SegmentedControl as MantineSegmentedControl } from "@mantine/core";-import type { ReactElement } from "react";+import type { FocusEvent, KeyboardEvent, ReactElement, ReactNode } from "react";import type { IconName } from "metabase-types/api";import { Icon } from "../../icons";+import { Tooltip } from "../../overlays/Tooltip";import S from "./SegmentedControl.module.css";+import { useItemTooltip } from "./use-item-tooltip";export { segmentedControlOverrides } from "./SegmentedControl.config";@@ -16,8 +18,19 @@ const ICON_ONLY_SIZE = 16;type SegmentedControlIcon = IconName | ReactElement;type SegmentedControlItemContent =- | { label: string; icon?: SegmentedControlIcon; ariaLabel?: never }- | { ariaLabel: string; icon: SegmentedControlIcon; label?: never };+ | {+ label: string;+ icon?: SegmentedControlIcon;+ ariaLabel?: never;+ withTooltip?: never;+ }+ | {+ ariaLabel: string;+ icon: SegmentedControlIcon;+ label?: never;+ /** Shows `ariaLabel` as a tooltip on hover and keyboard focus. */+ withTooltip?: boolean;+ };export type SegmentedControlItem<Value extends string> = {value: Value;@@ -45,8 +58,28 @@ export type SegmentedControlProps<Value extends string> = Omit<export function SegmentedControl<Value extends string = string>({data,onChange,+ onFocus,+ onBlur,+ onKeyDown,...props}: SegmentedControlProps<Value>) {+ const tooltip = useItemTooltip(data);++ const handleFocus = (event: FocusEvent<HTMLDivElement>) => {+ onFocus?.(event);+ tooltip.handleFocus(event);+ };++ const handleBlur = (event: FocusEvent<HTMLDivElement>) => {+ onBlur?.(event);+ tooltip.handleBlur();+ };++ const handleKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {+ onKeyDown?.(event);+ tooltip.handleKeyDown(event);+ };+const handleChange = (newValue: string) => {const item = data.find((item) => item.value === newValue);if (item) {@@ -54,19 +87,67 @@ export function SegmentedControl<Value extends string = string>({}};+ const items = data.map((item) => {+ const label = <SegmentedControlItemLabel content={item} />;++ return {+ value: item.value,+ disabled: item.disabled,+ label: item.withTooltip ? (+ <SegmentedControlItemTooltip+ label={item.ariaLabel}+ {...tooltip.getTargetProps(item.value)}+ >+ {label}+ </SegmentedControlItemTooltip>+ ) : (+ label+ ),+ };+ });+return (<MantineSegmentedControl{...props}- data={data.map((item) => ({- value: item.value,- disabled: item.disabled,- label: <SegmentedControlItemLabel content={item} />,- }))}+ data={items}onChange={handleChange}+ onFocus={handleFocus}+ onBlur={handleBlur}+ onKeyDown={tooltip.hasTooltipItems ? handleKeyDown : onKeyDown}/>);}+type SegmentedControlItemTooltipProps = {+ label: string;+ opened: boolean;+ onMouseEnter: () => void;+ onMouseLeave: () => void;+ children: ReactNode;+};++function SegmentedControlItemTooltip({+ label,+ opened,+ onMouseEnter,+ onMouseLeave,+ children,+}: SegmentedControlItemTooltipProps) {+ return (+ <Tooltip label={label} opened={opened}>+ <span+ className={S.SegmentedControlTooltipTarget}+ // The tooltip repeats the accessible name, so it mustn't also describe it.+ aria-describedby={undefined}+ onMouseEnter={onMouseEnter}+ onMouseLeave={onMouseLeave}+ >+ {children}+ </span>+ </Tooltip>+ );+}+type SegmentedControlItemLabelProps = {content: SegmentedControlItemContent;};diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/use-item-tooltip.ts b/frontend/src/metabase/ui/components/inputs/SegmentedControl/use-item-tooltip.tsnew file mode 100644index 00000000000..8809d375ef6--- /dev/null+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/use-item-tooltip.ts@@ -0,0 +1,65 @@+import { type FocusEvent, type KeyboardEvent, useState } from "react";++import { isFocusVisible } from "metabase/utils/dom";++import type { SegmentedControlItem } from "./index";++type TooltipItem<Value extends string> = Pick<+ SegmentedControlItem<Value>,+ "value" | "withTooltip"+>;++export function useItemTooltip<Value extends string>(+ data: readonly TooltipItem<Value>[],+) {+ const [hoveredValue, setHoveredValue] = useState<Value | null>(null);+ const [focusedValue, setFocusedValue] = useState<Value | null>(null);+ const activeTooltipValue = hoveredValue ?? focusedValue;+ const hasTooltipItems = data.some((item) => item.withTooltip);++ const getTooltipItemValue = (target: EventTarget) => {+ if (!(target instanceof HTMLInputElement)) {+ return null;+ }++ const item = data.find(+ (item) => item.withTooltip && item.value === target.value,+ );+ return item?.value ?? null;+ };++ const handleFocus = (event: FocusEvent<HTMLElement>) => {+ // the tooltip only follows keyboard focus so it doesn't stay open after the pointer leaves.+ if (!isFocusVisible(event.target)) {+ return;+ }++ setHoveredValue(null);+ setFocusedValue(getTooltipItemValue(event.target));+ };++ const handleBlur = () => {+ setFocusedValue(null);+ };++ const handleKeyDown = (event: KeyboardEvent<HTMLElement>) => {+ if (event.key === "Escape") {+ setHoveredValue(null);+ setFocusedValue(null);+ }+ };++ const getTargetProps = (value: Value) => ({+ opened: activeTooltipValue === value,+ onMouseEnter: () => setHoveredValue(value),+ onMouseLeave: () => setHoveredValue(null),+ });++ return {+ hasTooltipItems,+ getTargetProps,+ handleFocus,+ handleBlur,+ handleKeyDown,+ };+}diff --git a/frontend/src/metabase/utils/dom.ts b/frontend/src/metabase/utils/dom.tsindex 6a02b2623f9..9560edcc67e 100644--- a/frontend/src/metabase/utils/dom.ts+++ b/frontend/src/metabase/utils/dom.ts@@ -206,6 +206,10 @@ export function isReducedMotionPreferred(): boolean {return mediaQuery != null && mediaQuery.matches;}+export function isFocusVisible(element: Element): boolean {+ return element.matches(":focus-visible");+}+export function isSmallScreen(): boolean {const mediaQuery = window.matchMedia("(max-width: 40em)");return mediaQuery != null && mediaQuery.matches;