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
chore: drop deprecated ButtonGroup (#74904)
Uladzimir Havenchyke74ebaa14a18
diff --git a/.github/workflows/loki-stress-test-flake-fix.yml b/.github/workflows/loki-stress-test-flake-fix.ymlindex 953e02c6c31..b6afa282a3a 100644--- a/.github/workflows/loki-stress-test-flake-fix.yml+++ b/.github/workflows/loki-stress-test-flake-fix.yml@@ -59,7 +59,9 @@ jobs:fiFILES=$( \- gh pr view ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --json files --jq '.files[].path' \+ gh api "repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files" \+ --paginate \+ --jq '.[] | select(.status != "removed") | .filename' \| grep '\.stories\.tsx$' \| xargs -n1 \| sort -u \diff --git a/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.stories.tsx b/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.stories.tsxdeleted file mode 100644index f0d80701d08..00000000000--- a/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.stories.tsx+++ /dev/null@@ -1,24 +0,0 @@-import type { StoryFn } from "@storybook/react";--import { Button } from "../Button";--import { ButtonGroup } from "./ButtonGroup";--export default {- title: "Deprecated/Components/ButtonGroup",- component: ButtonGroup,-};--const Template: StoryFn<typeof ButtonGroup> = (args) => {- return (- <ButtonGroup {...args}>- <Button>One</Button>- <Button>Two</Button>- <Button>Three</Button>- </ButtonGroup>- );-};--export const Default = {- render: Template,-};diff --git a/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.styled.tsx b/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.styled.tsxdeleted file mode 100644index 7a5b0608e37..00000000000--- a/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.styled.tsx+++ /dev/null@@ -1,24 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Button } from "metabase/common/components/Button";--export const ButtonGroupRoot = styled.div`- display: inline-block;-- ${Button.Root} {- border: 1px solid var(--mb-color-border);-- &:not(:last-of-type) {- border-right-width: 0.5px;- border-top-right-radius: 0;- border-bottom-right-radius: 0;- }-- &:not(:first-of-type) {- border-left-width: 0.5px;- border-top-left-radius: 0;- border-bottom-left-radius: 0;- }- }-`;diff --git a/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.tsx b/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.tsxdeleted file mode 100644index d306714065d..00000000000--- a/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.tsx+++ /dev/null@@ -1,19 +0,0 @@-import type { HTMLAttributes, ReactNode, Ref } from "react";-import { forwardRef } from "react";--import { ButtonGroupRoot } from "./ButtonGroup.styled";--export interface ButtonGroupProps extends HTMLAttributes<HTMLDivElement> {- children?: ReactNode;-}--export const ButtonGroup = forwardRef(function ButtonGroup(- { children, ...props }: ButtonGroupProps,- ref: Ref<HTMLDivElement>,-) {- return (- <ButtonGroupRoot {...props} ref={ref}>- {children}- </ButtonGroupRoot>- );-});diff --git a/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.unit.spec.tsx b/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.unit.spec.tsxdeleted file mode 100644index 2585e4fe37a..00000000000--- a/frontend/src/metabase/common/components/ButtonGroup/ButtonGroup.unit.spec.tsx+++ /dev/null@@ -1,35 +0,0 @@-import userEvent from "@testing-library/user-event";--import { render, screen } from "__support__/ui";-import { Button } from "metabase/common/components/Button";--import { ButtonGroup } from "./ButtonGroup";--describe("ButtonGroup", () => {- it("should render correctly", () => {- render(- <ButtonGroup>- <Button>One</Button>- <Button>Two</Button>- </ButtonGroup>,- );-- expect(screen.getByRole("button", { name: "One" })).toBeInTheDocument();- expect(screen.getByRole("button", { name: "Two" })).toBeInTheDocument();- });-- it("should receive focus on tab", async () => {- render(- <ButtonGroup>- <Button>One</Button>- <Button>Two</Button>- </ButtonGroup>,- );-- await userEvent.tab();- expect(screen.getByRole("button", { name: "One" })).toHaveFocus();-- await userEvent.tab();- expect(screen.getByRole("button", { name: "Two" })).toHaveFocus();- });-});diff --git a/frontend/src/metabase/common/components/ButtonGroup/index.ts b/frontend/src/metabase/common/components/ButtonGroup/index.tsdeleted file mode 100644index 806780255a0..00000000000--- a/frontend/src/metabase/common/components/ButtonGroup/index.ts+++ /dev/null@@ -1 +0,0 @@-export { ButtonGroup } from "./ButtonGroup";diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.css b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.cssindex e0a0d61b97c..cf8aaa46f80 100644--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.css+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.css@@ -3,11 +3,21 @@flex-grow: 0;.FooterButtonGroup {- display: inline-flex;- align-items: stretch;-.Button {border: 1px solid var(--mb-color-background-primary);++ /* compatibility with Button.Group */+ &:not(:last-of-type) {+ border-right-width: 0.5px;+ border-top-right-radius: 0;+ border-bottom-right-radius: 0;+ }++ &:not(:first-of-type) {+ border-left-width: 0.5px;+ border-top-left-radius: 0;+ border-bottom-left-radius: 0;+ }}}}diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsxindex 1d947e260fe..62da6072072 100644--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx@@ -1,7 +1,6 @@import cx from "classnames";import { t } from "ttag";-import { ButtonGroup } from "metabase/common/components/ButtonGroup";import { ViewButton } from "metabase/common/components/ViewButton";import CS from "metabase/css/core/index.css";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";@@ -14,7 +13,7 @@ import {onOpenChartType,} from "metabase/redux/query-builder";import type { QueryBuilderUIControls } from "metabase/redux/store";-import { Group } from "metabase/ui";+import { Button, Group } from "metabase/ui";import S from "./LeftViewFooterButtonGroup.module.css";@@ -51,7 +50,7 @@ export const LeftViewFooterButtonGroup = () => {return (<Group className={cx(CS.flex1, S.Root)}>- <ButtonGroup className={S.FooterButtonGroup}>+ <Button.Group className={S.FooterButtonGroup}><ViewButtonmediumlabelBreakpoint="sm"@@ -78,7 +77,7 @@ export const LeftViewFooterButtonGroup = () => {: () => dispatch(onOpenChartSettings())}/>- </ButtonGroup>+ </Button.Group></Group>);};