zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2025-12-06 07:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(windows): add clipPath and touch events (#1933)

Browse Source 
Adding support for clipPath and touch events.
This commit is contained in:
Marlene Cota
2023-01-04 06:51:08 -08:00
committed by GitHub
parent 60fcb0f28f
commit 38da5fb67c
22 changed files with 235 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
windows/RNSVG/RenderableView.cpp
View File

@@ -187,6 +187,10 @@ void RenderableView::UpdateProperties(IJSValueReader const &reader, bool forceUp
}
} else if (propertyName == "opacity" && forceUpdate) {
m_opacity = Utils::JSValueAsFloat(propertyValue, 1.0f);
} else if (propertyName == "clipPath") {
m_clipPathId = to_hstring(Utils::JSValueAsString(propertyValue));
} else if (propertyName == "responsible") {
m_isResponsible = propertyValue.AsBoolean();
}
// forceUpdate = true means the property is being set on an element
@@ -230,9 +234,11 @@ void RenderableView::Render(UI::Xaml::CanvasControl const &canvas, CanvasDrawing
geometry = geometry.Transform(SvgTransform());
}
auto const &clipPathGeometry{ClipPathGeometry()};
geometry = Geometry::CanvasGeometry::CreateGroup(resourceCreator, {geometry}, FillRule());
if (auto const &opacityLayer{session.CreateLayer(m_opacity)}) {
if (auto const &opacityLayer{clipPathGeometry ? session.CreateLayer(m_opacity, clipPathGeometry) : session.CreateLayer(m_opacity)}) {
if (auto const &fillLayer{session.CreateLayer(FillOpacity())}) {
auto const &fill{Utils::GetCanvasBrush(FillBrushId(), Fill(), SvgRoot(), geometry, resourceCreator)};
session.FillGeometry(geometry, fill);
@@ -325,6 +331,18 @@ RNSVG::SvgView RenderableView::SvgRoot() {
return nullptr;
}
Geometry::CanvasGeometry RenderableView::ClipPathGeometry() {
if (!m_clipPathId.empty()) {
if (auto const &clipPath{SvgRoot().Templates().TryLookup(m_clipPathId)}) {
if (!clipPath.Geometry()) {
clipPath.CreateGeometry(SvgRoot().Canvas());
}
return clipPath.Geometry();
}
}
return nullptr;
}
void RenderableView::Unload() {
if (m_geometry) {
m_geometry.Close();
@@ -338,6 +356,21 @@ void RenderableView::Unload() {
m_strokeDashArray.Clear();
}
RNSVG::IRenderable RenderableView::HitTest(Point const &point) {
if (m_geometry) {
bool strokeContainsPoint{false};
if (auto const &svgRoot{SvgRoot()}) {
float canvasDiagonal{Utils::GetCanvasDiagonal(svgRoot.Canvas().Size())};
float strokeWidth{Utils::GetAbsoluteLength(StrokeWidth(), canvasDiagonal)};
strokeContainsPoint = m_geometry.StrokeContainsPoint(point, strokeWidth);
}
if (m_geometry.FillContainsPoint(point) || strokeContainsPoint) {
return *this;
}
}
return nullptr;
}
void RenderableView::SetColor(const JSValueObject& propValue, Windows::UI::Color fallbackColor, std::string propName) {
switch (propValue["type"].AsInt64()) {
case 1: {