Skip to content

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

Swap merge-refs for Mantine's mergeRefs (#81104)

Andrei Chernykh25ed6aac2b8a
diff --git a/bun.lock b/bun.lock
index bbdcdf9082f..c2a02090796 100644
--- a/bun.lock
+++ b/bun.lock
@@ -113,7 +113,6 @@
"lodash.debounce": "^4.0.8",
"lodash.orderby": "^4.6.0",
"marked": "18.0.6",
- "merge-refs": "^1.3.0",
"mustache": "^2.3.2",
"normalizr": "^3.0.2",
"ora": "^8.0.1",
@@ -3993,8 +3992,6 @@
"merge-descriptors": ["[email protected]", "", {}, "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="],
- "merge-refs": ["[email protected]", "", {}, "sha512-nqXPXbso+1dcKDpPCXvwZyJILz+vSLqGGOnDrYHQYE+B8n9JTCekVLC65AfCpR4ggVyA/45Y0iR9LDyS2iI+zA=="],
-
"merge-stream": ["[email protected]", "", {}, "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="],
"merge2": ["[email protected]", "", {}, "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="],
diff --git a/frontend/src/metabase/ui/components/inputs/Select/Select.tsx b/frontend/src/metabase/ui/components/inputs/Select/Select.tsx
index c7c8b7c5db3..548ef0502ac 100644
--- a/frontend/src/metabase/ui/components/inputs/Select/Select.tsx
+++ b/frontend/src/metabase/ui/components/inputs/Select/Select.tsx
@@ -5,7 +5,7 @@ import type {
OptionsFilter,
} from "@mantine/core";
import { Select as MantineSelect, defaultOptionsFilter } from "@mantine/core";
-import mergeRefs from "merge-refs";
+import { mergeRefs } from "@mantine/hooks";
import { type Ref, forwardRef, useCallback, useMemo, useRef } from "react";
import type { IconName } from "metabase-types/api";
@@ -60,9 +60,9 @@ function SelectWrapper<Value extends string | null>(
}, [searchable, onDropdownOpen]);
return (
+ // @ts-expect-error -- our tighter types are better
<MantineSelect
{...props}
- // @ts-expect-error -- our tighter types are better
ref={combinedRef}
filter={filterWithoutEmptyGroups}
// A bit confusing prop name but it actually means "on change of search input", not Select's value
diff --git a/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.tsx b/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.tsx
index 60c8a7db2b2..c982ee8e46d 100644
--- a/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.tsx
+++ b/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.tsx
@@ -1,6 +1,6 @@
+import { mergeRefs } from "@mantine/hooks";
import type { EChartsCoreOption, EChartsType } from "echarts/core";
import { init } from "echarts/core";
-import mergeRefs from "merge-refs";
import { forwardRef, useEffect, useRef } from "react";
import { useMount, useUnmount, useUpdateEffect } from "react-use";
diff --git a/package.json b/package.json
index dcdca1f7c61..ac189a85e44 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,6 @@
"lodash.debounce": "^4.0.8",
"lodash.orderby": "^4.6.0",
"marked": "18.0.6",
- "merge-refs": "^1.3.0",
"mustache": "^2.3.2",
"normalizr": "^3.0.2",
"ora": "^8.0.1",