Skip to content

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

chore: convert IconBorder component to typescript (#69735)

Uladzimir Havenchyke3ec99133a59
diff --git a/frontend/src/metabase/common/components/IconBorder/IconBorder.jsx b/frontend/src/metabase/common/components/IconBorder/IconBorder.jsx
deleted file mode 100644
index 7b207705243..00000000000
--- a/frontend/src/metabase/common/components/IconBorder/IconBorder.jsx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* eslint-disable react/prop-types */
-import cx from "classnames";
-import PropTypes from "prop-types";
-import { Component } from "react";
-
-import CS from "metabase/css/core/index.css";
-
-export class IconBorder extends Component {
- static propTypes = {
- borderWidth: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
- borderStyle: PropTypes.string,
- borderColor: PropTypes.string,
- borderRadius: PropTypes.string,
- style: PropTypes.object,
- children: PropTypes.any.isRequired,
- };
-
- static defaultProps = {
- borderWidth: "1px",
- borderStyle: "solid",
- borderColor: "currentcolor",
- borderRadius: "99px",
- style: {},
- };
-
- render() {
- const {
- borderWidth,
- borderStyle,
- borderColor,
- borderRadius,
- className,
- style,
- children,
- } = this.props;
- const size = parseInt(children.props.size || children.props.width, 10) * 2;
- const styles = {
- width: size,
- height: size,
- borderWidth: borderWidth,
- borderStyle: borderStyle,
- borderColor: borderColor,
- borderRadius: borderRadius,
- ...style,
- };
-
- return (
- <div className={cx(CS.flex, CS.layoutCentered, className)} style={styles}>
- {children}
- </div>
- );
- }
-}
diff --git a/frontend/src/metabase/common/components/IconBorder/index.tsx b/frontend/src/metabase/common/components/IconBorder/index.tsx
deleted file mode 100644
index c7a188aa554..00000000000
--- a/frontend/src/metabase/common/components/IconBorder/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { IconBorder } from "./IconBorder";
diff --git a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
index 729af4bb578..1ffb48d7dd6 100644
--- a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
@@ -2,10 +2,9 @@ import cx from "classnames";
import { type MouseEvent, useCallback, useEffect, useRef } from "react";
import { t } from "ttag";
-import { IconBorder } from "metabase/common/components/IconBorder";
import CS from "metabase/css/core/index.css";
import { formatValue } from "metabase/lib/formatting";
-import { Icon } from "metabase/ui";
+import { Flex, Icon } from "metabase/ui";
import type { VisualizationProps } from "metabase/visualizations/types";
import { PROGRESS_CHART_DEFINITION } from "./chart-definition";
@@ -200,9 +199,7 @@ export function Progress(props: VisualizationProps) {
CS.px2,
)}
>
- <IconBorder borderWidth={2}>
- <Icon name="check" />
- </IconBorder>
+ <IconWithBorder />
<div className={CS.pl2}>{barMessage}</div>
</div>
)}
@@ -242,3 +239,16 @@ function computeBarHeight({
return `${MAX_BAR_HEIGHT}px`;
}
+
+export function IconWithBorder() {
+ return (
+ <Flex
+ align="center"
+ justify="center"
+ bdrs="99px"
+ bd="2px solid currentcolor"
+ >
+ <Icon name="check" />
+ </Flex>
+ );
+}