muigui 0.0.1 → 0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (72) hide show
  1. package/README.md +72 -7
  2. package/package.json +9 -6
  3. package/src/controllers/Button.js +34 -0
  4. package/src/controllers/Canvas.js +17 -0
  5. package/src/controllers/Checkbox.js +11 -0
  6. package/src/controllers/Color.js +31 -0
  7. package/src/controllers/ColorChooser.js +12 -0
  8. package/src/controllers/Container.js +58 -0
  9. package/src/controllers/Controller.js +138 -0
  10. package/src/controllers/Direction.js +23 -0
  11. package/src/controllers/Divider.js +9 -0
  12. package/src/controllers/Folder.js +37 -0
  13. package/src/controllers/Label.js +14 -0
  14. package/src/controllers/LabelController.js +32 -0
  15. package/src/controllers/PopDownController.js +84 -0
  16. package/src/controllers/RadioGrid.js +17 -0
  17. package/src/controllers/Range.js +11 -0
  18. package/src/controllers/Select.js +14 -0
  19. package/src/controllers/Slider.js +12 -0
  20. package/src/controllers/TabHolder.js +36 -0
  21. package/src/controllers/Text.js +10 -0
  22. package/src/controllers/TextNumber.js +18 -0
  23. package/src/controllers/ValueController.js +107 -0
  24. package/src/controllers/Vec2.js +50 -0
  25. package/src/controllers/create-controller.js +43 -0
  26. package/src/layout/Column.js +7 -0
  27. package/src/layout/Frame.js +11 -0
  28. package/src/layout/Grid.js +7 -0
  29. package/src/layout/Layout.js +47 -0
  30. package/src/layout/Row.js +7 -0
  31. package/src/libs/assert.js +5 -0
  32. package/src/libs/color-utils.js +406 -0
  33. package/src/libs/conversions.js +14 -0
  34. package/src/libs/css-utils.js +3 -0
  35. package/src/libs/elem.js +8 -3
  36. package/src/libs/emitter.js +68 -0
  37. package/src/libs/iterable-array.js +57 -0
  38. package/src/libs/key-values.js +25 -0
  39. package/src/libs/keyboard.js +32 -0
  40. package/src/libs/resize-helpers.js +22 -0
  41. package/src/libs/svg.js +33 -0
  42. package/src/libs/taskrunner.js +56 -0
  43. package/src/libs/touch.js +50 -0
  44. package/src/libs/utils.js +38 -2
  45. package/src/libs/wheel.js +10 -0
  46. package/src/muigui.js +79 -19
  47. package/src/styles/muigui.css.js +640 -0
  48. package/src/umd.js +3 -0
  49. package/src/views/CheckboxView.js +21 -0
  50. package/src/views/ColorChooserView.js +124 -0
  51. package/src/views/ColorView.js +50 -0
  52. package/src/views/DirectionView.js +127 -0
  53. package/src/views/EditView.js +100 -0
  54. package/src/views/ElementView.js +8 -0
  55. package/src/views/GridView.js +15 -0
  56. package/src/views/NumberView.js +67 -0
  57. package/src/views/RadioGridView.js +46 -0
  58. package/src/views/RangeView.js +73 -0
  59. package/src/views/SelectView.js +23 -0
  60. package/src/views/SliderView.js +194 -0
  61. package/src/views/TextView.js +49 -0
  62. package/src/views/ValueView.js +11 -0
  63. package/src/views/Vec2View.js +51 -0
  64. package/src/views/View.js +56 -0
  65. package/src/widgets/checkbox.js +0 -0
  66. package/src/widgets/divider.js +0 -0
  67. package/src/widgets/menu.js +0 -0
  68. package/src/widgets/radio.js +0 -0
  69. package/src/widgets/select.js +0 -1
  70. package/src/widgets/slider.js +0 -41
  71. package/src/widgets/text.js +0 -0
  72. package/src/widgets/widget.js +0 -51
