support for viewBox attribute (#185)

* work in progress for viewbox attribute * support viewBox * fix tests * changelog and podspec * revert podspec * fix null CGRect * typo * improve doc
pocketsvg · Dec 3, 2020 · d0dde62 · d0dde62
1 parent cdcead3
commit d0dde62
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. Items under
 
 ## [Unreleased]
 
+## [2.7.0]
+### New Features
+- Support for `viewBox` tag. [Alessio Prosperi](https://github.com/NeedNap)
+ and [Ariel Elkin](https://github.com/arielelkin) [#181](https://github.com/pocketsvg/PocketSVG/pull/181) and [#185](https://github.com/pocketsvg/PocketSVG/pull/185).
+
 ## [2.6.0]
 ### New Features
 - Xcode 12 and SPM Support. [Ariel Elkin](https://github.com/arielelkin), [#178](https://github.com/pocketsvg/PocketSVG/pull/178/)

diff --git a/Demos/Demo-macOS/Demo-macOS/MacDemo.swift b/Demos/Demo-macOS/Demo-macOS/MacDemo.swift
@@ -15,7 +15,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {}
 class DemoController: NSViewController {
     override func loadView() {
         let url = Bundle.main.url(forResource: "iceland", withExtension: "svg")!
-        view = SVGImageView.init(contentsOf: url)
+        let j = SVGImageView.init(contentsOf: url)
+        print(j.viewBox == .null)
+        view = j
+
         view.frame = NSRect(x: 0, y: 0, width: 300, height: 200)
     }
 }
diff --git a/PocketSVG.podspec b/PocketSVG.podspec
@@ -4,7 +4,7 @@ Pod::Spec.new do |s|
   s.summary      = "Easily convert your SVG files into CGPaths, CAShapeLayers, and UIBezierPaths"
   s.homepage     = "https://github.com/pocketsvg/PocketSVG"
   s.authors      = { "Ponderwell, Fjölnir Ásgeirsson, Ariel Elkin, and Contributors" => "https://github.com/pocketsvg/PocketSVG" }
-  s.ios.deployment_target = '8.1'
+  s.ios.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'
   s.license = {
     :type => 'MIT',

diff --git a/Sources/SVGBezierPath.mm b/Sources/SVGBezierPath.mm
@@ -205,6 +205,16 @@ - (void)applyTransform:(CGAffineTransform)cgTransform
     [self transformUsingAffineTransform:transform];
 }
 #endif
+
+- (CGRect) viewBox {
+    NSString *viewBoxString = _svgAttributes[@"viewBox"];
+    NSArray *stringArray = [viewBoxString componentsSeparatedByString:@" "];
+    if (stringArray && stringArray.count == 4) {
+        return CGRectMake(CGFloat([stringArray[0] doubleValue]), CGFloat([stringArray[1] doubleValue]), CGFloat([stringArray[2] doubleValue]), CGFloat([stringArray[3] doubleValue]));
+    } else {
+        return CGRectNull;
+    }
+}
 @end
 
 

diff --git a/Sources/SVGEngine.mm b/Sources/SVGEngine.mm
@@ -81,6 +81,7 @@
 @interface SVGAttributeSet () {
 @public
     NSMapTable *_attributes;
+    CGRect _viewBox;
 }
 @end
 
@@ -118,7 +119,7 @@ @interface SVGAttributeSet () {
             else if(type == XML_READER_TYPE_END_ELEMENT)
                 --depthWithinUnknownElement;
         } else if(type == XML_READER_TYPE_ELEMENT && strcasecmp(tag, "svg") == 0) {
-            // recognize the root svg element but we don't need to do anything with it
+            pushGroup(readAttributes());
         } else if(type == XML_READER_TYPE_ELEMENT && strcasecmp(tag, "path") == 0)
             path = readPathTag();
         else if(type == XML_READER_TYPE_ELEMENT && strcasecmp(tag, "polyline") == 0)
@@ -996,6 +997,9 @@ - (id)mutableCopyWithZone:(NSZone *)zone
     }
     return copy;
 }
+- (CGRect) viewBox {
+    return _viewBox;
+}
 @end
 
 @implementation SVGMutableAttributeSet

diff --git a/Sources/SVGImageView.m b/Sources/SVGImageView.m
@@ -190,4 +190,8 @@ - (CGSize)intrinsicContentSize
 {
     return [self sizeThatFits:CGSizeZero];
 }
+
+- (CGRect) viewBox {
+    return _svgLayer.viewBox;
+}
 @end
diff --git a/Sources/SVGLayer.m b/Sources/SVGLayer.m
@@ -56,6 +56,10 @@ - (void)dealloc
     CGColorRelease(_strokeColor);
 }
 
+- (CGRect) viewBox {
+    return [[_paths firstObject] viewBox];
+}
+
 - (void)setPaths:(NSArray<SVGBezierPath*> *)paths
 {
     [self willChangeValueForKey:@"paths"];

diff --git a/Sources/include/SVGBezierPath.h b/Sources/include/SVGBezierPath.h
@@ -65,6 +65,13 @@ FOUNDATION_EXTERN void SVGDrawPathsWithBlock(NSArray<SVGBezierPath*> * const pat
  */
 - (SVGBezierPath *)pathBySettingSVGAttributes:(NSDictionary *)attributes;
 
+/*!
+ * @brief The value of the SVG's viewBox attribute, expressed as a CGRect. If there is
+ * no viewBox attribute, this property will be CGRect.null
+ *
+ */
+@property(nonatomic, readonly) CGRect viewBox;
+
 #if !TARGET_OS_IPHONE
 @property(nonatomic, readonly) CGPathRef CGPath;
 #endif

diff --git a/Sources/include/SVGEngine.h b/Sources/include/SVGEngine.h
@@ -51,6 +51,7 @@ NSString *SVGStringFromCGPaths(NSArray *paths, SVGAttributeSet *attributes);
 
 @interface SVGAttributeSet : NSObject <NSCopying, NSMutableCopying>
 - (NSDictionary<NSString*,id> *)attributesForPath:(CGPathRef)path;
+@property(nonatomic, readonly) CGRect viewBox;
 @end
 @interface SVGMutableAttributeSet : SVGAttributeSet
 - (void)setAttributes:(NSDictionary<NSString*,id> *)attributes forPath:(CGPathRef)path;

diff --git a/Sources/include/SVGImageView.h b/Sources/include/SVGImageView.h
@@ -59,5 +59,12 @@ IB_DESIGNABLE
  */
 @property(nonatomic) IBInspectable BOOL scaleLineWidth;
 
+/*!
+ * @brief The value of the SVG's viewBox attribute, expressed as a CGRect. If there is
+ * no viewBox attribute, this property will be CGRect.null
+ *
+ */
+@property(nonatomic, readonly) CGRect viewBox;
+
 @end
 NS_ASSUME_NONNULL_END
diff --git a/Sources/include/SVGLayer.h b/Sources/include/SVGLayer.h
@@ -60,5 +60,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic) BOOL scaleLineWidth;
 
+
+/*!
+ * @brief The value of the SVG's viewBox attribute, expressed as a CGRect. If there is
+ * no viewBox attribute, this property will be CGRect.null
+ *
+ */
+@property(nonatomic, readonly) CGRect viewBox;
+
 @end
 NS_ASSUME_NONNULL_END
diff --git a/Tests/PocketSVGTests.swift b/Tests/PocketSVGTests.swift
@@ -98,7 +98,7 @@ class PocketSVGTests: XCTestCase {
         XCTAssert(paths.count == 1)
         let rectanglePath = paths[0]
 
-        let representation = "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"100\" height=\"100\">\n  <path stroke=\"#fff000\" id=\"Page-1\" stroke-width=\"2px\" x=\"0\" sketch:type=\"MSPage\" rx=\"10px\" y=\"0\" fill-rule=\"evenodd\" width=\"100px\" fill=\"#ffffff\" fill-opacity=\"0\" ry=\"10px\" height=\"100px\" d=\"M100,50L100,90C100,95.523,95.523,100,90,100L10,100C4.477,100,0,95.523,0,90L0,10C0,4.477,4.477,-0,10,0L90,0C95.523,0,100,4.477,100,10Z\"/>\n\n</svg>\n"
+        let representation = "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"100\" height=\"100\">\n  <path stroke=\"#fff000\" id=\"Page-1\" stroke-width=\"2px\" version=\"1.1\" sketch:type=\"MSPage\" x=\"0\" width=\"100px\" fill=\"#ffffff\" fill-opacity=\"0\" fill-rule=\"evenodd\" y=\"0\" rx=\"10px\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:sketch=\"http://www.bohemiancoding.com/sketch/ns\" ry=\"10px\" height=\"100px\" viewBox=\"0 0 300 300\" xmlns=\"http://www.w3.org/2000/svg\" d=\"M100,50L100,90C100,95.523,95.523,100,90,100L10,100C4.477,100,0,95.523,0,90L0,10C0,4.477,4.477,-0,10,0L90,0C95.523,0,100,4.477,100,10Z\"/>\n\n</svg>\n"
 
         XCTAssertEqual(rectanglePath.svgRepresentation, representation)
     }