Skip to content

Dev #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 2, 2024
Merged

Dev #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
777a9df
removed a debug console.log
marcus-wishes Dec 2, 2024
75b856d
added onPrevious to the tour wrapper
marcus-wishes Dec 2, 2024
74a3ff5
time table - changed the placeholder height a bit and fixed that the …
marcus-wishes Dec 2, 2024
4f837cd
time table - fixed rendering of updated groups while scrolled down
marcus-wishes Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions library/src/components/timetable/TimeTableRows.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export default function TimeTableRows<
}
} else {
// not yet rendered
console.log("NOT YET RENDERED", i, refCollection.current)
console.log("TimeTable - placeholder not yet rendered", i)
return
}
}
Expand Down Expand Up @@ -270,6 +270,7 @@ export default function TimeTableRows<
const ret = prev >= newOne ? newOne : prev
if (ret === newOne) {
allPlaceholderRendered.current = false
groupRowsRenderedIdxRef.current = newOne
}
return ret
})
Expand Down Expand Up @@ -319,7 +320,7 @@ export default function TimeTableRows<
// we need to push through an initial rendering of the group rows
// there fore we need to render one time until entries.length - 1

let start = groupRowsRenderedIdx
let start = groupRowsRenderedIdx < 0 ? 0 : groupRowsRenderedIdx

// removal of too many rendered elements
for (
Expand All @@ -328,7 +329,6 @@ export default function TimeTableRows<
g++
) {
if (groupRowsRendered.current[g]) {
console.log("REMOVING ", g, groupRowsRendered.current)
delete groupRowsRendered.current[g]
delete refCollection.current[g]
renderedCells.current.delete(g)
Expand Down Expand Up @@ -398,6 +398,9 @@ export default function TimeTableRows<
start,
increment,
entries,
renderCells.current,
startRender,
groupRowsRenderedIdx,
)
return groupRowsRenderedIdx
}
Expand Down Expand Up @@ -907,7 +910,8 @@ function GroupRows<G extends TimeTableGroup, I extends TimeSlotBooking>({
: 1
const groupHeaderHeight =
rowHeight * rowCount +
(timeSlotSelectionDisabled ? 0 : placeHolderHeight)
(timeSlotSelectionDisabled ? 0 : placeHolderHeight) +
(renderCells ? 0 : 2) // the +1 on the placeholder should improve the behavior of the rounding (that the time table scrolls a bit after scrolling in the time table)
const GroupComponent = useGroupComponent(storeIdent)

const groupHeader = useMemo(() => {
Expand Down Expand Up @@ -940,7 +944,7 @@ function GroupRows<G extends TimeTableGroup, I extends TimeSlotBooking>({
rowSpan={rowSpanGroupHeader}
className={
renderCells
? `border-border border-b-border m-0 p-0 sticky left-0 z-[4] select-none border-0 border-b-2 border-r-2 border-solid ${
? `border-border overflow-hidden box-border border-b-border m-0 p-0 sticky left-0 z-[4] select-none border-0 border-b-2 border-r-2 border-solid ${
groupNumber % 2 === 0
? "bg-surface"
: "bg-surface-hovered"
Expand Down
6 changes: 6 additions & 0 deletions library/src/components/tour/TourWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ export class TourStep {
onPrepare,
onInit,
onExit,
onPrevious,
}: {
step: TourStepProps
onPrepare?: () => void
onInit?: () => void
onExit?: () => void
onPrevious?: () => void
}) {
const content = (
<div className={this.contentClassname}>{step.content}</div>
Expand All @@ -33,6 +35,7 @@ export class TourStep {
this.onInit = onInit
this.onPrepare = onPrepare
this.onExit = onExit
this.onPrevious = onPrevious
}

set step(step: Step) {
Expand All @@ -50,6 +53,8 @@ export class TourStep {
onPrepare?(): void

onExit?(): void

onPrevious?(): void
}

export interface TourProps {
Expand Down Expand Up @@ -160,6 +165,7 @@ export function Tour({
next(1)
break
case "prev":
steps[index]?.onPrevious?.()
steps[index - 1]?.onInit?.()
next(-1)
break
Expand Down
Loading