Skip to content

Update scroll functionality to handle resized screen and wrapped text #140

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

Open
Kyle-Shanks wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update scroll functionality to handle resized screen and wrapped text #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion desktop/sources/links/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ body stats ul { height: 100%; display: inline; overflow: scroll; white-space: no
body stats li { display: inline; margin-right: 10px; }
body stats li.active { text-decoration: underline; font-weight: bold; }

body textarea { font-family: var(--font-family); padding: 30px 15px 0; height: calc(100vh - 90px); display: block; width: 80ch; position: fixed; left: 25vw; font-size: var(--font-size); line-height: var(--line-height); resize: none; background: transparent; overflow: auto; max-width: 90%; transition: left 200ms; margin-left:-15px; }
body textarea { box-sizing: border-box; font-family: var(--font-family); padding: 30px 15px 0; height: calc(100vh - 60px); display: block; width: 80ch; position: fixed; left: 25vw; font-size: var(--font-size); line-height: var(--line-height); resize: none; background: transparent; overflow: auto; max-width: 90%; transition: left 200ms; margin-left:-15px; }
body div { left: 25vw; max-width:600px; width:80ch; line-height: var(--line-height); font-family: var(--font-family); font-size: var(--font-size); white-space: pre-wrap; word-wrap:break-word; }
body drag { display: block;width: 100vw;height: 30px;position: fixed;top: 0px;-webkit-user-select: none;-webkit-app-region: drag; background-color: transparent !important;}

Expand Down
33 changes: 22 additions & 11 deletions desktop/sources/scripts/go.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ function Go () {
}

this.to = function (from, to, scroll = true) {
if (scroll) this.scroll_to(from, to)

if (left.textarea_el.setSelectionRange) {
left.textarea_el.setSelectionRange(from, to)
} else if (left.textarea_el.createTextRange) {
Expand All @@ -36,11 +38,6 @@ function Go () {
range.moveStart('character', from)
range.select()
}
left.textarea_el.focus()

if (scroll) {
this.scroll_to(from, to)
}

return from === -1 ? null : from
}
Expand All @@ -54,12 +51,26 @@ function Go () {
}

this.scroll_to = function (from, to) {
const textVal = left.textarea_el.value
const div = document.createElement('div')
div.innerHTML = textVal.slice(0, to)
document.body.appendChild(div)
animateScrollTo(left.textarea_el, div.offsetHeight - 60, 200)
div.remove()
const ta = left.textarea_el
const text = ta.value
const sliceText = text.slice(0, to)
const scrollFrom = ta.scrollTop
const taPaddingTop = 30

// Textarea hack to get the proper scroll position of the selection
// This relies on textarea behavior where it scrolls to the bottom when focused
ta.scrollTop = 0
ta.blur()
ta.style.paddingTop = `${ta.clientHeight}px`
ta.value = sliceText
ta.focus()
const scrollTo = ta.scrollTop - 60
ta.style.paddingTop = `${taPaddingTop}px`
ta.value = text

// Reset scroll position and scroll to new position
ta.scrollTop = scrollFrom
animateScrollTo(ta, scrollTo, 200)
}

function animateScrollTo (element, to, duration) {
Expand Down
2 changes: 1 addition & 1 deletion desktop/sources/scripts/reader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ function Reader () {
left.reader.index += 1

const range = words.splice(0, left.reader.index).join(' ').length
left.select(left.reader.segment.from, left.reader.segment.from + range)
left.go.scroll_to(0, left.reader.segment.from + range)
left.select(left.reader.segment.from, left.reader.segment.from + range)

setTimeout(left.reader.run, left.reader.speed)
}
Expand Down