Skip to content

Update activecode locked and highlighted region markings on scroll #1190

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
ascholerChemeketa wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −6
Open

Update activecode locked and highlighted region markings on scroll #1190

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
37 changes: 31 additions & 6 deletions bases/rsptx/interactives/runestone/activecode/js/activecode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,14 @@ export class ActiveCode extends RunestoneBase {
editor.display.scrollbars.vert.style.bottom = "16px";
});
});
// Update line makers on scroll. Codemirror only renders a few lines offscreen
// so if locked lines are offscreen they may not get decorated
CodeMirror.on(editor, "scroll", (cm) => {
window.requestAnimationFrame(() => {
this.setLockedRegions();
this.setHighlightLines();
});
});

// Make the editor resizable
let ac = this;
Expand Down Expand Up @@ -450,11 +458,16 @@ export class ActiveCode extends RunestoneBase {
line = line.trim();
let lineNum = line.split("-");
if (lineNum.length > 1) {
for (let i = parseInt(lineNum[0]); i <= parseInt(lineNum[1]); i++) {
let startLine = parseInt(lineNum[0]) - this.editor.display.viewFrom;
let endLine = parseInt(lineNum[1]) - this.editor.display.viewFrom;
for (let i = startLine; i <= endLine; i++) {
lines[i - 1].classList.add("CodeMirror__highlight-line");
}
} else {
lines[lineNum - 1].classList.add("CodeMirror__highlight-line");
if (lineNum > this.editor.display.viewFrom && lineNum <= this.editor.display.viewTo) {
let offsetLineNum = parseInt(lineNum) - this.editor.display.viewFrom;
lines[offsetLineNum - 1].classList.add("CodeMirror__highlight-line");
}
}
});
}
Expand All @@ -475,10 +488,11 @@ export class ActiveCode extends RunestoneBase {
// downside is that this is not preserved on editor.refresh()
// so setLockedRegions() must be called again
}
let midLine = Math.floor((start + end) / 2);
}
function placeLock(lineNumber) {
var marker = document.createElement("div");
marker.className = "CodeMirror__gutter-locked-marker";
this.editor.setGutterMarker(midLine, "CodeMirror-lock-markers", marker);
this.editor.setGutterMarker(lineNumber, "CodeMirror-lock-markers", marker);
}

this.containerDiv.querySelectorAll(".CodeMirror-code > div").forEach(
Expand All @@ -487,11 +501,18 @@ export class ActiveCode extends RunestoneBase {
}
);

let startViewRange = this.editor.display.viewFrom;
let endViewRange = this.editor.display.viewTo;

if (this.visiblePrefixEnd) {
let lastLine = this.editor.posFromIndex(
this.visiblePrefixEnd - 1
).line;
decorateLines.call(this, 0, lastLine);
placeLock.call(this, Math.floor((0 + lastLine) / 2));
let numInView = lastLine - startViewRange;
if (numInView >= 0) {
decorateLines.call(this, 0, numInView);
}
let endPos = this.editor.posFromIndex(this.visiblePrefixEnd);
this.editor.markText(
{ line: 0, ch: 0 },
Expand All @@ -509,7 +530,11 @@ export class ActiveCode extends RunestoneBase {
this.editor.doc.getValue().length - this.visibleSuffixLength;
let endPos = this.editor.posFromIndex(endIndex);
let lastLine = this.editor.doc.lastLine();
decorateLines.call(this, endPos.line, lastLine);
placeLock.call(this, Math.floor((endPos.line + lastLine) / 2));

let startLine = Math.max(endPos.line - startViewRange, 0);
let endLine = Math.min(lastLine - startViewRange, endViewRange);
decorateLines.call(this, startLine, endLine);
// include preceeding newline
let endPos2 = this.editor.posFromIndex(endIndex - 1);
this.editor.markText(
Expand Down