Skip to content

Commit 5bcb375

Browse files
committed
Show in UI custom stored values
1 parent b7e23ef commit 5bcb375

3 files changed

Lines changed: 60 additions & 52 deletions

File tree

src/App.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@ class ui extends Element {
1212
window.addEventListener('message', e => {
1313
let msg = event.data.pluginMessage
1414
if (msg.type == 'init') {
15+
this.data.spacing = msg.spacing
1516
Tracking.setup(WP_AMPLITUDE_KEY, msg.UUID)
1617
Tracking.track('openPlugin', { cmd: msg.cmd })
1718
}
1819
})
1920
}
2021

2122
render() {
23+
if (!this.data.spacing) return '';
2224
return`
23-
<v-form></v-form>
25+
<v-form xspacing="${this.data.spacing.x}" yspacing="${this.data.spacing.y}"></v-form>
2426
`
2527
}
2628
}

src/Core.js

Lines changed: 55 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -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-

src/ui/views/form/FormView.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ class FormView extends Element {
119119
<div class="input-icon__icon">
120120
<div class="icon icon--text icon--black-3">X</div>
121121
</div>
122-
<input id="x_spacing" type="number" class="input-icon__input" placeholder="Horizontal" step="1" value="100">
122+
<input id="x_spacing" type="number" class="input-icon__input" placeholder="Horizontal" step="1" value="${this.attrs.xspacing}">
123123
</div>
124124
<div class="input-icon">
125125
<div class="input-icon__icon">
126126
<div class="icon icon--text icon--black-3">Y</div>
127127
</div>
128-
<input id="y_spacing" type="number" class="input-icon__input" placeholder="Vertical" step="1" value="200">
128+
<input id="y_spacing" type="number" class="input-icon__input" placeholder="Vertical" step="1" value="${this.attrs.yspacing}">
129129
</div>
130130
</section>
131131
</fieldset>

0 commit comments

Comments
 (0)