Compare commits

..

No commits in common. "main" and "v3.16.09" have entirely different histories.

376 changed files with 4549 additions and 4494 deletions

View File

@ -4,6 +4,22 @@
<dict> <dict>
<key>AvailableLibraries</key> <key>AvailableLibraries</key>
<array> <array>
<dict>
<key>BinaryPath</key>
<string>libBVLinearGradient.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libBVLinearGradient.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
<dict> <dict>
<key>BinaryPath</key> <key>BinaryPath</key>
<string>libBVLinearGradient.a</string> <string>libBVLinearGradient.a</string>
@ -23,22 +39,6 @@
<key>SupportedPlatformVariant</key> <key>SupportedPlatformVariant</key>
<string>simulator</string> <string>simulator</string>
</dict> </dict>
<dict>
<key>BinaryPath</key>
<string>libBVLinearGradient.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libBVLinearGradient.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
</array> </array>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>XFWK</string> <string>XFWK</string>

View File

@ -4,6 +4,22 @@
<dict> <dict>
<key>AvailableLibraries</key> <key>AvailableLibraries</key>
<array> <array>
<dict>
<key>BinaryPath</key>
<string>libRNCAsyncStorage.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNCAsyncStorage.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
<dict> <dict>
<key>BinaryPath</key> <key>BinaryPath</key>
<string>libRNCAsyncStorage.a</string> <string>libRNCAsyncStorage.a</string>
@ -23,22 +39,6 @@
<key>SupportedPlatformVariant</key> <key>SupportedPlatformVariant</key>
<string>simulator</string> <string>simulator</string>
</dict> </dict>
<dict>
<key>BinaryPath</key>
<string>libRNCAsyncStorage.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNCAsyncStorage.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
</array> </array>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>XFWK</string> <string>XFWK</string>

View File

@ -4,22 +4,6 @@
<dict> <dict>
<key>AvailableLibraries</key> <key>AvailableLibraries</key>
<array> <array>
<dict>
<key>BinaryPath</key>
<string>libRNDateTimePicker.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNDateTimePicker.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
<dict> <dict>
<key>BinaryPath</key> <key>BinaryPath</key>
<string>libRNDateTimePicker.a</string> <string>libRNDateTimePicker.a</string>
@ -39,6 +23,22 @@
<key>SupportedPlatformVariant</key> <key>SupportedPlatformVariant</key>
<string>simulator</string> <string>simulator</string>
</dict> </dict>
<dict>
<key>BinaryPath</key>
<string>libRNDateTimePicker.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNDateTimePicker.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
</array> </array>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>XFWK</string> <string>XFWK</string>

View File

@ -4,22 +4,6 @@
<dict> <dict>
<key>AvailableLibraries</key> <key>AvailableLibraries</key>
<array> <array>
<dict>
<key>BinaryPath</key>
<string>libRNDeviceInfo.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNDeviceInfo.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
<dict> <dict>
<key>BinaryPath</key> <key>BinaryPath</key>
<string>libRNDeviceInfo.a</string> <string>libRNDeviceInfo.a</string>
@ -39,6 +23,22 @@
<key>SupportedPlatformVariant</key> <key>SupportedPlatformVariant</key>
<string>simulator</string> <string>simulator</string>
</dict> </dict>
<dict>
<key>BinaryPath</key>
<string>libRNDeviceInfo.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNDeviceInfo.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
</array> </array>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>XFWK</string> <string>XFWK</string>

View File

@ -4,22 +4,6 @@
<dict> <dict>
<key>AvailableLibraries</key> <key>AvailableLibraries</key>
<array> <array>
<dict>
<key>BinaryPath</key>
<string>libRNGestureHandler.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNGestureHandler.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
<dict> <dict>
<key>BinaryPath</key> <key>BinaryPath</key>
<string>libRNGestureHandler.a</string> <string>libRNGestureHandler.a</string>
@ -39,6 +23,22 @@
<key>SupportedPlatformVariant</key> <key>SupportedPlatformVariant</key>
<string>simulator</string> <string>simulator</string>
</dict> </dict>
<dict>
<key>BinaryPath</key>
<string>libRNGestureHandler.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNGestureHandler.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
</array> </array>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>XFWK</string> <string>XFWK</string>

View File

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>AvailableLibraries</key>
<array>
<dict>
<key>BinaryPath</key>
<string>libRNOpenAppSettings.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libRNOpenAppSettings.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>libRNOpenAppSettings.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNOpenAppSettings.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
</array>
<key>CFBundlePackageType</key>
<string>XFWK</string>
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>

View File

@ -0,0 +1,7 @@
#import <React/RCTBridgeModule.h>
#import <UIKit/UIKit.h>
@interface RNOpenAppSettings : NSObject <RCTBridgeModule>
@end

View File

@ -0,0 +1,7 @@
#import <React/RCTBridgeModule.h>
#import <UIKit/UIKit.h>
@interface RNOpenAppSettings : NSObject <RCTBridgeModule>
@end

View File

@ -4,6 +4,22 @@
<dict> <dict>
<key>AvailableLibraries</key> <key>AvailableLibraries</key>
<array> <array>
<dict>
<key>BinaryPath</key>
<string>libRNSVG.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNSVG.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
<dict> <dict>
<key>BinaryPath</key> <key>BinaryPath</key>
<string>libRNSVG.a</string> <string>libRNSVG.a</string>
@ -23,22 +39,6 @@
<key>SupportedPlatformVariant</key> <key>SupportedPlatformVariant</key>
<string>simulator</string> <string>simulator</string>
</dict> </dict>
<dict>
<key>BinaryPath</key>
<string>libRNSVG.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libRNSVG.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
</array> </array>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>XFWK</string> <string>XFWK</string>

View File

@ -6,33 +6,29 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import <CoreText/CoreText.h>
#import <QuartzCore/QuartzCore.h> #import <QuartzCore/QuartzCore.h>
#import <React/RCTConvert.h> #import <CoreText/CoreText.h>
#import "RCTConvert+RNSVG.h" #import "RCTConvert+RNSVG.h"
#import <React/RCTConvert.h>
#import "RNSVGCGFCRule.h" #import "RNSVGCGFCRule.h"
#import "RNSVGColorMatrixType.h"
#import "RNSVGEdgeMode.h"
#import "RNSVGLength.h"
#import "RNSVGMaskType.h"
#import "RNSVGPathParser.h"
#import "RNSVGUnits.h"
#import "RNSVGVBMOS.h" #import "RNSVGVBMOS.h"
#import "RNSVGUnits.h"
#import "RNSVGLength.h"
#import "RNSVGPathParser.h"
@class RNSVGBrush; @class RNSVGBrush;
@interface RCTConvert (RNSVG) @interface RCTConvert (RNSVG)
+ (RNSVGLength *)RNSVGLength:(id)json; + (RNSVGLength*)RNSVGLength:(id)json;
+ (NSArray<RNSVGLength *> *)RNSVGLengthArray:(id)json; + (NSArray<RNSVGLength *>*)RNSVGLengthArray:(id)json;
+ (RNSVGCGFCRule)RNSVGCGFCRule:(id)json; + (RNSVGCGFCRule)RNSVGCGFCRule:(id)json;
+ (RNSVGVBMOS)RNSVGVBMOS:(id)json; + (RNSVGVBMOS)RNSVGVBMOS:(id)json;
+ (RNSVGUnits)RNSVGUnits:(id)json; + (RNSVGUnits)RNSVGUnits:(id)json;
+ (RNSVGMaskType)RNSVGMaskType:(id)json;
+ (RNSVGBrush *)RNSVGBrush:(id)json; + (RNSVGBrush *)RNSVGBrush:(id)json;
+ (RNSVGPathParser *)RNSVGCGPath:(NSString *)d; + (RNSVGPathParser *)RNSVGCGPath:(NSString *)d;
+ (CGRect)RNSVGCGRect:(id)json offset:(NSUInteger)offset; + (CGRect)RNSVGCGRect:(id)json offset:(NSUInteger)offset;
+ (RNSVGColor *)RNSVGColor:(id)json offset:(NSUInteger)offset; + (CGColorRef)RNSVGCGColor:(id)json offset:(NSUInteger)offset;
+ (CGGradientRef)RNSVGCGGradient:(id)json; + (CGGradientRef)RNSVGCGGradient:(id)json;
@end @end

