Merge 10b4641 into 55624eb

.gitignore

@@ -12,6 +12,7 @@ packages
 .flutter-plugins
 doc/api/
 coverage/
+.project
 
 # Flutter crash logs
 /flutter_*.log

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGES
 
+## 0.16.0
+
+- Move `transform` out of `DrawableStyle` and onto `DrawableStyleable`. Shapes
+  already worked this way, and the transform logic was handled in a confusingly
+  different way than all the other style attributes.
+- Support `<use/>` elements having `id`s.
+- Properly apply transforms to referenced use eleemnts.
+
 ## 0.15.0
 
 - Respect transformations on `<image/>` tags.

lib/src/avd_parser.dart

@@ -70,10 +70,10 @@ Drawable parseAvdGroup(XmlElement el, Rect bounds) {
   return DrawableGroup(
     children,
     DrawableStyle(
-      transform: transform?.storage,
       stroke: stroke,
       fill: fill,
       groupOpacity: 1.0,
     ),
+    transform: transform?.storage,
   );
 }

lib/src/svg/parser_state.dart

@@ -64,12 +64,14 @@ class _TextInfo {
   const _TextInfo(
     this.style,
     this.offset,
+    this.transform,
   );
   final DrawableStyle style;
   final Offset offset;
+  final Matrix4 transform;
 
   @override
-  String toString() => '$runtimeType{$offset, $style}';
+  String toString() => '$runtimeType{$offset, $style, $transform}';
 }
 
 class _Elements {
@@ -100,8 +102,8 @@ class _Elements {
         parserState._definitions,
         parserState.rootBounds,
         parent.style,
-        needsTransform: true,
       ),
+      transform: parseTransform(parserState.attribute('transform'))?.storage,
     );
     if (!parserState._inDefs) {
       parent.children.add(group);
@@ -119,8 +121,8 @@ class _Elements {
         parserState._definitions,
         null,
         parent.style,
-        needsTransform: true,
       ),
+      transform: parseTransform(parserState.attribute('transform'))?.storage,
     );
     parserState.addGroup(parserState._currentStartElement, group);
     return null;
@@ -139,18 +141,27 @@ class _Elements {
       parserState.rootBounds,
       parent.style,
     );
-    final Matrix4 transform = Matrix4.identity()
-      ..translate(
-        parseDouble(parserState.attribute('x', def: '0')),
-        parseDouble(parserState.attribute('y', def: '0')),
-      );
+
+    final Matrix4 transform =
+        parseTransform(parserState.attribute('transform')) ??
+            Matrix4.identity();
+    transform.translate(
+      parseDouble(parserState.attribute('x', def: '0')),
+      parseDouble(parserState.attribute('y', def: '0')),
+    );
+
     final DrawableStyleable ref =
         parserState._definitions.getDrawable('url($xlinkHref)');
     final DrawableGroup group = DrawableGroup(
       <Drawable>[ref.mergeStyle(style)],
-      DrawableStyle(transform: transform.storage),
+      style,
+      transform: transform.storage,
     );
-    parent.children.add(group);
+
+    final bool isIri = parserState.checkForIri(group);
+    if (!parserState._inDefs || !isIri) {
+      parent.children.add(group);
+    }
     return null;
   }
 
@@ -483,13 +494,16 @@ class _Elements {
             ? transparentStroke
             : lastTextInfo.style.stroke,
       );
-      parserState.currentGroup.children.add(DrawableText(
-        fill,
-        stroke,
-        lastTextInfo.offset,
-        lastTextInfo.style.textStyle.anchor ?? DrawableTextAnchorPosition.start,
-        transform: lastTextInfo.style.transform,
-      ));
+      parserState.currentGroup.children.add(
+        DrawableText(
+          fill,
+          stroke,
+          lastTextInfo.offset,
+          lastTextInfo.style.textStyle.anchor ??
+              DrawableTextAnchorPosition.start,
+          transform: lastTextInfo.transform?.storage,
+        ),
+      );
       lastTextWidth = fill.maxIntrinsicWidth;
     }
 
@@ -502,16 +516,24 @@ class _Elements {
         parserState,
         lastTextInfo?.offset?.translate(lastTextWidth, 0),
       );
+      Matrix4 transform = parseTransform(parserState.attribute('transform'));
+      if (lastTextInfo?.transform != null) {
+        if (transform == null) {
+          transform = lastTextInfo.transform;
+        } else {
+          transform = lastTextInfo.transform.multiplied(transform);
+        }
+      }
+
       textInfos.add(_TextInfo(
         parseStyle(
           parserState.attributes,
           parserState._definitions,
           parserState.rootBounds,
           lastTextInfo?.style ?? parserState.currentGroup.style,
-          needsTransform: true,
-          multiplyTransformByParent: lastTextInfo != null,
         ),
         currentOffset,
+        transform,
       ));
       if (event.isSelfClosing) {
         textInfos.removeLast();

lib/src/svg/xml_parsers.dart

@@ -1,4 +1,3 @@
-import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:path_drawing/path_drawing.dart';
@@ -374,30 +373,10 @@ DrawableStyle parseStyle(
   List<XmlElementAttribute> attributes,
   DrawableDefinitionServer definitions,
   Rect bounds,
-  DrawableStyle parentStyle, {
-  bool needsTransform = false,
-  bool multiplyTransformByParent = false,
-}) {
-  Float64List rawTransform;
-  if (needsTransform) {
-    final Matrix4 transform = parseTransform(
-      getAttribute(attributes, 'transform'),
-    );
-    if (multiplyTransformByParent && parentStyle?.transform != null) {
-      if (transform == null) {
-        rawTransform = parentStyle.transform;
-      } else {
-        rawTransform = Matrix4.fromFloat64List(parentStyle.transform)
-            .multiplied(transform)
-            .storage;
-      }
-    } else {
-      rawTransform = transform?.storage;
-    }
-  }
+  DrawableStyle parentStyle,
+) {
   return DrawableStyle.mergeAndBlend(
     parentStyle,
-    transform: rawTransform,
     stroke: parseStroke(attributes, bounds, definitions, parentStyle?.stroke),
     dashArray: parseDashArray(attributes),
     dashOffset: parseDashOffset(attributes),