@@ -88,8 +88,6 @@ function cmdTidy(xSpacing, ySpacing) {
8888 var y0 = 0
8989 var xPos = 0
9090 var yPos = 0
91- var defaultXSpacing = ( typeof xSpacing == 'undefined' ) ? 100 : xSpacing ;
92- var defaultYSpacing = ( typeof ySpacing == 'undefined' ) ? 200 : ySpacing ;
9391 var tallestInRow = [ ]
9492
9593 // Store tallest node per row
@@ -111,13 +109,13 @@ function cmdTidy(xSpacing, ySpacing) {
111109 yPos = col . y
112110 }
113111 var match = allNodes . find ( node => node . id === col . id )
114- match . x = ( colidx == 0 ) ? xPos : xPos + defaultXSpacing ;
112+ match . x = ( colidx == 0 ) ? xPos : xPos + xSpacing ;
115113 match . y = yPos
116114 xPos = match . x + match . width
117115 } )
118116
119117 xPos = x0
120- yPos = yPos + ( tallestInRow [ rowidx ] + defaultYSpacing )
118+ yPos = yPos + ( tallestInRow [ rowidx ] + ySpacing )
121119 } )
122120}
123121
@@ -131,52 +129,60 @@ figma.clientStorage.getAsync('UUID').then(data => {
131129 } else {
132130 UUID = data
133131 }
134-
135- figma . ui . postMessage ( { type : 'init' , UUID : UUID , cmd : cmd } )
136-
137- // Run with command
138- if ( cmd == 'rename' ) {
139- cmdRename ( )
140- setTimeout ( ( ) => figma . closePlugin ( ) , 100 )
141- } else
142- if ( cmd == 'reorder' ) {
143- cmdReorder ( )
144- setTimeout ( ( ) => figma . closePlugin ( ) , 100 )
145- } else
146- if ( cmd == 'tidy' ) {
147- cmdTidy ( )
148- setTimeout ( ( ) => figma . closePlugin ( ) , 100 )
149- } else
150- if ( cmd == 'all' ) {
151- cmdTidy ( )
152- cmdReorder ( )
153- cmdRename ( )
154- setTimeout ( ( ) => figma . closePlugin ( ) , 100 )
155- } else
156- if ( cmd == 'options' ) {
157- figma . showUI ( __html__ , { width : 320 , height : 360 } )
158- figma . ui . postMessage ( { type : 'init' , UUID : UUID , cmd : cmd } )
159- figma . ui . postMessage ( { type : 'selection' , selection : figma . currentPage . selection } )
160-
161- figma . on ( 'selectionchange' , ( ) => {
132+
133+
134+ figma . clientStorage . getAsync ( 'spacing' ) . then ( spacing => {
135+
136+ // Prepare defaults
137+ var xSpacing = ( typeof spacing == 'undefined' ) ? 100 : spacing . x ;
138+ var ySpacing = ( typeof spacing == 'undefined' ) ? 200 : spacing . y ;
139+
140+ figma . ui . postMessage ( { type : 'init' , UUID : UUID , cmd : cmd , spacing : { x : xSpacing , y : ySpacing } } )
141+
142+ // Run with command
143+ if ( cmd == 'rename' ) {
144+ cmdRename ( )
145+ setTimeout ( ( ) => figma . closePlugin ( ) , 100 )
146+ } else
147+ if ( cmd == 'reorder' ) {
148+ cmdReorder ( )
149+ setTimeout ( ( ) => figma . closePlugin ( ) , 100 )
150+ } else
151+ if ( cmd == 'tidy' ) {
152+ cmdTidy ( xSpacing , ySpacing )
153+ setTimeout ( ( ) => figma . closePlugin ( ) , 100 )
154+ } else
155+ if ( cmd == 'all' ) {
156+ cmdTidy ( xSpacing , ySpacing )
157+ cmdReorder ( )
158+ cmdRename ( )
159+ setTimeout ( ( ) => figma . closePlugin ( ) , 100 )
160+ } else
161+ if ( cmd == 'options' ) {
162+ figma . showUI ( __html__ , { width : 320 , height : 360 } )
163+ figma . ui . postMessage ( { type : 'init' , UUID : UUID , cmd : cmd , spacing : { x : xSpacing , y : ySpacing } } )
162164 figma . ui . postMessage ( { type : 'selection' , selection : figma . currentPage . selection } )
163- } )
164-
165- figma . ui . onmessage = msg => {
166- if ( msg . type === 'tidy' ) {
167- var X_SPACING = msg . options . spacing . x
168- var Y_SPACING = msg . options . spacing . y
169- var RENAMING_ENABLED = msg . options . renaming
170- var REORDER_ENABLED = msg . options . reorder
171- var TIDY_ENABLED = msg . options . tidy
172-
173- if ( TIDY_ENABLED ) cmdTidy ( X_SPACING , Y_SPACING )
174- if ( RENAMING_ENABLED ) cmdRename ( )
175- if ( REORDER_ENABLED ) cmdReorder ( )
176- figma . closePlugin ( )
165+
166+ figma . on ( 'selectionchange' , ( ) => {
167+ figma . ui . postMessage ( { type : 'selection' , selection : figma . currentPage . selection } )
168+ } )
169+
170+ figma . ui . onmessage = msg => {
171+ if ( msg . type === 'tidy' ) {
172+ var X_SPACING = msg . options . spacing . x
173+ var Y_SPACING = msg . options . spacing . y
174+ var RENAMING_ENABLED = msg . options . renaming
175+ var REORDER_ENABLED = msg . options . reorder
176+ var TIDY_ENABLED = msg . options . tidy
177+
178+ figma . clientStorage . setAsync ( 'spacing' , { x : X_SPACING , y : Y_SPACING } )
179+
180+ if ( TIDY_ENABLED ) cmdTidy ( X_SPACING , Y_SPACING )
181+ if ( RENAMING_ENABLED ) cmdRename ( )
182+ if ( REORDER_ENABLED ) cmdReorder ( )
183+ figma . closePlugin ( )
184+ }
177185 }
178186 }
179- }
187+ } )
180188} )
181-
182-
0 commit comments