diff --git a/src/elements/Circle.tsx b/src/elements/Circle.tsx index 9199f310..a3c2c503 100644 --- a/src/elements/Circle.tsx +++ b/src/elements/Circle.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { requireNativeComponent } from 'react-native'; -import extractProps, { propsAndStyles } from '../lib/extract/extractProps'; +import { extract } from '../lib/extract/extractProps'; import { NumberProp } from '../lib/extract/types'; import Shape from './Shape'; @@ -23,7 +23,7 @@ export default class Circle extends Shape<{ return ( { @@ -9,10 +9,7 @@ export default class ClipPath extends Shape<{}> { render() { const { props } = this; return ( - + {props.children} ); diff --git a/src/elements/Ellipse.tsx b/src/elements/Ellipse.tsx index dd5913b9..bb31d45c 100644 --- a/src/elements/Ellipse.tsx +++ b/src/elements/Ellipse.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { requireNativeComponent } from 'react-native'; -import extractProps, { propsAndStyles } from '../lib/extract/extractProps'; +import { extract } from '../lib/extract/extractProps'; import { NumberProp } from '../lib/extract/types'; import Shape from './Shape'; @@ -25,7 +25,7 @@ export default class Ellipse extends Shape<{ return ( + ); } } diff --git a/src/elements/Rect.tsx b/src/elements/Rect.tsx index 7856e449..07bfe43b 100644 --- a/src/elements/Rect.tsx +++ b/src/elements/Rect.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { requireNativeComponent } from 'react-native'; -import extractProps, { propsAndStyles } from '../lib/extract/extractProps'; +import { withoutXY } from '../lib/extract/extractProps'; import { NumberProp } from '../lib/extract/types'; import Shape from './Shape'; @@ -27,14 +27,7 @@ export default class Rect extends Shape<{ return (