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
Migrate the visualization skeletons off Emotion (#82992)
Andrei Chernykhe28f66a5ac24
diff --git a/.loki/reference/chrome_laptop_Viz_Components_ChartSkeleton_Gauge.png b/.loki/reference/chrome_laptop_Viz_Components_ChartSkeleton_Gauge.pngnew file mode 100644index 00000000000..74e300c1cd8Binary files /dev/null and b/.loki/reference/chrome_laptop_Viz_Components_ChartSkeleton_Gauge.png differdiff --git a/.loki/reference/chrome_laptop_Viz_Components_ChartSkeleton_Sankey.png b/.loki/reference/chrome_laptop_Viz_Components_ChartSkeleton_Sankey.pngnew file mode 100644index 00000000000..2f1d5d77dcfBinary files /dev/null and b/.loki/reference/chrome_laptop_Viz_Components_ChartSkeleton_Sankey.png differdiff --git a/frontend/src/metabase/visualizations/components/skeletons/AreaSkeleton/AreaSkeleton.module.css b/frontend/src/metabase/visualizations/components/skeletons/AreaSkeleton/AreaSkeleton.module.cssnew file mode 100644index 00000000000..92ced418994--- /dev/null+++ b/frontend/src/metabase/visualizations/components/skeletons/AreaSkeleton/AreaSkeleton.module.css@@ -0,0 +1,3 @@+.root {+ border-bottom: 1px solid currentColor;+}diff --git a/frontend/src/metabase/visualizations/components/skeletons/AreaSkeleton/AreaSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/AreaSkeleton/AreaSkeleton.styled.tsxdeleted file mode 100644index 226c00e9ac8..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/AreaSkeleton/AreaSkeleton.styled.tsx+++ /dev/null@@ -1,12 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- margin-top: 1rem;- padding-bottom: 0.5rem;- border-bottom: 1px solid currentColor;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/AreaSkeleton/AreaSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/AreaSkeleton/AreaSkeleton.tsxindex 8c25b764c53..c2976272fd3 100644--- a/frontend/src/metabase/visualizations/components/skeletons/AreaSkeleton/AreaSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/AreaSkeleton/AreaSkeleton.tsx@@ -1,9 +1,13 @@-import { SkeletonImage } from "./AreaSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";++import S from "./AreaSkeleton.module.css";const AreaSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"+ <ChartSkeletonImage+ className={S.root}+ mt="lg"+ pb="sm"viewBox="0 0 371 113"preserveAspectRatio="none">@@ -11,7 +15,7 @@ const AreaSkeleton = (): JSX.Element => {d="M15.254 97.568 0 107.524V113h371V59.736L345.455 0l-48.453 59.736-15.317-15.432-15.191 15.432-24.227-30.864-43.517 40.82-20.19-15.93-30.847 15.93-30.169-15.93-46.658 46.793-15.254-9.458L33.2 107.524l-17.946-9.956Z"fill="currentColor"/>- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/BarSkeleton/BarSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/BarSkeleton/BarSkeleton.styled.tsxdeleted file mode 100644index 96e073ac5ee..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/BarSkeleton/BarSkeleton.styled.tsx+++ /dev/null@@ -1,10 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- margin-top: 1rem;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/BarSkeleton/BarSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/BarSkeleton/BarSkeleton.tsxindex d8159f1a918..c36a4707717 100644--- a/frontend/src/metabase/visualizations/components/skeletons/BarSkeleton/BarSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/BarSkeleton/BarSkeleton.tsx@@ -1,9 +1,9 @@-import { SkeletonImage } from "./BarSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";const BarSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"+ <ChartSkeletonImage+ mt="lg"viewBox="0 0 372 117"preserveAspectRatio="none">@@ -11,7 +11,7 @@ const BarSkeleton = (): JSX.Element => {fill="currentColor"d="M0 38.71h23.878V117H0zM28.906 20.503h23.878V117H28.906zM57.81 38.71h23.878V117H57.81zM86.715 0h23.878v117H86.715zM115.62 20.503h23.878V117H115.62zM144.527 25.965h23.878v91.034h-23.878zM173.431 9.579h25.135V117h-25.135zM202.337 20.503h25.135V117h-25.135zM231.244 20.503h25.135V117h-25.135zM261.406 9.579h23.878V117h-23.878zM290.311 20.503h23.878V117h-23.878zM319.216 20.503h23.878V117h-23.878zM348.121 9.579h23.878V117h-23.878z"/>- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.module.css b/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.module.cssnew file mode 100644index 00000000000..da78d6c7743--- /dev/null+++ b/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.module.css@@ -0,0 +1,18 @@+@keyframes fading {+ 0% {+ opacity: 0.0625;+ }++ 50% {+ opacity: 0.125;+ }++ 100% {+ opacity: 0.0625;+ }+}++.animated {+ opacity: 0.1;+ animation: fading 1.5s infinite;+}diff --git a/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.stories.tsx b/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.stories.tsxindex 377b734264d..ec3b92246d3 100644--- a/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.stories.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.stories.tsx@@ -55,6 +55,15 @@ export const Funnel = {},};+export const Gauge = {+ render: Template,++ args: {+ display: "gauge",+ name: "Gauge",+ },+};+export const Line = {render: Template,@@ -100,6 +109,15 @@ export const Row = {},};+export const Sankey = {+ render: Template,++ args: {+ display: "sankey",+ name: "Sankey",+ },+};+export const Scalar = {render: Template,diff --git a/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled.tsxdeleted file mode 100644index d543ee13f79..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled.tsx+++ /dev/null@@ -1,20 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import { css, keyframes } from "@emotion/react";--const fadingKeyframes = keyframes`- 0% {- opacity: 0.0625;- }-- 50% {- opacity: 0.125;- }-- 100% {- opacity: 0.0625;- }-`;-export const animationStyles = css`- opacity: 0.1;- animation: ${fadingKeyframes} 1.5s infinite;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.tsxindex d4239fbd391..478fd623e02 100644--- a/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.tsx@@ -12,7 +12,6 @@ import RowSkeleton from "metabase/visualizations/components/skeletons/RowSkeletoimport SankeySkeleton from "metabase/visualizations/components/skeletons/SankeySkeleton";import ScalarSkeleton from "metabase/visualizations/components/skeletons/ScalarSkeleton/ScalarSkeleton";import ScatterSkeleton from "metabase/visualizations/components/skeletons/ScatterSkeleton";-import SkeletonCaption from "metabase/visualizations/components/skeletons/SkeletonCaption";import TableSkeleton from "metabase/visualizations/components/skeletons/TableSkeleton";import { VisualizationSkeleton } from "metabase/visualizations/components/skeletons/VisualizationSkeleton/VisualizationSkeleton";import WaterfallSkeleton from "metabase/visualizations/components/skeletons/WaterfallSkeleton";@@ -100,7 +99,4 @@ const ChartSkeleton = ({};// eslint-disable-next-line import/no-default-export -- deprecated usage-export default Object.assign(ChartSkeleton, {- Title: SkeletonCaption.Title,- Description: SkeletonCaption.Description,-});+export default ChartSkeleton;diff --git a/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage.tsx b/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage.tsxnew file mode 100644index 00000000000..b1b4489441e--- /dev/null+++ b/frontend/src/metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage.tsx@@ -0,0 +1,22 @@+import cx from "classnames";+import type { ComponentPropsWithoutRef } from "react";++import { Box, type BoxProps } from "metabase/ui";++import S from "./ChartSkeleton.module.css";++export type ChartSkeletonImageProps = BoxProps &+ Omit<ComponentPropsWithoutRef<"svg">, keyof BoxProps>;++export const ChartSkeletonImage = ({+ className,+ ...props+}: ChartSkeletonImageProps) => (+ <Box+ component="svg"+ className={cx(S.animated, className)}+ flex="1 1 0"+ xmlns="http://www.w3.org/2000/svg"+ {...props}+ />+);diff --git a/frontend/src/metabase/visualizations/components/skeletons/FunnelSkeleton/FunnelSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/FunnelSkeleton/FunnelSkeleton.styled.tsxdeleted file mode 100644index 96e073ac5ee..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/FunnelSkeleton/FunnelSkeleton.styled.tsx+++ /dev/null@@ -1,10 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- margin-top: 1rem;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/FunnelSkeleton/FunnelSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/FunnelSkeleton/FunnelSkeleton.tsxindex d9812da3030..94476f166b9 100644--- a/frontend/src/metabase/visualizations/components/skeletons/FunnelSkeleton/FunnelSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/FunnelSkeleton/FunnelSkeleton.tsx@@ -1,9 +1,9 @@-import { SkeletonImage } from "./FunnelSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";const FunnelSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"+ <ChartSkeletonImage+ mt="lg"viewBox="0 0 370 104"preserveAspectRatio="xMidYMid">@@ -11,7 +11,7 @@ const FunnelSkeleton = (): JSX.Element => {d="m0 0 123 24v56L0 104V0ZM124 24l122 16v32l-122 8V24ZM247 40l123 8v15l-123 9V40Z"fill="currentColor"/>- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/GaugeSkeleton/GaugeSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/GaugeSkeleton/GaugeSkeleton.styled.tsxdeleted file mode 100644index 3cabc59d962..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/GaugeSkeleton/GaugeSkeleton.styled.tsx+++ /dev/null@@ -1,11 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- margin-top: 1.25rem;- margin-bottom: 0.625rem;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/GaugeSkeleton/GaugeSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/GaugeSkeleton/GaugeSkeleton.tsxindex eb4ea77d0dd..795a1706ee1 100644--- a/frontend/src/metabase/visualizations/components/skeletons/GaugeSkeleton/GaugeSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/GaugeSkeleton/GaugeSkeleton.tsx@@ -1,9 +1,10 @@-import { SkeletonImage } from "./GaugeSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";const GaugeSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"+ <ChartSkeletonImage+ mt="lg"+ mb="sm"viewBox="0 0 169 143"preserveAspectRatio="xMidYMid">@@ -13,7 +14,7 @@ const GaugeSkeleton = (): JSX.Element => {d="M32.355 51.786c24.355-39.382 78.268-39.256 103.369.126 9.597 15.06 11.924 28.144 10.204 39.932-1.764 12.098-7.969 24.037-17.566 36.209l17.276 13.621c10.903-13.828 19.532-29.321 22.06-46.655 2.573-17.643-1.35-35.99-13.422-54.931-33.535-52.618-107.472-53.492-140.632.126-27.127 43.866-6.504 83.779 9.63 101.952l16.451-14.605c-12.866-14.493-27.242-43.64-7.37-75.775Zm38.916 25.991a5.994 5.994 0 0 0 0 11.988H97.87a5.994 5.994 0 0 0 0-11.988h-26.6Z"fill="currentColor"/>- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/LineSkeleton/LineSkeleton.module.css b/frontend/src/metabase/visualizations/components/skeletons/LineSkeleton/LineSkeleton.module.cssnew file mode 100644index 00000000000..92ced418994--- /dev/null+++ b/frontend/src/metabase/visualizations/components/skeletons/LineSkeleton/LineSkeleton.module.css@@ -0,0 +1,3 @@+.root {+ border-bottom: 1px solid currentColor;+}diff --git a/frontend/src/metabase/visualizations/components/skeletons/LineSkeleton/LineSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/LineSkeleton/LineSkeleton.styled.tsxdeleted file mode 100644index 226c00e9ac8..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/LineSkeleton/LineSkeleton.styled.tsx+++ /dev/null@@ -1,12 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- margin-top: 1rem;- padding-bottom: 0.5rem;- border-bottom: 1px solid currentColor;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/LineSkeleton/LineSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/LineSkeleton/LineSkeleton.tsxindex 9c031286bfe..4f74b456268 100644--- a/frontend/src/metabase/visualizations/components/skeletons/LineSkeleton/LineSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/LineSkeleton/LineSkeleton.tsx@@ -1,9 +1,13 @@-import { SkeletonImage } from "./LineSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";++import S from "./LineSkeleton.module.css";const LineSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"+ <ChartSkeletonImage+ className={S.root}+ mt="lg"+ pb="sm"viewBox="0 0 371 113"fill="none"preserveAspectRatio="none"@@ -13,7 +17,7 @@ const LineSkeleton = (): JSX.Element => {stroke="currentColor"strokeWidth="2"/>- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/MapSkeleton/MapSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/MapSkeleton/MapSkeleton.styled.tsxdeleted file mode 100644index 5397c25dd58..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/MapSkeleton/MapSkeleton.styled.tsx+++ /dev/null@@ -1,9 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/MapSkeleton/MapSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/MapSkeleton/MapSkeleton.tsxindex e0cbd8470ff..d4acadc3ba8 100644--- a/frontend/src/metabase/visualizations/components/skeletons/MapSkeleton/MapSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/MapSkeleton/MapSkeleton.tsx@@ -1,14 +1,10 @@-import { SkeletonImage } from "./MapSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";const MapSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 242 157"- preserveAspectRatio="xMidYMid"- >+ <ChartSkeletonImage viewBox="0 0 242 157" preserveAspectRatio="xMidYMid"><use xlinkHref="/app/assets/img/map.svg" />- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/PieSkeleton/PieSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/PieSkeleton/PieSkeleton.styled.tsxdeleted file mode 100644index 8d07985e786..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/PieSkeleton/PieSkeleton.styled.tsx+++ /dev/null@@ -1,11 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- margin-top: 1rem;- margin-bottom: 1rem;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/PieSkeleton/PieSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/PieSkeleton/PieSkeleton.tsxindex b7e3ce6c4b2..e6e620bcf08 100644--- a/frontend/src/metabase/visualizations/components/skeletons/PieSkeleton/PieSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/PieSkeleton/PieSkeleton.tsx@@ -1,9 +1,9 @@-import { SkeletonImage } from "./PieSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";const PieSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"+ <ChartSkeletonImage+ my="lg"viewBox="0 0 306 138"fill="none"preserveAspectRatio="xMidYMid"@@ -17,7 +17,7 @@ const PieSkeleton = (): JSX.Element => {stroke="currentColor"strokeWidth="24"/>- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/ProgressSkeleton/ProgressSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/ProgressSkeleton/ProgressSkeleton.tsxindex a43b648503f..26a8677e46d 100644--- a/frontend/src/metabase/visualizations/components/skeletons/ProgressSkeleton/ProgressSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/ProgressSkeleton/ProgressSkeleton.tsx@@ -1,9 +1,9 @@-import { SkeletonImage } from "../FunnelSkeleton/FunnelSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";const ProgressSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"+ <ChartSkeletonImage+ mt="lg"viewBox="0 0 404 57"preserveAspectRatio="xMidYMid">@@ -19,7 +19,7 @@ const ProgressSkeleton = (): JSX.Element => {d="M0 16a4 4 0 0 1 4-4h298v35H4a4 4 0 0 1-4-4V16ZM302 .485h8.485L302 8.971 293.515.485H302Z"fill="currentColor"/>- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/RowSkeleton/RowSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/RowSkeleton/RowSkeleton.styled.tsxdeleted file mode 100644index 96e073ac5ee..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/RowSkeleton/RowSkeleton.styled.tsx+++ /dev/null@@ -1,10 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- margin-top: 1rem;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/RowSkeleton/RowSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/RowSkeleton/RowSkeleton.tsxindex f4f293b0f54..e7e26ccdc3a 100644--- a/frontend/src/metabase/visualizations/components/skeletons/RowSkeleton/RowSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/RowSkeleton/RowSkeleton.tsx@@ -1,9 +1,9 @@-import { SkeletonImage } from "./RowSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";const RowSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"+ <ChartSkeletonImage+ mt="lg"viewBox="0 0 346 130"preserveAspectRatio="none">@@ -11,7 +11,7 @@ const RowSkeleton = (): JSX.Element => {fill="currentColor"d="M293 27v22H0V27zM224 54v22H0V54zM346 81v22H0V81zM73 108v22H0v-22zM129 0v22H0V0z"/>- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/SankeySkeleton/SankeySkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/SankeySkeleton/SankeySkeleton.styled.tsxdeleted file mode 100644index c43ba7cfb28..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/SankeySkeleton/SankeySkeleton.styled.tsx+++ /dev/null@@ -1,10 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- margin: 1rem;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/SankeySkeleton/SankeySkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/SankeySkeleton/SankeySkeleton.tsxindex 5f6977ccb23..f1e098fa307 100644--- a/frontend/src/metabase/visualizations/components/skeletons/SankeySkeleton/SankeySkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/SankeySkeleton/SankeySkeleton.tsx@@ -1,12 +1,8 @@-import { SkeletonImage } from "./SankeySkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";const SankeySkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 320 200"- preserveAspectRatio="none"- >+ <ChartSkeletonImage m="lg" viewBox="0 0 320 200" preserveAspectRatio="none"><pathfill="currentColor"d="M158 160v40H83v-44l75 4ZM160 86c10.542 0 21.687 3.951 29.89 10.861l.508.437c.036.03.071.062.107.094l-.021-.018c2.489 2.179 4.69 4.637 6.496 7.347l1.93 2.894A45.778 45.778 0 0 0 237 128v72a45.778 45.778 0 0 1-38.09-20.385l-1.93-2.894C189.183 165.025 174.057 158 160 158V86ZM320 158h-81V40h81v118Z"@@ -25,7 +21,7 @@ const SankeySkeleton = (): JSX.Element => {fill="currentColor"d="m199.856 108.978-.133-.184-.057-.081.19.265Z"/>- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/ScalarSkeleton/ScalarSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/ScalarSkeleton/ScalarSkeleton.tsxindex 2d964081add..57c1f7ca22d 100644--- a/frontend/src/metabase/visualizations/components/skeletons/ScalarSkeleton/ScalarSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/ScalarSkeleton/ScalarSkeleton.tsx@@ -76,7 +76,7 @@ const ScalarSkeleton = ({/></Flex>{name ? (- <SkeletonCaption name={name} description={description} size="large" />+ <SkeletonCaption name={name} description={description} />) : (tier.showsTitle && (<Flex align="center" justify="center" h={TITLE_LINE_HEIGHT}>diff --git a/frontend/src/metabase/visualizations/components/skeletons/ScatterSkeleton/ScatterSkeleton.module.css b/frontend/src/metabase/visualizations/components/skeletons/ScatterSkeleton/ScatterSkeleton.module.cssnew file mode 100644index 00000000000..54686700744--- /dev/null+++ b/frontend/src/metabase/visualizations/components/skeletons/ScatterSkeleton/ScatterSkeleton.module.css@@ -0,0 +1,4 @@+.root {+ border-bottom: 1px solid currentColor;+ border-left: 1px solid currentColor;+}diff --git a/frontend/src/metabase/visualizations/components/skeletons/ScatterSkeleton/ScatterSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/ScatterSkeleton/ScatterSkeleton.styled.tsxdeleted file mode 100644index 22b113d16d3..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/ScatterSkeleton/ScatterSkeleton.styled.tsx+++ /dev/null@@ -1,14 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- margin-top: 1rem;- padding-left: 0.5rem;- padding-bottom: 0.5rem;- border-left: 1px solid currentColor;- border-bottom: 1px solid currentColor;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/ScatterSkeleton/ScatterSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/ScatterSkeleton/ScatterSkeleton.tsxindex 39203138db4..e0b7c78cbba 100644--- a/frontend/src/metabase/visualizations/components/skeletons/ScatterSkeleton/ScatterSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/ScatterSkeleton/ScatterSkeleton.tsx@@ -1,9 +1,14 @@-import { SkeletonImage } from "./ScatterSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";++import S from "./ScatterSkeleton.module.css";const ScatterSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"+ <ChartSkeletonImage+ className={S.root}+ mt="lg"+ pl="sm"+ pb="sm"viewBox="0 0 340 119"preserveAspectRatio="xMidYMid">@@ -16,7 +21,7 @@ const ScatterSkeleton = (): JSX.Element => {<circle cx="298" cy="4" r="4" fill="currentColor" /><circle cx="141" cy="15" r="11" fill="currentColor" /><circle cx="141" cy="87" r="16" fill="currentColor" />- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.module.css b/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.module.cssnew file mode 100644index 00000000000..2fb01db2a4f--- /dev/null+++ b/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.module.css@@ -0,0 +1,7 @@+.descriptionIcon {+ color: var(--mb-color-text-disabled);++ &:hover {+ color: var(--mb-color-text-secondary);+ }+}diff --git a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.styled.tsxdeleted file mode 100644index e4d7c7e18a2..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.styled.tsx+++ /dev/null@@ -1,31 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Ellipsified, Icon } from "metabase/ui";--import type { SkeletonCaptionSize } from "./types";--export const SkeletonCaptionRoot = styled.div`- display: flex;- justify-content: center;- align-items: center;- width: 100%;-`;--interface SkeletonTitleProps {- size: SkeletonCaptionSize;-}--export const SkeletonCaptionTitle = styled(Ellipsified)<SkeletonTitleProps>`- color: var(--mb-color-text-primary);- font-size: ${(props) => (props.size === "large" ? "1rem" : "")};- line-height: ${(props) => (props.size === "large" ? "1.375rem" : "")};- font-weight: bold;- overflow: hidden;-`;--export const SkeletonCaptionDescription = styled(Icon)`- color: var(--mb-color-text-secondary);- margin-left: 0.5rem;- visibility: hidden;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.tsx b/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.tsxindex f195bd41ca1..9d32366fbd2 100644--- a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.tsx@@ -1,36 +1,28 @@import type { HTMLAttributes } from "react";import { Markdown } from "metabase/common/components/Markdown";-import { Tooltip } from "metabase/ui";-import {- LegendDescriptionIcon,- LegendRightContent,-} from "metabase/visualizations/components/legend/LegendCaption/LegendCaption.styled";+import { Box, Ellipsified, Flex, Icon, Tooltip } from "metabase/ui";import type { VisualizationSkeletonProps } from "metabase/visualizations/components/skeletons/VisualizationSkeleton/VisualizationSkeleton";-import {- SkeletonCaptionDescription,- SkeletonCaptionRoot,- SkeletonCaptionTitle,-} from "./SkeletonCaption.styled";-import type { SkeletonCaptionSize } from "./types";+import S from "./SkeletonCaption.module.css";export type SkeletonCaptionProps = HTMLAttributes<HTMLDivElement> &- VisualizationSkeletonProps & {- size?: SkeletonCaptionSize;- };+ VisualizationSkeletonProps;const SkeletonCaption = ({name,description,actionMenu,className,- size = "medium",}: SkeletonCaptionProps): JSX.Element => {return (- <SkeletonCaptionRoot className={className}>- {name && <SkeletonCaptionTitle size={size}>{name}</SkeletonCaptionTitle>}- <LegendRightContent>+ <Flex className={className} justify="center" align="center" w="100%">+ {name && (+ <Ellipsified c="text-primary" fw="bold">+ {name}+ </Ellipsified>+ )}+ <Flex justify="flex-end" align="center" ml="auto">{description && (<Tooltipmaw="22em"@@ -40,21 +32,22 @@ const SkeletonCaption = ({</Markdown>}>- <LegendDescriptionIcon+ <Box+ component="span"+ className={S.descriptionIcon}+ mx="xxs"data-testid="skeleton-description-icon"- name="info"- />+ >+ <Icon name="info" />+ </Box></Tooltip>)}{actionMenu}- </LegendRightContent>- </SkeletonCaptionRoot>+ </Flex>+ </Flex>);};// eslint-disable-next-line import/no-default-export -- deprecated usage-export default Object.assign(SkeletonCaption, {- Title: SkeletonCaptionTitle,- Description: SkeletonCaptionDescription,-});+export default SkeletonCaption;diff --git a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/types.ts b/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/types.tsdeleted file mode 100644index 78cf6ef83ae..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/types.ts+++ /dev/null@@ -1 +0,0 @@-export type SkeletonCaptionSize = "medium" | "large";diff --git a/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.module.css b/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.module.cssnew file mode 100644index 00000000000..c468154e5a5--- /dev/null+++ b/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.module.css@@ -0,0 +1,11 @@+.tooltipIcon {+ color: var(--mb-color-text-disabled);+}++.iconContainer:hover .tooltipIcon {+ color: var(--mb-color-text-secondary);+}++.tooltipIconContainer {+ border-radius: var(--mantine-radius-sm);+}diff --git a/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.styled.tsxdeleted file mode 100644index 23418245a4e..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.styled.tsx+++ /dev/null@@ -1,50 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";-import { Ellipsified, Icon } from "metabase/ui";--export const SkeletonRoot = styled.div`- position: relative;-`;--export const SkeletonTitle = styled(Ellipsified)`- color: var(--mb-color-text-primary);- font-size: 1rem;- line-height: 1.5rem;- font-weight: bold;-`;--export const SkeletonDescription = styled(MarkdownPreview)`- color: var(--mb-color-text-secondary);- line-height: 1.5rem;-`;--export const SkeletonTooltipIcon = styled(Icon)`- display: block;- color: var(--mb-color-text-disabled);- width: 0.75rem;- height: 0.75rem;-`;--export const SkeletonIconContainer = styled.div`- position: relative;- width: 1.5rem;- margin-top: 0.5rem;- margin-bottom: 1rem;-- &:hover {- ${SkeletonTooltipIcon} {- color: var(--mb-color-text-secondary);- }- }-`;--export const SkeletonTooltipIconContainer = styled.div`- position: absolute;- right: -0.5rem;- bottom: -0.5rem;- padding: 0.125rem;- border-radius: 0.5rem;- background-color: var(--mb-color-background_page-primary);-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.tsxindex f3f4b42f1a5..0526a39f2a4 100644--- a/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.tsx@@ -1,17 +1,11 @@import type { HTMLAttributes, ReactNode } from "react";import { EntityIcon } from "metabase/common/components/EntityIcon";-import { Group, Tooltip } from "metabase/ui";+import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";+import { Box, Ellipsified, Group, Icon, Tooltip, rem } from "metabase/ui";import type { IconName } from "metabase-types/api";-import {- SkeletonDescription,- SkeletonIconContainer,- SkeletonRoot,- SkeletonTitle,- SkeletonTooltipIcon,- SkeletonTooltipIconContainer,-} from "./StaticSkeleton.styled";+import S from "./StaticSkeleton.module.css";export interface StaticSkeletonProps extends HTMLAttributes<HTMLDivElement> {name?: string | null;@@ -37,10 +31,16 @@ const StaticSkeleton = ({const defaultedDescription = description || "";return (- <SkeletonRoot {...props}>+ <Box pos="relative" {...props}>{icon && (<Tooltip label={tooltip} disabled={!tooltip}>- <SkeletonIconContainer>+ <Box+ className={S.iconContainer}+ pos="relative"+ w="xl"+ mt="sm"+ mb="lg"+ ><EntityIcon{...icon}size="1.5rem"@@ -51,20 +51,36 @@ const StaticSkeleton = ({style={{ display: "block" }}/>{tooltip && (- <SkeletonTooltipIconContainer>- <SkeletonTooltipIcon name="eye_crossed_out" />- </SkeletonTooltipIconContainer>+ <Box+ className={S.tooltipIconContainer}+ pos="absolute"+ right={-8}+ bottom={-8}+ p="xxxs"+ bg="background_page-primary"+ >+ <Icon+ className={S.tooltipIcon}+ name="eye_crossed_out"+ size={12}+ display="block"+ />+ </Box>)}- </SkeletonIconContainer>+ </Box></Tooltip>)}<Group gap="0.5rem">- <SkeletonTitle>{name}</SkeletonTitle>+ <Ellipsified c="text-primary" fw="bold">+ {name}+ </Ellipsified>{nameRightSection}</Group>- <SkeletonDescription>{defaultedDescription}</SkeletonDescription>- </SkeletonRoot>+ <Box c="text-secondary" lh={rem(24)}>+ <MarkdownPreview>{defaultedDescription}</MarkdownPreview>+ </Box>+ </Box>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/TableSkeleton/TableSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/TableSkeleton/TableSkeleton.styled.tsxdeleted file mode 100644index 3fec4f2e12f..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/TableSkeleton/TableSkeleton.styled.tsx+++ /dev/null@@ -1,11 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- width: 100%;- margin-top: 1.5rem;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/TableSkeleton/TableSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/TableSkeleton/TableSkeleton.tsxindex 959c283e3a1..898cb7021bd 100644--- a/frontend/src/metabase/visualizations/components/skeletons/TableSkeleton/TableSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/TableSkeleton/TableSkeleton.tsx@@ -1,6 +1,6 @@import { useId } from "react";-import { SkeletonImage } from "./TableSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";const COLUMN_WIDTHS = [110, 150, 96, 176, 132];const TILE_WIDTH = COLUMN_WIDTHS.reduce((sum, width) => sum + width, 0);@@ -22,7 +22,7 @@ const TableSkeleton = (): JSX.Element => {const bodyPatternId = `table-skeleton-body-${id}`;return (- <SkeletonImage xmlns="http://www.w3.org/2000/svg">+ <ChartSkeletonImage w="100%" mt="xl"><defs><patternid={headerPatternId}@@ -72,7 +72,7 @@ const TableSkeleton = (): JSX.Element => {height="100%"fill={`url(#${bodyPatternId})`}/>- </SkeletonImage>+ </ChartSkeletonImage>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/VisualizationSkeleton/VisualizationSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/VisualizationSkeleton/VisualizationSkeleton.styled.tsxdeleted file mode 100644index fedcb04bfad..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/VisualizationSkeleton/VisualizationSkeleton.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import SkeletonCaption from "metabase/visualizations/components/skeletons/SkeletonCaption";--export const VisualizationSkeletonCaption = styled(SkeletonCaption)`- justify-content: space-between;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/VisualizationSkeleton/VisualizationSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/VisualizationSkeleton/VisualizationSkeleton.tsxindex 152a78d10b4..0dbb371e64d 100644--- a/frontend/src/metabase/visualizations/components/skeletons/VisualizationSkeleton/VisualizationSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/VisualizationSkeleton/VisualizationSkeleton.tsx@@ -1,7 +1,7 @@import type { HTMLAttributes } from "react";-import { VisualizationRoot } from "metabase/visualizations/components/Visualization/Visualization.styled";-import { VisualizationSkeletonCaption } from "metabase/visualizations/components/skeletons/VisualizationSkeleton/VisualizationSkeleton.styled";+import { Flex } from "metabase/ui";+import SkeletonCaption from "metabase/visualizations/components/skeletons/SkeletonCaption";export type VisualizationSkeletonProps = HTMLAttributes<HTMLDivElement> & {name?: string | null;@@ -17,13 +17,13 @@ export const VisualizationSkeleton = ({className,}: VisualizationSkeletonProps) => {return (- <VisualizationRoot className={className}>- <VisualizationSkeletonCaption+ <Flex className={className} direction="column" h="100%">+ <SkeletonCaptionname={name}description={description}actionMenu={actionMenu}/>{children}- </VisualizationRoot>+ </Flex>);};diff --git a/frontend/src/metabase/visualizations/components/skeletons/WaterfallSkeleton/WaterfallSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/WaterfallSkeleton/WaterfallSkeleton.styled.tsxdeleted file mode 100644index 96e073ac5ee..00000000000--- a/frontend/src/metabase/visualizations/components/skeletons/WaterfallSkeleton/WaterfallSkeleton.styled.tsx+++ /dev/null@@ -1,10 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { animationStyles } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeleton.styled";--export const SkeletonImage = styled.svg`- ${animationStyles};- flex: 1 1 0;- margin-top: 1rem;-`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/WaterfallSkeleton/WaterfallSkeleton.tsx b/frontend/src/metabase/visualizations/components/skeletons/WaterfallSkeleton/WaterfallSkeleton.tsxindex 19a2a0d6ea6..36a4abeb945 100644--- a/frontend/src/metabase/visualizations/components/skeletons/WaterfallSkeleton/WaterfallSkeleton.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/WaterfallSkeleton/WaterfallSkeleton.tsx@@ -1,9 +1,9 @@-import { SkeletonImage } from "./WaterfallSkeleton.styled";+import { ChartSkeletonImage } from "metabase/visualizations/components/skeletons/ChartSkeleton/ChartSkeletonImage";const WaterfallSkeleton = (): JSX.Element => {return (- <SkeletonImage- xmlns="http://www.w3.org/2000/svg"+ <ChartSkeletonImage+ mt="lg"viewBox="0 0 372 107"preserveAspectRatio="none">@@ -11,7 +11,7 @@ const WaterfallSkeleton = (): JSX.Element => {fill="currentColor"d="M0 28.71h23.878V107H0zM29 11h24v45H29zM58 22h24v17H58zM87 39h24v68H87zM115.62 10.503h23.878V107H115.62zM145 0h23v45h-23zM173 39h26v68h-26zM202 80h25v27h-25zM231 11h25v39h-25zM261 0h24v29h-24zM290 11h24v69h-24zM319 11h24v96h-24zM348 0h24v56h-24z"/>- </SkeletonImage>+ </ChartSkeletonImage>);};