Skip to content

Commit ef45fe1

Browse files
committed
Update deprecations
1 parent 7cdb455 commit ef45fe1

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

components/navbar.tsx

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
import React, {Fragment, JSX, useContext} from 'react'
2-
import {Disclosure, Menu, Transition} from '@headlessui/react'
2+
import {
3+
Disclosure,
4+
DisclosureButton,
5+
DisclosurePanel,
6+
Menu,
7+
MenuButton,
8+
MenuItem,
9+
MenuItems,
10+
Transition
11+
} from '@headlessui/react'
312
import {Bars3Icon, QuestionMarkCircleIcon, XMarkIcon} from '@heroicons/react/24/outline'
413
import Link from 'next/link'
514
import {NextRouter, useRouter} from 'next/router'
@@ -26,7 +35,7 @@ export default function Navbar() {
2635

2736
function MobileMenuButton() {
2837
return <div className="absolute inset-y-0 left-0 flex items-center sm:hidden" onClick={() => setOpen(!open)}>
29-
<Disclosure.Button className="inline-flex items-center justify-center p-2 rounded-md
38+
<DisclosureButton className="inline-flex items-center justify-center p-2 rounded-md
3039
text-discal-light-grey hover:text-white hover:bg-discal-dark-grey focus:outline-none
3140
focus:ring-2 focus:ring-inset focus:ring-white">
3241
<span className="sr-only">Open main menu</span>
@@ -35,7 +44,7 @@ export default function Navbar() {
3544
) : (
3645
<Bars3Icon className="block h-6 w-6" aria-hidden="true"/>
3746
)}
38-
</Disclosure.Button>
47+
</DisclosureButton>
3948
</div>
4049
}
4150

@@ -108,15 +117,15 @@ export default function Navbar() {
108117
return (
109118
<Menu as="div" className="ml-3 relative">
110119
<div>
111-
<Menu.Button
120+
<MenuButton
112121
className="bg-discal-dark-blue flex text-sm rounded-full focus:outline-none focus:ring-2
113122
focus:ring-offset-2 focus:ring-offset-discal-dark-grey focus:ring-white">
114123
<span className="sr-only">Open user menu</span>
115124
<img className="h-8 w-8 rounded-full"
116125
src={props.user.avatar}
117126
alt="Profile Photo"
118127
/>
119-
</Menu.Button>
128+
</MenuButton>
120129
</div>
121130
<Transition
122131
as={Fragment}
@@ -127,14 +136,14 @@ export default function Navbar() {
127136
leaveFrom="opacity-100 scale-100"
128137
leaveTo="opacity-0 scale-95"
129138
>
130-
<Menu.Items className="z-[999] origin-top-right absolute right-0 mt-2 w-48 rounded-md shadow-lg py-1
139+
<MenuItems className="z-[999] origin-top-right absolute right-0 mt-2 w-48 rounded-md shadow-lg py-1
131140
bg-discord-not-quite-black ring-1 ring-black ring-opacity-5 focus:outline-none">
132-
<Menu.Item>
141+
<MenuItem>
133142
<p className="block px-4 py-2 text-sm text-discal-light-grey">
134143
{props.user.username}#{props.user.discriminator}
135144
</p>
136-
</Menu.Item>
137-
<Menu.Item>
145+
</MenuItem>
146+
<MenuItem>
138147
<Link
139148
href='/logout'
140149
role={"button"}
@@ -143,20 +152,20 @@ export default function Navbar() {
143152
Sign out
144153

145154
</Link>
146-
</Menu.Item>
147-
</Menu.Items>
155+
</MenuItem>
156+
</MenuItems>
148157
</Transition>
149158
</Menu>
150159
);
151160
}
152161

153162
function MobileDropdownNav(): JSX.Element {
154163
return (
155-
<Disclosure.Panel className="sm:hidden" onClick={() => setOpen(!open)}>
164+
<DisclosurePanel className="sm:hidden" onClick={() => setOpen(!open)}>
156165
<div className="px-2 pt-2 pb-3 space-y-1">
157166
{navigation.map((item) => (
158167
<Link href={item.href} key={item.name} passHref legacyBehavior>
159-
<Disclosure.Button
168+
<DisclosureButton
160169
as="a"
161170
className={classNames(
162171
currentPage(router, item.href) ? 'bg-discal-dark-blue text-white' :
@@ -166,11 +175,11 @@ export default function Navbar() {
166175
aria-current={currentPage(router, item.href) ? 'page' : undefined}
167176
>
168177
{item.name}
169-
</Disclosure.Button>
178+
</DisclosureButton>
170179
</Link>
171180
))}
172181
</div>
173-
</Disclosure.Panel>
182+
</DisclosurePanel>
174183
);
175184
}
176185

0 commit comments

Comments
 (0)