Skip to content

Commit 78a9502

Browse files
committed
use radix utility function to merge refs
1 parent 55c1112 commit 78a9502

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"@next/bundle-analyzer": "^14.2.5",
3838
"@radix-ui/react-accordion": "^1.2.0",
3939
"@radix-ui/react-checkbox": "^1.1.1",
40+
"@radix-ui/react-compose-refs": "^1.1.0",
4041
"@radix-ui/react-dialog": "^1.1.1",
4142
"@radix-ui/react-navigation-menu": "^1.2.0",
4243
"@radix-ui/react-popover": "^1.1.1",
@@ -75,7 +76,6 @@
7576
"react-i18next": "^13.3.1",
7677
"react-icons": "^4.10.1",
7778
"react-lite-youtube-embed": "^2.4.0",
78-
"react-merge-refs": "^2.1.1",
7979
"react-select": "5.8.0",
8080
"reading-time": "^1.5.0",
8181
"remark-gfm": "^3.0.1",

src/components/Search/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import dynamic from "next/dynamic"
33
import { useRouter } from "next/router"
44
import { useTranslation } from "next-i18next"
55
import { MdSearch } from "react-icons/md"
6-
import { mergeRefs } from "react-merge-refs"
76
import { useDocSearchKeyboardEvents } from "@docsearch/react"
87
import { DocSearchHit } from "@docsearch/react/dist/esm/types"
8+
import { useComposedRefs } from "@radix-ui/react-compose-refs"
99
import * as Portal from "@radix-ui/react-portal"
1010

1111
import { trackCustomEvent } from "@/lib/utils/matomo"
@@ -26,7 +26,7 @@ const Search = forwardRef<HTMLButtonElement, Props>(
2626
({ isOpen, onOpen, onClose }, ref) => {
2727
const { locale } = useRouter()
2828
const searchButtonRef = useRef<HTMLButtonElement>(null)
29-
const mergedButtonRefs = mergeRefs([ref, searchButtonRef])
29+
const mergedButtonRefs = useComposedRefs(ref, searchButtonRef)
3030
const { t } = useTranslation("common")
3131

3232
useDocSearchKeyboardEvents({

yarn.lock

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4394,7 +4394,7 @@
43944394
"@babel/runtime" "^7.13.10"
43954395
"@radix-ui/react-primitive" "1.0.3"
43964396

4397-
"@radix-ui/react-portal@1.1.1", "@radix-ui/react-portal@^1.1.1":
4397+
"@radix-ui/react-portal@1.1.1":
43984398
version "1.1.1"
43994399
resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.1.tgz#1957f1eb2e1aedfb4a5475bd6867d67b50b1d15f"
44004400
integrity sha512-A3UtLk85UtqhzFqtoC8Q0KvR2GbXF3mtPgACSazajqq6A41mEQgo53iPzY4i6BwDxlIFqWIhiQ2G729n+2aw/g==
@@ -13453,11 +13453,6 @@ react-lite-youtube-embed@^2.4.0:
1345313453
resolved "https://registry.yarnpkg.com/react-lite-youtube-embed/-/react-lite-youtube-embed-2.4.0.tgz#1f56a12be1061d50431444d52d836bd09a1283a2"
1345413454
integrity sha512-Xo6cM1zPlROvvM97JkqQIoXstlQDaC4+DawmM7BB7Hh1cXrkBHEGq1iJlQxBTUWAUklmpcC7ph7qg7CztXtABQ==
1345513455

13456-
react-merge-refs@^2.1.1:
13457-
version "2.1.1"
13458-
resolved "https://registry.yarnpkg.com/react-merge-refs/-/react-merge-refs-2.1.1.tgz#e46763f8f1b881c0226ee54a1a2a10ffefba0233"
13459-
integrity sha512-jLQXJ/URln51zskhgppGJ2ub7b2WFKGq3cl3NYKtlHoTG+dN2q7EzWrn3hN3EgPsTMvpR9tpq5ijdp7YwFZkag==
13460-
1346113456
react-refresh@^0.14.0:
1346213457
version "0.14.2"
1346313458
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9"

0 commit comments

Comments
 (0)