obsidian-plugin/youfoundjk_TeXcore
1
0
Fork 0
mirror of https://github.com/youfoundjk/TeXcore.git synced 2026-07-22 07:33:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(tikz): enhance canvas coordinate handling and modal overlay management

Browse source
This commit is contained in:
JK 2026-06-14 00:41:24 +02:00
parent 3f0ea8c86c
commit 416e4fa987
4 changed files with 41 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/features/tikz-editor/components/canvas-grid.ts
View file

@ -447,13 +447,13 @@ export class CanvasGrid {
});
}
private getCanvasCoords(e: MouseEvent): { x: number; y: number } {
private getCanvasCoords(e: MouseEvent, snap = true): { x: number; y: number } {
const rect = this.workspaceEl.getBoundingClientRect();
const zoom = this.context.getZoom();
const rawX = (e.clientX - rect.left) / zoom;
const rawY = (e.clientY - rect.top) / zoom;
if (this.context.isSnapToGrid() && !e.ctrlKey) {
if (snap && this.context.isSnapToGrid() && !e.ctrlKey) {
const gridSize = this.context.isHalfGrid()
? this.context.PX_PER_UNIT / 2
: this.context.PX_PER_UNIT;
@ -608,11 +608,12 @@ export class CanvasGrid {
this.context.handleSelectVertices([]);
}
this.lassoStart = coords;
this.lassoCurrent = coords;
const nonSnappedCoords = this.getCanvasCoords(e, false);
this.lassoStart = nonSnappedCoords;
this.lassoCurrent = nonSnappedCoords;
const onMouseMove = (moveEvent: MouseEvent) => {
const mCoords = this.getCanvasCoords(moveEvent);
const mCoords = this.getCanvasCoords(moveEvent, false);
this.lassoCurrent = mCoords;
this.renderWires();
};

15
src/features/tikz-editor/tikz-editor-modal.ts
View file

@ -338,7 +338,7 @@ export class TikzEditorModal extends Modal implements TikzEditorContext {
const offset = this.PX_PER_UNIT / 2; // Offset by half grid (40px)
const copies = elementsToDuplicate.map(el => {
const copy: EditorElement = JSON.parse(JSON.stringify(el));
const copy = JSON.parse(JSON.stringify(el)) as EditorElement;
copy.id = this.createId();
copy.x += offset;
copy.y += offset;
@ -535,7 +535,7 @@ export class TikzEditorModal extends Modal implements TikzEditorContext {
const uniqueIds = Array.from(new Set(this.selectedVertices.map(v => v.elementId)));
const selectedElements = this.elements.filter(el => uniqueIds.includes(el.id));
if (selectedElements.length > 0) {
this.copiedElements = JSON.parse(JSON.stringify(selectedElements));
this.copiedElements = JSON.parse(JSON.stringify(selectedElements)) as EditorElement[];
showNotice(`Copied ${selectedElements.length} component(s)`);
}
return;
@ -612,6 +612,17 @@ export class TikzEditorModal extends Modal implements TikzEditorContext {
// Modal Lifecycles
onOpen() {
this.plugin.isTikzEditorOpen = true;
this.plugin.updateEditorExtensions();
const removeOverlays = (doc: Document) => {
doc.querySelectorAll('.tikz-live-preview-overlay').forEach(el => el.remove());
};
removeOverlays(activeDocument);
if (this.app.workspace.containerEl && this.app.workspace.containerEl.ownerDocument) {
removeOverlays(this.app.workspace.containerEl.ownerDocument);
}
const { contentEl, containerEl } = this;
contentEl.empty();

20
src/features/tikz/live-preview-overlay.ts
View file

@ -53,6 +53,17 @@ class TikzLivePreviewOverlay {
if (this.overlayEl) return;
const doc = this.view.dom.ownerDocument;
const isModalOpen =
this.plugin.isTikzEditorOpen ||
!!doc.querySelector('.tikz-editor-modal') ||
!!activeDocument.querySelector('.tikz-editor-modal') ||
!!this.plugin.app.workspace.containerEl.ownerDocument?.querySelector('.tikz-editor-modal');
if (isModalOpen) {
this.destroy();
return;
}
const body = doc.body;
this.overlayEl = doc.createElement('div');
@ -412,7 +423,14 @@ export const createTikzLivePreviewPlugin = (plugin: LatexReferencer): Extension
constructor(private view: EditorView) {}
update(update: ViewUpdate) {
if (!plugin.settings.enableTikzjax || plugin.isTikzEditorOpen) {
const doc = update.view.dom.ownerDocument;
const isModalOpen =
plugin.isTikzEditorOpen ||
!!doc.querySelector('.tikz-editor-modal') ||
!!activeDocument.querySelector('.tikz-editor-modal') ||
!!plugin.app.workspace.containerEl.ownerDocument?.querySelector('.tikz-editor-modal');
if (!plugin.settings.enableTikzjax || isModalOpen) {
this.cleanup();
return;
}

20
src/main.ts
View file

@ -316,14 +316,7 @@ export default class LatexReferencer extends Plugin {
typeof activeView?.getViewData === 'function' ? activeView.getViewData() : null;
if (!activeFile || targetFile.path !== activeFile.path || activeContent === null) {
return oldFunc.call(
this,
hoverParent,
targetEl,
linktext,
sourcePath,
state
) as unknown;
return oldFunc.call(this, hoverParent, targetEl, linktext, sourcePath, state);
}
const equations = getEquations(activeFile, activeContent);
@ -333,21 +326,14 @@ export default class LatexReferencer extends Plugin {
const line = targetEquation.$position.start;
const newState = { ...state, scroll: line };
// Immediately call the original function with the correct line number
return oldFunc.call(
this,
hoverParent,
targetEl,
linktext,
sourcePath,
newState
) as unknown;
return oldFunc.call(this, hoverParent, targetEl, linktext, sourcePath, newState);
}
}
}
// If it's not our link, or if we couldn't find it in the cache,
// call the original function without modification.
return oldFunc.call(this, hoverParent, targetEl, linktext, sourcePath, state) as unknown;
return oldFunc.call(this, hoverParent, targetEl, linktext, sourcePath, state);
};
}
});