Support canvas frame nodes and explicit membership snapshots
This commit is contained in:
@@ -105,7 +105,7 @@ func normalizeCanvas(raw json.RawMessage) (json.RawMessage, bool) {
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, key := range []string{"selected", "dragging", "measured", "style"} {
|
||||
for _, key := range []string{"selected", "dragging", "measured", "style", "zIndex"} {
|
||||
delete(n, key)
|
||||
}
|
||||
if !canvasFields(n, "id", "type", "position", "width", "height", "data") {
|
||||
@@ -125,7 +125,7 @@ func normalizeCanvas(raw json.RawMessage) (json.RawMessage, bool) {
|
||||
return nil, false
|
||||
}
|
||||
d, ok := n["data"].(map[string]any)
|
||||
if !ok || !canvasFields(d, "kind", "title", "text", "src", "icon", "rotation", "fontSize", "textStyle") {
|
||||
if !ok || !canvasFields(d, "kind", "title", "text", "src", "icon", "rotation", "fontSize", "textStyle", "frameId", "labelMode") {
|
||||
return nil, false
|
||||
}
|
||||
kind, ok := d["kind"].(string)
|
||||
@@ -137,12 +137,28 @@ func normalizeCanvas(raw json.RawMessage) (json.RawMessage, bool) {
|
||||
typ = "plainText"
|
||||
} else if kind == "icon" {
|
||||
typ = "icon"
|
||||
} else if kind == "frame" {
|
||||
typ = "frame"
|
||||
} else if !canvasChoice(kind, "text", "image", "script") {
|
||||
return nil, false
|
||||
}
|
||||
if n["type"] != typ || !canvasString(d["title"], 300) || !canvasString(d["text"], 100000) {
|
||||
return nil, false
|
||||
}
|
||||
if frameID, exists := d["frameId"]; exists {
|
||||
value, ok := frameID.(string)
|
||||
if kind == "frame" || !ok || !canvasID.MatchString(value) {
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
if mode, exists := d["labelMode"]; exists && (kind != "frame" || !canvasChoice(mode, "hidden", "fixed", "scaled")) {
|
||||
return nil, false
|
||||
}
|
||||
if kind == "frame" {
|
||||
if rotation, exists := d["rotation"]; exists && rotation != float64(0) {
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
kinds[id] = kind
|
||||
if r, exists := d["rotation"]; exists && (!canvasNumber(r, 0, 360) || r == float64(360)) {
|
||||
return nil, false
|
||||
@@ -191,6 +207,14 @@ func normalizeCanvas(raw json.RawMessage) (json.RawMessage, bool) {
|
||||
}
|
||||
}
|
||||
}
|
||||
// Resolve memberships after all nodes so forward references are valid.
|
||||
// Geometry never creates membership: only explicit frameId is persisted.
|
||||
for _, value := range nodes {
|
||||
data := value.(map[string]any)["data"].(map[string]any)
|
||||
if id, exists := data["frameId"]; exists && kinds[id.(string)] != "frame" {
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
seen := map[string]bool{}
|
||||
for _, v := range edges {
|
||||
e, ok := v.(map[string]any)
|
||||
|
||||
Reference in New Issue
Block a user