Reset artboard coordinates to leftmost layer

koenbok · Dec 18, 2015 · 6b2f999dec71443a018eac5a1da48a61ab852fed · 6b2f999
1 parent d8cabe8
commit 6b2f999dec71443a018eac5a1da48a61ab852fed
diff --git a/framer/Importer.coffee b/framer/Importer.coffee
@@ -173,18 +173,20 @@ class exports.Importer

 	_correctArtboards: (layers) ->

-		points = []
+		leftMostLayer = null

 		for layer in layers
 			if layer._info.kind is "artboard"
 				layer.point = layer._info.layerFrame
 				layer.visible = true
-				points.push(layer.point)
+
+				if leftMostLayer is null or layer.x < leftMostLayer.x
+					leftMostLayer = layer
+
+		return unless leftMostLayer

 		# Calculate the artboard positions to always be 0,0.
-		pointOffset =
-			x: Math.min.apply(@, points.map (p) -> p.x)
-			y: Math.min.apply(@, points.map (p) -> p.y)
+		pointOffset = leftMostLayer.point

 		# Correct the artboard positions to 0,0.
 		for layer in layers
diff --git a/test/static/ExternalDocument/Screens.sketch b/test/static/ExternalDocument/Screens.sketch
diff --git a/test/static/ExternalDocument/Screens@1x.out.json b/test/static/ExternalDocument/Screens@1x.out.json
@@ -0,0 +1,20 @@
+{
+	"screenB": {
+		"frame": {
+			"x": 0,
+			"y": 0,
+			"width": 375,
+			"height": 667
+		},
+		"subLayerNames": []
+	},
+	"screenA": {
+		"frame": {
+			"x": 475,
+			"y": -200,
+			"width": 375,
+			"height": 667
+		},
+		"subLayerNames": []
+	}
+}
diff --git a/...ExternalDocument/Screens@1x/images/Layer-screenA-C03716FB-BF3B-4059-8178-197728793CDA.png b/...ExternalDocument/Screens@1x/images/Layer-screenA-C03716FB-BF3B-4059-8178-197728793CDA.png
diff --git a/...ExternalDocument/Screens@1x/images/Layer-screenB-216BB552-1D6F-46DC-9454-8290DCC7E144.png b/...ExternalDocument/Screens@1x/images/Layer-screenB-216BB552-1D6F-46DC-9454-8290DCC7E144.png
diff --git a/test/static/ExternalDocument/Screens@1x/layers.json b/test/static/ExternalDocument/Screens@1x/layers.json
@@ -0,0 +1,52 @@
+[
+    {
+        "children": [], 
+        "id": "216BB552-1D6F-46DC-9454-8290DCC7E144", 
+        "image": {
+            "frame": {
+                "height": 667, 
+                "width": 375, 
+                "x": 443, 
+                "y": 600
+            }, 
+            "path": "images/Layer-screenB-216BB552-1D6F-46DC-9454-8290DCC7E144.png"
+        }, 
+        "imageType": "png", 
+        "kind": "artboard", 
+        "layerFrame": {
+            "height": 667, 
+            "width": 375, 
+            "x": 443, 
+            "y": 600
+        }, 
+        "maskFrame": null, 
+        "metadata": {}, 
+        "name": "screenB", 
+        "visible": true
+    }, 
+    {
+        "children": [], 
+        "id": "C03716FB-BF3B-4059-8178-197728793CDA", 
+        "image": {
+            "frame": {
+                "height": 667, 
+                "width": 375, 
+                "x": 918, 
+                "y": 400
+            }, 
+            "path": "images/Layer-screenA-C03716FB-BF3B-4059-8178-197728793CDA.png"
+        }, 
+        "imageType": "png", 
+        "kind": "artboard", 
+        "layerFrame": {
+            "height": 667, 
+            "width": 375, 
+            "x": 918, 
+            "y": 400
+        }, 
+        "maskFrame": null, 
+        "metadata": {}, 
+        "name": "screenA", 
+        "visible": false
+    }
+]
diff --git a/test/static/ExternalDocument/Screens@1x/layers.json.js b/test/static/ExternalDocument/Screens@1x/layers.json.js
@@ -0,0 +1,54 @@
+
+window.__imported__ = window.__imported__ || {};
+window.__imported__["Screens/layers.json.js"] = [
+    {
+        "children": [], 
+        "id": "216BB552-1D6F-46DC-9454-8290DCC7E144", 
+        "image": {
+            "frame": {
+                "height": 667, 
+                "width": 375, 
+                "x": 443, 
+                "y": 600
+            }, 
+            "path": "images/Layer-screenB-216BB552-1D6F-46DC-9454-8290DCC7E144.png"
+        }, 
+        "imageType": "png", 
+        "kind": "artboard", 
+        "layerFrame": {
+            "height": 667, 
+            "width": 375, 
+            "x": 443, 
+            "y": 600
+        }, 
+        "maskFrame": null, 
+        "metadata": {}, 
+        "name": "screenB", 
+        "visible": true
+    }, 
+    {
+        "children": [], 
+        "id": "C03716FB-BF3B-4059-8178-197728793CDA", 
+        "image": {
+            "frame": {
+                "height": 667, 
+                "width": 375, 
+                "x": 918, 
+                "y": 400
+            }, 
+            "path": "images/Layer-screenA-C03716FB-BF3B-4059-8178-197728793CDA.png"
+        }, 
+        "imageType": "png", 
+        "kind": "artboard", 
+        "layerFrame": {
+            "height": 667, 
+            "width": 375, 
+            "x": 918, 
+            "y": 400
+        }, 
+        "maskFrame": null, 
+        "metadata": {}, 
+        "name": "screenA", 
+        "visible": false
+    }
+]
diff --git a/test/tests/ImporterTest.coffee b/test/tests/ImporterTest.coffee
@@ -55,6 +55,9 @@ describe "ExternalDocument", ->
 			it "innermasks@1x", ->
 				compareDocument "innermasks@1x"

+			it "Screens@1x", ->
+				compareDocument "Screens@1x"
+
 	describe "Shady Hacks", ->

 		it "Should work on Chrome", ->