Skip to content

SVG text instead of div #7

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

Merged
andreasknoepfle merged 1 commit into from
Jan 4, 2026
Merged

SVG text instead of div #7

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
78 changes: 35 additions & 43 deletions client/src/components/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use crate::data::{NodeProperty, Store};
use crate::data::node::measure_line_height;
use crate::data::{NodeProperty, Store, FONT_SIZE, TEXT_PADDING};
use dioxus::prelude::*;
use std::rc::Rc;
use uuid::Uuid;
Expand All @@ -9,10 +10,7 @@ const SELECTED_PADDING: f32 = 5.0;
pub fn DraggedNode(id: Uuid, coords: (f32, f32)) -> Element {
rsx! {
g { transform: format!("translate({}, {})", coords.0, coords.1),
r#use {
href: format!("#{id}"),
style: "transform: scale(0.5); opacity: 0.3;",
}
r#use { href: format!("#{id}") }
}
}
}
Expand Down Expand Up @@ -61,6 +59,22 @@ fn RawRootNode(width: f32, height: f32, color: String) -> Element {
}
}

#[component]
fn NodeLabel(label: String) -> Element {
rsx! {
for (index , line) in label.lines().enumerate() {
text {
y: index as f32 * measure_line_height() + TEXT_PADDING,
x: TEXT_PADDING,
text_anchor: "start",
dominant_baseline: "text-before-edge",
font_size: FONT_SIZE,
"{line}"
}
}
}
}

#[component]
fn RawNode(node: crate::data::RenderedNode) -> Element {
let width = node.width();
Expand Down Expand Up @@ -184,14 +198,13 @@ pub fn Node(id: Uuid, store: Store) -> Element {
}
}

foreignObject {
x: format!("{}", -width / 2.0),
y: format!("{}", -height / 2.0),
width: format!("{}", width),
height: format!("{}", height),
if *store.pane.editing.read() == Some(node.id) {
if *store.pane.editing.read() == Some(node.id) {
foreignObject {
x: format!("{}", -width / 2.0),
y: format!("{}", -height / 2.0),
width: format!("{}", width),
height: format!("{}", height),
textarea {
style: if store.pane.dragging_node.read().is_some() { "pointer-events: none;" } else { "" },
key: "{id}-textarea",
onmounted: move |element| input_element.set(Some(element.data())),
value: "{node.text}",
Expand All @@ -202,49 +215,28 @@ pub fn Node(id: Uuid, store: Store) -> Element {
tabindex: -1,
style: "
user-select: none;
margin: 0px 10px;
padding: 9px 0px;
margin: 0px;
padding: {TEXT_PADDING}px {TEXT_PADDING}px;
font-family: inherit;
width: 100%;
height: 100%;
width: {width}px;
height: {height}px;
outline:none;
background: transparent;
border: none;
resize:none;
overflow:hidden;
font-size: {font_size}px;
display: block;
line-height: 1.2",
line-height: {measure_line_height() + 0.3}px",
oninput: move |evt| {
store.graph.update_node(id, NodeProperty::Text(evt.value().clone()));
},
}
} else {
div {
style: "
vertical-align: top;
line-height: 1.2;
padding-left: 2px;
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
overflow: hidden;
white-space: pre-wrap;
word-wrap: break-word;
text-align: center;
font-size: {font_size}px;
background: transparent;
color: black;
pointer-events: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
font-family: inherit;",
{node.text}
}
}
} else {
g { transform: format!("translate({},{})", -width / 2.0, -height / 2.0),

NodeLabel { label: node.text }
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions client/src/data/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ pub mod connection;
pub use connection::Connection;

pub const DEFAULT_COLOR: &str = "#bdb2ff";
pub const FONT_SIZE: f32 = 14.0;
pub const TEXT_PADDING: f32 = 10.0;
14 changes: 10 additions & 4 deletions client/src/data/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::DEFAULT_COLOR;
use super::{DEFAULT_COLOR, FONT_SIZE, TEXT_PADDING};
use std::sync::OnceLock;
use uuid::Uuid;

Expand All @@ -10,7 +10,6 @@ fn get_font() -> &'static Font {
Font::from_bytes(FONT_BYTES, fontdue::FontSettings::default()).expect("Failed to load font")
})
}
const FONT_SIZE: f32 = 14.0;

pub fn measure_text_width(text: &str) -> f32 {
text.chars()
Expand All @@ -21,6 +20,14 @@ pub fn measure_text_width(text: &str) -> f32 {
.sum()
}

pub fn measure_line_height() -> f32 {
get_font()
.horizontal_line_metrics(FONT_SIZE)
.unwrap()
.new_line_size
.ceil()
}

#[derive(Clone, Copy, PartialEq, Eq, Debug)]
pub enum RelativeLocation {
Top,
Expand All @@ -44,7 +51,6 @@ pub struct RenderedNode {
pub progress: i64,
}

const TEXT_PADDING: f32 = 10.0;
impl RenderedNode {
pub fn new(
id: Uuid,
Expand Down Expand Up @@ -85,7 +91,7 @@ impl RenderedNode {
self.text.lines().count()
}
.max(1);
FONT_SIZE * lines as f32 + FONT_SIZE * 0.2 * (lines as f32 - 1.0) + TEXT_PADDING * 2.0
lines as f32 * measure_line_height() + TEXT_PADDING * 2.0
}

pub fn font_size(&self) -> f32 {
Expand Down