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 Text visualization to typescript (#70364)

Uladzimir Havenchyk4e7d009a53d7
diff --git a/bun.lock b/bun.lock
index 3741ac12ecd..044294b901b 100644
--- a/bun.lock
+++ b/bun.lock
@@ -152,7 +152,7 @@
"redux-actions": "^2.0.1",
"redux-auth-wrapper": "2.1.0",
"redux-undo": "^1.1.0",
- "rehype-external-links": "^2.0.1",
+ "rehype-external-links": "^3.0.0",
"remark-gfm": "^4.0.0",
"reselect": "^5.1.0",
"resize-observer-polyfill": "^1.5.1",
@@ -1928,7 +1928,7 @@
"@uiw/react-codemirror": ["@uiw/[email protected]", "", { "dependencies": { "@babel/runtime": "^7.18.6", "@codemirror/commands": "^6.1.0", "@codemirror/state": "^6.1.1", "@codemirror/theme-one-dark": "^6.0.0", "@uiw/codemirror-extensions-basic-setup": "4.23.8", "codemirror": "^6.0.0" } }, "sha512-/NA5Pj4MmXkLSlmlUm4yfEmRLntrNq5TkQKBSINn7TukXQ4fc+C6Bk0U60Qa4rkvCSgwzZdQ2exyP0t0+2GtqA=="],
- "@ungap/structured-clone": ["@ungap/[email protected]", "", {}, "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="],
+ "@ungap/structured-clone": ["@ungap/[email protected]", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="],
"@unrs/resolver-binding-android-arm-eabi": ["@unrs/[email protected]", "", { "os": "android", "cpu": "arm" }, "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw=="],
@@ -3214,6 +3214,8 @@
"hast-util-from-parse5": ["[email protected]", "", { "dependencies": { "@types/hast": "^3.0.0", "@types/unist": "^3.0.0", "devlop": "^1.0.0", "hastscript": "^8.0.0", "property-information": "^6.0.0", "vfile": "^6.0.0", "vfile-location": "^5.0.0", "web-namespaces": "^2.0.0" } }, "sha512-Er/Iixbc7IEa7r/XLtuG52zoqn/b3Xng/w6aZQ0xGVxzhw5xUFxcRqdPzP6yFi/4HBYRaifaI5fQ1RH8n0ZeOQ=="],
+ "hast-util-is-element": ["[email protected]", "", { "dependencies": { "@types/hast": "^3.0.0" } }, "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g=="],
+
"hast-util-parse-selector": ["[email protected]", "", { "dependencies": { "@types/hast": "^3.0.0" } }, "sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A=="],
"hast-util-raw": ["[email protected]", "", { "dependencies": { "@types/hast": "^3.0.0", "@types/unist": "^3.0.0", "@ungap/structured-clone": "^1.0.0", "hast-util-from-parse5": "^8.0.0", "hast-util-to-parse5": "^8.0.0", "html-void-elements": "^3.0.0", "mdast-util-to-hast": "^13.0.0", "parse5": "^7.0.0", "unist-util-position": "^5.0.0", "unist-util-visit": "^5.0.0", "vfile": "^6.0.0", "web-namespaces": "^2.0.0", "zwitch": "^2.0.0" } }, "sha512-PldBy71wO9Uq1kyaMch9AHIghtQvIwxBUkv823pKmkTM3oV1JxtsTNYdevMxvUHqcnOAuO65JKU2+0NOxc2ksA=="],
@@ -4618,7 +4620,7 @@
"regjsparser": ["[email protected]", "", { "dependencies": { "jsesc": "~3.1.0" }, "bin": { "regjsparser": "bin/parser" } }, "sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q=="],
- "rehype-external-links": ["[email protected]", "", { "dependencies": { "@types/hast": "^2.0.0", "extend": "^3.0.0", "is-absolute-url": "^4.0.0", "space-separated-tokens": "^2.0.0", "unified": "^10.0.0", "unist-util-visit": "^4.0.0" } }, "sha512-u2dNypma+ps12SJWlS23zvbqwNx0Hl24t0YHXSM/6FCZj/pqWETCO3WyyrvALv4JYvRtuPjhiv2Lpen15ESqbA=="],
+ "rehype-external-links": ["[email protected]", "", { "dependencies": { "@types/hast": "^3.0.0", "@ungap/structured-clone": "^1.0.0", "hast-util-is-element": "^3.0.0", "is-absolute-url": "^4.0.0", "space-separated-tokens": "^2.0.0", "unist-util-visit": "^5.0.0" } }, "sha512-yp+e5N9V3C6bwBeAC4n796kc86M4gJCdlVhiMTxIrJG5UHDMh+PJANf9heqORJbt1nrCbDwIlAZKjANIaVBbvw=="],
"relateurl": ["[email protected]", "", {}, "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="],
@@ -6292,6 +6294,8 @@
"hast-util-raw/@types/unist": ["@types/[email protected]", "", {}, "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="],
+ "hast-util-raw/@ungap/structured-clone": ["@ungap/[email protected]", "", {}, "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="],
+
"hast-util-to-html/@types/unist": ["@types/[email protected]", "", {}, "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="],
"hast-util-to-jsx-runtime/@types/estree": ["@types/[email protected]", "", {}, "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="],
@@ -6538,6 +6542,8 @@
"mdast-util-mdx-jsx/@types/unist": ["@types/[email protected]", "", {}, "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="],
+ "mdast-util-to-hast/@ungap/structured-clone": ["@ungap/[email protected]", "", {}, "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="],
+
"mdast-util-to-markdown/@types/unist": ["@types/[email protected]", "", {}, "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="],
"micromatch/picomatch": ["[email protected]", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
@@ -6840,12 +6846,6 @@
"reg-cli/yargs-parser": ["[email protected]", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="],
- "rehype-external-links/@types/hast": ["@types/[email protected]", "", { "dependencies": { "@types/unist": "*" } }, "sha512-Op5W7jYgZI7AWKY5wQ0/QNMzQM7dGQPyW1rXKNiymVCy5iTfdPuGu4HhYNOM2sIv8gUfIuIdcYlXmAepwaowow=="],
-
- "rehype-external-links/unified": ["[email protected]", "", { "dependencies": { "@types/unist": "^2.0.0", "bail": "^2.0.0", "extend": "^3.0.0", "is-buffer": "^2.0.0", "is-plain-obj": "^4.0.0", "trough": "^2.0.0", "vfile": "^5.0.0" } }, "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q=="],
-
- "rehype-external-links/unist-util-visit": ["[email protected]", "", { "dependencies": { "@types/unist": "^2.0.0", "unist-util-is": "^5.0.0", "unist-util-visit-parents": "^5.1.1" } }, "sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg=="],
-
"renderkid/css-select": ["[email protected]", "", { "dependencies": { "boolbase": "^1.0.0", "css-what": "^5.0.0", "domhandler": "^4.2.0", "domutils": "^2.6.0", "nth-check": "^2.0.0" } }, "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA=="],
"resolve/is-core-module": ["[email protected]", "", { "dependencies": { "hasown": "^2.0.2" } }, "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w=="],
@@ -7206,8 +7206,6 @@
"@jest/reporters/glob/path-scurry": ["[email protected]", "", { "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="],
- "@jest/reporters/jest-worker/@ungap/structured-clone": ["@ungap/[email protected]", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="],
-
"@jest/reporters/jest-worker/supports-color": ["[email protected]", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="],
"@jest/source-map/@jridgewell/trace-mapping/@jridgewell/resolve-uri": ["@jridgewell/[email protected]", "", {}, "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="],
@@ -7784,8 +7782,6 @@
"jest-haste-map/anymatch/picomatch": ["[email protected]", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
- "jest-haste-map/jest-worker/@ungap/structured-clone": ["@ungap/[email protected]", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="],
-
"jest-haste-map/jest-worker/supports-color": ["[email protected]", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="],
"jest-haste-map/micromatch/picomatch": ["[email protected]", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
@@ -7804,8 +7800,6 @@
"jest-message-util/pretty-format/react-is": ["[email protected]", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
- "jest-runner/jest-worker/@ungap/structured-clone": ["@ungap/[email protected]", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="],
-
"jest-runner/jest-worker/supports-color": ["[email protected]", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="],
"jest-runner/source-map-support/source-map": ["[email protected]", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="],
@@ -8092,16 +8086,6 @@
"reg-cli/meow/redent": ["[email protected]", "", { "dependencies": { "indent-string": "^2.1.0", "strip-indent": "^1.0.1" } }, "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g=="],
- "rehype-external-links/unified/is-buffer": ["[email protected]", "", {}, "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="],
-
- "rehype-external-links/unified/is-plain-obj": ["[email protected]", "", {}, "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg=="],
-
- "rehype-external-links/unified/vfile": ["[email protected]", "", { "dependencies": { "@types/unist": "^2.0.0", "is-buffer": "^2.0.0", "unist-util-stringify-position": "^3.0.0", "vfile-message": "^3.0.0" } }, "sha512-ADBsmerdGBs2WYckrLBEmuETSPyTD4TuLxTrw0DvjirxW1ra4ZwkbzG8ndsv3Q57smvHxo677MHaQrY9yxH8cA=="],
-
- "rehype-external-links/unist-util-visit/unist-util-is": ["[email protected]", "", {}, "sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ=="],
-
- "rehype-external-links/unist-util-visit/unist-util-visit-parents": ["[email protected]", "", { "dependencies": { "@types/unist": "^2.0.0", "unist-util-is": "^5.0.0" } }, "sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw=="],
-
"renderkid/css-select/css-what": ["[email protected]", "", {}, "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="],
"renderkid/css-select/domhandler": ["[email protected]", "", { "dependencies": { "domelementtype": "^2.2.0" } }, "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="],
@@ -8838,10 +8822,6 @@
"reg-cli/meow/redent/strip-indent": ["[email protected]", "", { "dependencies": { "get-stdin": "^4.0.1" }, "bin": { "strip-indent": "cli.js" } }, "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA=="],
- "rehype-external-links/unified/vfile/unist-util-stringify-position": ["[email protected]", "", { "dependencies": { "@types/unist": "^2.0.0" } }, "sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg=="],
-
- "rehype-external-links/unified/vfile/vfile-message": ["[email protected]", "", { "dependencies": { "@types/unist": "^2.0.0", "unist-util-stringify-position": "^3.0.0" } }, "sha512-0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA=="],
-
"renderkid/css-select/domhandler/domelementtype": ["[email protected]", "", {}, "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="],
"renderkid/css-select/domutils/dom-serializer": ["[email protected]", "", { "dependencies": { "domelementtype": "^2.0.1", "domhandler": "^4.2.0", "entities": "^2.0.0" } }, "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="],
diff --git a/frontend/src/metabase/visualizations/visualizations/Text/Text.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Text/Text.stories.tsx
index 182deb1e28f..212c6f815f5 100644
--- a/frontend/src/metabase/visualizations/visualizations/Text/Text.stories.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Text/Text.stories.tsx
@@ -14,7 +14,6 @@ const Template: StoryFn = ({ align }: { align?: string }) => {
return (
<VisualizationWrapper>
<Box h={300} w={300}>
- {/* @ts-expect-error Text is still a js component */}
<Text
settings={{
virtual_card: {
diff --git a/frontend/src/metabase/visualizations/visualizations/Text/Text.jsx b/frontend/src/metabase/visualizations/visualizations/Text/Text.tsx
similarity index 69%
rename from frontend/src/metabase/visualizations/visualizations/Text/Text.jsx
rename to frontend/src/metabase/visualizations/visualizations/Text/Text.tsx
index 331f09fc98b..1eccc04f062 100644
--- a/frontend/src/metabase/visualizations/visualizations/Text/Text.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Text/Text.tsx
@@ -1,12 +1,11 @@
-/* eslint-disable react/prop-types */
+import { useDisclosure } from "@mantine/hooks";
import cx from "classnames";
import { useCallback, useEffect, useMemo, useState } from "react";
-import ReactMarkdown from "react-markdown";
+import ReactMarkdown, { type Options } from "react-markdown";
import rehypeExternalLinks from "rehype-external-links";
import remarkGfm from "remark-gfm";
import { t } from "ttag";
-import { useToggle } from "metabase/common/hooks/use-toggle";
import CS from "metabase/css/core/index.css";
import { updateParameterMappingsForDashcardText } from "metabase/dashboard/actions";
import { getParameterValues } from "metabase/dashboard/selectors";
@@ -14,6 +13,12 @@ import { useTranslateContent } from "metabase/i18n/hooks";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { isEmpty } from "metabase/lib/validate";
import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
+import type { VisualizationGridSize } from "metabase/visualizations/types";
+import type {
+ Dashboard,
+ VirtualDashboardCard,
+ VisualizationSettings,
+} from "metabase-types/api";
import {
DisplayContainer,
@@ -22,7 +27,20 @@ import {
TextInput,
} from "./Text.styled";
-const getSettingsStyle = (settings) => ({
+type TextProps = {
+ onUpdateVisualizationSettings?: (settings: VisualizationSettings) => void;
+ className?: string;
+ dashboard?: Dashboard;
+ dashcard?: VirtualDashboardCard;
+ gridSize?: VisualizationGridSize;
+ settings?: VisualizationSettings;
+ isEditing?: boolean;
+ isMobile?: boolean;
+};
+
+const getSettingsStyle = (
+ settings: VisualizationSettings,
+): Record<string, boolean> => ({
[CS.textCentered]: settings["text.align_horizontal"] === "center",
[CS.textRight]: settings["text.align_horizontal"] === "right",
[CS.justifyCenter]: settings["text.align_vertical"] === "middle",
@@ -30,7 +48,7 @@ const getSettingsStyle = (settings) => ({
});
const REMARK_PLUGINS = [remarkGfm];
-const REHYPE_PLUGINS = [
+const REHYPE_PLUGINS: Options["rehypePlugins"] = [
[rehypeExternalLinks, { rel: ["noreferrer"], target: "_blank" }],
];
@@ -40,52 +58,55 @@ export function Text({
dashboard,
dashcard,
gridSize,
- settings,
- isEditing,
- isMobile,
-}) {
+ settings = {},
+ isEditing = false,
+ isMobile = false,
+}: TextProps) {
const dispatch = useDispatch();
const parameterValues = useSelector(getParameterValues);
+ const settingsText = typeof settings.text === "string" ? settings.text : "";
+
const justAdded = useMemo(() => dashcard?.justAdded || false, [dashcard]);
- const [textValue, setTextValue] = useState(settings.text);
+ const [textValue, setTextValue] = useState(settingsText);
const tc = useTranslateContent();
- const translatedText = tc(settings.text);
+ const translatedText = tc(settingsText);
- const [isFocused, { turnOn: toggleFocusOn, turnOff: toggleFocusOff }] =
- useToggle(justAdded);
+ const [isFocused, { open: toggleFocusOn, close: toggleFocusOff }] =
+ useDisclosure(justAdded);
const isPreviewing = !isFocused;
- const preventDragging = (e) => e.stopPropagation();
+ const preventDragging = (e: React.MouseEvent) => e.stopPropagation();
const isSingleRow = gridSize?.height === 1;
- // handles a case when settings are updated externally
useEffect(() => {
- setTextValue(settings.text);
- }, [settings.text]);
+ setTextValue(settingsText);
+ }, [settingsText]);
const content = useMemo(
() =>
- fillParametersInText({
- dashcard,
- dashboard,
- parameterValues,
- text: translatedText,
- escapeMarkdown: true,
- }),
+ dashboard
+ ? fillParametersInText({
+ dashcard,
+ dashboard,
+ parameterValues,
+ text: translatedText,
+ escapeMarkdown: true,
+ })
+ : translatedText,
[dashcard, dashboard, parameterValues, translatedText],
);
const updateParameterMappings = useCallback(() => {
- if (!dashcard.id) {
+ if (typeof dashcard?.id !== "number") {
return;
}
- dispatch(updateParameterMappingsForDashcardText(dashcard?.id));
- }, [dashcard?.id, dispatch]);
+ dispatch(updateParameterMappingsForDashcardText(dashcard.id));
+ }, [dashcard, dispatch]);
- const hasContent = !isEmpty(settings.text);
+ const hasContent = !isEmpty(settingsText);
const placeholder = t`You can use Markdown here, and include variables {{like_this}}`;
if (isEditing) {
@@ -105,7 +126,6 @@ export function Text({
data-testid="editing-dashboard-text-preview"
onMouseDown={preventDragging}
>
- {/* ReactMarkdown does not allow adding an onMouseDown event handler */}
<ReactMarkdown
remarkPlugins={REMARK_PLUGINS}
rehypePlugins={REHYPE_PLUGINS}
@@ -119,7 +139,7 @@ export function Text({
getSettingsStyle(settings),
)}
>
- {hasContent ? settings.text : placeholder}
+ {hasContent ? settingsText : placeholder}
</ReactMarkdown>
</ReactMarkdownStyleWrapper>
) : (
@@ -134,8 +154,8 @@ export function Text({
onBlur={() => {
toggleFocusOff();
- if (settings.text !== textValue) {
- onUpdateVisualizationSettings({ text: textValue });
+ if (settingsText !== textValue) {
+ onUpdateVisualizationSettings?.({ text: textValue });
updateParameterMappings();
}
}}
@@ -156,8 +176,6 @@ export function Text({
>
<ReactMarkdownStyleWrapper>
<ReactMarkdown
- remarkPlugins={REMARK_PLUGINS}
- rehypePlugins={REHYPE_PLUGINS}
className={cx(
CS.full,
CS.flexFull,
@@ -166,6 +184,8 @@ export function Text({
"text-card-markdown",
getSettingsStyle(settings),
)}
+ remarkPlugins={REMARK_PLUGINS}
+ rehypePlugins={REHYPE_PLUGINS}
>
{content}
</ReactMarkdown>
diff --git a/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx
index 30f038e0ab1..3bb926eb4d5 100644
--- a/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx
@@ -2,6 +2,10 @@ import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen } from "__support__/ui";
import type { ParameterValuesMap } from "metabase-types/api";
+import {
+ createMockDashboard,
+ createMockVirtualDashCard,
+} from "metabase-types/api/mocks";
import { createMockDashboardState } from "metabase-types/store/mocks";
import { Text } from "../Text";
@@ -11,10 +15,8 @@ interface Settings {
}
const defaultProps = {
- onUpdateVisualizationSettings: null,
- className: null,
- dashboard: {},
- dashcard: {},
+ dashboard: createMockDashboard(),
+ dashcard: createMockVirtualDashCard(),
gridSize: Text.defaultSize,
settings: {},
isEditing: false,
diff --git a/package.json b/package.json
index ac947a168eb..23b255e9b24 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
"redux-actions": "^2.0.1",
"redux-auth-wrapper": "2.1.0",
"redux-undo": "^1.1.0",
- "rehype-external-links": "^2.0.1",
+ "rehype-external-links": "^3.0.0",
"remark-gfm": "^4.0.0",
"reselect": "^5.1.0",
"resize-observer-polyfill": "^1.5.1",