Skip to content
Merged
Changes from all commits
Commits
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
28 changes: 22 additions & 6 deletions src/lib/tours/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,22 @@ function openOnNext(opener: () => Promise<void>): DriverHook {
};
}

type PopoverSpec = NonNullable<DriveStep['popover']>;

/** Drop keys whose value is `undefined` from a popover spec.
*
* driver.js merges a step's `popover` *over* its own defaults — the step
* spread comes last. An explicit `onNextClick: undefined` therefore clobbers
* driver.js's built-in Next handler, leaving the button rendered but inert.
* Builders that forward optional hooks (`rawStep`, `blockStep`, `actionStep`)
* must prune undefined keys before handing the popover to driver.js. */
function prunePopover(popover: PopoverSpec): PopoverSpec {
for (const key of Object.keys(popover) as (keyof PopoverSpec)[]) {
if (popover[key] === undefined) delete popover[key];
}
return popover;
}

const FLOATING_POPOVER = { popoverClass: 'tour-floating' } as const;
const FLOATING_BR = {
side: 'top' as Side,
Expand Down Expand Up @@ -296,13 +312,13 @@ export function actionStep(opts: ActionStep): DriveStep[] {
{
element: opts.result,
onHighlightStarted: opts.beforeResult,
popover: {
popover: prunePopover({
title: opts.resultTitle,
description: opts.resultBody,
side: opts.resultPosition?.side ?? 'right',
align: opts.resultPosition?.align ?? 'center',
onNextClick: opts.onResultNext
}
})
}
];
}
Expand All @@ -328,13 +344,13 @@ export function blockStep(opts: BlockStep): DriveStep {
onHighlightStarted: opts.onHighlightStarted,
onHighlighted: opts.onHighlighted,
onDeselected: opts.onDeselected,
popover: {
popover: prunePopover({
title: opts.title,
description: opts.body,
side: opts.side ?? 'right',
align: opts.align ?? 'center',
onNextClick: opts.onNextClick
}
})
};
}

Expand Down Expand Up @@ -364,14 +380,14 @@ export function rawStep(opts: RawStep): DriveStep {
element: opts.element,
onHighlightStarted: opts.onHighlightStarted,
onDeselected: opts.onDeselected,
popover: {
popover: prunePopover({
title: opts.title,
description: opts.body,
side: opts.side ?? 'right',
align: opts.align ?? 'center',
popoverClass: opts.popoverClass,
onNextClick: opts.onNextClick,
onPopoverRender: opts.onPopoverRender
}
})
};
}
Loading