fix: improve handling of transform attribute on clipPath, fixes softw…

…are-mansion#1152

android/src/main/java/com/horcrux/svg/VirtualView.java

@@ -334,6 +334,7 @@ public void setResponsible(boolean responsible) {
                 Path clipPath = mClipNode.mClipRule == CLIP_RULE_EVENODD ? mClipNode.getPath(canvas, paint) :
                         mClipNode.getPath(canvas, paint, Region.Op.UNION);
                 clipPath.transform(mClipNode.mMatrix);
+                clipPath.transform(mClipNode.mTransform);
                 switch (mClipNode.mClipRule) {
                     case CLIP_RULE_EVENODD:
                         clipPath.setFillType(Path.FillType.EVEN_ODD);

ios/RNSVGNode.m

@@ -314,7 +314,7 @@ - (CGPathRef)getClipPath:(CGContextRef)context
         if (_cachedClipPath) {
             CGPathRelease(_cachedClipPath);
         }
-        CGAffineTransform transform = _clipNode.matrix;
+        CGAffineTransform transform = CGAffineTransformConcat(_clipNode.matrix, _clipNode.transforms);
         _cachedClipPath = CGPathCreateCopyByTransformingPath([_clipNode getPath:context], &transform);
         CGPathRetain(_cachedClipPath);
         if (_clipMask) {

src/elements/ClipPath.tsx

@@ -1,23 +1,19 @@
 import React from 'react';
 import { requireNativeComponent } from 'react-native';
-import extractClipPath from '../lib/extract/extractClipPath';
-import { TransformProps } from '../lib/extract/types';
+import extractProps, { propsAndStyles } from '../lib/extract/extractProps';
 import Shape from './Shape';
 
-export default class ClipPath extends Shape<{
-  id?: string;
-  clipPath?: string;
-  clipRule?: 'evenodd' | 'nonzero';
-  transform?: number[] | string | TransformProps;
-}> {
+export default class ClipPath extends Shape<{}> {
   static displayName = 'ClipPath';
 
   render() {
     const { props } = this;
-    const { id, children } = props;
     return (
-      <RNSVGClipPath ref={this.refMethod} name={id} {...extractClipPath(props)}>
-        {children}
+      <RNSVGClipPath
+        ref={this.refMethod}
+        {...extractProps(propsAndStyles(props), this)}
+      >
+        {props.children}
       </RNSVGClipPath>
     );
   }

src/lib/extract/extractClipPath.ts

@@ -1,18 +1,16 @@
 import { idPattern } from '../util';
 import { ClipProps } from './types';
-import extractTransform from './extractTransform';
 
 const clipRules: { evenodd: number; nonzero: number } = {
   evenodd: 0,
   nonzero: 1,
 };
 
 export default function extractClipPath(props: ClipProps) {
-  const { clipPath, clipRule, transform } = props;
+  const { clipPath, clipRule } = props;
   const extracted: {
     clipPath?: string;
     clipRule?: number;
-    matrix?: number[];
   } = {};
 
   if (clipRule) {
@@ -33,9 +31,5 @@ export default function extractClipPath(props: ClipProps) {
     }
   }
 
-  if (transform) {
-    extracted.matrix = extractTransform(transform);
-  }
-
   return extracted;
 }

src/lib/extract/types.ts

@@ -92,5 +92,4 @@ export type StrokeProps = {
 export type ClipProps = {
   clipPath?: string;
   clipRule?: 'evenodd' | 'nonzero';
-  transform?: number[] | string | TransformProps;
 };