mirror of
https://github.com/storytold/figcraft.git
synced 2026-10-28 04:16:46 -06:00
- Min/max width/height: the W/H sizing menus add min/max (at the current size) and remove them;
limit rows edit or add the missing bound. The layout clamps Fixed, Hug and Fill children and
the frame itself; a hugging text wider than its max width wraps at the max. min > max is kept
ordered by node.set (the other bound follows); in the layout min wins.
- Ignore auto layout (absolute position): a toggle in the Position section; the child stays
where it is, can't Fill, shows constraints and follows them when the auto layout frame resizes
(by hugging, filling or a direct resize).
- Text baseline alignment for horizontal layouts ("Align text baselines"; crossAlign baseline):
first-line baselines line up, other layers align to the top, nested auto layout frames use
their first child's baseline. Measure gains text_baseline.
- Grid auto layout: column/row tracks (fixed px, hug, fr fill) via columnTracks / rowTracks or
layout.setTrack, cells anchored by gridColumn / gridRow with gridColumnSpan / gridRowSpan,
auto placement in reading order, rows grow to fit, hugging grids size to their tracks.
Panel: column/row gap, track size rows, a child's cell and spans. Old files load unchanged
(serde defaults; missing tracks are 1fr).
- Canvas handles: wrapped-row gaps and grid column/row gaps are draggable; a selected grid's
tracks are outlined.
- The layout section moved from right.rs to layout_panel.rs; inspect reports min/max and a
grid child's resolved gridCell; docs list the new props.
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
157 lines
4.7 KiB
Rust
157 lines
4.7 KiB
Rust
//! Parameter parsing helpers shared by commands (lenient: agents send numbers as strings, ids as
|
|
//! "12" or "0:12", colours as hex or CSS).
|
|
|
|
use figcraft_color::{BlendMode, Color, Paint};
|
|
use figcraft_doc::NodeId;
|
|
use serde_json::Value;
|
|
|
|
use crate::{EngineError, Result, Session, bad};
|
|
|
|
pub fn get<'a>(p: &'a Value, key: &str) -> Option<&'a Value> {
|
|
p.get(key).filter(|v| !v.is_null())
|
|
}
|
|
|
|
pub fn f64_of(v: &Value) -> Option<f64> {
|
|
match v {
|
|
Value::Number(n) => n.as_f64().filter(|f| f.is_finite()),
|
|
Value::String(s) => s.trim().trim_end_matches("px").trim_end_matches('%').trim().parse::<f64>().ok().filter(|f| f.is_finite()),
|
|
Value::Bool(b) => Some(if *b { 1.0 } else { 0.0 }),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
pub fn num(p: &Value, key: &str) -> Option<f64> {
|
|
get(p, key).and_then(f64_of)
|
|
}
|
|
|
|
pub fn num_or(p: &Value, key: &str, d: f64) -> f64 {
|
|
num(p, key).unwrap_or(d)
|
|
}
|
|
|
|
pub fn req_num(cmd: &str, p: &Value, key: &str) -> Result<f64> {
|
|
num(p, key).ok_or_else(|| bad(cmd, format!("`{key}` must be a number")))
|
|
}
|
|
|
|
pub fn string(p: &Value, key: &str) -> Option<String> {
|
|
match get(p, key)? {
|
|
Value::String(s) => Some(s.clone()),
|
|
Value::Number(n) => Some(n.to_string()),
|
|
Value::Bool(b) => Some(b.to_string()),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
pub fn req_string(cmd: &str, p: &Value, key: &str) -> Result<String> {
|
|
string(p, key).ok_or_else(|| bad(cmd, format!("`{key}` must be a string")))
|
|
}
|
|
|
|
pub fn boolean(p: &Value, key: &str) -> Option<bool> {
|
|
bool_of(get(p, key)?)
|
|
}
|
|
|
|
/// A lenient boolean: `true`, `1`, `"yes"`, `"on"`…
|
|
pub fn bool_of(v: &Value) -> Option<bool> {
|
|
match v {
|
|
Value::Bool(b) => Some(*b),
|
|
Value::Number(n) => n.as_f64().map(|f| f != 0.0),
|
|
Value::String(s) => match s.to_ascii_lowercase().as_str() {
|
|
"true" | "yes" | "on" | "1" => Some(true),
|
|
"false" | "no" | "off" | "0" => Some(false),
|
|
_ => None,
|
|
},
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
pub fn id_of(v: &Value) -> Option<NodeId> {
|
|
match v {
|
|
Value::Number(n) => n.as_u64().map(NodeId),
|
|
Value::String(s) => s.parse().ok(),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
pub fn id(p: &Value, key: &str) -> Option<NodeId> {
|
|
get(p, key).and_then(id_of)
|
|
}
|
|
|
|
pub fn req_id(cmd: &str, p: &Value, key: &str) -> Result<NodeId> {
|
|
id(p, key).ok_or_else(|| bad(cmd, format!("`{key}` must be a node id")))
|
|
}
|
|
|
|
/// `ids` (array), `id` (single), or the current selection.
|
|
pub fn targets(s: &Session, p: &Value) -> Vec<NodeId> {
|
|
if let Some(Value::Array(a)) = get(p, "ids") {
|
|
return a.iter().filter_map(id_of).collect();
|
|
}
|
|
if let Some(i) = id(p, "id") {
|
|
return vec![i];
|
|
}
|
|
s.selection()
|
|
}
|
|
|
|
/// Like [`targets`] but an empty result is an error.
|
|
pub fn req_targets(cmd: &str, s: &Session, p: &Value) -> Result<Vec<NodeId>> {
|
|
let t = targets(s, p);
|
|
if t.is_empty() {
|
|
return Err(EngineError::Disabled(cmd.to_string(), "nothing is selected (pass `ids`)".into()));
|
|
}
|
|
if let Ok(doc) = s.doc() {
|
|
for i in &t {
|
|
if !doc.contains(*i) {
|
|
return Err(EngineError::NoNode(*i));
|
|
}
|
|
}
|
|
}
|
|
Ok(t)
|
|
}
|
|
|
|
pub fn color_of(v: &Value) -> Option<Color> {
|
|
match v {
|
|
Value::String(s) => Color::parse_css(s),
|
|
Value::Object(_) => serde_json::from_value::<Color>(v.clone()).ok().map(Color::sanitized),
|
|
Value::Array(a) => {
|
|
let c: Vec<f32> = a.iter().filter_map(|x| x.as_f64()).map(|f| f as f32).collect();
|
|
match c.as_slice() {
|
|
[r, g, b] => Some(Color::new(*r, *g, *b, 1.0)),
|
|
[r, g, b, a] => Some(Color::new(*r, *g, *b, *a)),
|
|
_ => None,
|
|
}
|
|
}
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
pub fn color(p: &Value, key: &str) -> Option<Color> {
|
|
get(p, key).and_then(color_of)
|
|
}
|
|
|
|
/// A paint from JSON: a colour string/object (solid) or a full paint object.
|
|
pub fn paint_of(v: &Value) -> Option<Paint> {
|
|
if let Some(c) = color_of(v) {
|
|
return Some(Paint::solid(c));
|
|
}
|
|
let mut p: Paint = serde_json::from_value(v.clone()).ok()?;
|
|
p.opacity = if p.opacity.is_finite() { p.opacity.clamp(0.0, 1.0) } else { 1.0 };
|
|
Some(p)
|
|
}
|
|
|
|
pub fn paints_of(v: &Value) -> Option<Vec<Paint>> {
|
|
match v {
|
|
Value::Array(a) => a.iter().map(paint_of).collect(),
|
|
other => paint_of(other).map(|p| vec![p]),
|
|
}
|
|
}
|
|
|
|
pub fn blend(p: &Value, key: &str) -> Option<BlendMode> {
|
|
string(p, key).and_then(|s| BlendMode::from_name(&s))
|
|
}
|
|
|
|
/// Serde-deserialize `key` leniently into `T`.
|
|
pub fn parse<T: serde::de::DeserializeOwned>(cmd: &str, p: &Value, key: &str) -> Result<Option<T>> {
|
|
match get(p, key) {
|
|
None => Ok(None),
|
|
Some(v) => serde_json::from_value(v.clone()).map(Some).map_err(|e| bad(cmd, format!("`{key}`: {e}"))),
|
|
}
|
|
}
|