Merge branch 'master' into f/more-reliable-font-weight

Author: mathieudutour

src/jsonUtils/sketchImpl/makeSvgLayer.ts

@@ -4,25 +4,22 @@ import { toSJSON } from './sketch-to-json';
 import { LayoutInfo } from '../../types';
 
 export default function makeSvgLayer(
-  layout: LayoutInfo,
+  _layout: LayoutInfo,
   name: string,
   svg: string,
 ): FileFormat.Group {
   const svgString = NSString.stringWithString(svg);
   const svgData = svgString.dataUsingEncoding(NSUTF8StringEncoding);
   const svgImporter = MSSVGImporter.svgImporter();
   svgImporter.prepareToImportFromData(svgData);
-  const svgLayer = svgImporter.importAsLayer();
-  svgLayer.name = name;
-  svgLayer.rect = {
-    origin: {
-      x: 0,
-      y: 0,
-    },
-    size: {
-      width: layout.width,
-      height: layout.height,
-    },
-  };
-  return toSJSON(svgLayer) as FileFormat.Group;
+
+  const frame = NSMakeRect(0, 0, svgImporter.graph().width(), svgImporter.graph().height());
+  const root = MSLayerGroup.alloc().initWithFrame(frame);
+  root.name = name;
+
+  svgImporter.graph().makeLayerWithParentLayer_progress(root, null);
+  root.ungroupSingleChildDescendentGroups();
+  svgImporter.scale_rootGroup(svgImporter.importer().scaleValue(), root);
+
+  return toSJSON(root) as FileFormat.Group;
 }

src/types/globals.d.ts

@@ -29,3 +29,5 @@ declare const MSPage: any;
 declare const MOPointer: any;
 declare const MSJSONDictionaryUnarchiver: any;
 declare const MSJSONDataArchiver: any;
+declare const NSMakeRect: any;
+declare const MSLayerGroup: any;

src/utils/processTransform/index.ts

@@ -12,15 +12,19 @@ function isRotation(a: number, b: number, c: number, d: number) {
 
 const rad2deg = 180 / Math.PI;
 
-function getRotation(a, b) {
+function getRotation(a: number, b: number) {
+  const sketchFactor = -1;
   const possibleRotation = Math.acos(a);
   if (closeEnough(Math.sin(possibleRotation), b) || closeEnough(Math.sin(possibleRotation), -b)) {
-    return possibleRotation * rad2deg;
+    return sketchFactor * possibleRotation * rad2deg;
   }
-  return (possibleRotation + Math.PI) * rad2deg;
+  return sketchFactor * (possibleRotation + Math.PI) * rad2deg;
 }
 
-export default function(layout: LayoutInfo, props: ViewStyle) {
+export default function(
+  layout: LayoutInfo,
+  props: ViewStyle,
+): { rotation?: number; isFlippedVertical?: boolean; isFlippedHorizontal?: boolean } {
   if (!props.transform) {
     return {};
   }