mirror/slate
1
0
Fork 0
mirror of https://github.com/ianstormtaylor/slate.git synced 2025-08-29 18:09:49 +02:00
Code Issues Releases Wiki Activity

Fix issue with scrollTo (#623)

Browse Source 
I realized I made a mistake in the scrollWindow function I was calculating the scrollBy position incorrectly. I decided to just switch to scrollTo instead of scrollBy

Also I was getting an issue where the `getBoundingClientRect().bottom` of one of my wrapper was incorrect when the height changed via newline or deletion. I'm not entirely sure why but I noticed that if I used wrapperRect.top + wrapper.offsetHeight it gave the correct bottom so I swapped to use that instead. Let me know if there's any issue with these changes.

Also I'm wondering is there anyway to add tests for these changes? I'm not too familiar with testing for scroll
This commit is contained in:
Kenneth Truong
2017-02-23 18:34:46 -08:00
committed by Ian Storm Taylor
parent d1aec53326
commit b1ef5bcf61
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/scroll-to.js
View File

@@ -6,19 +6,19 @@
import getWindow from 'get-window'
function scrollWindow(window, cursorTop, cursorLeft, cursorHeight) {
let deltaX = 0
let deltaY = 0
let scrollX = window.scrollX
let scrollY = window.scrollY
let cursorBottom = cursorTop + cursorHeight
if (cursorTop < 0 || cursorBottom > window.innerHeight) {
deltaY = cursorTop - window.scrollY + window.innerHeight / 2 - cursorHeight / 2
scrollY += cursorTop - window.innerHeight / 2 + cursorHeight / 2
}
if (cursorLeft < 0 || cursorLeft > window.innerWidth) {
deltaX = cursorLeft - window.scrollX + window.innerWidth / 2
scrollX += cursorLeft - window.innerWidth / 2
}
window.scrollBy(deltaX, deltaY)
window.scrollTo(scrollX, scrollY)
}
function scrollTo(element) {
@@ -36,7 +36,7 @@ function scrollTo(element) {
let wrapperRect = wrapper.getBoundingClientRect()
let currentY = cursorTop
let cursorBottom = cursorTop + cursorHeight
if (cursorTop < wrapperRect.top || cursorBottom > wrapperRect.bottom) {
if (cursorTop < wrapperRect.top || cursorBottom > wrapperRect.top + wrapper.offsetHeight) {
cursorTop = wrapperRect.top + wrapperRect.height / 2 - cursorHeight / 2
wrapper.scrollTop += currentY - cursorTop
}