Bug fix: multiple transforms are now cumulative (again). Fixes #7

coolbutuseless · Feb 29, 2020 · 1d03996 · 1d03996
1 parent 83d0f5a
commit 1d03996
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: minisvg
 Type: Package
 Title: SVG Document Builder
-Version: 0.1.10
+Version: 0.1.11
 Author: mikefc
 Maintainer: mikefc <mikefc@coolbutuseless.com>
 Description: Build SVG documents with R.

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,8 @@
 
+# minisvg 0.1.11  2020-02-29
+
+* Bug fix: multiple transforms are now cumulative (again!).  (Fixes Issue #7)
+
 # minisvg 0.1.10  2020-02-22
 
 * Added new `$child` list which tracks the direct child elements by tag name.

diff --git a/R/SVGElement.R b/R/SVGElement.R
@@ -104,14 +104,6 @@ SVGElement <- R6::R6Class(
 
       do.call(self$append, children)
 
-      #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      # If duplicate named attributes are given, keep only the last one
-      #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      dups <- rev(duplicated(rev(names(attribs))))
-      if (any(dups)) {
-        attribs <- attribs[!dups]
-      }
-
       #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       # If one of the values for an attribute is an SVGElement, convert it
       # into an ID
@@ -143,6 +135,15 @@ SVGElement <- R6::R6Class(
       trans <- attribs[names(attribs) == 'transform']
       attribs[names(attribs) == 'transform'] <- NULL
 
+      #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      # If duplicate named attributes are given, keep only the last one.
+      # Make sure to do this *AFTER* all the 'transform' attributes have been
+      # selected as we want to keep all the transforms and concatenate them.
+      #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      dups <- rev(duplicated(rev(names(attribs))))
+      if (any(dups)) {
+        attribs <- attribs[!dups]
+      }
 
       #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       # If element is animate, animateColor, animateMotion, animateTransform

diff --git a/tests/testthat/test-cumulative-transform.R b/tests/testthat/test-cumulative-transform.R
@@ -0,0 +1,19 @@
+
+
+test_that("transforms are cumulative", {
+
+  heart_shadow <- stag$g(
+    fill = 'grey',
+    svg_prop$transform$rotate(-10, 50, 100),
+    svg_prop$transform$translate(-36, 45.5),
+    svg_prop$transform$skewX(40),
+    svg_prop$transform$scale(1, 0.5)
+  )
+
+  expect_equal(
+    heart_shadow$attribs$transform,
+    "rotate(-10 50 100) translate(-36 45.5) skewX(40) scale(1 0.5)"
+  )
+
+
+})