@@ -0,0 +1,640 @@
1
+ const css = `
2
+ .muigui {
3
+ --width: 250px;
4
+ --label-width: 45%;
5
+
6
+ --bg-color: #222222;
7
+ --color: #dddddd;
8
+ --value-color: #43e5f7;
9
+ --value-bg-color: #444444;
10
+ --disabled-color: #666666;
11
+ --menu-bg-color: #000000;
12
+ --menu-sep-color: #444444;
13
+ --hover-bg-color: #666666;
14
+ --focus-color: #88AAFF;
15
+ --range-color: #888888;
16
+ --invalid-color: #FF6666;
17
+ --selected-color: rgba(255, 255, 255, 0.3);
18
+
19
+ --button-bg-color: var(--value-bg-color);
20
+
21
+ --font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Arial, sans-serif;
22
+ --font-size: 11px;
23
+ --font-family-mono: Menlo, Monaco, Consolas, "Droid Sans Mono", monospace;
24
+ --font-size-mono: 11px;
25
+
26
+ --range-left-color: var(--value-color);
27
+ --range-right-color: var(--value-bg-color);
28
+ --range-right-hover-color: var(--hover-bg-color);
29
+ --line-height: 1.7em;
30
+ --border-radius: 0px;
31
+
32
+ width: var(--width);
33
+ color: var(--color);
34
+ background-color: var(--bg-color);
35
+ font-family: var(--font-family);
36
+ font-size: var(--font-size);
37
+ box-sizing: border-box;
38
+ }
39
+ .muigui * {
40
+ box-sizing: inherit;
41
+ }
42
+
43
+ .muigui-invalid-value {
44
+ background-color: red !important;
45
+ color: white !important;
46
+ }
47
+
48
+ .muigui-grid {
49
+ display: grid;
50
+ }
51
+ .muigui-rows {
52
+ display: flex;
53
+ flex-direction: column;
54
+
55
+ min-height: 20px;
56
+ border: 2px solid red;
57
+ }
58
+ .muigui-columns {
59
+ display: flex;
60
+ flex-direction: row;
61
+
62
+ height: 20px;
63
+ border: 2px solid green;
64
+ }
65
+ .muigui-rows>*,
66
+ .muigui-columns>* {
67
+ flex: 1 1 auto;
68
+ align-items: stretch;
69
+ min-height: 0;
70
+ min-width: 0;
71
+ }
72
+
73
+ .muigui-row {
74
+ border: 2px solid yellow;
75
+ min-height: 10px
76
+ }
77
+ .muigui-column {
78
+ border: 2px solid lightgreen;
79
+ }
80
+
81
+ /* -------- */
82
+
83
+ .muigui-show { /* */ }
84
+ .muigui-hide {
85
+ display: none !important;
86
+ }
87
+ .muigui-disabled {
88
+ pointer-events: none;
89
+ --color: var(--disabled-color) !important;
90
+ --value-color: var(--disabled-color) !important;
91
+ --range-left-color: var(--disabled-color) !important;
92
+ }
93
+
94
+ .muigui canvas,
95
+ .muigui svg {
96
+ display: block;
97
+ border-radius: var(--border-radius);
98
+ }
99
+ .muigui canvas {
100
+ background-color: var(--value-bg-color);
101
+ }
102
+
103
+ .muigui-controller {
104
+ min-width: 0;
105
+ min-height: var(--line-height);
106
+ }
107
+ .muigui-root,
108
+ .muigui-menu {
109
+ display: flex;
110
+ flex-direction: column;
111
+ position: relative;
112
+ user-select: none;
113
+ height: fit-content;
114
+ margin: 0;
115
+ padding-bottom: 0.1em;
116
+ border-radius: var(--border-radius);
117
+ }
118
+ .muigui-menu {
119
+ border-bottom: 1px solid var(--menu-sep-color);
120
+ }
121
+
122
+ .muigui-root>button:nth-child(1),
123
+ .muigui-menu>button:nth-child(1) {
124
+ border-top: 1px solid var(--menu-sep-color);
125
+ border-bottom: 1px solid var(--menu-sep-color);
126
+ position: relative;
127
+ text-align: left;
128
+ color: var(--color);
129
+ background-color: var(--menu-bg-color);
130
+ min-height: var(--line-height);
131
+ padding-top: 0.2em;
132
+ padding-bottom: 0.2em;
133
+ cursor: pointer;
134
+ border-radius: var(--border-radius);
135
+ }
136
+ .muigui-root>div:nth-child(2),
137
+ .muigui-menu>div:nth-child(2) {
138
+ flex: 1 1 auto;
139
+ }
140
+
141
+ .muigui-controller {
142
+ margin-left: 0.2em;
143
+ margin-right: 0.2em;
144
+ }
145
+ .muigui-root.muigui-controller,
146
+ .muigui-menu.muigui-controller {
147
+ margin-left: 0;
148
+ margin-right: 0;
149
+ }
150
+ .muigui-controller>*:nth-child(1) {
151
+ flex: 1 0 var(--label-width);
152
+ min-width: 0;
153
+ white-space: pre;
154
+ }
155
+ .muigui-controller>label:nth-child(1) {
156
+ place-content: center start;
157
+ display: inline-grid;
158
+ overflow: hidden;
159
+ }
160
+ .muigui-controller>*:nth-child(2) {
161
+ flex: 1 1 75%;
162
+ min-width: 0;
163
+ }
164
+
165
+ /* -----------------------------------------
166
+ a label controller is [[label][value]]
167
+ */
168
+
169
+ .muigui-label-controller {
170
+ display: flex;
171
+ margin: 0.4em 0 0.4em 0;
172
+ word-wrap: initial;
173
+ align-items: stretch;
174
+ }
175
+
176
+ .muigui-value {
177
+ display: flex;
178
+ align-items: stretch;
179
+ }
180
+ .muigui-value>* {
181
+ flex: 1 1 auto;
182
+ min-width: 0;
183
+ }
184
+ .muigui-value>*:nth-child(1) {
185
+ flex: 1 1 60%;
186
+ }
187
+ .muigui-value>*:nth-child(2) {
188
+ flex: 1 1 40%;
189
+ margin-left: 0.2em;
190
+ }
191
+
192
+ /* fix! */
193
+ .muigui-open>button>label::before,
194
+ .muigui-closed>button>label::before {
195
+ width: 1.25em;
196
+ height: var(--line-height);
197
+ display: inline-grid;
198
+ place-content: center start;
199
+ pointer-events: none;
200
+ }
201
+ .muigui-open>button>label::before {
202
+ content: "ⓧ"; /*"▼";*/
203
+ }
204
+ .muigui-closed>button>label::before {
205
+ content: "⨁"; /*"▶";*/
206
+ }
207
+ .muigui-open>*:nth-child(2) {
208
+ transition: max-height 0.2s ease-out,
209
+ opacity 0.5s ease-out;
210
+ max-height: 100vh;
211
+ overflow: auto;
212
+ opacity: 1;
213
+ }
214
+
215
+ .muigui-closed>*:nth-child(2) {
216
+ transition: max-height 0.2s ease-out,
217
+ opacity 1s;
218
+ max-height: 0;
219
+ opacity: 0;
220
+ overflow: hidden;
221
+ }
222
+
223
+ /* ---- popdown ---- */
224
+
225
+ .muigui-pop-down-top {
226
+ display: flex;
227
+ }
228
+ /* fix? */
229
+ .muigui-value>*:nth-child(1).muigui-pop-down-top {
230
+ flex: 0;
231
+ }
232
+ .muigui-pop-down-bottom {
233
+
234
+ }
235
+
236
+ .muigui-pop-down-values {
237
+ min-width: 0;
238
+ display: flex;
239
+ }
240
+ .muigui-pop-down-values>* {
241
+ flex: 1 1 auto;
242
+ min-width: 0;
243
+ }
244
+
245
+ .muigui-value.muigui-pop-down-controller {
246
+ flex-direction: column;
247
+ }
248
+
249
+ .muigui-pop-down-top input[type=checkbox] {
250
+ -webkit-appearance: none;
251
+ appearance: none;
252
+ width: auto;
253
+ color: var(--value-color);
254
+ background-color: var(--value-bg-color);
255
+ cursor: pointer;
256
+
257
+ display: grid;
258
+ place-content: center;
259
+ margin: 0;
260
+ font: inherit;
261
+ color: currentColor;
262
+ width: 1.7em;
263
+ height: 1.7em;
264
+ transform: translateY(-0.075em);
265
+ }
266
+
267
+ .muigui-pop-down-top input[type=checkbox]::before {
268
+ content: "+";
269
+ display: grid;
270
+ place-content: center;
271
+ border-radius: calc(var(--border-radius) + 2px);
272
+ border-left: 1px solid rgba(255,255,255,0.3);
273
+ border-top: 1px solid rgba(255,255,255,0.3);
274
+ border-bottom: 1px solid rgba(0,0,0,0.2);
275
+ border-right: 1px solid rgba(0,0,0,0.2);
276
+ background-color: var(--range-color);
277
+ color: var(--value-bg-color);
278
+ width: calc(var(--line-height) - 4px);
279
+ height: calc(var(--line-height) - 4px);
280
+ }
281
+
282
+ .muigui-pop-down-top input[type=checkbox]:checked::before {
283
+ content: "X";
284
+ }
285
+
286
+
287
+ /* ---- select ---- */
288
+
289
+ .muigui select,
290
+ .muigui option,
291
+ .muigui input,
292
+ .muigui button {
293
+ color: var(--value-color);
294
+ background-color: var(--value-bg-color);
295
+ font-family: var(--font-family);
296
+ font-size: var(--font-size);
297
+ border: none;
298
+ margin: 0;
299
+ border-radius: var(--border-radius);
300
+ }
301
+ .muigui select {
302
+ appearance: none;
303
+ margin: 0;
304
+ margin-left: 0; /*?*/
305
+ overflow: hidden; /* Safari */
306
+ }
307
+
308
+ .muigui select:focus,
309
+ .muigui input:focus,
310
+ .muigui button:focus {
311
+ outline: 1px solid var(--focus-color);
312
+ }
313
+
314
+ .muigui select:hover,
315
+ .muigui option:hover,
316
+ .muigui input:hover,
317
+ .muigui button:hover {
318
+ background-color: var(--hover-bg-color);
319
+ }
320
+
321
+ /* ------ [ label ] ------ */
322
+
323
+ .muigui-label {
324
+ border-top: 1px solid var(--menu-sep-color);
325
+ border-bottom: 1px solid var(--menu-sep-color);
326
+ padding-top: 0.4em;
327
+ padding-bottom: 0.3em;
328
+ place-content: center start;
329
+ background-color: var(--menu-bg-color);
330
+ white-space: pre;
331
+ border-radius: var(--border-radius);
332
+ }
333
+
334
+ /* ------ [ divider] ------ */
335
+
336
+ .muigui-divider {
337
+ min-height: 6px;
338
+ border-top: 2px solid var(--menu-sep-color);
339
+ margin-top: 6px;
340
+ }
341
+
342
+ /* ------ [ button ] ------ */
343
+
344
+ .muigui-button {
345
+ display: grid;
346
+
347
+ }
348
+ .muigui-button button {
349
+ border: none;
350
+ color: var(--value-color);
351
+ background-color: var(--button-bg-color);
352
+ cursor: pointer;
353
+ place-content: center center;
354
+ }
355
+
356
+ /* ------ [ color ] ------ */
357
+
358
+ .muigui-color>div {
359
+ overflow: hidden;
360
+ position: relative;
361
+ margin-left: 0;
362
+ margin-right: 0; /* why? */
363
+ max-width: var(--line-height);
364
+ border-radius: var(--border-radius);
365
+ }
366
+
367
+ .muigui-color>div:focus-within {
368
+ outline: 1px solid var(--focus-color);
369
+ }
370
+
371
+ .muigui-color input[type=color] {
372
+ border: none;
373
+ padding: 0;
374
+ background: inherit;
375
+ cursor: pointer;
376
+ position: absolute;
377
+ width: 200%;
378
+ left: -10px;
379
+ top: -10px;
380
+ height: 200%;
381
+ }
382
+ .muigui-disabled canvas,
383
+ .muigui-disabled svg,
384
+ .muigui-disabled img,
385
+ .muigui-disabled .muigui-color input[type=color] {
386
+ opacity: 0.2;
387
+ }
388
+
389
+ /* ------ [ checkbox ] ------ */
390
+
391
+ .muigui-checkbox>label:nth-child(2) {
392
+ display: grid;
393
+ place-content: center start;
394
+ margin: 0;
395
+ }
396
+
397
+ .muigui-checkbox input[type=checkbox] {
398
+ -webkit-appearance: none;
399
+ appearance: none;
400
+ width: auto;
401
+ color: var(--value-color);
402
+ background-color: var(--value-bg-color);
403
+ cursor: pointer;
404
+
405
+ display: grid;
406
+ place-content: center;
407
+ margin: 0;
408
+ font: inherit;
409
+ color: currentColor;
410
+ width: 1.7em;
411
+ height: 1.7em;
412
+ transform: translateY(-0.075em);
413
+ }
414
+
415
+ .muigui-checkbox input[type=checkbox]::before {
416
+ content: "";
417
+ color: var(--value-color);
418
+ display: grid;
419
+ place-content: center;
420
+ }
421
+
422
+ .muigui-checkbox input[type=checkbox]:checked::before {
423
+ content: "✔";
424
+ }
425
+
426
+ .muigui input[type=number]::-webkit-inner-spin-button,
427
+ .muigui input[type=number]::-webkit-outer-spin-button {
428
+ -webkit-appearance: none;
429
+ appearance: none;
430
+ margin: 0;
431
+ }
432
+ .muigui input[type=number] {
433
+ -moz-appearance: textfield;
434
+ }
435
+
436
+ /* ------ [ radio grid ] ------ */
437
+
438
+ .muigui-radio-grid>div {
439
+ display: grid;
440
+ gap: 2px;
441
+ }
442
+
443
+ .muigui-radio-grid input {
444
+ appearance: none;
445
+ display: none;
446
+ }
447
+
448
+ .muigui-radio-grid button {
449
+ color: var(--color);
450
+ width: 100%;
451
+ text-align: left;
452
+ }
453
+
454
+ .muigui-radio-grid input:checked + button {
455
+ color: var(--value-color);
456
+ background-color: var(--selected-color);
457
+ }
458
+
459
+ /* ------ [ color-chooser ] ------ */
460
+
461
+ .muigui-color-chooser-cursor {
462
+ stroke-width: 1px;
463
+ stroke: white;
464
+ fill: none;
465
+ }
466
+ .muigui-color-chooser-circle {
467
+ stroke-width: 1px;
468
+ stroke: white;
469
+ fill: none;
470
+ }
471
+
472
+
473
+ /* ------ [ vec2 ] ------ */
474
+
475
+ .muigui-vec2 svg {
476
+ background-color: var(--value-bg-color);
477
+ }
478
+
479
+ .muigui-vec2-axis {
480
+ stroke: 1px;
481
+ stroke: var(--focus-color);
482
+ }
483
+
484
+ .muigui-vec2-line {
485
+ stroke-width: 1px;
486
+ stroke: var(--value-color);
487
+ fill: var(--value-color);
488
+ }
489
+
490
+ /* ------ [ direction ] ------ */
491
+
492
+ .muigui-direction svg {
493
+ background-color: rgba(0,0,0,0.2);
494
+ }
495
+
496
+ .muigui-direction:focus-within svg {
497
+ outline: none;
498
+ }
499
+ .muigui-direction-range {
500
+ fill: var(--value-bg-color);
501
+ }
502
+ .muigui-direction svg:focus {
503
+ outline: none;
504
+ }
505
+ .muigui-direction svg:focus .muigui-direction-range {
506
+ stroke-width: 0.5px;
507
+ stroke: var(--focus-color);
508
+ }
509
+
510
+ .muigui-direction-arrow {
511
+ fill: var(--value-color);
512
+ }
513
+
514
+ /* ------ [ slider ] ------ */
515
+
516
+ .muigui-slider>div {
517
+ display: flex;
518
+ align-items: stretch;
519
+ height: var(--line-height);
520
+ }
521
+ .muigui-slider svg {
522
+ flex: 1 1 auto;
523
+ }
524
+ .muigui-slider .muigui-slider-up #muigui-orientation {
525
+ transform: scale(1, -1) translateY(-100%);
526
+ }
527
+
528
+ .muigui-slider .muigui-slider-up #muigui-number-orientation {
529
+ transform: scale(1,-1);
530
+ }
531
+
532
+ .muigui-ticks {
533
+ stroke: var(--range-color);
534
+ }
535
+ .muigui-thicks {
536
+ stroke: var(--color);
537
+ stroke-width: 2px;
538
+ }
539
+ .muigui-svg-text {
540
+ fill: var(--color);
541
+ font-size: 7px;
542
+ }
543
+ .muigui-mark {
544
+ fill: var(--value-color);
545
+ }
546
+
547
+ /* ------ [ range ] ------ */
548
+
549
+
550
+ .muigui-range input[type=range] {
551
+ -webkit-appearance: none;
552
+ appearance: none;
553
+ background-color: transparent;
554
+ }
555
+
556
+ .muigui-range input[type=range]::-webkit-slider-thumb {
557
+ -webkit-appearance: none;
558
+ appearance: none;
559
+ border-radius: calc(var(--border-radius) + 2px);
560
+ border-left: 1px solid rgba(255,255,255,0.3);
561
+ border-top: 1px solid rgba(255,255,255,0.3);
562
+ border-bottom: 1px solid rgba(0,0,0,0.2);
563
+ border-right: 1px solid rgba(0,0,0,0.2);
564
+ background-color: var(--range-color);
565
+ margin-top: calc((var(--line-height) - 2px) / -2);
566
+ width: calc(var(--line-height) - 2px);
567
+ height: calc(var(--line-height) - 2px);
568
+ }
569
+
570
+ .muigui-range input[type=range]::-webkit-slider-runnable-track {
571
+ -webkit-appearance: none;
572
+ appearance: none;
573
+ border: 1px solid var(--menu-sep-color);
574
+ height: 2px;
575
+ }
576
+
577
+
578
+ /* dat.gui style - doesn't work on Safari iOS */
579
+
580
+ /*
581
+ .muigui-range input[type=range] {
582
+ cursor: ew-resize;
583
+ overflow: hidden;
584
+ }
585
+
586
+ .muigui-range input[type=range] {
587
+ -webkit-appearance: none;
588
+ appearance: none;
589
+ background-color: var(--range-right-color);
590
+ margin: 0;
591
+ }
592
+ .muigui-range input[type=range]:hover {
593
+ background-color: var(--range-right-hover-color);
594
+ }
595
+
596
+ .muigui-range input[type=range]::-webkit-slider-runnable-track {
597
+ -webkit-appearance: none;
598
+ appearance: none;
599
+ height: max-content;
600
+ color: var(--range-left-color);
601
+ margin-top: -1px;
602
+ }
603
+
604
+ .muigui-range input[type=range]::-webkit-slider-thumb {
605
+ -webkit-appearance: none;
606
+ appearance: none;
607
+ width: 0px;
608
+ height: max-content;
609
+ box-shadow: -1000px 0 0 1000px var(--range-left-color);
610
+ }
611
+ */
612
+
613
+ /* FF */
614
+ /*
615
+ .muigui-range input[type=range]::-moz-slider-progress {
616
+ background-color: var(--range-left-color);
617
+ }
618
+ .muigui-range input[type=range]::-moz-slider-thumb {
619
+ height: max-content;
620
+ width: 0;
621
+ border: none;
622
+ box-shadow: -1000px 0 0 1000px var(--range-left-color);
623
+ box-sizing: border-box;
624
+ }
625
+ */
626
+
627
+ /* ---------------------------------------------------------- */
628
+
629
+ /* needs to be at bottom to take precedence */
630
+ .muigui-auto-place {
631
+ max-height: 100%;
632
+ position: fixed;
633
+ top: 0;
634
+ right: 15px;
635
+ z-index: 100001;
636
+ }
637
+
638
+ `;
639
+ export default css;
640
+
package/src/umd.js ADDED
@@ -0,0 +1,3 @@
1
+ import GUI from './muigui.js';
2
+
3
+ export default GUI;
@@ -0,0 +1,21 @@
1
+ import { createElem } from '../libs/elem.js';
2
+ import EditView from './EditView.js';
3
+
4
+ export default class CheckboxView extends EditView {
5
+ constructor(setter, id) {
6
+ const checkboxElem = createElem('input', {
7
+ type: 'checkbox',
8
+ id,
9
+ onInput: () => {
10
+ setter.setValue(this.domElement.checked);
11
+ },
12
+ onChange: () => {
13
+ setter.setFinalValue(this.domElement.checked);
14
+ },
15
+ });
16
+ super(createElem('label', {}, [checkboxElem]));
17
+ }
18
+ updateDisplay(v) {
19
+ this.domElement.checked = v;
20
+ }
21
+ }