View File

@ -4,10 +4,9 @@
https://github.com/erica/iOS-Drawing/tree/master/C08/Quartz%20Book%20Pack/Bezier https://github.com/erica/iOS-Drawing/tree/master/C08/Quartz%20Book%20Pack/Bezier
*/ */
#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "RNSVGUIKit.h"
#define RNSVGNULLPOINT CGRectNull.origin #define RNSVGNULLPOINT CGRectNull.origin
@interface RNSVGBezierElement : NSObject @interface RNSVGBezierElement : NSObject
@ -19,7 +18,8 @@
@property (nonatomic, assign) CGPoint controlPoint2; @property (nonatomic, assign) CGPoint controlPoint2;
// Instance creation // Instance creation
+ (instancetype)elementWithPathElement:(CGPathElement)element; + (instancetype) elementWithPathElement: (CGPathElement) element;
+ (NSArray *)elementsFromCGPath:(CGPathRef)path; + (NSArray *) elementsFromCGPath:(CGPathRef)path;
@end @end

View File

@ -12,7 +12,7 @@
@interface RNSVGBrush : NSObject @interface RNSVGBrush : NSObject
@property (nonatomic, strong) NSString *brushRef; @property (nonatomic, strong) NSString* brushRef;
/* @abstract */ /* @abstract */
- (instancetype)initWithArray:(NSArray *)data; - (instancetype)initWithArray:(NSArray *)data;

View File

