Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

GDGT-2576 migrate Toggle (#77063)

Egor Grushinda4e98d389d3
diff --git a/e2e/support/helpers/e2e-permissions-helpers.js b/e2e/support/helpers/e2e-permissions-helpers.js
index 72bcd927c61..3023bb123ca 100644
--- a/e2e/support/helpers/e2e-permissions-helpers.js
+++ b/e2e/support/helpers/e2e-permissions-helpers.js
@@ -28,10 +28,8 @@ export function modifyPermission(
cy.findByRole("switch")
.as("toggle")
.then(($el) => {
- if (
- $el.attr("aria-checked") !== shouldPropagateToChildren.toString()
- ) {
- cy.get("@toggle").click();
+ if ($el.prop("checked") !== shouldPropagateToChildren) {
+ cy.get("@toggle").click({ force: true });
}
});
}
diff --git a/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js b/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
index bee87ceefa2..326bd05298b 100644
--- a/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
+++ b/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
@@ -470,7 +470,7 @@ const MODEL_NAME = "Test Action Model";
});
H.popover().within(() => {
- cy.findByLabelText("Required").uncheck();
+ cy.findByLabelText("Required").uncheck({ force: true });
});
H.modal().within(() => {
@@ -529,7 +529,7 @@ const MODEL_NAME = "Test Action Model";
});
H.popover().within(() => {
- cy.findByLabelText("Required").check();
+ cy.findByLabelText("Required").check({ force: true });
});
H.modal().within(() => {
@@ -630,7 +630,9 @@ const MODEL_NAME = "Test Action Model";
newValue: 2.2,
});
- cy.findByLabelText("Boolean").should("be.checked").click();
+ cy.findByLabelText("Boolean")
+ .should("be.checked")
+ .click({ force: true });
changeValue({
fieldName: "String",
@@ -704,7 +706,11 @@ const MODEL_NAME = "Test Action Model";
cy.findByPlaceholderText("Integer").type("-20");
cy.findByPlaceholderText("IntegerUnsigned").type("20");
cy.findByPlaceholderText("Tinyint").type("101");
- cy.findByPlaceholderText("Tinyint1").type("1");
+ if (dialect === "mysql") {
+ cy.findByLabelText("Tinyint1").click({ force: true });
+ } else {
+ cy.findByPlaceholderText("Tinyint1").type("1");
+ }
cy.findByPlaceholderText("Smallint").type("32767");
cy.findByPlaceholderText("Mediumint").type("8388607");
cy.findByPlaceholderText("Bigint").type("922337204775");
@@ -712,7 +718,7 @@ const MODEL_NAME = "Test Action Model";
cy.findByPlaceholderText("Double").type("1.79769313486");
cy.findByPlaceholderText("Decimal").type("123901.21");
- cy.findByLabelText("Boolean").click();
+ cy.findByLabelText("Boolean").click({ force: true });
cy.findByPlaceholderText("String").type("Zany Zebras");
cy.findByPlaceholderText("Text").type("Zany Zebras");
diff --git a/e2e/test/scenarios/actions/model-actions.cy.spec.js b/e2e/test/scenarios/actions/model-actions.cy.spec.js
index 7006b6c163e..4af990f1807 100644
--- a/e2e/test/scenarios/actions/model-actions.cy.spec.js
+++ b/e2e/test/scenarios/actions/model-actions.cy.spec.js
@@ -486,7 +486,7 @@ describe(
});
H.popover().within(() => {
- cy.findByLabelText("Required").uncheck();
+ cy.findByLabelText("Required").uncheck({ force: true });
});
cy.findByRole("button", { name: "Update" }).click();
@@ -520,7 +520,7 @@ describe(
});
H.popover().within(() => {
- cy.findByLabelText("Required").check();
+ cy.findByLabelText("Required").check({ force: true });
});
cy.findByRole("button", { name: "Update" }).click();
@@ -654,7 +654,7 @@ describe(
});
H.popover().within(() => {
- cy.findByLabelText("Required").uncheck();
+ cy.findByLabelText("Required").uncheck({ force: true });
});
cy.findByRole("button", { name: "Update" }).click();
diff --git a/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts b/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts
index 7688d25d448..c7d4b2fb644 100644
--- a/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts
+++ b/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts
@@ -343,7 +343,7 @@ function expectSuccess(response: Cypress.Response<unknown>) {
}
function enableTableEditing() {
- cy.findByLabelText("Editable tables").scrollIntoView().click();
+ cy.findByLabelText("Editable tables").scrollIntoView().click({ force: true });
}
function performTableEdit() {
diff --git a/e2e/test/scenarios/collections/collections-reproductions.cy.spec.ts b/e2e/test/scenarios/collections/collections-reproductions.cy.spec.ts
index 1e8181fd143..8cba2dc403f 100644
--- a/e2e/test/scenarios/collections/collections-reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/collections/collections-reproductions.cy.spec.ts
@@ -225,7 +225,7 @@ describe("issue 56567", () => {
H.getPermissionRowPermissions("All Users").click();
// checks the 'Also change sub-collections' toggle
- H.popover().findByRole("switch").click();
+ H.popover().findByRole("switch").click({ force: true });
H.popover().findByRole("switch").should("be.checked");
// selected desired permission
diff --git a/e2e/test/scenarios/onboarding/setup/setup.cy.spec.ts b/e2e/test/scenarios/onboarding/setup/setup.cy.spec.ts
index 61974fdc889..10e2143cbeb 100644
--- a/e2e/test/scenarios/onboarding/setup/setup.cy.spec.ts
+++ b/e2e/test/scenarios/onboarding/setup/setup.cy.spec.ts
@@ -118,7 +118,7 @@ describe("scenarios > setup", () => {
// turn collection off, which hides data collection description
cy.findByLabelText(
"Allow Metabase to anonymously collect usage events",
- ).click();
+ ).click({ force: true });
cy.findByText("All collection is completely anonymous.").should(
"not.exist",
@@ -173,7 +173,7 @@ describe("scenarios > setup", () => {
// Turns off anonymous data collection
cy.findByLabelText(
"Allow Metabase to anonymously collect usage events",
- ).click();
+ ).click({ force: true });
cy.findByText("All collection is completely anonymous.").should(
"not.exist",
@@ -484,7 +484,7 @@ describe("scenarios > setup", () => {
// Turns off anonymous data collection
cy.findByLabelText(
"Allow Metabase to anonymously collect usage events",
- ).click();
+ ).click({ force: true });
cy.findByText("All collection is completely anonymous.").should(
"not.exist",
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx
index 14c4c3fea3c..5e08506ad62 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx
@@ -7,10 +7,9 @@ import {
Label,
} from "metabase/admin/databases/components/DatabaseFeatureComponents";
import { DatabaseInfoSection } from "metabase/admin/databases/components/DatabaseInfoSection";
-import { Toggle } from "metabase/common/components/Toggle";
import { hasDbRoutingEnabled } from "metabase/common/utils/database";
import { ALLOWED_ENGINES_FOR_TABLE_EDITING } from "metabase/databases/constants";
-import { Alert, Box, Flex, Icon } from "metabase/ui";
+import { Alert, Box, Flex, Icon, Switch } from "metabase/ui";
import { getResponseErrorMessage } from "metabase/utils/errors";
import type {
Database,
@@ -105,10 +104,10 @@ export function AdminDatabaseTableEditingSection({
>
<Flex align="center" justify="space-between" mb="xs">
<Label htmlFor="table-editing-toggle">{t`Editable tables`}</Label>
- <Toggle
+ <Switch
id="table-editing-toggle"
- value={isEnabled}
- onChange={handleToggle}
+ checked={isEnabled}
+ onChange={(e) => handleToggle(e.currentTarget.checked)}
disabled={isSettingDisabled || (!isEnabled && databaseHasRouting)}
/>
</Flex>
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx
index 4b307d1a918..e12504fb279 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx
@@ -4,9 +4,8 @@ import { useMemo } from "react";
import { t } from "ttag";
import { getInputTypes } from "metabase/actions/constants";
-import { Toggle } from "metabase/common/components/Toggle";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
-import { Popover, Radio, Stack, UnstyledButton } from "metabase/ui";
+import { Popover, Radio, Stack, Switch, UnstyledButton } from "metabase/ui";
import { TextInput } from "metabase/ui/components/inputs/TextInput";
import type {
FieldSettings,
@@ -203,10 +202,10 @@ function RequiredInput({
<RequiredToggleLabel
htmlFor={`${id}-required`}
>{t`Required`}</RequiredToggleLabel>
- <Toggle
+ <Switch
id={`${id}-required`}
- value={required}
- onChange={onChangeRequired}
+ checked={required}
+ onChange={(e) => onChangeRequired(e.currentTarget.checked)}
/>
</ToggleContainer>
{required && (
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx
index 60795f53f6b..7d98796ee55 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx
@@ -1,7 +1,6 @@
import { Fragment, memo, useState } from "react";
-import { Toggle } from "metabase/common/components/Toggle";
-import { Icon, Popover, Tooltip } from "metabase/ui";
+import { Icon, Popover, Switch, Tooltip } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import type { IconName } from "metabase-types/api";
@@ -147,10 +146,10 @@ export const PermissionsSelect = memo(function PermissionsSelect({
{hasChildren && (
<ToggleContainer>
<ToggleLabel>{toggleLabel}</ToggleLabel>
- <Toggle
- small
- value={toggleState || false}
- onChange={onToggleChange}
+ <Switch
+ size="sm"
+ checked={toggleState || false}
+ onChange={(e) => onToggleChange(e.currentTarget.checked)}
disabled={toggleDisabled ?? false}
/>
</ToggleContainer>
diff --git a/frontend/src/metabase/common/components/FormField/FormField.stories.tsx b/frontend/src/metabase/common/components/FormField/FormField.stories.tsx
deleted file mode 100644
index 96e8327bc9a..00000000000
--- a/frontend/src/metabase/common/components/FormField/FormField.stories.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { useArgs } from "@storybook/preview-api";
-import type { StoryFn } from "@storybook/react";
-import type { ComponentProps } from "react";
-import { cloneElement, isValidElement } from "react";
-
-import { Toggle } from "../Toggle/Toggle";
-
-import { FormField } from "./FormField";
-
-export default {
- title: "Components/Ask Before Using/FormField",
- component: FormField,
-};
-
-type inputProps = {
- value: unknown;
- onChange: (value: unknown) => void;
-};
-
-const Template: StoryFn<typeof FormField> = ({
- children,
- ...args
-}: ComponentProps<typeof FormField>) => {
- const [{ value }, updateArgs] = useArgs();
- const handleChange = (value: unknown) => updateArgs({ value });
-
- return (
- <div style={{ maxWidth: 400 }}>
- <FormField {...args}>
- {isValidElement<inputProps>(children) &&
- cloneElement(children, {
- value,
- onChange: handleChange,
- })}
- </FormField>
- </div>
- );
-};
-
-export const ToggleStory = {
- render: Template,
- name: "Toggle",
-
- args: {
- children: <Toggle />,
- },
-};
-
-export const ToggleWithTitle = {
- render: Template,
-
- args: {
- children: <Toggle />,
- title: "Toggle this value?",
- infoTooltip: "Info tooltip",
- },
-};
-
-export const ToggleWithInlineTitle = {
- render: Template,
-
- args: {
- children: <Toggle />,
- title: "Toggle this value?",
- orientation: "horizontal",
- infoTooltip: "Info tooltip",
- },
-};
diff --git a/frontend/src/metabase/common/components/FormToggle/FormToggle.tsx b/frontend/src/metabase/common/components/FormToggle/FormToggle.tsx
index ea9ed147575..11c3022d9e3 100644
--- a/frontend/src/metabase/common/components/FormToggle/FormToggle.tsx
+++ b/frontend/src/metabase/common/components/FormToggle/FormToggle.tsx
@@ -1,18 +1,23 @@
import { useField } from "formik";
-import type { ReactNode, Ref } from "react";
+import type { CSSProperties, ChangeEvent, ReactNode, Ref } from "react";
import { forwardRef, useCallback } from "react";
import { FormField } from "metabase/common/components/FormField";
-import type { ToggleProps } from "metabase/common/components/Toggle";
-import { Toggle } from "metabase/common/components/Toggle";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
+import type { SwitchProps } from "metabase/ui";
+import { Switch } from "metabase/ui";
-export interface FormToggleProps extends Omit<ToggleProps, "value" | "onBlur"> {
+export interface FormToggleProps extends Omit<
+ SwitchProps,
+ "value" | "onBlur" | "style" | "onChange"
+> {
name: string;
title?: string;
actions?: ReactNode;
description?: ReactNode;
optional?: boolean;
+ nullable?: boolean;
+ style?: CSSProperties;
}
export const FormToggle = forwardRef(function FormToggle(
@@ -23,8 +28,8 @@ export const FormToggle = forwardRef(function FormToggle(
title,
actions,
description,
- onChange,
optional,
+ nullable: _nullable,
...props
}: FormToggleProps,
ref: Ref<HTMLDivElement>,
@@ -33,11 +38,10 @@ export const FormToggle = forwardRef(function FormToggle(
const [{ value, onBlur }, { error, touched }, { setValue }] = useField(name);
const handleChange = useCallback(
- (value: boolean) => {
- setValue(value);
- onChange?.(value);
+ (event: ChangeEvent<HTMLInputElement>) => {
+ setValue(event.currentTarget.checked);
},
- [setValue, onChange],
+ [setValue],
);
return (
@@ -52,11 +56,11 @@ export const FormToggle = forwardRef(function FormToggle(
error={touched ? error : undefined}
optional={optional}
>
- <Toggle
+ <Switch
{...props}
id={id}
name={name}
- value={value ?? false}
+ checked={value ?? false}
onChange={handleChange}
onBlur={onBlur}
/>
diff --git a/frontend/src/metabase/common/components/Toggle/Toggle.stories.tsx b/frontend/src/metabase/common/components/Toggle/Toggle.stories.tsx
deleted file mode 100644
index fd05f6e08bf..00000000000
--- a/frontend/src/metabase/common/components/Toggle/Toggle.stories.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useArgs } from "@storybook/preview-api";
-import type { StoryFn } from "@storybook/react";
-
-import { Toggle } from "./Toggle";
-
-export default {
- title: "Deprecated/Components/Toggle",
- component: Toggle,
-};
-
-const Template: StoryFn<typeof Toggle> = (args) => {
- const [{ value }, updateArgs] = useArgs();
- const handleChange = (value: boolean) => updateArgs({ value });
-
- return <Toggle {...args} value={value} onChange={handleChange} />;
-};
-
-export const Default = {
- render: Template,
-
- args: {
- value: false,
- },
-};
diff --git a/frontend/src/metabase/common/components/Toggle/Toggle.styled.tsx b/frontend/src/metabase/common/components/Toggle/Toggle.styled.tsx
deleted file mode 100644
index c0376c5623e..00000000000
--- a/frontend/src/metabase/common/components/Toggle/Toggle.styled.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { focusOutlineStyle } from "metabase/common/style/input";
-import { color } from "metabase/ui/utils/colors";
-
-interface ToggleRootProps {
- checked?: boolean;
- small?: boolean;
- currentColor?: string;
-}
-
-const getTranslateX = ({ checked, small }: ToggleRootProps): string => {
- if (!checked) {
- return "1px";
- } else if (!small) {
- return "25px";
- } else {
- return "12px";
- }
-};
-
-const getBackgroundColor = ({
- checked,
- currentColor,
-}: ToggleRootProps): string => {
- if (checked) {
- return currentColor ?? color("core-brand");
- } else {
- return "var(--mb-color-background_page-tertiary)";
- }
-};
-
-export const ToggleRoot = styled.input<ToggleRootProps>`
- appearance: none;
- position: relative;
- display: inline-block;
- color: ${(props) => props.currentColor ?? color("core-brand")};
- cursor: pointer;
- width: ${(props) => (props.small ? "28px" : "48px")};
- height: ${(props) => (props.small ? "17px" : "24px")};
- border-radius: 99px;
- border: 1px solid var(--mb-color-border-neutral);
- background-color: ${getBackgroundColor};
- transition: background-color 0.3s;
- flex-shrink: 0;
-
- &[disabled] {
- cursor: not-allowed;
- opacity: 0.5;
- background-color: var(--mb-color-background_page-tertiary);
- }
-
- &:after {
- content: "";
- width: ${(props) => (props.small ? "13px" : "20px")};
- height: ${(props) => (props.small ? "13px" : "20px")};
- border-radius: 99px;
- position: absolute;
- top: 1px;
- transform: translateX(${getTranslateX});
- background-color: var(--mb-color-background_page-primary);
- transition: transform 0.3s;
- box-shadow: 2px 2px 6px var(--mb-color-shadow-default);
- }
-
- ${focusOutlineStyle("core-brand")};
-`;
diff --git a/frontend/src/metabase/common/components/Toggle/Toggle.tsx b/frontend/src/metabase/common/components/Toggle/Toggle.tsx
deleted file mode 100644
index cdf0c661d4c..00000000000
--- a/frontend/src/metabase/common/components/Toggle/Toggle.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import type { ChangeEvent, InputHTMLAttributes, Ref } from "react";
-import { forwardRef, useCallback } from "react";
-
-import { ToggleRoot } from "./Toggle.styled";
-
-export interface ToggleProps extends Omit<
- InputHTMLAttributes<HTMLInputElement>,
- "value" | "onChange"
-> {
- className?: string;
- value?: boolean;
- small?: boolean;
- color?: string;
- onChange?: (value: boolean) => void;
-}
-
-/** @deprecated use metabase/ui Switch instead */
-export const Toggle = forwardRef(function Toggle(
- { className, value, small, color, onChange, ...rest }: ToggleProps,
- ref: Ref<HTMLInputElement>,
-): JSX.Element {
- const handleChange = useCallback(
- (event: ChangeEvent<HTMLInputElement>) => {
- onChange?.(event.currentTarget.checked);
- },
- [onChange],
- );
-
- return (
- <ToggleRoot
- {...rest}
- ref={ref}
- className={className}
- type="checkbox"
- role="switch"
- checked={value}
- aria-checked={value}
- small={small}
- currentColor={color}
- onChange={handleChange}
- />
- );
-});
diff --git a/frontend/src/metabase/common/components/Toggle/Toggle.unit.spec.tsx b/frontend/src/metabase/common/components/Toggle/Toggle.unit.spec.tsx
deleted file mode 100644
index 5082b74c07f..00000000000
--- a/frontend/src/metabase/common/components/Toggle/Toggle.unit.spec.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import { render, screen } from "__support__/ui";
-
-import { Toggle } from "./Toggle";
-
-describe("Toggle", () => {
- it("should receive focus on tab", async () => {
- const onChange = jest.fn();
-
- render(<Toggle value={false} onChange={onChange} />);
-
- const checkbox = screen.getByRole("switch");
- await userEvent.tab();
-
- expect(checkbox).toHaveFocus();
- });
-
- it("should toggle on enter", async () => {
- const onChange = jest.fn();
-
- render(<Toggle value={false} onChange={onChange} />);
-
- const checkbox = screen.getByRole("switch");
- await userEvent.tab();
- await userEvent.type(checkbox, "{Enter}");
-
- expect(onChange).toHaveBeenCalledWith(true);
- });
-
- it("should toggle on space", async () => {
- const onChange = jest.fn();
-
- render(<Toggle value={false} onChange={onChange} />);
-
- const checkbox = screen.getByRole("switch");
- await userEvent.tab();
- await userEvent.type(checkbox, "{Space}");
-
- expect(onChange).toHaveBeenCalledWith(true);
- });
-
- it("should toggle on click", async () => {
- const onChange = jest.fn();
-
- render(<Toggle value={false} onChange={onChange} />);
-
- const checkbox = screen.getByRole("switch");
- await userEvent.click(checkbox);
-
- expect(checkbox).toHaveFocus();
- expect(onChange).toHaveBeenCalledWith(true);
- });
-});
diff --git a/frontend/src/metabase/common/components/Toggle/index.ts b/frontend/src/metabase/common/components/Toggle/index.ts
deleted file mode 100644
index 8ba8447fe41..00000000000
--- a/frontend/src/metabase/common/components/Toggle/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { Toggle } from "./Toggle";
-export type { ToggleProps } from "./Toggle";
diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsx b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsx
index 841d4a45b7a..c24aed1506c 100644
--- a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsx
+++ b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsx
@@ -1,8 +1,6 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { Toggle } from "metabase/common/components/Toggle";
-
export const StepDescription = styled.div`
margin: 0.875rem 0 1.25rem;
color: var(--mb-color-text-secondary);
@@ -17,10 +15,6 @@ export const StepToggleContainer = styled.div`
border-radius: 0.5rem;
`;
-export const StepToggle = styled(Toggle)`
- flex: 0 0 auto;
-`;
-
export const StepToggleLabel = styled.div`
color: var(--mb-color-text-secondary);
margin-left: 0.5rem;
diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx
index 5aaef50dca7..4ed88322f3e 100644
--- a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx
+++ b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx
@@ -6,6 +6,7 @@ import { ActionButton } from "metabase/common/components/ActionButton";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl } from "metabase/common/hooks";
import { useDispatch, useSelector } from "metabase/redux";
+import { Switch } from "metabase/ui";
import { goToNextStep, updateTracking } from "../../actions";
import { getIsTrackingAllowed } from "../../selectors";
@@ -18,7 +19,6 @@ import {
StepDescription,
StepError,
StepInfoList,
- StepToggle,
StepToggleContainer,
StepToggleLabel,
} from "./DataUsageStep.styled";
@@ -74,10 +74,11 @@ export const DataUsageStep = ({
>{t`Here's a full list of what we track and why.`}</ExternalLink>
</StepDescription>
<StepToggleContainer>
- <StepToggle
- value={isTrackingAllowed}
+ <Switch
+ flex="0 0 auto"
+ checked={isTrackingAllowed}
autoFocus
- onChange={handleTrackingChange}
+ onChange={(e) => handleTrackingChange(e.currentTarget.checked)}
aria-labelledby="anonymous-usage-events-label"
/>
<StepToggleLabel id="anonymous-usage-events-label">