Skip to content

Commit 03ad3d0

Browse files
Merge pull request #166 from linked-planet/dev
TimeTable - fix table focus styles
2 parents f8edc6b + ddf0f9c commit 03ad3d0

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

library/src/components/styleHelper.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ export const inputBaseStyles = twJoin(
2222
// the focusVisibleOutlineStyles are used in button/others components for the blue focus ring
2323
export const focusVisibleOutlineStyles =
2424
"focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-input-border-focused focus-visible:outline-solid" as const
25+
26+
export const focusOutlineStyles =
27+
"focus:outline-2 focus:outline-offset-0 focus:outline-input-border-focused focus:outline-solid" as const

library/src/components/timetable/TimeTable.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { twJoin, twMerge } from "tailwind-merge"
55
import useResizeObserver from "use-resize-observer"
66
import { useRateLimitHelper } from "../../utils/rateLimit"
77
import { InlineMessage } from "../InlineMessage"
8-
import { focusVisibleOutlineStyles } from "../styleHelper"
98
import { Group as GroupComponent, type TimeTableGroupProps } from "./Group"
109
import { Item as ItemComponent } from "./Item"
1110
import type { TimeTableItemProps } from "./ItemWrapper"
@@ -576,11 +575,7 @@ const LPTimeTableImpl = <G extends TimeTableGroup, I extends TimeSlotBooking>({
576575
{/** biome-ignore lint/a11y/useSemanticElements: it is already a table, I dont know why it complains */}
577576
<table
578577
className={twJoin(
579-
"table w-full table-fixed border-separate border-spacing-0 select-none overflow-auto",
580-
"focus:outline-2 focus:outline-input-border-focused focus:outline-solid",
581-
focusVisibleOutlineStyles,
582-
"ring-2 ring-brand-bold",
583-
"focus:border-2 focus:border-brand-bold focus:border-solid",
578+
"table w-full table-fixed border-separate border-spacing-0 select-none overflow-auto border-2 box-border border-transparent border-solid focus-visible:border-input-border-focused",
584579
)}
585580
ref={tableRef}
586581
// biome-ignore lint/a11y/noNoninteractiveElementToInteractiveRole: grid makes it "interactive" from screen readers while a table is not interactive

library/src/components/timetable/TimeTableRows.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import {
4545
toggleTimeSlotSelected,
4646
useTimeSlotSelection,
4747
} from "./TimeTableSelectionStore"
48-
import { getNextTabbableElement } from "./tabUtils"
4948
import { getLeftAndWidth, getTimeSlotMinutes } from "./timeTableUtils"
5049
import type { ItemRowEntry } from "./useGoupRows"
5150
import { useKeyboardHandlers } from "./useKeyboardHandler"
@@ -947,7 +946,7 @@ function TableCell<G extends TimeTableGroup, I extends TimeSlotBooking>({
947946
? 0
948947
: -1
949948
}
950-
onFocus={(e) => {
949+
onFocus={(_e) => {
951950
if (
952951
rowNumber === 0 &&
953952
groupNumber === 0 &&

0 commit comments

Comments
 (0)