Skip to content

Commit 58e60b6

Browse files
committed
Prettier
1 parent 581839a commit 58e60b6

File tree

4 files changed

+72
-40
lines changed

4 files changed

+72
-40
lines changed

src/app/layouts/default/header/menus/main-menu/dropdown/dropdown.tsx

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ import './dropdown.scss';
1515
// for ordinary website navigations, per
1616
// https://www.w3.org/WAI/ARIA/apg/patterns/menubar/examples/menubar-navigation/
1717

18-
export function MenuItem({label, url, local = undefined}: {
18+
export function MenuItem({
19+
label,
20+
url,
21+
local = undefined
22+
}: {
1923
label: string;
2024
url: string;
2125
local?: string;
@@ -37,7 +41,10 @@ export function MenuItem({label, url, local = undefined}: {
3741
);
3842
}
3943

40-
function OptionalWrapper({isWrapper, children}: {
44+
function OptionalWrapper({
45+
isWrapper,
46+
children
47+
}: {
4148
isWrapper: boolean;
4249
children?: React.ReactNode;
4350
}) {
@@ -66,9 +73,8 @@ export default function Dropdown({
6673
const topRef = useRef<HTMLAnchorElement>(null);
6774
const dropdownRef = useRef<HTMLDivElement>(null);
6875
const ddId = `ddId-${label}`;
69-
const {
70-
closeMenu, closeDesktopMenu, openMenu, openDesktopMenu
71-
} = useMenuControls({topRef, label});
76+
const {closeMenu, closeDesktopMenu, openMenu, openDesktopMenu} =
77+
useMenuControls({topRef, label});
7278
const navigateByKey = useNavigateByKey({
7379
topRef,
7480
dropdownRef,
@@ -135,7 +141,10 @@ function DropdownController({
135141
[openMenu, closeMenu, activeDropdown, topRef]
136142
);
137143
const closeOnBlur = React.useCallback(
138-
({currentTarget, relatedTarget}: React.FocusEvent<HTMLAnchorElement>) => {
144+
({
145+
currentTarget,
146+
relatedTarget
147+
}: React.FocusEvent<HTMLAnchorElement>) => {
139148
if (currentTarget.parentNode?.contains(relatedTarget)) {
140149
return;
141150
}
@@ -175,7 +184,13 @@ function DropdownController({
175184
);
176185
}
177186

178-
function DropdownContents({id, label, dropdownRef, navAnalytics, children}: {
187+
function DropdownContents({
188+
id,
189+
label,
190+
dropdownRef,
191+
navAnalytics,
192+
children
193+
}: {
179194
id: string;
180195
label: string;
181196
dropdownRef: React.RefObject<HTMLDivElement>;

src/app/layouts/default/header/menus/main-menu/dropdown/use-navigate-by-key.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import useDropdownContext from '../../dropdown-context';
22
import {isMobileDisplay} from '~/helpers/device';
3-
import { assertDefined } from '~/helpers/data';
3+
import {assertDefined} from '~/helpers/data';
44

55
function findNext(dropdownRef: React.MutableRefObject<HTMLDivElement | null>) {
66
const nextSib = document.activeElement?.nextElementSibling;
77

88
if (nextSib?.matches('a')) {
99
return nextSib as HTMLAnchorElement;
1010
}
11-
const targets = Array.from(assertDefined(dropdownRef.current?.querySelectorAll('a')));
11+
const targets = Array.from(
12+
assertDefined(dropdownRef.current?.querySelectorAll('a'))
13+
);
1214
const idx = targets.indexOf(document.activeElement as HTMLAnchorElement);
1315
const nextIdx = (idx + 1) % targets.length;
1416

@@ -24,7 +26,9 @@ function findPrev(
2426
if (prevSib?.matches('a')) {
2527
return prevSib as HTMLAnchorElement;
2628
}
27-
const targets = Array.from(assertDefined(dropdownRef.current?.querySelectorAll('a')));
29+
const targets = Array.from(
30+
assertDefined(dropdownRef.current?.querySelectorAll('a'))
31+
);
2832
const idx = targets.indexOf(document.activeElement as HTMLAnchorElement);
2933

3034
if (idx === 0) {
@@ -70,7 +74,9 @@ export default function useNavigateByKey({
7074
case 'ArrowDown':
7175
event.preventDefault();
7276
if (document.activeElement === topRef.current) {
73-
(dropdownRef.current?.firstChild as HTMLAnchorElement)?.focus();
77+
(
78+
dropdownRef.current?.firstChild as HTMLAnchorElement
79+
)?.focus();
7480
} else {
7581
findNext(dropdownRef).focus();
7682
}

src/app/layouts/default/header/menus/main-menu/login-menu/login-menu-with-dropdown.tsx

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ function AccountItem() {
1414
const {myOpenStaxUser} = useUserContext();
1515
const mosIsAvailable = !myOpenStaxUser.error;
1616

17-
return (
18-
mosIsAvailable ?
19-
<MenuItem label="Account Dashboard" url="/account" /> :
20-
<MenuItem label="Account Profile" url={`${settings.accountHref}/profile`} />
17+
return mosIsAvailable ? (
18+
<MenuItem label="Account Dashboard" url="/account" />
19+
) : (
20+
<MenuItem
21+
label="Account Profile"
22+
url={`${settings.accountHref}/profile`}
23+
/>
2124
);
2225
}
2326

24-
2527
export default function LoginMenuWithDropdown() {
2628
const userModel = assertDefined(useUserContext().userModel);
2729

@@ -30,25 +32,32 @@ export default function LoginMenuWithDropdown() {
3032
const label = `Hi ${userModel.first_name || userModel.username}`;
3133

3234
return (
33-
<Dropdown className="login-menu nav-menu-item rightmost dropdown" label={label} excludeWrapper>
35+
<Dropdown
36+
className="login-menu nav-menu-item rightmost dropdown"
37+
label={label}
38+
excludeWrapper
39+
>
3440
<AccountItem />
35-
{
36-
userModel.instructorEligible &&
37-
<MenuItem label="Request instructor access" url={reqFacultyAccessLink} />
38-
}
39-
{
40-
userModel.incompleteSignup &&
41-
<MenuItem label="Complete your profile" url={profileLink} />
42-
}
43-
{
44-
userModel.pendingInstructorAccess &&
45-
<MenuItem label="Pending instructor access" url={profileLink} />
46-
}
47-
{
48-
userModel.emailUnverified &&
49-
<MenuItem label="Verify your email address" url={profileLink} />
50-
}
51-
<MenuItem label="Log out" url={linkHelper.logoutLink()} local="true" />
41+
{userModel.instructorEligible && (
42+
<MenuItem
43+
label="Request instructor access"
44+
url={reqFacultyAccessLink}
45+
/>
46+
)}
47+
{userModel.incompleteSignup && (
48+
<MenuItem label="Complete your profile" url={profileLink} />
49+
)}
50+
{userModel.pendingInstructorAccess && (
51+
<MenuItem label="Pending instructor access" url={profileLink} />
52+
)}
53+
{userModel.emailUnverified && (
54+
<MenuItem label="Verify your email address" url={profileLink} />
55+
)}
56+
<MenuItem
57+
label="Log out"
58+
url={linkHelper.logoutLink()}
59+
local="true"
60+
/>
5261
</Dropdown>
5362
);
5463
}

src/app/layouts/default/header/menus/main-menu/login-menu/login-menu.tsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ function LoginLink() {
1111
return (
1212
<li className="login-menu nav-menu-item rightmost">
1313
<a
14-
href={linkHelper.loginLink()} className="pardotTrackClick"
15-
data-local="true" role="menuitem"
14+
href={linkHelper.loginLink()}
15+
className="pardotTrackClick"
16+
data-local="true"
17+
role="menuitem"
1618
>
1719
Log in
1820
</a>
@@ -24,9 +26,9 @@ export default function LoginMenu() {
2426
const {userModel} = useUserContext();
2527
const loggedIn = Boolean(typeof userModel === 'object' && userModel.id);
2628

27-
return (
28-
loggedIn ?
29-
<JITLoad importFn={() => import('./login-menu-with-dropdown')} /> :
30-
<LoginLink />
29+
return loggedIn ? (
30+
<JITLoad importFn={() => import('./login-menu-with-dropdown')} />
31+
) : (
32+
<LoginLink />
3133
);
3234
}

0 commit comments

Comments
 (0)