Skip to content

Commit de49195

Browse files
committed
use semantic html tags in finder backend
1 parent 9fb1aa6 commit de49195

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

client/finder/DropDownMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default function DropDownMenu(props) {
2323
<Wrapper
2424
aria-haspopup="true"
2525
onClick={toggleSubmenu}
26-
className={`dropdown-menu ${props.className}`}
26+
className={props.className}
2727
data-tooltip-id="django-finder-tooltip"
2828
data-tooltip-content={props.tooltip}
2929
>

client/finder/MenuBar.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ function ExtraMenu(props) {
207207
<li className={numClippedInodes ? null : "disabled"} onClick={clearClipboard}>
208208
<ClipboardIcon/><span>{gettext("Clear clipboard")}</span>
209209
</li>
210+
{settings.menu_extensions.length && <hr/>}
210211
{settings.menu_extensions.map((extension, index) => (
211212
<MenuExtension key={index} extension={extension} {...props} />
212213
))}
@@ -419,7 +420,7 @@ const MenuBar = forwardRef((props: any, forwardedRef) => {
419420

420421
return (
421422
<nav role="menubar">
422-
<ul>
423+
<menu>
423424
<li className="search-field">
424425
<SearchField columnRefs={columnRefs} setSearchResult={setSearchResult} settings={settings}/>
425426
</li>
@@ -464,7 +465,7 @@ const MenuBar = forwardRef((props: any, forwardedRef) => {
464465
{...props}
465466
/>
466467
</>)}
467-
</ul>
468+
</menu>
468469
</nav>
469470
);
470471
});

client/finder/Search.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import React, {useEffect, useRef, useState} from 'react';
2-
import {useCookie} from './Storage';
1+
import React, {useRef, useState} from 'react';
2+
import {useSearchRealm} from '../finder/Storage';
33
import DropDownMenu from './DropDownMenu';
44
import SearchIcon from 'icons/search.svg';
55

6-
const useSearchRealm = initial => useCookie('django-finder-search-realm', initial);
7-
86

97
function useSearchParam(key) : [string, (value: string) => any] {
108
const params = new URLSearchParams(window.location.search);
@@ -80,7 +78,14 @@ export function SearchField(props) {
8078
}
8179

8280
return (<>
83-
<input ref={searchRef} type="search" defaultValue={searchQuery} placeholder={gettext("Search for …")} onChange={handleSearch} onKeyDown={handleSearch} />
81+
<input
82+
ref={searchRef}
83+
type="search"
84+
defaultValue={searchQuery}
85+
placeholder={gettext("Search for …")}
86+
onChange={handleSearch}
87+
onKeyDown={handleSearch}
88+
/>
8489
<div>
8590
<span className="search-icon" onClick={handleSearch}><SearchIcon/></span>
8691
<DropDownMenu wrapperElement="span" className="search-realm with-caret" tooltip={gettext("Restrict search")}>
@@ -90,6 +95,7 @@ export function SearchField(props) {
9095
<li onClick={() => changeSearchRealm('everywhere')}
9196
className={isActive('everywhere')}>{gettext("In all folders")}
9297
</li>
98+
<hr/>
9399
<li onClick={() => changeSearchRealm('filename')}
94100
className={isActive('filename')}>{gettext("Filename only")}
95101
</li>

0 commit comments

Comments
 (0)