Skip to content

Commit 7a4c8b6

Browse files
committed
chore(global-search): seperate tab and arrow navigation
1 parent d6cfce2 commit 7a4c8b6

6 files changed

Lines changed: 8 additions & 3 deletions

File tree

plugins/global-search/src/components/GroupHeader.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export const GroupHeader = memo(
3030

3131
return (
3232
<button
33+
tabIndex={-1}
3334
ref={ref}
3435
onClick={onToggle}
3536
className={cn(

plugins/global-search/src/components/Match.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ export const Match = forwardRef<HTMLButtonElement, MatchProps>(function Match(pr
4949
return (
5050
<button
5151
ref={ref}
52+
tabIndex={-1}
5253
onClick={navigateToResult}
5354
className={cn(
5455
"text-secondary-light dark:text-secondary-dark text-xs w-full text-left select-none cursor-pointer pl-5 rounded-lg transition-colors h-6 left-0",

plugins/global-search/src/components/Results.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export function ResultsList({ groups }: ResultsProps) {
5353
return (
5454
<div
5555
ref={scrollElementRef}
56-
className="flex-1 min-h-0 overflow-auto scrollbar-hidden contain-strict"
56+
className="flex-1 min-h-0 overflow-auto scrollbar-hidden contain-strict focus-visible:outline-focus-ring-light focus-visible:dark:outline-focus-ring-dark focus-visible:outline-2 rounded-lg"
5757
role="listbox"
5858
aria-label="Search results"
5959
>

plugins/global-search/src/components/SearchScene.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export function SearchScene() {
7878
<IconEllipsis className="text-framer-text-tertiary-light dark:text-framer-text-tertiary-dark" />
7979
</Menu>
8080
</div>
81-
<div className="overflow-y-auto px-3 flex flex-col flex-1 scrollbar-hidden">
81+
<div className="px-3 flex flex-col flex-1 scrollbar-hidden">
8282
{queryToUse && hasResults && <ResultsList groups={results} />}
8383
{noResultsState === "searching" && <ResultMessage>Searching…</ResultMessage>}
8484
{noResultsState === "no-results" && <ResultMessage>No Results</ResultMessage>}

plugins/global-search/src/components/ui/Menu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export const Menu = memo(function Menu({ items, children, className }: MenuProps
4242
ref={buttonRef}
4343
onMouseDown={toggleMenu}
4444
onKeyDown={toggleMenu}
45-
className="group h-full -mx-2 px-2 -my-3 py-3 text-white rounded-md flex-shrink-0 flex items-center justify-center bg-transparent focus:outline-none hover:text-primary-light dark:hover:text-primary-dark focus:text-primary-light dark:focus:text-primary-dark disabled:opacity-50 disabled:pointer-events-none disabled:cursor-default visible"
45+
className="group h-full -mx-2 px-2 -my-3 py-3 text-white rounded-md flex-shrink-0 flex items-center justify-center bg-transparent outline-focus-ring-light dark:outline-focus-ring-dark hover:text-primary-light dark:hover:text-primary-dark focus:text-primary-light dark:focus:text-primary-dark disabled:opacity-50 disabled:pointer-events-none disabled:cursor-default visible"
4646
aria-haspopup="true"
4747
>
4848
<div className="flex items-center justify-center w-fit h-fit flex-shrink-0 bg-transparent text-tertiary-light dark:text-tertiary-dark group-hover:text-primary-light dark:group-hover:text-primary-dark group-focus:text-primary-light dark:group-focus:text-primary-dark">

plugins/global-search/src/styles.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
--color-modal-light: #ffffff;
2929
--color-modal-dark: #111111;
3030

31+
--color-focus-ring-light: #0099ff;
32+
--color-focus-ring-dark: #0099ff;
33+
3134
/* Spacing */
3235
--spacing: 5px;
3336
}

0 commit comments

Comments
 (0)