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

[iOS] Refactor remaining uses of NSString to SVGLength

Browse Source
This commit is contained in:
Mikael Sand
2018-10-19 01:19:35 +03:00
parent 44744bc1f3
commit a8fe15c506
18 changed files with 262 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/Brushes/RNSVGPainter.m
+14 -14
View File
@@ -135,16 +135,16 @@ void PatternFunction(void* info, CGContextRef context)
float offsetX = CGRectGetMinX(rect);
float offsetY = CGRectGetMinY(rect);
CGFloat x = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:0]
CGFloat x = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:0]
relative:width
offset:offsetX];
CGFloat y = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:1]
CGFloat y = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:1]
relative:height
offset:offsetY];
CGFloat w = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:2]
CGFloat w = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:2]
relative:width
offset:offsetX];
CGFloat h = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:3]
CGFloat h = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:3]
relative:height
offset:offsetY];
@@ -185,16 +185,16 @@ void PatternFunction(void* info, CGContextRef context)
float offsetX = CGRectGetMinX(rect);
float offsetY = CGRectGetMinY(rect);
CGFloat x1 = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:0]
CGFloat x1 = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:0]
relative:width
offset:offsetX];
CGFloat y1 = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:1]
CGFloat y1 = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:1]
relative:height
offset:offsetY];
CGFloat x2 = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:2]
CGFloat x2 = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:2]
relative:width
offset:offsetX];
CGFloat y2 = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:3]
CGFloat y2 = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:3]
relative:height
offset:offsetY];
@@ -215,22 +215,22 @@ void PatternFunction(void* info, CGContextRef context)
float offsetX = CGRectGetMinX(rect);
float offsetY = CGRectGetMinY(rect);
CGFloat rx = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:2]
CGFloat rx = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:2]
relative:width
offset:0];
CGFloat ry = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:3]
CGFloat ry = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:3]
relative:height
offset:0];
CGFloat fx = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:0]
CGFloat fx = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:0]
relative:width
offset:offsetX];
CGFloat fy = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:1]
CGFloat fy = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:1]
relative:height
offset:offsetY] / (ry / rx);
CGFloat cx = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:4]
CGFloat cx = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:4]
relative:width
offset:offsetX];
CGFloat cy = [RNSVGPercentageConverter stringToFloat:(NSString *)[_points objectAtIndex:5]
CGFloat cy = [RNSVGPercentageConverter lengthToFloat:[_points objectAtIndex:5]
relative:height
offset:offsetY] / (ry / rx);
ios/Elements/RNSVGSvgView.m
+4
View File
@@ -184,6 +184,10 @@
- (void)drawRect:(CGRect)rect
{
UIView* parent = self.superview;
if ([parent isKindOfClass:[RNSVGNode class]]) {
return;
}
rendered = true;
_clipPaths = nil;
_templates = nil;
ios/RNSVGNode.m
+49 -3
View File
@@ -23,6 +23,9 @@
BOOL _transparent;
CGPathRef _cachedClipPath;
CGImageRef _clipMask;
double canvasWidth;
double canvasHeight;
double canvasDiagonal;
}
CGFloat const RNSVG_M_SQRT1_2l = 0.707106781186547524400844362104849039;
@@ -59,6 +62,9 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12;
id<RNSVGContainer> container = (id<RNSVGContainer>)self.superview;
[container invalidate];
[self clearPath];
canvasWidth = -1;
canvasHeight = -1;
canvasDiagonal = -1;
}
- (void)clearPath
@@ -362,7 +368,7 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12;
if (unit == SVG_LENGTHTYPE_NUMBER){
return length.value;
} else if (unit == SVG_LENGTHTYPE_PERCENTAGE){
return length.value / 100 * [self getContextWidth];
return length.value / 100 * [self getCanvasWidth];
}
return [self fromRelative:length];
}
@@ -373,7 +379,7 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12;
if (unit == SVG_LENGTHTYPE_NUMBER){
return length.value;
} else if (unit == SVG_LENGTHTYPE_PERCENTAGE){
return length.value / 100 * [self getContextHeight];
return length.value / 100 * [self getCanvasHeight];
}
return [self fromRelative:length];
}
@@ -384,7 +390,7 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12;
if (unit == SVG_LENGTHTYPE_NUMBER){
return length.value;
} else if (unit == SVG_LENGTHTYPE_PERCENTAGE){
return length.value / 100 * [self getContextDiagonal];
return length.value / 100 * [self getCanvasDiagonal];
}
return [self fromRelative:length];
}
@@ -446,6 +452,46 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12;
return r;
}
- (CGFloat) getCanvasWidth {
if (canvasWidth != -1) {
return canvasWidth;
}
RNSVGGroup* root = [self textRoot];
if (root == nil) {
canvasWidth = [self getContextWidth];
} else {
canvasWidth = [[root getGlyphContext] getWidth];
}
return canvasWidth;
}
- (CGFloat) getCanvasHeight {
if (canvasHeight != -1) {
return canvasHeight;
}
RNSVGGroup* root = [self textRoot];
if (root == nil) {
canvasHeight = [self getContextHeight];
} else {
canvasHeight = [[root getGlyphContext] getHeight];
}
return canvasHeight;
}
- (CGFloat) getCanvasDiagonal {
if (canvasDiagonal != -1) {
return canvasDiagonal;
}
CGFloat width = [self getCanvasWidth];
CGFloat height = [self getCanvasHeight];
CGFloat powX = width * width;
CGFloat powY = height * height;
canvasDiagonal = sqrt(powX + powY) * RNSVG_M_SQRT1_2l;
return canvasDiagonal;
}
- (void)parseReference
{
if (self.name) {
ios/RNSVGRenderable.m
+1 -1
View File
@@ -320,7 +320,7 @@ UInt32 saturate(double value) {
}
if (self.stroke) {
CGFloat width = [self relativeOnOther:self.strokeWidth];
CGFloat width = self.strokeWidth ? [self relativeOnOther:self.strokeWidth] : 1;
CGContextSetLineWidth(context, width);
CGContextSetLineCap(context, self.strokeLinecap);
CGContextSetLineJoin(context, self.strokeLinejoin);
ios/Text/RNSVGGlyphContext.h
+1 -1
View File
@@ -26,7 +26,7 @@
- (double)nextDeltaY;
- (NSNumber*)nextRotation;
- (double)nextRotation;
- (double)nextXWithDouble:(double)advance;
ios/Text/RNSVGGlyphContext.m
+45 -53
View File
@@ -12,25 +12,25 @@
NSMutableArray *mFontContext_;
// Unique input attribute lists (only added if node sets a value)
NSMutableArray *mXsContext_;
NSMutableArray *mYsContext_;
NSMutableArray *mDXsContext_;
NSMutableArray *mDYsContext_;
NSMutableArray *mRsContext_;
NSMutableArray<NSArray<RNSVGLength*>*> *mXsContext_;
NSMutableArray<NSArray<RNSVGLength*>*> *mYsContext_;
NSMutableArray<NSArray<RNSVGLength*>*> *mDXsContext_;
NSMutableArray<NSArray<RNSVGLength*>*> *mDYsContext_;
NSMutableArray<NSArray<RNSVGLength*>*> *mRsContext_;
// Unique index into attribute list (one per unique list)
NSMutableArray *mXIndices_;
NSMutableArray *mYIndices_;
NSMutableArray *mDXIndices_;
NSMutableArray *mDYIndices_;
NSMutableArray *mRIndices_;
NSMutableArray<NSNumber*> *mXIndices_;
NSMutableArray<NSNumber*> *mYIndices_;
NSMutableArray<NSNumber*> *mDXIndices_;
NSMutableArray<NSNumber*> *mDYIndices_;
NSMutableArray<NSNumber*> *mRIndices_;
// Index of unique context used (one per node push/pop)
NSMutableArray *mXsIndices_;
NSMutableArray *mYsIndices_;
NSMutableArray *mDXsIndices_;
NSMutableArray *mDYsIndices_;
NSMutableArray *mRsIndices_;
NSMutableArray<NSNumber*> *mXsIndices_;
NSMutableArray<NSNumber*> *mYsIndices_;
NSMutableArray<NSNumber*> *mDXsIndices_;
NSMutableArray<NSNumber*> *mDYsIndices_;
NSMutableArray<NSNumber*> *mRsIndices_;
// Calculated on push context, percentage and em length depends on parent font size
double mFontSize_;
@@ -51,25 +51,25 @@
// https://www.w3.org/TR/SVG/types.html#DataTypeCoordinates
// https://www.w3.org/TR/SVG/text.html#TSpanElementXAttribute
NSArray *mXs_;
NSArray<RNSVGLength*> *mXs_;
// https://www.w3.org/TR/SVG/text.html#TSpanElementYAttribute
NSArray *mYs_;
NSArray<RNSVGLength*> *mYs_;
// Current <list-of-lengths> SVGLengthList
// https://www.w3.org/TR/SVG/types.html#DataTypeLengths
// https://www.w3.org/TR/SVG/text.html#TSpanElementDXAttribute
NSArray *mDXs_;
NSArray<RNSVGLength*> *mDXs_;
// https://www.w3.org/TR/SVG/text.html#TSpanElementDYAttribute
NSArray *mDYs_;
NSArray<RNSVGLength*> *mDYs_;
// Current <list-of-numbers> SVGLengthList
// https://www.w3.org/TR/SVG/types.html#DataTypeNumbers
// https://www.w3.org/TR/SVG/text.html#TSpanElementRotateAttribute
NSArray *mRs_;
NSArray<RNSVGLength*> *mRs_;
// Current attribute list index
long mXsIndex_;
@@ -179,7 +179,7 @@
self->mYs_ = [[NSArray alloc]init];
self->mDXs_ = [[NSArray alloc]init];
self->mDYs_ = [[NSArray alloc]init];
self->mRs_ = [[NSArray alloc]initWithObjects:@0, nil];
self->mRs_ = [[NSArray alloc]initWithObjects:[RNSVGLength lengthWithNumber:0], nil];
self->mXIndex_ = -1;
self->mYIndex_ = -1;
@@ -254,11 +254,11 @@
- (void)pushContext:(RNSVGText*)node
font:(NSDictionary*)font
x:(NSArray*)x
y:(NSArray*)y
deltaX:(NSArray*)deltaX
deltaY:(NSArray*)deltaY
rotate:(NSArray*)rotate {
x:(NSArray<RNSVGLength*>*)x
y:(NSArray<RNSVGLength*>*)y
deltaX:(NSArray<RNSVGLength*>*)deltaX
deltaY:(NSArray<RNSVGLength*>*)deltaY
rotate:(NSArray<RNSVGLength*>*)rotate {
[self pushNode:(RNSVGGroup*)node andFont:font];
if (x != nil && [x count] != 0) {
mXsIndex_++;
@@ -292,7 +292,7 @@
mRsIndex_++;
mRIndex_ = -1;
[mRIndices_ addObject:[NSNumber numberWithLong:mRIndex_]];
mRs_ = [rotate valueForKeyPath:@"self.doubleValue"];
mRs_ = rotate;
[mRsContext_ addObject:mRs_];
}
[self pushIndices];
@@ -398,12 +398,10 @@
if (nextIndex < [mXs_ count]) {
mDX_ = 0;
mXIndex_ = nextIndex;
NSString *string = [mXs_ objectAtIndex:nextIndex];
mX_ = [RNSVGPropHelper fromRelativeWithNSString:string
relative:mWidth_
offset:0
scale:mScale_
fontSize:mFontSize_];
RNSVGLength *length = [mXs_ objectAtIndex:nextIndex];
mX_ = [RNSVGPropHelper fromRelative:length
relative:mWidth_
fontSize:mFontSize_];
}
mX_ += advance;
return mX_;
@@ -415,12 +413,10 @@
if (nextIndex < [mYs_ count]) {
mDY_ = 0;
mYIndex_ = nextIndex;
NSString *string = [mYs_ objectAtIndex:nextIndex];
mY_ = [RNSVGPropHelper fromRelativeWithNSString:string
relative:mHeight_
offset:0
scale:mScale_
fontSize:mFontSize_];
RNSVGLength *length = [mYs_ objectAtIndex:nextIndex];
mY_ = [RNSVGPropHelper fromRelative:length
relative:mHeight_
fontSize:mFontSize_];
}
return mY_;
}
@@ -430,12 +426,10 @@
long nextIndex = mDXIndex_ + 1;
if (nextIndex < [mDXs_ count]) {
mDXIndex_ = nextIndex;
NSString *string = [mDXs_ objectAtIndex:nextIndex];
double val = [RNSVGPropHelper fromRelativeWithNSString:string
relative:mWidth_
offset:0
scale:mScale_
fontSize:mFontSize_];
RNSVGLength *length = [mDXs_ objectAtIndex:nextIndex];
double val = [RNSVGPropHelper fromRelative:length
relative:mWidth_
fontSize:mFontSize_];
mDX_ += val;
}
return mDX_;
@@ -446,18 +440,16 @@
long nextIndex = mDYIndex_ + 1;
if (nextIndex < [mDYs_ count]) {
mDYIndex_ = nextIndex;
NSString *string = [mDYs_ objectAtIndex:nextIndex];
double val = [RNSVGPropHelper fromRelativeWithNSString:string
relative:mHeight_
offset:0
scale:mScale_
fontSize:mFontSize_];
RNSVGLength *length = [mDYs_ objectAtIndex:nextIndex];
double val = [RNSVGPropHelper fromRelative:length
relative:mHeight_
fontSize:mFontSize_];
mDY_ += val;
}
return mDY_;
}
- (NSNumber*)nextRotation {
- (double)nextRotation {
[RNSVGGlyphContext incrementIndices:mRIndices_ topIndex:mRsIndex_];
long nextIndex = mRIndex_ + 1;
long count = [mRs_ count];
@@ -466,7 +458,7 @@
} else {
mRIndex_ = count - 1;
}
return mRs_[mRIndex_];
return [mRs_[mRIndex_] value];
}
- (float)getWidth {
ios/Text/RNSVGPropHelper.h
-2
View File
@@ -15,8 +15,6 @@
+ (double) fromRelative:(RNSVGLength*)length
relative:(double)relative
offset:(double)offset
scale:(double)scale
fontSize:(double)fontSize;
+ (double)fromRelative:(RNSVGLength*)length
ios/Text/RNSVGPropHelper.m
+5 -5
View File
@@ -50,8 +50,6 @@
+ (double)fromRelative:(RNSVGLength*)length
relative:(double)relative
offset:(double)offset
scale:(double)scale
fontSize:(double)fontSize {
RNSVGLengthUnitType unitType = length.unit;
double value = length.value;
@@ -59,10 +57,11 @@
switch (unitType) {
case SVG_LENGTHTYPE_NUMBER:
case SVG_LENGTHTYPE_PX:
return value;
break;
case SVG_LENGTHTYPE_PERCENTAGE:
return value / 100 * relative + offset;
return value / 100 * relative;
case SVG_LENGTHTYPE_EMS:
unit = fontSize;
@@ -89,9 +88,9 @@
default:
case SVG_LENGTHTYPE_UNKNOWN:
return value * scale + offset;
return value;
}
return value * unit * scale + offset;
return value * unit;
}
+ (double)fromRelative:(RNSVGLength*)length
@@ -102,6 +101,7 @@
switch (unitType) {
case SVG_LENGTHTYPE_NUMBER:
case SVG_LENGTHTYPE_PX:
return value;
break;
case SVG_LENGTHTYPE_PERCENTAGE:
ios/Text/RNSVGTSpan.m
+5 -9
View File
@@ -358,8 +358,6 @@ static double RNSVGTSpan_radToDeg = 180 / M_PI;
*/
double absoluteStartOffset = [RNSVGPropHelper fromRelative:textPath.startOffset
relative:_pathLength
offset:0
scale:1
fontSize:fontSize];
offset += absoluteStartOffset;
if (isClosed) {
@@ -452,14 +450,12 @@ static double RNSVGTSpan_radToDeg = 180 / M_PI;
thus, no advance adjustments are made.
*/
double scaleSpacingAndGlyphs = 1;
NSString *mTextLength = [self textLength];
RNSVGLength *mTextLength = [self textLength];
enum RNSVGTextLengthAdjust mLengthAdjust = RNSVGTextLengthAdjustFromString([self lengthAdjust]);
if (mTextLength != nil) {
double author = [RNSVGPropHelper fromRelativeWithNSString:mTextLength
relative:[gc getWidth]
offset:0
scale:1
fontSize:fontSize];
double author = [RNSVGPropHelper fromRelative:mTextLength
relative:[gc getWidth]
fontSize:fontSize];
if (author < 0) {
NSException *e = [NSException
exceptionWithName:@"NegativeTextLength"
@@ -727,7 +723,7 @@ static double RNSVGTSpan_radToDeg = 180 / M_PI;
double y = [gc nextY];
double dx = [gc nextDeltaX];
double dy = [gc nextDeltaY];
double r = [[gc nextRotation] doubleValue] / RNSVGTSpan_radToDeg;
double r = [gc nextRotation] / RNSVGTSpan_radToDeg;
if (isWordSeparator) {
continue;
ios/Text/RNSVGText.h
+6 -6
View File
@@ -11,15 +11,15 @@
@interface RNSVGText : RNSVGGroup
@property (nonatomic, strong) NSString *textLength;
@property (nonatomic, strong) RNSVGLength *textLength;
@property (nonatomic, strong) NSString *baselineShift;
@property (nonatomic, strong) NSString *lengthAdjust;
@property (nonatomic, strong) NSString *alignmentBaseline;
@property (nonatomic, strong) NSArray<NSString *> *deltaX;
@property (nonatomic, strong) NSArray<NSString *> *deltaY;
@property (nonatomic, strong) NSArray<NSString *> *positionX;
@property (nonatomic, strong) NSArray<NSString *> *positionY;
@property (nonatomic, strong) NSArray<NSString *> *rotate;
@property (nonatomic, strong) NSArray<RNSVGLength *> *deltaX;
@property (nonatomic, strong) NSArray<RNSVGLength *> *deltaY;
@property (nonatomic, strong) NSArray<RNSVGLength *> *positionX;
@property (nonatomic, strong) NSArray<RNSVGLength *> *positionY;
@property (nonatomic, strong) NSArray<RNSVGLength *> *rotate;
- (CGPathRef)getGroupPath:(CGContextRef)context;
- (CTFontRef)getFontFromContext;
ios/Text/RNSVGText.m
+8 -8
View File
@@ -23,12 +23,12 @@
- (void)invalidate
{
[super invalidate];
[self releaseCachedPath];
//[self releaseCachedPath];
}
- (void)setTextLength:(NSString *)textLength
- (void)setTextLength:(RNSVGLength *)textLength
{
if ([textLength isEqualToString:_textLength]) {
if ([textLength isEqualTo:_textLength]) {
return;
}
[self invalidate];
@@ -62,7 +62,7 @@
_alignmentBaseline = alignmentBaseline;
}
- (void)setDeltaX:(NSArray<NSString *> *)deltaX
- (void)setDeltaX:(NSArray<RNSVGLength *> *)deltaX
{
if (deltaX == _deltaX) {
return;
@@ -71,7 +71,7 @@
_deltaX = deltaX;
}
- (void)setDeltaY:(NSArray<NSString *> *)deltaY
- (void)setDeltaY:(NSArray<RNSVGLength *> *)deltaY
{
if (deltaY == _deltaY) {
return;
@@ -80,7 +80,7 @@
_deltaY = deltaY;
}
- (void)setPositionX:(NSArray<NSString *>*)positionX
- (void)setPositionX:(NSArray<RNSVGLength *>*)positionX
{
if (positionX == _positionX) {
return;
@@ -89,7 +89,7 @@
_positionX = positionX;
}
- (void)setPositionY:(NSArray<NSString *>*)positionY
- (void)setPositionY:(NSArray<RNSVGLength *>*)positionY
{
if (positionY == _positionY) {
return;
@@ -98,7 +98,7 @@
_positionY = positionY;
}
- (void)setRotate:(NSArray<NSString *> *)rotate
- (void)setRotate:(NSArray<RNSVGLength *> *)rotate
{
if (rotate == _rotate) {
return;
ios/Utils/RCTConvert+RNSVG.h
+1
View File
@@ -22,6 +22,7 @@
@interface RCTConvert (RNSVG)
+ (RNSVGLength*)RNSVGLength:(id)json;
+ (NSArray<RNSVGLength *>*)RNSVGLengthArray:(id)json;
+ (RNSVGCGFCRule)RNSVGCGFCRule:(id)json;
+ (RNSVGVBMOS)RNSVGVBMOS:(id)json;
+ (RNSVGUnits)RNSVGUnits:(id)json;
ios/Utils/RCTConvert+RNSVG.m
+21
View File
@@ -109,6 +109,27 @@ RCT_ENUM_CONVERTER(RNSVGUnits, (@{
}
}
+ (NSArray<RNSVGLength *>*)RNSVGLengthArray:(id)json
{
if ([json isKindOfClass:[NSNumber class]]) {
RNSVGLength* length = [RNSVGLength lengthWithNumber:[json doubleValue]];
return [NSArray arrayWithObject:length];
} else if ([json isKindOfClass:[NSArray class]]) {
NSArray *arrayValue = (NSArray*)json;
NSMutableArray<RNSVGLength*>* lengths = [NSMutableArray arrayWithCapacity:[arrayValue count]];
for (id obj in arrayValue) {
[lengths addObject:[self RNSVGLength:obj]];
}
return lengths;
} else if ([json isKindOfClass:[NSString class]]) {
NSString *stringValue = (NSString *)json;
RNSVGLength* length = [RNSVGLength lengthWithString:stringValue];
return [NSArray arrayWithObject:length];
} else {
return nil;
}
}
+ (CGRect)RNSVGCGRect:(id)json offset:(NSUInteger)offset
{
NSArray *arr = [self NSArray:json];
ios/Utils/RNSVGPercentageConverter.h
+3
View File
@@ -8,6 +8,7 @@
#import <Foundation/Foundation.h>
#import <QuartzCore/QuartzCore.h>
#import "RNSVGLength.h"
@interface RNSVGPercentageConverter : NSObject
@@ -17,4 +18,6 @@
+ (BOOL) isPercentage:(NSString *) string;
+ (CGFloat)lengthToFloat:(RNSVGLength *)length relative:(CGFloat)relative offset:(CGFloat)offset;
@end
ios/Utils/RNSVGPercentageConverter.m
+14 -3
View File
@@ -28,20 +28,31 @@ static NSRegularExpression* percentageRegExp;
}
}
+ (CGFloat)lengthToFloat:(RNSVGLength *)length relative:(CGFloat)relative offset:(CGFloat)offset
{
if (length == nil) {
return offset;
} else if ([length unit] != SVG_LENGTHTYPE_PERCENTAGE) {
return [length value] + offset;
} else {
return [length value] / 100 * relative + offset;
}
}
+ (CGFloat)percentageToFloat:(NSString *)percentage relative:(CGFloat)relative offset:(CGFloat)offset
{
__block CGFloat matched;
[percentageRegExp enumerateMatchesInString:percentage
options:0
range:NSMakeRange(0, percentage.length)
usingBlock:^(NSTextCheckingResult *result, NSMatchingFlags flags, BOOL *stop)
{
matched = [[percentage substringWithRange:NSMakeRange(result.range.location, result.range.length)] floatValue];
matched = matched / 100 * relative + offset;
}];
return matched;
}
ios/ViewManagers/RNSVGNodeManager.m
+76 -16
View File
@@ -64,9 +64,9 @@ static const NSUInteger kMatrixArrayLength = 4 * 4;
RCTLogWarn(@"[RCTConvert CATransform3D:] has deprecated a matrix as input. Pass an array of configs (which can contain a matrix key) instead.");
return [self CATransform3DFromMatrix:json];
}
CGFloat zeroScaleThreshold = FLT_EPSILON;
for (NSDictionary *transformConfig in (NSArray<NSDictionary *> *)json) {
if (transformConfig.count != 1) {
RCTLogConvertError(json, @"a CATransform3D. You must specify exactly one property per transform object.");
@@ -74,63 +74,63 @@ static const NSUInteger kMatrixArrayLength = 4 * 4;
}
NSString *property = transformConfig.allKeys[0];
id value = transformConfig[property];
if ([property isEqualToString:@"matrix"]) {
transform = [self CATransform3DFromMatrix:value];
} else if ([property isEqualToString:@"perspective"]) {
transform.m34 = -1 / [value floatValue];
} else if ([property isEqualToString:@"rotateX"]) {
CGFloat rotate = [self convertToRadians:value];
transform = CATransform3DRotate(transform, rotate, 1, 0, 0);
} else if ([property isEqualToString:@"rotateY"]) {
CGFloat rotate = [self convertToRadians:value];
transform = CATransform3DRotate(transform, rotate, 0, 1, 0);
} else if ([property isEqualToString:@"rotate"] || [property isEqualToString:@"rotateZ"]) {
CGFloat rotate = [self convertToRadians:value];
transform = CATransform3DRotate(transform, rotate, 0, 0, 1);
} else if ([property isEqualToString:@"scale"]) {
CGFloat scale = [value floatValue];
scale = ABS(scale) < zeroScaleThreshold ? zeroScaleThreshold : scale;
transform = CATransform3DScale(transform, scale, scale, 1);
} else if ([property isEqualToString:@"scaleX"]) {
CGFloat scale = [value floatValue];
scale = ABS(scale) < zeroScaleThreshold ? zeroScaleThreshold : scale;
transform = CATransform3DScale(transform, scale, 1, 1);
} else if ([property isEqualToString:@"scaleY"]) {
CGFloat scale = [value floatValue];
scale = ABS(scale) < zeroScaleThreshold ? zeroScaleThreshold : scale;
transform = CATransform3DScale(transform, 1, scale, 1);
} else if ([property isEqualToString:@"translate"]) {
NSArray *array = (NSArray<NSNumber *> *)value;
CGFloat translateX = [array[0] floatValue];
CGFloat translateY = [array[1] floatValue];
CGFloat translateZ = array.count > 2 ? [array[2] floatValue] : 0;
transform = CATransform3DTranslate(transform, translateX, translateY, translateZ);
} else if ([property isEqualToString:@"translateX"]) {
CGFloat translate = [value floatValue];
transform = CATransform3DTranslate(transform, translate, 0, 0);
} else if ([property isEqualToString:@"translateY"]) {
CGFloat translate = [value floatValue];
transform = CATransform3DTranslate(transform, 0, translate, 0);
} else if ([property isEqualToString:@"skewX"]) {
CGFloat skew = [self convertToRadians:value];
transform.m21 = tanf(skew);
} else if ([property isEqualToString:@"skewY"]) {
CGFloat skew = [self convertToRadians:value];
transform.m12 = tanf(skew);
} else {
RCTLogError(@"Unsupported transform type for a CATransform3D: %@.", property);
}
@@ -166,5 +166,65 @@ RCT_EXPORT_VIEW_PROPERTY(clipRule, RNSVGCGFCRule)
RCT_EXPORT_VIEW_PROPERTY(responsible, BOOL)
RCT_EXPORT_VIEW_PROPERTY(onLayout, RCTDirectEventBlock)
RCT_CUSTOM_SHADOW_PROPERTY(top, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(right, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(start, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(end, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(bottom, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(left, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(width, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(height, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(minWidth, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(maxWidth, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(minHeight, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(maxHeight, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(borderTopWidth, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(borderRightWidth, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(borderBottomWidth, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(borderLeftWidth, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(borderStartWidth, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(borderEndWidth, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(borderWidth, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(marginTop, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(marginRight, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(marginBottom, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(marginLeft, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(marginStart, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(marginEnd, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(marginVertical, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(marginHorizontal, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(margin, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(paddingTop, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(paddingRight, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(paddingBottom, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(paddingLeft, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(paddingStart, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(paddingEnd, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(paddingVertical, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(paddingHorizontal, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(padding, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(flex, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(flexGrow, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(flexShrink, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(flexBasis, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(flexDirection, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(flexWrap, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(justifyContent, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(alignItems, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(alignSelf, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(alignContent, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(position, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(aspectRatio, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(overflow, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(display, id, RNSVGNode) {}
RCT_CUSTOM_SHADOW_PROPERTY(direction, id, RNSVGNode) {}
@end
ios/ViewManagers/RNSVGRenderableManager.m
+1 -1
View File
@@ -28,7 +28,7 @@ RCT_EXPORT_VIEW_PROPERTY(strokeOpacity, CGFloat)
RCT_EXPORT_VIEW_PROPERTY(strokeWidth, RNSVGLength*)
RCT_EXPORT_VIEW_PROPERTY(strokeLinecap, CGLineCap)
RCT_EXPORT_VIEW_PROPERTY(strokeLinejoin, CGLineJoin)
RCT_EXPORT_VIEW_PROPERTY(strokeDasharray, NSArray<NSString *>)
RCT_EXPORT_VIEW_PROPERTY(strokeDasharray, NSArray<RNSVGLength *>)
RCT_EXPORT_VIEW_PROPERTY(strokeDashoffset, CGFloat)
RCT_EXPORT_VIEW_PROPERTY(strokeMiterlimit, CGFloat)
RCT_EXPORT_VIEW_PROPERTY(propList, NSArray<NSString *>)
ios/ViewManagers/RNSVGTextManager.m
+8 -62
View File
@@ -23,92 +23,38 @@ RCT_EXPORT_MODULE()
RCT_EXPORT_VIEW_PROPERTY(textAnchor, RNSVGTextAnchor)
RCT_CUSTOM_VIEW_PROPERTY(dx, id, RNSVGText)
{
if ([json isKindOfClass:[NSArray class]]) {
NSArray<NSString *> *arrayValue = (NSArray<NSString *> *)json;
view.deltaX = arrayValue;
} else if ([json isKindOfClass:[NSString class]]) {
view.deltaX = [NSArray arrayWithObject:json];
} else if ([json isKindOfClass:[NSNumber class]]) {
view.deltaX = [NSArray arrayWithObject:[NSString stringWithFormat:@"%f", [json floatValue]]];
}
view.deltaX = [RCTConvert RNSVGLengthArray:json];
}
RCT_CUSTOM_VIEW_PROPERTY(dy, id, RNSVGText)
{
if ([json isKindOfClass:[NSArray class]]) {
NSArray<NSString *> *arrayValue = (NSArray<NSString *> *)json;
view.deltaY = arrayValue;
} else if ([json isKindOfClass:[NSString class]]) {
view.deltaY = [NSArray arrayWithObject:json];
} else if ([json isKindOfClass:[NSNumber class]]) {
view.deltaY = [NSArray arrayWithObject:[NSString stringWithFormat:@"%f", [json floatValue]]];
}
view.deltaY = [RCTConvert RNSVGLengthArray:json];
}
RCT_CUSTOM_VIEW_PROPERTY(positionX, id, RNSVGText)
{
if ([json isKindOfClass:[NSArray class]]) {
NSArray<NSString *> *arrayValue = (NSArray<NSString *> *)json;
view.positionX = arrayValue;
} else if ([json isKindOfClass:[NSString class]]) {
view.positionX = [NSArray arrayWithObject:json];
} else if ([json isKindOfClass:[NSNumber class]]) {
view.positionX = [NSArray arrayWithObject:[NSString stringWithFormat:@"%f", [json floatValue]]];
}
view.positionX = [RCTConvert RNSVGLengthArray:json];
}
RCT_CUSTOM_VIEW_PROPERTY(positionY, id, RNSVGText)
{
if ([json isKindOfClass:[NSArray class]]) {
NSArray<NSString *> *arrayValue = (NSArray<NSString *> *)json;
view.positionY = arrayValue;
} else if ([json isKindOfClass:[NSString class]]) {
view.positionY = [NSArray arrayWithObject:json];
} else if ([json isKindOfClass:[NSNumber class]]) {
view.positionY = [NSArray arrayWithObject:[NSString stringWithFormat:@"%f", [json floatValue]]];
}
view.positionY = [RCTConvert RNSVGLengthArray:json];
}
RCT_CUSTOM_VIEW_PROPERTY(x, id, RNSVGText)
{
if ([json isKindOfClass:[NSArray class]]) {
NSArray<NSString *> *arrayValue = (NSArray<NSString *> *)json;
view.positionX = arrayValue;
} else if ([json isKindOfClass:[NSString class]]) {
view.positionX = [NSArray arrayWithObject:json];
} else if ([json isKindOfClass:[NSNumber class]]) {
view.positionX = [NSArray arrayWithObject:[NSString stringWithFormat:@"%f", [json floatValue]]];
}
view.positionX = [RCTConvert RNSVGLengthArray:json];
}
RCT_CUSTOM_VIEW_PROPERTY(y, id, RNSVGText)
{
if ([json isKindOfClass:[NSArray class]]) {
NSArray<NSString *> *arrayValue = (NSArray<NSString *> *)json;
view.positionY = arrayValue;
} else if ([json isKindOfClass:[NSString class]]) {
view.positionY = [NSArray arrayWithObject:json];
} else if ([json isKindOfClass:[NSNumber class]]) {
view.positionY = [NSArray arrayWithObject:[NSString stringWithFormat:@"%f", [json floatValue]]];
}
view.positionY = [RCTConvert RNSVGLengthArray:json];
}
RCT_CUSTOM_VIEW_PROPERTY(rotate, id, RNSVGText)
{
if ([json isKindOfClass:[NSArray class]]) {
NSArray<NSString *> *arrayValue = (NSArray<NSString *> *)json;
view.rotate = arrayValue;
} else if ([json isKindOfClass:[NSString class]]) {
view.rotate = [NSArray arrayWithObject:json];
} else if ([json isKindOfClass:[NSNumber class]]) {
view.rotate = [NSArray arrayWithObject:[NSString stringWithFormat:@"%f", [json floatValue]]];
}
view.rotate = [RCTConvert RNSVGLengthArray:json];
}
RCT_EXPORT_VIEW_PROPERTY(font, NSDictionary)
RCT_CUSTOM_VIEW_PROPERTY(textLength, id, RNSVGText)
{
if ([json isKindOfClass:[NSString class]]) {
NSString *stringValue = (NSString *)json;
view.textLength = stringValue;
} else {
view.textLength = [NSString stringWithFormat:@"%f", [json floatValue]];
}
view.textLength = [RCTConvert RNSVGLength:json];
}
RCT_CUSTOM_VIEW_PROPERTY(baselineShift, id, RNSVGText)
{