open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix closestVisible nearby check

Browse Source
This commit is contained in:
tophf 2020-12-08 18:34:16 +03:00
parent 463c3b5139
commit 26a539bd62
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
edit/sections-editor.js
View File

@ -209,23 +209,25 @@ function SectionsEditor() {
2. last active if visible 2. last active if visible
3. first visible 3. first visible
*/ */
function closestVisible(nearbyElement) { function closestVisible(el) {
const cm =
nearbyElement instanceof CodeMirror ? nearbyElement :
nearbyElement instanceof Node && getAssociatedEditor(nearbyElement) || getLastActivatedEditor();
if (nearbyElement instanceof Node && cm) {
const {left, top} = nearbyElement.getBoundingClientRect();
const bounds = cm.display.wrapper.getBoundingClientRect();
if (top >= 0 && top >= bounds.top &&
left >= 0 && left >= bounds.left) {
return cm;
}
}
// closest editor should have at least 2 lines visible // closest editor should have at least 2 lines visible
const lineHeight = sections[0].cm.defaultTextHeight(); const lineHeight = sections[0].cm.defaultTextHeight();
const margin = 2 * lineHeight;
const cm = el instanceof CodeMirror ? el :
el instanceof Node && getAssociatedEditor(el) || getLastActivatedEditor();
if (el === cm) el = document.body;
if (el instanceof Node && cm) {
const {wrapper} = cm.display;
if (!container.contains(el) || wrapper.closest('.section').contains(el)) {
const rect = wrapper.getBoundingClientRect();
if (rect.top < window.innerHeight - margin && rect.bottom > margin) {
return cm;
}
}
}
const scrollY = window.scrollY; const scrollY = window.scrollY;
const windowBottom = scrollY + window.innerHeight - 2 * lineHeight; const windowBottom = scrollY + window.innerHeight - margin;
const allSectionsContainerTop = scrollY + $('#sections').getBoundingClientRect().top; const allSectionsContainerTop = scrollY + container.getBoundingClientRect().top;
const distances = []; const distances = [];
const alreadyInView = cm && offscreenDistance(null, cm) === 0; const alreadyInView = cm && offscreenDistance(null, cm) === 0;
return alreadyInView ? cm : findClosest(); return alreadyInView ? cm : findClosest();