Skip to content

fix(EAV-555): make prompter scroll #51

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
ianshade merged 2 commits into from
Apr 16, 2025
Merged

fix(EAV-555): make prompter scroll #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f70a5b
fix(EAV-555): make prompter scroll
ianshade Apr 16, 2025
d724e7c
chore(EAV-555): fix linting errors
ianshade Apr 16, 2025
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
98 changes: 18 additions & 80 deletions packages/webui/src/client/ui/Prompter/PrompterView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,65 +319,28 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
const target = document.querySelector<HTMLElement>(`[data-part-instance-id="${partInstanceId}"]`)

if (!target) return
// Velocity(document.body, 'finish')
// Velocity(target, 'scroll', { offset: -1 * scrollMargin, duration: 400, easing: 'ease-out' })
const offsetTop = window.scrollY + target.offsetTop
this._lastAnimation?.stop()
this._lastAnimation = animate(
window,
{
scrollY: offsetTop + -1 * scrollMargin,
},
{
duration: 0.4,
ease: 'easeOut',
}
)

const targetOffsetTop = target.getBoundingClientRect().top + window.pageYOffset
this.animateScrollTo(targetOffsetTop - scrollMargin)
}
scrollToLive(): void {
const scrollMargin = this.calculateScrollPosition()
const current =
document.querySelector<HTMLElement>('.prompter .live') || document.querySelector<HTMLElement>('.prompter .next')

if (!current) return
// Velocity(document.body, 'finish')
// Velocity(current, 'scroll', { offset: -1 * scrollMargin, duration: 400, easing: 'ease-out' })
// }

const offsetTop = window.scrollY + current.offsetTop
this._lastAnimation?.stop()
this._lastAnimation = animate(
window,
{
scrollY: offsetTop + -1 * scrollMargin,
},
{
duration: 0.4,
ease: 'easeOut',
}
)
const targetOffsetTop = current.getBoundingClientRect().top + window.pageYOffset
this.animateScrollTo(targetOffsetTop - scrollMargin)
}
scrollToNext(): void {
const scrollMargin = this.calculateScrollPosition()
const next = document.querySelector<HTMLElement>('.prompter .next')

if (!next) return
// Velocity(document.body, 'finish')
// Velocity(next, 'scroll', { offset: -1 * scrollMargin, duration: 400, easing: 'ease-out' })
// }

const offsetTop = window.scrollY + next.offsetTop
this._lastAnimation?.stop()
this._lastAnimation = animate(
window,
{
scrollY: offsetTop + -1 * scrollMargin,
},
{
duration: 0.4,
ease: 'easeOut',
}
)
const targetOffsetTop = next.getBoundingClientRect().top + window.pageYOffset
this.animateScrollTo(targetOffsetTop - scrollMargin)
}
scrollToPrevious(): void {
const scrollMargin = this.calculateScrollPosition()
Expand All @@ -386,25 +349,8 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
const target = anchors[anchors.length - 2] || anchors[0]
if (!target) return

// Velocity(document.body, 'finish')
// Velocity(document.body, 'scroll', {
// offset: window.scrollY - scrollMargin + target[0],
// duration: 200,
// easing: 'ease-out',
// })

const offsetTop = window.scrollY + target[0]
this._lastAnimation?.stop()
this._lastAnimation = animate(
window,
{
scrollY: offsetTop + -1 * scrollMargin,
},
{
duration: 0.4,
ease: 'easeOut',
}
)
const targetOffsetTop = target[0] + window.pageYOffset
this.animateScrollTo(targetOffsetTop - scrollMargin)
}
scrollToFollowing(): void {
const scrollMargin = this.calculateScrollPosition()
Expand All @@ -413,24 +359,16 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
const target = anchors[0]
if (!target) return

// Velocity(document.body, 'finish')
// Velocity(document.body, 'scroll', {
// offset: window.scrollY - scrollMargin + target[0],
// duration: 200,
// easing: 'ease-out',
// })
const offsetTop = window.scrollY + target[0]
const targetOffsetTop = target[0] + window.pageYOffset
this.animateScrollTo(targetOffsetTop - scrollMargin)
}
private animateScrollTo(scrollToPosition: number) {
this._lastAnimation?.stop()
this._lastAnimation = animate(
window,
{
scrollY: offsetTop + -1 * scrollMargin,
},
{
duration: 0.4,
ease: 'easeOut',
}
)
this._lastAnimation = animate(window.scrollY, scrollToPosition, {
duration: 0.4,
ease: 'easeOut',
onUpdate: (latest) => window.scrollTo(0, latest),
})
}
listAnchorPositions(startY: number, endY: number, sortDirection = 1): [number, Element][] {
let foundPositions: [number, Element][] = []
Expand Down
Loading