Skip to content

Resolve clipPaths via stylesheet #96

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
merged 1 commit into from
Aug 26, 2025
Merged

Resolve clipPaths via stylesheet #96

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 Samples.bundle/amex.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions SwiftDraw/Sources/LayerTree/LayerTree.Builder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ extension LayerTree {
}

func makeClipShapes(for element: DOM.GraphicsElement) -> [ClipShape] {
guard let clipId = element.attributes.clipPath?.fragmentID,
let clip = svg.defs.clipPaths.first(where: { $0.id == clipId }) else { return [] }

let attributes = DOM.presentationAttributes(for: element, styles: svg.styles)
guard let clipID = attributes.clipPath?.fragmentID,
let clip = svg.defs.clipPaths.first(where: { $0.id == clipID }) else { return [] }
return clip.childElements.compactMap(makeClipShape)
}

Expand Down
23 changes: 19 additions & 4 deletions SwiftDraw/Tests/LayerTree/LayerTree.BuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,30 @@ final class LayerTreeBuilderTests: XCTestCase {
let circle = DOM.Circle(cx: 5, cy: 5, r: 5)
let svg = DOM.SVG(width: 10, height: 10)
svg.defs.clipPaths.append(DOM.ClipPath(id: "clip1", childElements: [circle]))

var attributes = DOM.PresentationAttributes()
attributes.clipPath = URL(string: "#clip1")
svg.styles = [DOM.StyleSheet(attributes: [.class("a"): attributes])]

let builder = LayerTree.Builder(svg: svg)

let element = DOM.GraphicsElement()
var element = DOM.GraphicsElement()
element.attributes.clipPath = URL(string: "#clip1")

let shapes = builder.createClipShapes(for: element)
XCTAssertEqual(shapes, [.ellipse(within: LayerTree.Rect(x: 0, y: 0, width: 10, height: 10))])
var shapes = builder.createClipShapes(for: element)
XCTAssertEqual(
builder.createClipShapes(for: element),
[.ellipse(within: LayerTree.Rect(x: 0, y: 0, width: 10, height: 10))]
)

element = DOM.GraphicsElement()
element.class = "a"
XCTAssertEqual(
builder.createClipShapes(for: element),
[.ellipse(within: LayerTree.Rect(x: 0, y: 0, width: 10, height: 10))]
)
}

func testDOMGroupMakesChildContents() {
let builder = LayerTree.Builder(svg: DOM.SVG(width: 10, height: 10))

Expand Down