github/motion-canvas
1
1
Fork 0
mirror of https://github.com/motion-canvas/motion-canvas.git synced 2026-01-13 07:48:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(2d): stop code highlighting from jumping (#230)

Browse Source
This commit is contained in:
Hunter Henrichsen
2023-02-07 03:11:43 -07:00
committed by GitHub
parent 9e3c10d8bf
commit 67ef1c4970
1 changed files with 33 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
packages/2d/src/components/CodeBlock.ts
View File

@@ -312,42 +312,19 @@ export class CodeBlock extends Shape {
context.save();
context.fillStyle = token.color ?? '#ff6470';
if (token.code.includes('()')) {
const alpha = context.globalAlpha;
for (let i = 0; i < token.code.length; i++) {
const char = token.code.charAt(i);
if (char === '\n') {
y++;
x = 0;
continue;
}
context.globalAlpha = alpha * getSelectionAlpha(x, y);
context.fillText(char, x * w, y * lh);
x++;
const alpha = context.globalAlpha;
for (let i = 0; i < token.code.length; i++) {
const char = token.code.charAt(i);
if (char === '\n') {
y++;
x = 0;
continue;
}
context.restore();
continue;
}
//*
const [first, ...rest] = token.code.split('\n');
context.save();
context.globalAlpha *= getSelectionAlpha(x, y);
context.fillText(first, x * w, y * lh);
context.restore();
x += first.length;
for (const text of rest) {
x = 0;
y++;
context.save();
context.globalAlpha *= getSelectionAlpha(x, y);
context.fillText(text, x * w, y * lh);
context.restore();
x = text.length;
context.globalAlpha = alpha * getSelectionAlpha(x, y);
context.fillText(char, x * w, y * lh);
x++;
}
context.restore();
//*/
}
} else {
const diffed = this.diffed!;
@@ -401,34 +378,30 @@ export class CodeBlock extends Shape {
token.to![1] * lh,
);
if (token.code.includes('()')) {
let offsetX = 0;
let offsetY = 0;
for (let i = 0; i < token.code.length; i++) {
const char = token.code.charAt(i);
if (char === '\n') {
offsetY++;
offsetX = 0;
continue;
}
context.globalAlpha =
alpha *
(remapped > 0.5
? getSelectionAlpha(
token.to![0] + offsetX,
token.to![1] + offsetY,
)
: getSelectionAlpha(
token.from![0] + offsetX,
token.from![1] + offsetY,
));
context.fillText(char, x + offsetX * w, y + offsetY * lh);
offsetX++;
let offsetX = 0;
let offsetY = 0;
for (let i = 0; i < token.code.length; i++) {
const char = token.code.charAt(i);
if (char === '\n') {
offsetY++;
offsetX = 0;
continue;
}
} else {
context.fillText(token.code, x, y);
context.globalAlpha =
alpha *
(remapped > 0.5
? getSelectionAlpha(
token.to![0] + offsetX,
token.to![1] + offsetY,
)
: getSelectionAlpha(
token.from![0] + offsetX,
token.from![1] + offsetY,
));
context.fillText(char, x + offsetX * w, y + offsetY * lh);
offsetX++;
}
} else {
useLogger().warn({