gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-22 15:24:24 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

chore(right_pane): fix typecheck

Browse Source
This commit is contained in:
Elian Doran 2025-12-20 12:32:20 +02:00
parent ea76fd797c
commit f1ca8881a1
No known key found for this signature in database
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/client/src/widgets/highlights_list.ts
View File

@ -5,14 +5,14 @@
* - For example, if there is a formula in the middle of the highlighted text, the two ends of the formula will be regarded as two entries * - For example, if there is a formula in the middle of the highlighted text, the two ends of the formula will be regarded as two entries
*/ */
import { t } from "../services/i18n.js";
import attributeService from "../services/attributes.js";
import RightPanelWidget from "./right_panel_widget.js";
import options from "../services/options.js";
import OnClickButtonWidget from "./buttons/onclick_button.js";
import appContext, { type EventData } from "../components/app_context.js"; import appContext, { type EventData } from "../components/app_context.js";
import type FNote from "../entities/fnote.js"; import type FNote from "../entities/fnote.js";
import attributeService from "../services/attributes.js";
import { t } from "../services/i18n.js";
import katex from "../services/math.js"; import katex from "../services/math.js";
import options from "../services/options.js";
import OnClickButtonWidget from "./buttons/onclick_button.js";
import RightPanelWidget from "./right_panel_widget.js";
const TPL = /*html*/`<div class="highlights-list-widget"> const TPL = /*html*/`<div class="highlights-list-widget">
<style> <style>
@ -159,13 +159,13 @@ export default class HighlightsListWidget extends RightPanelWidget {
*/ */
async replaceMathTextWithKatax(html: string) { async replaceMathTextWithKatax(html: string) {
const mathTextRegex = /<span class="math-tex">\\\(([\s\S]*?)\\\)<\/span>/g; const mathTextRegex = /<span class="math-tex">\\\(([\s\S]*?)\\\)<\/span>/g;
var matches = [...html.matchAll(mathTextRegex)]; const matches = [...html.matchAll(mathTextRegex)];
let modifiedText = html; let modifiedText = html;
if (matches.length > 0) { if (matches.length > 0) {
// Process all matches asynchronously // Process all matches asynchronously
for (const match of matches) { for (const match of matches) {
let latexCode = match[1]; const latexCode = match[1];
let rendered; let rendered;
try { try {
@ -234,7 +234,7 @@ export default class HighlightsListWidget extends RightPanelWidget {
} }
findSubStr = findSubStr.substring(1); findSubStr = findSubStr.substring(1);
combinedRegexStr = `(` + combinedRegexStr.substring(1) + `)`; combinedRegexStr = `(${combinedRegexStr.substring(1)}`;
const combinedRegex = new RegExp(combinedRegexStr, "gi"); const combinedRegex = new RegExp(combinedRegexStr, "gi");
const $highlightsList = $("<ol>"); const $highlightsList = $("<ol>");
let prevEndIndex = -1, let prevEndIndex = -1,
@ -302,16 +302,17 @@ export default class HighlightsListWidget extends RightPanelWidget {
let targetElement; let targetElement;
if (isReadOnly) { if (isReadOnly) {
const $container = await this.noteContext.getContentElement(); const $container = await this.noteContext.getContentElement();
if ($container) {
targetElement = $container targetElement = $container
.find(findSubStr) .find(findSubStr)
.filter(function () { .filter(function () {
if (findSubStr.indexOf("color") >= 0 && findSubStr.indexOf("background-color") < 0) { if (findSubStr.indexOf("color") >= 0 && findSubStr.indexOf("background-color") < 0) {
let color = this.style.color; const color = this.style.color;
const $el = $(this as HTMLElement); const $el = $(this as HTMLElement);
return !($el.prop("tagName") === "SPAN" && color === ""); return !($el.prop("tagName") === "SPAN" && color === "");
} else {
return true;
} }
return true;
}) })
.filter(function () { .filter(function () {
const $el = $(this as HTMLElement); const $el = $(this as HTMLElement);
@ -322,6 +323,7 @@ export default class HighlightsListWidget extends RightPanelWidget {
$el.parent().parent().parent().parent(findSubStr).length === 0 $el.parent().parent().parent().parent(findSubStr).length === 0
); );
}); });
}
} else { } else {
const textEditor = await this.noteContext.getTextEditor(); const textEditor = await this.noteContext.getTextEditor();
const el = textEditor?.editing.view.domRoots.values().next().value; const el = textEditor?.editing.view.domRoots.values().next().value;
@ -333,11 +335,11 @@ export default class HighlightsListWidget extends RightPanelWidget {
// the background-color error will be regarded as color, so it needs to be filtered // the background-color error will be regarded as color, so it needs to be filtered
const $el = $(this as HTMLElement); const $el = $(this as HTMLElement);
if (findSubStr.indexOf("color") >= 0 && findSubStr.indexOf("background-color") < 0) { if (findSubStr.indexOf("color") >= 0 && findSubStr.indexOf("background-color") < 0) {
let color = this.style.color; const color = this.style.color;
return !($el.prop("tagName") === "SPAN" && color === ""); return !($el.prop("tagName") === "SPAN" && color === "");
} else {
return true;
} }
return true;
}) })
.filter(function () { .filter(function () {
// Need to filter out the child elements of the element that has been found // Need to filter out the child elements of the element that has been found