@ -5,7 +5,6 @@
* This source code is licensed under the MIT-style license found in the * This source code is licensed under the MIT-style license found in the
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import <Foundation/Foundation.h>
typedef CF_ENUM(int32_t, RNSVGCGFCRule) { typedef CF_ENUM(int32_t, RNSVGCGFCRule) {
kRNSVGCGFCRuleEvenodd, kRNSVGCGFCRuleEvenodd,

View File

@ -12,8 +12,9 @@
@interface RNSVGCircle : RNSVGRenderable @interface RNSVGCircle : RNSVGRenderable
@property (nonatomic, strong) RNSVGLength *cx; @property (nonatomic, strong) RNSVGLength* cx;
@property (nonatomic, strong) RNSVGLength *cy; @property (nonatomic, strong) RNSVGLength* cy;
@property (nonatomic, strong) RNSVGLength *r; @property (nonatomic, strong) RNSVGLength* r;
@end @end

View File

@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "RNSVGGroupManager.h" #import "RNSVGNodeManager.h"
@interface RNSVGClipPathManager : RNSVGGroupManager @interface RNSVGClipPathManager : RNSVGNodeManager
@end @end

View File

@ -1,7 +0,0 @@
typedef CF_ENUM(int32_t, RNSVGColorMatrixType) {
SVG_FECOLORMATRIX_TYPE_UNKNOWN,
SVG_FECOLORMATRIX_TYPE_MATRIX,
SVG_FECOLORMATRIX_TYPE_SATURATE,
SVG_FECOLORMATRIX_TYPE_HUEROTATE,
SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA
};

View File

@ -1,18 +0,0 @@
#ifdef RCT_NEW_ARCH_ENABLED
#import <react/renderer/components/rnsvg/Props.h>
#import "RNSVGColorMatrixType.h"
#import "RNSVGEdgeMode.h"
#import "RNSVGUnits.h"
namespace react = facebook::react;
@interface RNSVGConvert : NSObject
+ (RNSVGUnits)RNSVGUnitsFromFilterUnitsCppEquivalent:(react::RNSVGFilterFilterUnits)svgUnits;
+ (RNSVGUnits)RNSVGUnitsFromPrimitiveUnitsCppEquivalent:(react::RNSVGFilterPrimitiveUnits)svgUnits;
+ (RNSVGColorMatrixType)RNSVGColorMatrixTypeFromCppEquivalent:(react::RNSVGFeColorMatrixType)type;
+ (RNSVGEdgeMode)RNSVGEdgeModeFromCppEquivalent:(react::RNSVGFeGaussianBlurEdgeMode)edgeMode;
@end
#endif // RCT_NEW_ARCH_ENABLED

View File

@ -9,7 +9,7 @@
#import "RNSVGNode.h" #import "RNSVGNode.h"
/** /**
* RNSVG defination are implemented as abstract views for all elements inside Defs. * RNSVG defination are implemented as abstract UIViews for all elements inside Defs.
*/ */
@interface RNSVGDefs : RNSVGNode @interface RNSVGDefs : RNSVGNode

View File

@ -6,8 +6,10 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "RNSVGNodeManager.h" #import <React/RCTViewManager.h>
@interface RNSVGDefsManager : RNSVGNodeManager @interface RNSVGDefsManager : RCTViewManager
@end @end
#import "RNSVGNode.h"

View File

@ -1,6 +0,0 @@
typedef CF_ENUM(int32_t, RNSVGEdgeMode) {
SVG_EDGEMODE_UNKNOWN,
SVG_EDGEMODE_DUPLICATE,
SVG_EDGEMODE_WRAP,
SVG_EDGEMODE_NONE
};

View File

@ -11,8 +11,8 @@
#import "RNSVGPath.h" #import "RNSVGPath.h"
@interface RNSVGEllipse : RNSVGRenderable @interface RNSVGEllipse : RNSVGRenderable
@property (nonatomic, strong) RNSVGLength *cx; @property (nonatomic, strong) RNSVGLength* cx;
@property (nonatomic, strong) RNSVGLength *cy; @property (nonatomic, strong) RNSVGLength* cy;
@property (nonatomic, strong) RNSVGLength *rx; @property (nonatomic, strong) RNSVGLength* rx;
@property (nonatomic, strong) RNSVGLength *ry; @property (nonatomic, strong) RNSVGLength* ry;
@end @end

View File

@ -1,10 +0,0 @@
#import "RNSVGColorMatrixType.h"
#import "RNSVGFilterPrimitive.h"
@interface RNSVGFeColorMatrix : RNSVGFilterPrimitive
@property (nonatomic, strong) NSString *in1;
@property (nonatomic, assign) RNSVGColorMatrixType type;
@property (nonatomic, strong) NSArray<NSNumber *> *values;
@end

View File

@ -1,5 +0,0 @@
#import "RNSVGFilterPrimitiveManager.h"
@interface RNSVGFeColorMatrixManager : RNSVGFilterPrimitiveManager
@end

View File

@ -1,11 +0,0 @@
#import "RNSVGEdgeMode.h"
#import "RNSVGFilterPrimitive.h"
@interface RNSVGFeGaussianBlur : RNSVGFilterPrimitive
@property (nonatomic, strong) NSString *in1;
@property (nonatomic, strong) NSNumber *stdDeviationX;
@property (nonatomic, strong) NSNumber *stdDeviationY;
@property (nonatomic, assign) RNSVGEdgeMode edgeMode;
@end

View File

@ -1,5 +0,0 @@
#import "RNSVGFilterPrimitiveManager.h"
@interface RNSVGFeGaussianBlurManager : RNSVGFilterPrimitiveManager
@end

View File

@ -1,7 +0,0 @@
#import "RNSVGFilterPrimitive.h"
@interface RNSVGFeMerge : RNSVGFilterPrimitive
@property (nonatomic, copy) NSArray<NSString *> *nodes;
@end

View File

@ -1,5 +0,0 @@
#import "RNSVGFilterPrimitiveManager.h"
@interface RNSVGFeMergeManager : RNSVGFilterPrimitiveManager
@end

View File

@ -1,9 +0,0 @@
#import "RNSVGFilterPrimitive.h"
@interface RNSVGFeOffset : RNSVGFilterPrimitive
@property (nonatomic, strong) NSString *in1;
@property (nonatomic, strong) RNSVGLength *dx;
@property (nonatomic, strong) RNSVGLength *dy;
@end

View File

@ -1,5 +0,0 @@
#import "RNSVGFilterPrimitiveManager.h"
@interface RNSVGFeOffsetManager : RNSVGFilterPrimitiveManager
@end

View File

@ -1,22 +0,0 @@
#import "RNSVGFilterRegion.h"
#import "RNSVGNode.h"
@interface RNSVGFilter : RNSVGNode
@property (nonatomic, strong) RNSVGLength *x;
@property (nonatomic, strong) RNSVGLength *y;
@property (nonatomic, strong) RNSVGLength *width;
@property (nonatomic, strong) RNSVGLength *height;
@property (nonatomic, assign) RNSVGUnits filterUnits;
@property (nonatomic, assign) RNSVGUnits primitiveUnits;
- (CIImage *)applyFilter:(CIImage *)img
backgroundImg:(CIImage *)backgroundImg
renderableBounds:(CGRect)renderableBounds
canvasBounds:(CGRect)canvasBounds
ctm:(CGAffineTransform)ctm;
- (CGContext *)openContext:(CGSize)size;
- (void)endContext:(CGContext *)context;
- (CIImage *)getMaskFromRect:(CGContext *)context rect:(CGRect)rect ctm:(CGAffineTransform)ctm;
@end

View File

@ -1,5 +0,0 @@
#import "RNSVGNodeManager.h"
@interface RNSVGFilterManager : RNSVGNodeManager
@end

View File

@ -1,17 +0,0 @@
#import "RNSVGFilterRegion.h"
#import "RNSVGNode.h"
@interface RNSVGFilterPrimitive : RNSVGNode
@property (nonatomic, strong) RNSVGLength *x;
@property (nonatomic, strong) RNSVGLength *y;
@property (nonatomic, strong) RNSVGLength *width;
@property (nonatomic, strong) RNSVGLength *height;
@property (nonatomic, strong) NSString *result;
- (CIImage *)applyFilter:(NSMutableDictionary<NSString *, CIImage *> *)results previousFilterResult:(CIImage *)previous;
- (CIImage *)applyFilter:(NSMutableDictionary<NSString *, CIImage *> *)results
previousFilterResult:(CIImage *)previous
ctm:(CGAffineTransform)ctm;
@end

View File

@ -1,5 +0,0 @@
#import "RNSVGNodeManager.h"
@interface RNSVGFilterPrimitiveManager : RNSVGNodeManager
@end

View File

@ -1,19 +0,0 @@
#import "RNSVGNode.h"
#import "RNSVGUnits.h"
#ifndef RNSVGFilterRegion_h
#define RNSVGFilterRegion_h
@interface RNSVGFilterRegion : NSObject
@property (nonatomic, strong) RNSVGLength *x;
@property (nonatomic, strong) RNSVGLength *y;
@property (nonatomic, strong) RNSVGLength *width;
@property (nonatomic, strong) RNSVGLength *height;
+ (instancetype)regionWithX:(RNSVGLength *)x y:(RNSVGLength *)y width:(RNSVGLength *)width height:(RNSVGLength *)height;
- (CGRect)getCropRect:(RNSVGNode *)node units:(RNSVGUnits)units renderableBounds:(CGRect)renderableBounds;
@end
#endif /* RNSVGFilterRegion_h */

View File

@ -1,17 +1,16 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import "RNSVGUIKit.h"
#import "RNSVGPropHelper.h"
#import "RNSVGTextProperties.h" #import "RNSVGTextProperties.h"
#import "RNSVGPropHelper.h"
@interface RNSVGFontData : NSObject { @interface RNSVGFontData : NSObject {
@public @public
CGFloat fontSize; CGFloat fontSize;
NSString *fontSize_; NSString * fontSize_;
NSString *fontFamily; NSString *fontFamily;
enum RNSVGFontStyle fontStyle; enum RNSVGFontStyle fontStyle;
NSDictionary *fontData; NSDictionary * fontData;
enum RNSVGFontWeight fontWeight; enum RNSVGFontWeight fontWeight;
int absoluteFontWeight; int absoluteFontWeight;
NSString *fontFeatureSettings; NSString *fontFeatureSettings;
@ -26,9 +25,11 @@
+ (instancetype)Defaults; + (instancetype)Defaults;
+ (CGFloat)toAbsoluteWithNSString:(NSString *)string fontSize:(CGFloat)fontSize; + (CGFloat)toAbsoluteWithNSString:(NSString *)string
fontSize:(CGFloat)fontSize;
+ (instancetype)initWithNSDictionary:(NSDictionary *)font parent:(RNSVGFontData *)parent; + (instancetype)initWithNSDictionary:(NSDictionary *)font
parent:(RNSVGFontData *)parent;
@end @end

View File

@ -1,5 +1,5 @@
#import <CoreText/CoreText.h>
#import <React/UIView+React.h> #import <React/UIView+React.h>
#import <CoreText/CoreText.h>
#import "RNSVGFontData.h" #import "RNSVGFontData.h"
@class RNSVGText; @class RNSVGText;
@ -10,7 +10,8 @@
- (CTFontRef)getGlyphFont; - (CTFontRef)getGlyphFont;
- (instancetype)initWithWidth:(CGFloat)width height:(CGFloat)height; - (instancetype)initWithWidth:(CGFloat)width
height:(CGFloat)height;
- (RNSVGFontData *)getFont; - (RNSVGFontData *)getFont;
@ -32,16 +33,17 @@
- (void)popContext; - (void)popContext;
- (void)pushContext:(RNSVGText *)node - (void)pushContext:(RNSVGText*)node
font:(NSDictionary *)font font:(NSDictionary*)font
x:(NSArray<RNSVGLength *> *)x x:(NSArray<RNSVGLength*>*)x
y:(NSArray<RNSVGLength *> *)y y:(NSArray<RNSVGLength*>*)y
deltaX:(NSArray<RNSVGLength *> *)deltaX deltaX:(NSArray<RNSVGLength*>*)deltaX
deltaY:(NSArray<RNSVGLength *> *)deltaY deltaY:(NSArray<RNSVGLength*>*)deltaY
rotate:(NSArray<RNSVGLength *> *)rotate; rotate:(NSArray<RNSVGLength*>*)rotate;
- (void)pushContext:(RNSVGGroup *)node font:(NSDictionary *)font; - (void)pushContext:(RNSVGGroup*)node
font:(NSDictionary *)font;
- (NSArray *)getFontContext; - (NSArray*)getFontContext;
@end @end

View File

@ -7,14 +7,12 @@
*/ */
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import "RNSVGUIKit.h"
#import "RNSVGCGFCRule.h"
#import "RNSVGContainer.h" #import "RNSVGContainer.h"
#import "RNSVGGlyphContext.h" #import "RNSVGCGFCRule.h"
#import "RNSVGPath.h"
#import "RNSVGSvgView.h" #import "RNSVGSvgView.h"
#import "RNSVGPath.h"
#import "RNSVGGlyphContext.h"
@interface RNSVGGroup : RNSVGPath <RNSVGContainer> @interface RNSVGGroup : RNSVGPath <RNSVGContainer>

View File

@ -9,29 +9,19 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <React/RCTBridge.h> #import <React/RCTBridge.h>
#import "RNSVGLength.h"
#import "RNSVGRenderable.h" #import "RNSVGRenderable.h"
#import "RNSVGVBMOS.h" #import "RNSVGVBMOS.h"
#import "RNSVGLength.h"
#import <React/RCTImageSource.h>
#ifdef RCT_NEW_ARCH_ENABLED
#import <React/RCTImageResponseDelegate.h>
#endif
@interface RNSVGImage : RNSVGRenderable @interface RNSVGImage : RNSVGRenderable
#ifdef RCT_NEW_ARCH_ENABLED
<RCTImageResponseDelegate>
#endif
@property (nonatomic, weak) RCTBridge *bridge; @property (nonatomic, weak) RCTBridge *bridge;
@property (nonatomic, assign) RCTImageSource *src; @property (nonatomic, assign) id src;
@property (nonatomic, strong) RNSVGLength *x; @property (nonatomic, strong) RNSVGLength* x;
@property (nonatomic, strong) RNSVGLength *y; @property (nonatomic, strong) RNSVGLength* y;
@property (nonatomic, strong) RNSVGLength *imagewidth; @property (nonatomic, strong) RNSVGLength* imagewidth;
@property (nonatomic, strong) RNSVGLength *imageheight; @property (nonatomic, strong) RNSVGLength* imageheight;
@property (nonatomic, strong) NSString *align; @property (nonatomic, strong) NSString *align;
@property (nonatomic, assign) RNSVGVBMOS meetOrSlice; @property (nonatomic, assign) RNSVGVBMOS meetOrSlice;
@property (nonatomic, copy) RCTDirectEventBlock onLoad;
@end @end

View File

@ -1,4 +1,4 @@
#import "RNSVGUIKit.h" #import <UIKit/UIKit.h>
#ifndef RNSVGLength_h #ifndef RNSVGLength_h
#define RNSVGLength_h #define RNSVGLength_h
@ -23,9 +23,9 @@ typedef CF_ENUM(unsigned short, RNSVGLengthUnitType) {
@property (nonatomic, assign) CGFloat value; @property (nonatomic, assign) CGFloat value;
@property (nonatomic, assign) RNSVGLengthUnitType unit; @property (nonatomic, assign) RNSVGLengthUnitType unit;
+ (instancetype)lengthWithNumber:(CGFloat)number; + (instancetype) lengthWithNumber: (CGFloat) number;
+ (instancetype)lengthWithString:(NSString *)lengthString; + (instancetype) lengthWithString: (NSString *) lengthString;
- (BOOL)isEqualTo:(RNSVGLength *)other; - (BOOL) isEqualTo: (RNSVGLength *)other;
@end @end

View File

@ -11,8 +11,8 @@
#import "RNSVGPath.h" #import "RNSVGPath.h"
@interface RNSVGLine : RNSVGRenderable @interface RNSVGLine : RNSVGRenderable
@property (nonatomic, strong) RNSVGLength *x1; @property (nonatomic, strong) RNSVGLength* x1;
@property (nonatomic, strong) RNSVGLength *y1; @property (nonatomic, strong) RNSVGLength* y1;
@property (nonatomic, strong) RNSVGLength *x2; @property (nonatomic, strong) RNSVGLength* x2;
@property (nonatomic, strong) RNSVGLength *y2; @property (nonatomic, strong) RNSVGLength* y2;
@end @end

View File

@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "RNSVGLength.h"
#import "RNSVGNode.h" #import "RNSVGNode.h"
#import "RNSVGLength.h"
@interface RNSVGLinearGradient : RNSVGNode @interface RNSVGLinearGradient : RNSVGNode

View File

@ -19,9 +19,6 @@
@property (nonatomic, strong) NSString *align; @property (nonatomic, strong) NSString *align;
@property (nonatomic, assign) RNSVGVBMOS meetOrSlice; @property (nonatomic, assign) RNSVGVBMOS meetOrSlice;
- (void)renderMarker:(CGContextRef)context - (void)renderMarker:(CGContextRef)context rect:(CGRect)rect position:(RNSVGMarkerPosition*)position strokeWidth:(CGFloat)strokeWidth;
rect:(CGRect)rect
position:(RNSVGMarkerPosition *)position
strokeWidth:(CGFloat)strokeWidth;
@end @end

View File

@ -1,8 +1,12 @@
#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "RNSVGUIKit.h" typedef enum RNSVGMarkerType {
kStartMarker,
typedef enum RNSVGMarkerType { kStartMarker, kMidMarker, kEndMarker } RNSVGMarkerType; kMidMarker,
kEndMarker
} RNSVGMarkerType;
#define RNSVGZEROPOINT CGRectZero.origin #define RNSVGZEROPOINT CGRectZero.origin
@ -14,8 +18,8 @@ typedef enum RNSVGMarkerType { kStartMarker, kMidMarker, kEndMarker } RNSVGMarke
@property (nonatomic, assign) float angle; @property (nonatomic, assign) float angle;
// Instance creation // Instance creation
+ (instancetype)markerPosition:(RNSVGMarkerType)type origin:(CGPoint)origin angle:(float)angle; + (instancetype) markerPosition:(RNSVGMarkerType)type origin:(CGPoint)origin angle:(float)angle;
+ (NSArray<RNSVGMarkerPosition *> *)fromCGPath:(CGPathRef)path; + (NSArray<RNSVGMarkerPosition*>*) fromCGPath:(CGPathRef)path;
@end @end

View File

@ -10,6 +10,6 @@
@property (nonatomic, strong) RNSVGLength *maskheight; @property (nonatomic, strong) RNSVGLength *maskheight;
@property (nonatomic, assign) RNSVGUnits maskUnits; @property (nonatomic, assign) RNSVGUnits maskUnits;
@property (nonatomic, assign) RNSVGUnits maskContentUnits; @property (nonatomic, assign) RNSVGUnits maskContentUnits;
@property (nonatomic, assign) RNSVGMaskType maskType; @property (nonatomic, assign) CGAffineTransform maskTransform;
@end @end

View File

@ -1,4 +0,0 @@
typedef CF_ENUM(int32_t, RNSVGMaskType) {
kRNSVGMaskTypeLuminance,
kRNSVGMaskTypeAlpha
};

View File

@ -6,20 +6,19 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import <React/UIView+React.h>
#import <React/RCTPointerEvents.h>
#import "RNSVGCGFCRule.h" #import "RNSVGCGFCRule.h"
#import "RNSVGSvgView.h" #import "RNSVGSvgView.h"
#import <React/RCTPointerEvents.h>
#import <React/UIView+React.h>
@class RNSVGGroup; @class RNSVGGroup;
/** /**
* RNSVG nodes are implemented as base NSViews/UIViews. They should be implementation for all basic * RNSVG nodes are implemented as base UIViews. They should be implementation for all basic
interfaces for all non-definition nodes. interfaces for all non-definition nodes.
*/ */
@interface RNSVGNode : RNSVGView @interface RNSVGNode : UIView
/* /*
N[1/Sqrt[2], 36] N[1/Sqrt[2], 36]
The inverse of the square root of 2. The inverse of the square root of 2.
@ -37,7 +36,6 @@ extern CGFloat const RNSVG_DEFAULT_FONT_SIZE;
@property (nonatomic, strong) NSString *markerStart; @property (nonatomic, strong) NSString *markerStart;
@property (nonatomic, strong) NSString *markerMid; @property (nonatomic, strong) NSString *markerMid;
@property (nonatomic, strong) NSString *markerEnd; @property (nonatomic, strong) NSString *markerEnd;
@property (nonatomic, strong) RNSVGPlatformView *parentComponentView;
/** /**
* Used to control how touch events are processed. * Used to control how touch events are processed.
@ -65,6 +63,7 @@ extern CGFloat const RNSVG_DEFAULT_FONT_SIZE;
@property (nonatomic, assign) CGRect markerBounds; @property (nonatomic, assign) CGRect markerBounds;
@property (nonatomic, copy) RCTDirectEventBlock onLayout; @property (nonatomic, copy) RCTDirectEventBlock onLayout;
/** /**
* RNSVGSvgView which ownes current RNSVGNode * RNSVGSvgView which ownes current RNSVGNode
*/ */
@ -102,7 +101,7 @@ extern CGFloat const RNSVG_DEFAULT_FONT_SIZE;
/** /**
* getPath will return the path inside node as a ClipPath. * getPath will return the path inside node as a ClipPath.
*/ */
- (CGPathRef)getPath:(CGContextRef)context; - (CGPathRef)getPath:(CGContextRef) context;
- (CGFloat)relativeOnWidthString:(NSString *)length; - (CGFloat)relativeOnWidthString:(NSString *)length;
@ -112,8 +111,6 @@ extern CGFloat const RNSVG_DEFAULT_FONT_SIZE;
- (CGFloat)relativeOn:(RNSVGLength *)length relative:(CGFloat)relative; - (CGFloat)relativeOn:(RNSVGLength *)length relative:(CGFloat)relative;
- (CGFloat)relativeOnFraction:(RNSVGLength *)length relative:(CGFloat)relative;
- (CGFloat)relativeOnWidth:(RNSVGLength *)length; - (CGFloat)relativeOnWidth:(RNSVGLength *)length;
- (CGFloat)relativeOnHeight:(RNSVGLength *)length; - (CGFloat)relativeOnHeight:(RNSVGLength *)length;
@ -135,7 +132,7 @@ extern CGFloat const RNSVG_DEFAULT_FONT_SIZE;
- (void)endTransparencyLayer:(CGContextRef)context; - (void)endTransparencyLayer:(CGContextRef)context;
- (void)traverseSubviews:(BOOL (^)(__kindof RNSVGView *node))block; - (void)traverseSubviews:(BOOL (^)(__kindof UIView *node))block;
- (void)clearChildCache; - (void)clearChildCache;

View File

@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import <React/RCTViewManager.h>
#import "RNSVGNode.h" #import "RNSVGNode.h"
#import <React/RCTViewManager.h>
@interface RNSVGNodeManager : RCTViewManager @interface RNSVGNodeManager : RCTViewManager

View File

@ -8,14 +8,14 @@
#import "RCTConvert+RNSVG.h" #import "RCTConvert+RNSVG.h"
#import "RNSVGBrushType.h" #import "RNSVGBrushType.h"
#import "RNSVGLength.h"
#import "RNSVGUnits.h" #import "RNSVGUnits.h"
#import "RNSVGLength.h"
@class RNSVGPattern; @class RNSVGPattern;
@interface RNSVGPainter : NSObject @interface RNSVGPainter : NSObject
@property (nonatomic, assign) RNSVGPattern *pattern; @property (nonatomic, assign) RNSVGPattern* pattern;
@property (nonatomic, assign) CGRect paintBounds; @property (nonatomic, assign) CGRect paintBounds;
@property (nonatomic, assign) bool useObjectBoundingBoxForContentUnits; @property (nonatomic, assign) bool useObjectBoundingBoxForContentUnits;
@property (nonatomic, assign) CGRect bounds; @property (nonatomic, assign) CGRect bounds;

View File

@ -6,7 +6,7 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "RNSVGUIKit.h" #import <UIKit/UIKit.h>
@interface RNSVGPathMeasure : NSObject @interface RNSVGPathMeasure : NSObject

View File

@ -6,11 +6,12 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "RNSVGUIKit.h"
#import <UIKit/UIKit.h>
@interface RNSVGPathParser : NSObject @interface RNSVGPathParser : NSObject
- (instancetype)initWithPathString:(NSString *)d; - (instancetype) initWithPathString:(NSString *)d;
- (CGPathRef)getPath; - (CGPathRef)getPath;
@end @end

View File

@ -7,11 +7,16 @@
@interface RNSVGPropHelper : NSObject @interface RNSVGPropHelper : NSObject
+ (CGFloat)fromRelativeWithNSString:(NSString *)length relative:(CGFloat)relative fontSize:(CGFloat)fontSize; + (CGFloat) fromRelativeWithNSString:(NSString *)length
relative:(CGFloat)relative
fontSize:(CGFloat)fontSize;
+ (CGFloat)fromRelative:(RNSVGLength *)length relative:(CGFloat)relative fontSize:(CGFloat)fontSize; + (CGFloat) fromRelative:(RNSVGLength*)length
relative:(CGFloat)relative
fontSize:(CGFloat)fontSize;
+ (CGFloat)fromRelative:(RNSVGLength *)length relative:(CGFloat)relative; + (CGFloat)fromRelative:(RNSVGLength*)length
relative:(CGFloat)relative;
@end @end
#endif #endif

View File

@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "RNSVGLength.h"
#import "RNSVGNode.h" #import "RNSVGNode.h"
#import "RNSVGLength.h"
@interface RNSVGRadialGradient : RNSVGNode @interface RNSVGRadialGradient : RNSVGNode

View File

@ -12,11 +12,11 @@
@interface RNSVGRect : RNSVGRenderable @interface RNSVGRect : RNSVGRenderable
@property (nonatomic, strong) RNSVGLength *x; @property (nonatomic, strong) RNSVGLength* x;
@property (nonatomic, strong) RNSVGLength *y; @property (nonatomic, strong) RNSVGLength* y;
@property (nonatomic, strong) RNSVGLength *rectwidth; @property (nonatomic, strong) RNSVGLength* rectwidth;
@property (nonatomic, strong) RNSVGLength *rectheight; @property (nonatomic, strong) RNSVGLength* rectheight;
@property (nonatomic, strong) RNSVGLength *rx; @property (nonatomic, strong) RNSVGLength* rx;
@property (nonatomic, strong) RNSVGLength *ry; @property (nonatomic, strong) RNSVGLength* ry;
@end @end

View File

@ -1,12 +0,0 @@
#import "RNSVGRenderable.h"
@interface RNSVGRenderUtils : NSObject
+ (CIContext *)sharedCIContext;
+ (CGFloat)getScreenScale;
+ (CGImage *)renderToImage:(RNSVGRenderable *)renderable
ctm:(CGAffineTransform)ctm
rect:(CGRect)rect
clip:(CGRect *)clip;
@end

View File

@ -8,12 +8,10 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "RNSVGUIKit.h"
#import "RNSVGBrush.h" #import "RNSVGBrush.h"
#import "RNSVGCGFCRule.h" #import "RNSVGCGFCRule.h"
#import "RNSVGLength.h"
#import "RNSVGNode.h" #import "RNSVGNode.h"
#import "RNSVGLength.h"
#import "RNSVGVectorEffect.h" #import "RNSVGVectorEffect.h"
@interface RNSVGRenderable : RNSVGNode @interface RNSVGRenderable : RNSVGNode
@ -33,7 +31,6 @@
@property (nonatomic, assign) RNSVGVectorEffect vectorEffect; @property (nonatomic, assign) RNSVGVectorEffect vectorEffect;
@property (nonatomic, copy) NSArray<NSString *> *propList; @property (nonatomic, copy) NSArray<NSString *> *propList;
@property (nonatomic, assign) CGPathRef hitArea; @property (nonatomic, assign) CGPathRef hitArea;
@property (nonatomic, strong) NSString *filter;
- (void)setHitArea:(CGPathRef)path; - (void)setHitArea:(CGPathRef)path;

View File

@ -1,21 +0,0 @@
/**
* Copyright (c) 2015-present, Horcrux.
* All rights reserved.
*
* This source code is licensed under the MIT-style license found in the
* LICENSE file in the root directory of this source tree.
*/
#ifdef RCT_NEW_ARCH_ENABLED
#import <rnsvg/rnsvg.h>
#else
#import <React/RCTBridge.h>
#endif
@interface RNSVGRenderableModule : NSObject
#ifdef RCT_NEW_ARCH_ENABLED
<NativeSvgRenderableModuleSpec>
#else
<RCTBridgeModule>
#endif
@end

View File

@ -11,6 +11,5 @@
@interface RNSVGSolidColorBrush : RNSVGBrush @interface RNSVGSolidColorBrush : RNSVGBrush
- (instancetype)initWithNumber:(NSNumber *)number; - (instancetype)initWithNumber:(NSNumber *)number;
- (instancetype)initWithColor:(RNSVGColor *)color;
@end @end

View File

@ -6,18 +6,14 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "RNSVGUIKit.h" #import <UIKit/UIKit.h>
#import "RNSVGContainer.h"
#import "RNSVGPainter.h" #import "RNSVGPainter.h"
#import "RNSVGContainer.h"
#import "RNSVGVBMOS.h" #import "RNSVGVBMOS.h"
@class RNSVGNode; @class RNSVGNode;
@class RNSVGMarker;
@class RNSVGMask;
@class RNSVGFilter;
@interface RNSVGSvgView : RNSVGView <RNSVGContainer> @interface RNSVGSvgView : UIView <RNSVGContainer>
@property (nonatomic, strong) RNSVGLength *bbWidth; @property (nonatomic, strong) RNSVGLength *bbWidth;
@property (nonatomic, strong) RNSVGLength *bbHeight; @property (nonatomic, strong) RNSVGLength *bbHeight;
@ -33,7 +29,8 @@
@property (nonatomic, assign) CGAffineTransform initialCTM; @property (nonatomic, assign) CGAffineTransform initialCTM;
@property (nonatomic, assign) CGAffineTransform invInitialCTM; @property (nonatomic, assign) CGAffineTransform invInitialCTM;
@property (nonatomic, assign) CGAffineTransform viewBoxTransform; @property (nonatomic, assign) CGAffineTransform viewBoxTransform;
@property (nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;
/** /**
* define <ClipPath></ClipPath> content as clipPath template. * define <ClipPath></ClipPath> content as clipPath template.
@ -42,7 +39,7 @@
- (RNSVGNode *)getDefinedClipPath:(NSString *)clipPathName; - (RNSVGNode *)getDefinedClipPath:(NSString *)clipPathName;
- (void)defineTemplate:(__kindof RNSVGNode *)definedTemplate templateName:(NSString *)templateName; - (void)defineTemplate:(__kindof RNSVGNode *)template templateName:(NSString *)templateName;
- (RNSVGNode *)getDefinedTemplate:(NSString *)templateName; - (RNSVGNode *)getDefinedTemplate:(NSString *)templateName;
@ -50,19 +47,17 @@
- (RNSVGPainter *)getDefinedPainter:(NSString *)painterName; - (RNSVGPainter *)getDefinedPainter:(NSString *)painterName;
- (void)defineMarker:(RNSVGMarker *)marker markerName:(NSString *)markerName; - (void)defineMarker:(RNSVGNode *)marker markerName:(NSString *)markerName;
- (RNSVGMarker *)getDefinedMarker:(NSString *)markerName; - (RNSVGNode *)getDefinedMarker:(NSString *)markerName;
- (void)defineMask:(RNSVGMask *)mask maskName:(NSString *)maskName; - (void)defineMask:(RNSVGNode *)mask maskName:(NSString *)maskName;
- (RNSVGMask *)getDefinedMask:(NSString *)maskName; - (RNSVGNode *)getDefinedMask:(NSString *)maskName;
- (void)defineFilter:(RNSVGFilter *)filter filterName:(NSString *)filterName; - (NSString *)getDataURL;
- (RNSVGFilter *)getDefinedFilter:(NSString *)filterName; - (NSString *)getDataURLwithBounds:(CGRect)bounds;
- (NSString *)getDataURLWithBounds:(CGRect)bounds;
- (CGRect)getContextBounds; - (CGRect)getContextBounds;

View File

@ -1,21 +0,0 @@
/**
* Copyright (c) 2015-present, Horcrux.
* All rights reserved.
*
* This source code is licensed under the MIT-style license found in the
* LICENSE file in the root directory of this source tree.
*/
#ifdef RCT_NEW_ARCH_ENABLED
#import <rnsvg/rnsvg.h>
#else
#import <React/RCTBridge.h>
#endif
@interface RNSVGSvgViewModule : NSObject
#ifdef RCT_NEW_ARCH_ENABLED
<NativeSvgViewModuleSpec>
#else
<RCTBridgeModule>
#endif
@end

View File

@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "RNSVGGroupManager.h" #import "RNSVGNodeManager.h"
@interface RNSVGSymbolManager : RNSVGGroupManager @interface RNSVGSymbolManager : RNSVGNodeManager
@end @end

View File

@ -5,12 +5,9 @@
* This source code is licensed under the MIT-style license found in the * This source code is licensed under the MIT-style license found in the
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import <UIKit/UIKit.h>
#import <CoreText/CoreText.h>
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <CoreText/CoreText.h>
#import "RNSVGUIKit.h"
#import "RNSVGText.h" #import "RNSVGText.h"
@interface RNSVGTSpan : RNSVGText @interface RNSVGTSpan : RNSVGText

View File

@ -25,6 +25,6 @@
- (CGPathRef)getGroupPath:(CGContextRef)context; - (CGPathRef)getGroupPath:(CGContextRef)context;
- (CTFontRef)getFontFromContext; - (CTFontRef)getFontFromContext;
- (CGFloat)getSubtreeTextChunksTotalAdvance; - (CGFloat)getSubtreeTextChunksTotalAdvance;
- (RNSVGText *)getTextAnchorRoot; - (RNSVGText*)getTextAnchorRoot;
@end @end

View File

@ -6,10 +6,10 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import <CoreText/CoreText.h>
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "RNSVGLength.h" #import <CoreText/CoreText.h>
#import "RNSVGText.h" #import "RNSVGText.h"
#import "RNSVGLength.h"
@interface RNSVGTextPath : RNSVGText @interface RNSVGTextPath : RNSVGText

View File

@ -8,6 +8,6 @@
#import "RNSVGTextManager.h" #import "RNSVGTextManager.h"
@interface RNSVGTextPathManager : RNSVGTextManager @interface RNSVGTextPathManager : RNSVGRenderableManager
@end @end

View File

@ -30,15 +30,35 @@ typedef NS_ENUM(NSInteger, RNSVGAlignmentBaseline) {
RNSVGAlignmentBaselineDEFAULT = RNSVGAlignmentBaselineBaseline RNSVGAlignmentBaselineDEFAULT = RNSVGAlignmentBaselineBaseline
}; };
static NSString *const RNSVGAlignmentBaselineStrings[] = { static NSString* const RNSVGAlignmentBaselineStrings[] = {
@"baseline", @"text-bottom", @"alphabetic", @"ideographic", @"middle", @"central", @"baseline",
@"mathematical", @"text-top", @"bottom", @"center", @"top", @"text-before-edge", @"text-bottom",
@"text-after-edge", @"before-edge", @"after-edge", @"hanging", @"central", @"mathematical", @"alphabetic",
@"text-top", @"bottom", @"center", @"top", nil}; @"ideographic",
@"middle",
@"central",
@"mathematical",
@"text-top",
@"bottom",
@"center",
@"top",
@"text-before-edge",
@"text-after-edge",
@"before-edge",
@"after-edge",
@"hanging",
@"central",
@"mathematical",
@"text-top",
@"bottom",
@"center",
@"top",
nil
};
NSString *RNSVGAlignmentBaselineToString(enum RNSVGAlignmentBaseline fw); NSString* RNSVGAlignmentBaselineToString( enum RNSVGAlignmentBaseline fw );
enum RNSVGAlignmentBaseline RNSVGAlignmentBaselineFromString(NSString *s); enum RNSVGAlignmentBaseline RNSVGAlignmentBaselineFromString( NSString* s );
typedef NS_ENUM(NSInteger, RNSVGFontStyle) { typedef NS_ENUM(NSInteger, RNSVGFontStyle) {
RNSVGFontStyleNormal, RNSVGFontStyleNormal,
@ -47,11 +67,11 @@ typedef NS_ENUM(NSInteger, RNSVGFontStyle) {
RNSVGFontStyleDEFAULT = RNSVGFontStyleNormal, RNSVGFontStyleDEFAULT = RNSVGFontStyleNormal,
}; };
static NSString *const RNSVGFontStyleStrings[] = {@"normal", @"italic", @"oblique", nil}; static NSString* const RNSVGFontStyleStrings[] = {@"normal", @"italic", @"oblique", nil};
NSString *RNSVGFontStyleToString(enum RNSVGFontStyle fw); NSString* RNSVGFontStyleToString( enum RNSVGFontStyle fw );
enum RNSVGFontStyle RNSVGFontStyleFromString(NSString *s); enum RNSVGFontStyle RNSVGFontStyleFromString( NSString* s );
typedef NS_ENUM(NSInteger, RNSVGFontVariantLigatures) { typedef NS_ENUM(NSInteger, RNSVGFontVariantLigatures) {
RNSVGFontVariantLigaturesNormal, RNSVGFontVariantLigaturesNormal,
@ -59,11 +79,11 @@ typedef NS_ENUM(NSInteger, RNSVGFontVariantLigatures) {
RNSVGFontVariantLigaturesDEFAULT = RNSVGFontVariantLigaturesNormal, RNSVGFontVariantLigaturesDEFAULT = RNSVGFontVariantLigaturesNormal,
}; };
static NSString *const RNSVGFontVariantLigaturesStrings[] = {@"normal", @"none", nil}; static NSString* const RNSVGFontVariantLigaturesStrings[] = {@"normal", @"none", nil};
NSString *RNSVGFontVariantLigaturesToString(enum RNSVGFontVariantLigatures fw); NSString* RNSVGFontVariantLigaturesToString( enum RNSVGFontVariantLigatures fw );
enum RNSVGFontVariantLigatures RNSVGFontVariantLigaturesFromString(NSString *s); enum RNSVGFontVariantLigatures RNSVGFontVariantLigaturesFromString( NSString* s );
typedef NS_ENUM(NSInteger, RNSVGFontWeight) { typedef NS_ENUM(NSInteger, RNSVGFontWeight) {
// Absolute // Absolute
@ -84,21 +104,7 @@ typedef NS_ENUM(NSInteger, RNSVGFontWeight) {
RNSVGFontWeightDEFAULT = RNSVGFontWeightNormal, RNSVGFontWeightDEFAULT = RNSVGFontWeightNormal,
}; };
static NSString *const RNSVGFontWeightStrings[] = { static NSString* const RNSVGFontWeightStrings[] = {@"normal", @"bold", @"100", @"200", @"300", @"400", @"500", @"600", @"700", @"800", @"900", @"bolder", @"lighter", nil};
@"normal",
@"bold",
@"100",
@"200",
@"300",
@"400",
@"500",
@"600",
@"700",
@"800",
@"900",
@"bolder",
@"lighter",
nil};
static int const RNSVGAbsoluteFontWeights[] = {400, 700, 100, 200, 300, 400, 500, 600, 700, 800, 900}; static int const RNSVGAbsoluteFontWeights[] = {400, 700, 100, 200, 300, 400, 500, 600, 700, 800, 900};
@ -113,11 +119,12 @@ static RNSVGFontWeight const RNSVGFontWeights[] = {
RNSVGFontWeightBold, RNSVGFontWeightBold,
RNSVGFontWeight800, RNSVGFontWeight800,
RNSVGFontWeight900, RNSVGFontWeight900,
RNSVGFontWeight900}; RNSVGFontWeight900
};
NSString *RNSVGFontWeightToString(enum RNSVGFontWeight fw); NSString* RNSVGFontWeightToString( enum RNSVGFontWeight fw );
NSInteger RNSVGFontWeightFromString(NSString *s); enum RNSVGFontWeight RNSVGFontWeightFromString( NSString* s );
typedef NS_ENUM(NSInteger, RNSVGTextAnchor) { typedef NS_ENUM(NSInteger, RNSVGTextAnchor) {
RNSVGTextAnchorStart, RNSVGTextAnchorStart,
@ -126,11 +133,11 @@ typedef NS_ENUM(NSInteger, RNSVGTextAnchor) {
RNSVGTextAnchorDEFAULT = RNSVGTextAnchorStart, RNSVGTextAnchorDEFAULT = RNSVGTextAnchorStart,
}; };
static NSString *const RNSVGTextAnchorStrings[] = {@"start", @"middle", @"end", nil}; static NSString* const RNSVGTextAnchorStrings[] = {@"start", @"middle", @"end", nil};
NSString *RNSVGTextAnchorToString(enum RNSVGTextAnchor fw); NSString* RNSVGTextAnchorToString( enum RNSVGTextAnchor fw );
enum RNSVGTextAnchor RNSVGTextAnchorFromString(NSString *s); enum RNSVGTextAnchor RNSVGTextAnchorFromString( NSString* s );
typedef NS_ENUM(NSInteger, RNSVGTextDecoration) { typedef NS_ENUM(NSInteger, RNSVGTextDecoration) {
RNSVGTextDecorationNone, RNSVGTextDecorationNone,
@ -141,12 +148,11 @@ typedef NS_ENUM(NSInteger, RNSVGTextDecoration) {
RNSVGTextDecorationDEFAULT = RNSVGTextDecorationNone, RNSVGTextDecorationDEFAULT = RNSVGTextDecorationNone,
}; };
static NSString *const RNSVGTextDecorationStrings[] = static NSString* const RNSVGTextDecorationStrings[] = {@"None", @"Underline", @"Overline", @"LineThrough", @"Blink", nil};
{@"None", @"Underline", @"Overline", @"LineThrough", @"Blink", nil};
NSString *RNSVGTextDecorationToString(enum RNSVGTextDecoration fw); NSString* RNSVGTextDecorationToString( enum RNSVGTextDecoration fw );
enum RNSVGTextDecoration RNSVGTextDecorationFromString(NSString *s); enum RNSVGTextDecoration RNSVGTextDecorationFromString( NSString* s );
typedef NS_ENUM(NSInteger, RNSVGTextLengthAdjust) { typedef NS_ENUM(NSInteger, RNSVGTextLengthAdjust) {
RNSVGTextLengthAdjustSpacing, RNSVGTextLengthAdjustSpacing,
@ -154,11 +160,11 @@ typedef NS_ENUM(NSInteger, RNSVGTextLengthAdjust) {
RNSVGTextLengthAdjustDEFAULT = RNSVGTextLengthAdjustSpacing, RNSVGTextLengthAdjustDEFAULT = RNSVGTextLengthAdjustSpacing,
}; };
static NSString *const RNSVGTextLengthAdjustStrings[] = {@"spacing", @"spacingAndGlyphs", nil}; static NSString* const RNSVGTextLengthAdjustStrings[] = {@"spacing", @"spacingAndGlyphs", nil};
NSString *RNSVGTextLengthAdjustToString(enum RNSVGTextLengthAdjust fw); NSString* RNSVGTextLengthAdjustToString( enum RNSVGTextLengthAdjust fw );
enum RNSVGTextLengthAdjust RNSVGTextLengthAdjustFromString(NSString *s); enum RNSVGTextLengthAdjust RNSVGTextLengthAdjustFromString( NSString* s );
typedef NS_ENUM(NSInteger, RNSVGTextPathMethod) { typedef NS_ENUM(NSInteger, RNSVGTextPathMethod) {
RNSVGTextPathMethodAlign, RNSVGTextPathMethodAlign,
@ -166,11 +172,11 @@ typedef NS_ENUM(NSInteger, RNSVGTextPathMethod) {
RNSVGTextPathMethodDEFAULT = RNSVGTextPathMethodAlign, RNSVGTextPathMethodDEFAULT = RNSVGTextPathMethodAlign,
}; };
static NSString *const RNSVGTextPathMethodStrings[] = {@"align", @"stretch", nil}; static NSString* const RNSVGTextPathMethodStrings[] = {@"align", @"stretch", nil};
NSString *RNSVGTextPathMethodToString(enum RNSVGTextPathMethod fw); NSString* RNSVGTextPathMethodToString( enum RNSVGTextPathMethod fw );
enum RNSVGTextPathMethod RNSVGTextPathMethodFromString(NSString *s); enum RNSVGTextPathMethod RNSVGTextPathMethodFromString( NSString* s );
typedef NS_ENUM(NSInteger, RNSVGTextPathMidLine) { typedef NS_ENUM(NSInteger, RNSVGTextPathMidLine) {
RNSVGTextPathMidLineSharp, RNSVGTextPathMidLineSharp,
@ -178,11 +184,11 @@ typedef NS_ENUM(NSInteger, RNSVGTextPathMidLine) {
RNSVGTextPathMidLineDEFAULT = RNSVGTextPathMidLineSharp, RNSVGTextPathMidLineDEFAULT = RNSVGTextPathMidLineSharp,
}; };
static NSString *const RNSVGTextPathMidLineStrings[] = {@"sharp", @"smooth", nil}; static NSString* const RNSVGTextPathMidLineStrings[] = {@"sharp", @"smooth", nil};
NSString *RNSVGTextPathMidLineToString(enum RNSVGTextPathMidLine fw); NSString* RNSVGTextPathMidLineToString( enum RNSVGTextPathMidLine fw );
enum RNSVGTextPathMidLine RNSVGTextPathMidLineFromString(NSString *s); enum RNSVGTextPathMidLine RNSVGTextPathMidLineFromString( NSString* s );
typedef NS_ENUM(NSInteger, RNSVGTextPathSide) { typedef NS_ENUM(NSInteger, RNSVGTextPathSide) {
RNSVGTextPathSideLeft, RNSVGTextPathSideLeft,
@ -190,11 +196,11 @@ typedef NS_ENUM(NSInteger, RNSVGTextPathSide) {
RNSVGTextPathSideDEFAULT = RNSVGTextPathSideLeft, RNSVGTextPathSideDEFAULT = RNSVGTextPathSideLeft,
}; };
static NSString *const RNSVGTextPathSideStrings[] = {@"left", @"right", nil}; static NSString* const RNSVGTextPathSideStrings[] = {@"left", @"right", nil};
NSString *RNSVGTextPathSideToString(enum RNSVGTextPathSide fw); NSString* RNSVGTextPathSideToString( enum RNSVGTextPathSide fw );
enum RNSVGTextPathSide RNSVGTextPathSideFromString(NSString *s); enum RNSVGTextPathSide RNSVGTextPathSideFromString( NSString* s );
typedef NS_ENUM(NSInteger, RNSVGTextPathSpacing) { typedef NS_ENUM(NSInteger, RNSVGTextPathSpacing) {
RNSVGTextPathSpacingAutoSpacing, RNSVGTextPathSpacingAutoSpacing,
@ -202,10 +208,10 @@ typedef NS_ENUM(NSInteger, RNSVGTextPathSpacing) {
RNSVGTextPathSpacingDEFAULT = RNSVGTextPathSpacingAutoSpacing, RNSVGTextPathSpacingDEFAULT = RNSVGTextPathSpacingAutoSpacing,
}; };
static NSString *const RNSVGTextPathSpacingStrings[] = {@"auto", @"exact", nil}; static NSString* const RNSVGTextPathSpacingStrings[] = {@"auto", @"exact", nil};
NSString *RNSVGTextPathSpacingToString(enum RNSVGTextPathSpacing fw); NSString* RNSVGTextPathSpacingToString( enum RNSVGTextPathSpacing fw );
enum RNSVGTextPathSpacing RNSVGTextPathSpacingFromString(NSString *s); enum RNSVGTextPathSpacing RNSVGTextPathSpacingFromString( NSString* s );
#endif #endif

View File

@ -1,14 +0,0 @@
#if TARGET_OS_OSX
#import <React/RCTTextView.h>
@interface RNSVGTopAlignedLabel : NSTextView
@property NSAttributedString *attributedText;
@property NSLineBreakMode lineBreakMode;
@property NSInteger numberOfLines;
@property NSString *text;
@property NSTextAlignment textAlignment;
#else
#import <UIKit/UIKit.h>
@interface RNSVGTopAlignedLabel : UILabel
#endif
@end

View File

@ -1,70 +0,0 @@
// Most (if not all) of this file could probably go away once react-native-macos's version of RCTUIKit.h makes its way
// upstream. https://github.com/microsoft/react-native-macos/issues/242
#ifdef RCT_NEW_ARCH_ENABLED
#import <React/RCTViewComponentView.h>
#endif // RCT_NEW_ARCH_ENABLED
#if !TARGET_OS_OSX
#import <UIKit/UIKit.h>
#define RNSVGColor UIColor
#define RNSVGPlatformView UIView
#define RNSVGTextView UILabel
#ifdef RCT_NEW_ARCH_ENABLED
#define RNSVGView RCTViewComponentView
#else
#define RNSVGView UIView
#endif // RCT_NEW_ARCH_ENABLED
#else // TARGET_OS_OSX [
// Due to name mangling, calling c-style functions from .mm files will fail, therefore we need to wrap them with extern
// "C" so they are handled correctly. We also need to have imports positioned in a correct way, so that this extern "C"
// wrapper is used before the functions from RCTUIKit are used.
#ifdef __cplusplus
extern "C" {
#endif
#import <React/RCTUIKit.h>
#ifdef __cplusplus
}
#endif
#define RNSVGColor NSColor
#define RNSVGPlatformView NSView
#define RNSVGTextView NSTextView
@interface RNSVGColor (CGColor)
- (NSColor *)CGColor;
@end
@interface RNSVGView :
#ifdef RCT_NEW_ARCH_ENABLED
RCTViewComponentView
#else
RCTUIView
#endif // RCT_NEW_ARCH_ENABLED
@property CGPoint center;
@property (nonatomic, strong) RNSVGColor *tintColor;
@end
// TODO: These could probably be a part of react-native-macos
// See https://github.com/microsoft/react-native-macos/issues/658 and
// https://github.com/microsoft/react-native-macos/issues/659
@interface NSImage (RNSVGMacOSExtensions)
@property (readonly) CGImageRef CGImage;
@end
@interface NSValue (RNSVGMacOSExtensions)
+ (NSValue *)valueWithCGAffineTransform:(CGAffineTransform)transform;
+ (NSValue *)valueWithCGPoint:(CGPoint)point;
@property (readonly) CGAffineTransform CGAffineTransformValue;
@property (readonly) CGPoint CGPointValue;
@end
#endif // ] TARGET_OS_OSX

View File

@ -6,8 +6,8 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "RNSVGLength.h"
#import "RNSVGRenderable.h" #import "RNSVGRenderable.h"
#import "RNSVGLength.h"
/** /**
* RNSVG defination are implemented as abstract UIViews for all elements inside Defs. * RNSVG defination are implemented as abstract UIViews for all elements inside Defs.

View File

@ -6,15 +6,11 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "RNSVGUIKit.h" #import <UIKit/UIKit.h>
#import "RNSVGVBMOS.h" #import "RNSVGVBMOS.h"
@interface RNSVGViewBox : NSObject @interface RNSVGViewBox : NSObject
+ (CGAffineTransform)getTransform:(CGRect)vbRect + (CGAffineTransform)getTransform:(CGRect)vbRect eRect:(CGRect)eRect align:(NSString *)align meetOrSlice:(RNSVGVBMOS)meetOrSlice;
eRect:(CGRect)eRect
align:(NSString *)align
meetOrSlice:(RNSVGVBMOS)meetOrSlice;
@end @end

Some files were not shown because too many files have changed in this diff Show More