Skip to content

Preserve text rendering order to maintain z-index #91

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
sugoidesune wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve text rendering order to maintain z-index #91

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/diagram.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ export class Diagram {
foreignobjdata: Partial<ForeignObjectData> = {};
mutable : boolean = false;
tags : string[] = [];
svg_element : SVGSVGElement | SVGTextElement | undefined = undefined;

private _bbox_cache : [Vector2, Vector2] | undefined = undefined;

Expand Down
19 changes: 10 additions & 9 deletions src/draw_svg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,10 @@ function draw_texts(

let textdata = {...default_textdata, ...diagram.textdata}; // use default if not defined
if (diagram.path == undefined) { throw new Error("Text must have a path"); }
// draw svg of text
let text = document.createElementNS("http://www.w3.org/2000/svg", "text");
// get svg of text
let text = diagram.svg_element as SVGTextElement; // typecast because we're sure its not undefined


// text.setAttribute("x", diagram.path.points[0].x.toString());
// text.setAttribute("y", (-diagram.path.points[0].y).toString());
let xpos = diagram.path.points[0].x;
Expand Down Expand Up @@ -370,8 +372,6 @@ function draw_texts(
text_content = str_to_mathematical_italic(text_content);
text.innerHTML = text_content;

// add to svgelement
target_element.appendChild(text);
if (diagram.tags) {
text.setAttribute('_dg_elem_tag', diagram.tags.join(" "));
}
Expand All @@ -395,8 +395,8 @@ function draw_multiline_texts(
//
// let textdata = {...default_textdata, ...diagram.textdata}; // use default if not defined
if (diagram.path == undefined) { throw new Error("Text must have a path"); }
// draw svg of text
let textsvg = document.createElementNS("http://www.w3.org/2000/svg", "text");
// get svg of text
let textsvg = diagram.svg_element as SVGTextElement; // typecast because we're sure its not undefined
let xpos = diagram.path.points[0].x;
let ypos = -diagram.path.points[0].y;
// let angle_deg = to_degree(parseFloat(textdata["angle"] as string));
Expand Down Expand Up @@ -526,8 +526,6 @@ function draw_multiline_texts(
// text_content = str_to_mathematical_italic(text_content);
// text.innerHTML = text_content;
//
// // add to svgelement
target_element.appendChild(textsvg);
if (diagram.tags) {
textsvg.setAttribute('_dg_elem_tag', diagram.tags.join(" "));
}
Expand Down Expand Up @@ -584,7 +582,10 @@ export function f_draw_to_svg(
} else if (diagram.type == DiagramType.Curve){
draw_curve(svgelement, target_element, diagram, global_scale_factor, svgtag);
} else if (diagram.type == DiagramType.Text || diagram.type == DiagramType.MultilineText){
// do nothing
// we create and add the element here to preserve rendering order to maintain z-index
let text_element = document.createElementNS("http://www.w3.org/2000/svg", "text");
diagram.svg_element = text_element;
target_element.appendChild(text_element);
} else if (diagram.type == DiagramType.Image){
draw_image(target_element, diagram, embed_image, global_scale_factor, svgtag);
} else if (diagram.type == DiagramType.ForeignObject){
Expand Down