Fixing animationg of fontSize and lineHeight

koenbok · Jul 17, 2017 · 962b105 · 962b105
1 parent 9fe65a5
commit 962b105
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/framer/TextLayer.coffee b/framer/TextLayer.coffee
@@ -44,6 +44,8 @@ class exports.TextLayer extends Layer
 		if options.styledText?
 			@styledTextOptions = options.styledText
 			options.color ?= @_styledText.getStyle("color")
+			options.fontSize ?= parseFloat(@_styledText.getStyle("fontSize"))
+			options.lineHeight ?= parseFloat(@_styledText.getStyle("lineHeight"))
 		else
 			_.defaults options,
 				backgroundColor: "transparent"

diff --git a/test/tests/TextLayerTest.coffee b/test/tests/TextLayerTest.coffee
@@ -66,6 +66,16 @@ describe "TextLayer", ->
 			text.animate
 				color: "red"
 
+		it "should start animating from the fontsize the layer has", (done) ->
+			text = new TextLayer
+				styledText: simpleStyledTextOptions
+
+			text.onAnimationStart ->
+				text.fontSize.should.equal 16
+				done()
+			#
+			text.animate
+				color: "red"
 	describe "Auto-sizing", ->
 
 		it "should auto size the layer the size of the text", ->