Skip to content

Commit 318dbf4

Browse files
markusvoeltermarkusvoelter
committed
basic grid support
1 parent 370e064 commit 318dbf4

File tree

7 files changed

+664
-246
lines changed

7 files changed

+664
-246
lines changed

‎mps/modules/ReactDemoLanguage.editor/models/ReactDemoLanguage.editor.modelix.mps‎

Lines changed: 154 additions & 89 deletions
Large diffs are not rendered by default.

‎mps/modules/org.modelix.mps.react.muicomponents/generator/templates/org.modelix.mps.react.muicomponents.generator.templates@generator.mps‎

Lines changed: 308 additions & 157 deletions
Large diffs are not rendered by default.

‎mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.behavior.mps‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@
402402
</node>
403403
</node>
404404
<node concept="13h7C7" id="2vPZMAn_p7C">
405+
<property role="3GE5qa" value="output" />
405406
<ref role="13h7C2" to="zaxg:2vPZMAmDmtP" resolve="Label" />
406407
<node concept="13hLZK" id="2vPZMAn_p7D" role="13h7CW">
407408
<node concept="3clFbS" id="2vPZMAn_p7E" role="2VODD2">
@@ -420,6 +421,7 @@
420421
</node>
421422
</node>
422423
<node concept="13h7C7" id="2vPZMAnEJvN">
424+
<property role="3GE5qa" value="layout" />
423425
<ref role="13h7C2" to="zaxg:2vPZMAnBVdN" resolve="Accordion" />
424426
<node concept="13hLZK" id="2vPZMAnEJvO" role="13h7CW">
425427
<node concept="3clFbS" id="2vPZMAnEJvP" role="2VODD2">
@@ -559,6 +561,7 @@
559561
</node>
560562
</node>
561563
<node concept="13h7C7" id="2vPZMAnZU_y">
564+
<property role="3GE5qa" value="action" />
562565
<ref role="13h7C2" to="zaxg:2vPZMAnZ0ck" resolve="State" />
563566
<node concept="13hLZK" id="2vPZMAnZU_z" role="13h7CW">
564567
<node concept="3clFbS" id="2vPZMAnZU_$" role="2VODD2" />
@@ -585,6 +588,7 @@
585588
</node>
586589
</node>
587590
<node concept="13h7C7" id="2vPZMAory6T">
591+
<property role="3GE5qa" value="widgets" />
588592
<ref role="13h7C2" to="zaxg:2vPZMAolrZd" resolve="ShowAndEdit" />
589593
<node concept="13hLZK" id="2vPZMAory6U" role="13h7CW">
590594
<node concept="3clFbS" id="2vPZMAory6V" role="2VODD2" />
@@ -1082,6 +1086,7 @@
10821086
</node>
10831087
</node>
10841088
<node concept="13h7C7" id="gNsEGB2qvR">
1089+
<property role="3GE5qa" value="layout" />
10851090
<ref role="13h7C2" to="zaxg:2vPZMAoGIbo" resolve="LabelWidgetPair" />
10861091
<node concept="13hLZK" id="gNsEGB2qvS" role="13h7CW">
10871092
<node concept="3clFbS" id="gNsEGB2qvT" role="2VODD2" />
@@ -1229,6 +1234,7 @@
12291234
</node>
12301235
</node>
12311236
<node concept="13h7C7" id="5KtU3pYnaq3">
1237+
<property role="3GE5qa" value="widgets" />
12321238
<ref role="13h7C2" to="zaxg:5KtU3pY8yh1" resolve="ReferenceTargetChooser" />
12331239
<node concept="13hLZK" id="5KtU3pYnaq4" role="13h7CW">
12341240
<node concept="3clFbS" id="5KtU3pYnaq5" role="2VODD2" />

‎mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.editor.mps‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@
8787
<child id="1164826688380" name="menuDescriptor" index="P5bDN" />
8888
</concept>
8989
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
90+
<property id="1160590353935" name="usesFolding" index="S$Qs1" />
9091
<child id="1106270802874" name="cellLayout" index="2iSdaV" />
92+
<child id="7723470090030138869" name="foldedCellModel" index="AHCbl" />
9193
<child id="1073389446424" name="childCellModel" index="3EZMnx" />
9294
</concept>
9395
<concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
@@ -199,6 +201,7 @@
199201
</language>
200202
</registry>
201203
<node concept="24kQdi" id="2vPZMAmvsgt">
204+
<property role="3GE5qa" value="widgets" />
202205
<ref role="1XX52x" to="zaxg:2vPZMAmvnIB" resolve="TextField" />
203206
<node concept="3EZMnI" id="2vPZMAmvsgy" role="2wV5jI">
204207
<node concept="2iRfu4" id="2vPZMAmvsgz" role="2iSdaV" />
@@ -262,6 +265,7 @@
262265
</node>
263266
</node>
264267
<node concept="24kQdi" id="2vPZMAmDmtU">
268+
<property role="3GE5qa" value="output" />
265269
<ref role="1XX52x" to="zaxg:2vPZMAmDmtP" resolve="Label" />
266270
<node concept="3EZMnI" id="2vPZMAmDmtW" role="2wV5jI">
267271
<node concept="2iRfu4" id="2vPZMAmDmtX" role="2iSdaV" />
@@ -407,6 +411,7 @@
407411
</node>
408412
</node>
409413
<node concept="24kQdi" id="2vPZMAmJaEL">
414+
<property role="3GE5qa" value="output" />
410415
<ref role="1XX52x" to="zaxg:2vPZMAmJaEH" resolve="Header" />
411416
<node concept="3EZMnI" id="2vPZMAmJaEP" role="2wV5jI">
412417
<node concept="2iRfu4" id="2vPZMAmJaEQ" role="2iSdaV" />
@@ -454,6 +459,7 @@
454459
</node>
455460
</node>
456461
<node concept="24kQdi" id="2vPZMAmMpdP">
462+
<property role="3GE5qa" value="output" />
457463
<ref role="1XX52x" to="zaxg:2vPZMAmMlUm" resolve="Space" />
458464
<node concept="PMmxH" id="2vPZMAmMpdT" role="2wV5jI">
459465
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
@@ -490,6 +496,7 @@
490496
</node>
491497
</node>
492498
<node concept="24kQdi" id="2vPZMAmYWc2">
499+
<property role="3GE5qa" value="action" />
493500
<ref role="1XX52x" to="zaxg:2vPZMAmYEO_" resolve="Button" />
494501
<node concept="3EZMnI" id="2vPZMAmYWc5" role="2wV5jI">
495502
<node concept="2iRfu4" id="2vPZMAmYWc6" role="2iSdaV" />
@@ -616,6 +623,7 @@
616623
</node>
617624
</node>
618625
<node concept="24kQdi" id="2vPZMAnBVdW">
626+
<property role="3GE5qa" value="output" />
619627
<ref role="1XX52x" to="zaxg:2vPZMAnBVdU" resolve="Icon" />
620628
<node concept="3EZMnI" id="2vPZMAnBVdZ" role="2wV5jI">
621629
<node concept="2iRfu4" id="2vPZMAnBVe0" role="2iSdaV" />
@@ -662,6 +670,7 @@
662670
</node>
663671
</node>
664672
<node concept="24kQdi" id="2vPZMAnEQ4m">
673+
<property role="3GE5qa" value="layout" />
665674
<ref role="1XX52x" to="zaxg:2vPZMAnBVdN" resolve="Accordion" />
666675
<node concept="3EZMnI" id="2vPZMAnEQ4p" role="2wV5jI">
667676
<node concept="2iRfu4" id="2vPZMAnEQ4q" role="2iSdaV" />
@@ -706,6 +715,7 @@
706715
</node>
707716
</node>
708717
<node concept="24kQdi" id="2vPZMAnIc9d">
718+
<property role="3GE5qa" value="layout" />
709719
<ref role="1XX52x" to="zaxg:2vPZMAnIaRS" resolve="Box" />
710720
<node concept="3EZMnI" id="2vPZMAnK4v$" role="2wV5jI">
711721
<node concept="2iRkQZ" id="2vPZMAnK4v_" role="2iSdaV" />
@@ -752,6 +762,7 @@
752762
</node>
753763
</node>
754764
<node concept="24kQdi" id="2vPZMAnZ0cq">
765+
<property role="3GE5qa" value="action" />
755766
<ref role="1XX52x" to="zaxg:2vPZMAnZ0ck" resolve="State" />
756767
<node concept="3EZMnI" id="2vPZMAnZ0cz" role="2wV5jI">
757768
<node concept="2iRkQZ" id="2vPZMAnZ0c$" role="2iSdaV" />
@@ -792,6 +803,7 @@
792803
</node>
793804
</node>
794805
<node concept="24kQdi" id="2vPZMAolrZf">
806+
<property role="3GE5qa" value="widgets" />
795807
<ref role="1XX52x" to="zaxg:2vPZMAolrZd" resolve="ShowAndEdit" />
796808
<node concept="3EZMnI" id="2vPZMAolrZq" role="2wV5jI">
797809
<node concept="2iRkQZ" id="2vPZMAolrZr" role="2iSdaV" />
@@ -818,6 +830,7 @@
818830
</node>
819831
</node>
820832
<node concept="24kQdi" id="2vPZMAonvg$">
833+
<property role="3GE5qa" value="layout" />
821834
<ref role="1XX52x" to="zaxg:2vPZMAonvgy" resolve="PlainDiv" />
822835
<node concept="3EZMnI" id="2vPZMAonvgB" role="2wV5jI">
823836
<node concept="2iRkQZ" id="2vPZMAonvgC" role="2iSdaV" />
@@ -845,6 +858,7 @@
845858
</node>
846859
</node>
847860
<node concept="24kQdi" id="2vPZMAoGIbs">
861+
<property role="3GE5qa" value="layout" />
848862
<ref role="1XX52x" to="zaxg:2vPZMAoGIbo" resolve="LabelWidgetPair" />
849863
<node concept="3EZMnI" id="2vPZMAoGIbx" role="2wV5jI">
850864
<node concept="2iRfu4" id="2vPZMAoGIby" role="2iSdaV" />
@@ -1188,6 +1202,7 @@
11881202
</node>
11891203
</node>
11901204
<node concept="24kQdi" id="2NkZbYeZYCG">
1205+
<property role="3GE5qa" value="layout" />
11911206
<ref role="1XX52x" to="zaxg:2NkZbYeZWAz" resolve="TreeNode" />
11921207
<node concept="3EZMnI" id="2NkZbYeZYVg" role="2wV5jI">
11931208
<node concept="PMmxH" id="2NkZbYf1JEM" role="3EZMnx">
@@ -1253,6 +1268,7 @@
12531268
</node>
12541269
</node>
12551270
<node concept="24kQdi" id="2NkZbYfayiC">
1271+
<property role="3GE5qa" value="layout" />
12561272
<ref role="1XX52x" to="zaxg:2NkZbYfax87" resolve="TreeView" />
12571273
<node concept="3EZMnI" id="2NkZbYfaAml" role="2wV5jI">
12581274
<node concept="2iRkQZ" id="2NkZbYfaAmm" role="2iSdaV" />
@@ -1286,6 +1302,7 @@
12861302
</node>
12871303
</node>
12881304
<node concept="24kQdi" id="2iVdnDeRYZv">
1305+
<property role="3GE5qa" value="widgets" />
12891306
<ref role="1XX52x" to="zaxg:2iVdnDeRY63" resolve="Checkbox" />
12901307
<node concept="3EZMnI" id="2iVdnDeRZSg" role="2wV5jI">
12911308
<node concept="2iRfu4" id="2iVdnDeRZSh" role="2iSdaV" />
@@ -1302,6 +1319,7 @@
13021319
<property role="3GE5qa" value="values" />
13031320
<ref role="1XX52x" to="zaxg:1Lliyak$MAq" resolve="ValueConverter" />
13041321
<node concept="3EZMnI" id="1LliyakH5qC" role="2wV5jI">
1322+
<property role="S$Qs1" value="true" />
13051323
<node concept="2iRkQZ" id="1LliyakH5qD" role="2iSdaV" />
13061324
<node concept="3EZMnI" id="1LliyakH3Fk" role="3EZMnx">
13071325
<node concept="2iRfu4" id="1LliyakH3Fl" role="2iSdaV" />
@@ -1364,6 +1382,19 @@
13641382
</node>
13651383
<node concept="2iRfu4" id="1LliyakH5ZO" role="2iSdaV" />
13661384
</node>
1385+
<node concept="3EZMnI" id="5KtU3pY_1G4" role="AHCbl">
1386+
<node concept="2iRfu4" id="5KtU3pY_1G5" role="2iSdaV" />
1387+
<node concept="PMmxH" id="5KtU3pY_1G6" role="3EZMnx">
1388+
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
1389+
<ref role="1k5W1q" to="vpip:2vPZMAmxCQO" resolve="RKeyword" />
1390+
</node>
1391+
<node concept="3F0A7n" id="5KtU3pY_1G7" role="3EZMnx">
1392+
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
1393+
</node>
1394+
<node concept="3F0ifn" id="5KtU3pY_2hd" role="3EZMnx">
1395+
<property role="3F0ifm" value="{...}" />
1396+
</node>
1397+
</node>
13671398
</node>
13681399
</node>
13691400
<node concept="24kQdi" id="1LliyakMr3o">
@@ -1428,6 +1459,7 @@
14281459
</node>
14291460
</node>
14301461
<node concept="24kQdi" id="2D6UMN610Y3">
1462+
<property role="3GE5qa" value="widgets" />
14311463
<ref role="1XX52x" to="zaxg:2D6UMN5ZxG9" resolve="Dropdown" />
14321464
<node concept="3EZMnI" id="2D6UMN613hi" role="2wV5jI">
14331465
<node concept="2iRkQZ" id="2D6UMN613hj" role="2iSdaV" />
@@ -1452,6 +1484,7 @@
14521484
</node>
14531485
</node>
14541486
<node concept="24kQdi" id="2D6UMN62OiI">
1487+
<property role="3GE5qa" value="widgets" />
14551488
<ref role="1XX52x" to="zaxg:2D6UMN62NpD" resolve="ChoiceSpecifierStatic" />
14561489
<node concept="3EZMnI" id="2D6UMN62XEC" role="2wV5jI">
14571490
<node concept="2iRfu4" id="2D6UMN62XED" role="2iSdaV" />
@@ -1467,6 +1500,7 @@
14671500
</node>
14681501
</node>
14691502
<node concept="24kQdi" id="2D6UMN62VT5">
1503+
<property role="3GE5qa" value="widgets" />
14701504
<ref role="1XX52x" to="zaxg:2D6UMN62V0l" resolve="ChoiceEntry" />
14711505
<node concept="3F0A7n" id="2D6UMN62Wc1" role="2wV5jI">
14721506
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
@@ -1476,6 +1510,7 @@
14761510
</node>
14771511
</node>
14781512
<node concept="24kQdi" id="gNsEGB5FHi">
1513+
<property role="3GE5qa" value="widgets" />
14791514
<ref role="1XX52x" to="zaxg:gNsEGB5DCe" resolve="ChoiceSpecifierDynamic" />
14801515
<node concept="3EZMnI" id="gNsEGB5G0$" role="2wV5jI">
14811516
<node concept="2iRfu4" id="gNsEGB5G0_" role="2iSdaV" />
@@ -1489,6 +1524,7 @@
14891524
</node>
14901525
</node>
14911526
<node concept="24kQdi" id="5KtU3pY8zI5">
1527+
<property role="3GE5qa" value="widgets" />
14921528
<ref role="1XX52x" to="zaxg:5KtU3pY8yh1" resolve="ReferenceTargetChooser" />
14931529
<node concept="3EZMnI" id="5KtU3pY8$Si" role="2wV5jI">
14941530
<node concept="2iRfu4" id="5KtU3pY8$Sj" role="2iSdaV" />
@@ -1538,5 +1574,88 @@
15381574
</node>
15391575
</node>
15401576
</node>
1577+
<node concept="24kQdi" id="5KtU3pZ8GbA">
1578+
<property role="3GE5qa" value="layout" />
1579+
<ref role="1XX52x" to="zaxg:5KtU3pZ8Esn" resolve="GridItem" />
1580+
<node concept="3EZMnI" id="5KtU3pZ8GKH" role="2wV5jI">
1581+
<node concept="2iRfu4" id="5KtU3pZ8GKI" role="2iSdaV" />
1582+
<node concept="PMmxH" id="5KtU3pZ8Gua" role="3EZMnx">
1583+
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
1584+
<ref role="1k5W1q" to="vpip:2vPZMAnOoz_" resolve="RComponent" />
1585+
</node>
1586+
<node concept="3F0ifn" id="5KtU3pZ8HCp" role="3EZMnx">
1587+
<property role="3F0ifm" value="[" />
1588+
<ref role="1k5W1q" to="vpip:2vPZMAnOoz_" resolve="RComponent" />
1589+
<node concept="11L4FC" id="5KtU3pZ8JEk" role="3F10Kt">
1590+
<property role="VOm3f" value="true" />
1591+
</node>
1592+
<node concept="11LMrY" id="5KtU3pZ8JWS" role="3F10Kt">
1593+
<property role="VOm3f" value="true" />
1594+
</node>
1595+
</node>
1596+
<node concept="3F0A7n" id="5KtU3pZ8Id$" role="3EZMnx">
1597+
<ref role="1NtTu8" to="zaxg:5KtU3pZ8F1s" resolve="cols" />
1598+
</node>
1599+
<node concept="3F0ifn" id="5KtU3pZ8Iw9" role="3EZMnx">
1600+
<property role="3F0ifm" value="]" />
1601+
<ref role="1k5W1q" to="vpip:2vPZMAnOoz_" resolve="RComponent" />
1602+
<node concept="11L4FC" id="5KtU3pZ8IMH" role="3F10Kt">
1603+
<property role="VOm3f" value="true" />
1604+
</node>
1605+
</node>
1606+
<node concept="3F1sOY" id="5KtU3pZ8H3i" role="3EZMnx">
1607+
<ref role="1NtTu8" to="zaxg:2vPZMAnIaRX" resolve="child" />
1608+
</node>
1609+
</node>
1610+
</node>
1611+
<node concept="24kQdi" id="5KtU3pZ8LG9">
1612+
<property role="3GE5qa" value="layout" />
1613+
<ref role="1XX52x" to="zaxg:5KtU3pZ8DQW" resolve="Grid" />
1614+
<node concept="3EZMnI" id="5KtU3pZ8LZ3" role="2wV5jI">
1615+
<node concept="2iRkQZ" id="5KtU3pZ8LZ4" role="2iSdaV" />
1616+
<node concept="3EZMnI" id="5KtU3pZ8LZ5" role="3EZMnx">
1617+
<node concept="2iRfu4" id="5KtU3pZ8LZ6" role="2iSdaV" />
1618+
<node concept="PMmxH" id="5KtU3pZ8LZ7" role="3EZMnx">
1619+
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
1620+
<ref role="1k5W1q" to="vpip:2vPZMAnOoz_" resolve="RComponent" />
1621+
</node>
1622+
<node concept="3F0ifn" id="5KtU3pZ8LZ8" role="3EZMnx">
1623+
<property role="3F0ifm" value="[" />
1624+
<node concept="11L4FC" id="5KtU3pZ8LZ9" role="3F10Kt">
1625+
<property role="VOm3f" value="true" />
1626+
</node>
1627+
<node concept="11LMrY" id="5KtU3pZ8LZa" role="3F10Kt">
1628+
<property role="VOm3f" value="true" />
1629+
</node>
1630+
</node>
1631+
<node concept="3F0A7n" id="5KtU3pZ8MQV" role="3EZMnx">
1632+
<property role="1$x2rV" value="&lt;none&gt;" />
1633+
<property role="1O74Pk" value="true" />
1634+
<ref role="1NtTu8" to="zaxg:5KtU3pZ8KOy" resolve="spacing" />
1635+
</node>
1636+
<node concept="3F0ifn" id="5KtU3pZ8LZc" role="3EZMnx">
1637+
<property role="3F0ifm" value="]" />
1638+
<node concept="11L4FC" id="5KtU3pZ8LZd" role="3F10Kt">
1639+
<property role="VOm3f" value="true" />
1640+
</node>
1641+
</node>
1642+
<node concept="3F0ifn" id="5KtU3pZ8LZe" role="3EZMnx">
1643+
<property role="3F0ifm" value="{" />
1644+
<ref role="1k5W1q" to="vpip:2vPZMAmxCQO" resolve="RKeyword" />
1645+
</node>
1646+
</node>
1647+
<node concept="3EZMnI" id="5KtU3pZ8LZf" role="3EZMnx">
1648+
<node concept="2iRfu4" id="5KtU3pZ8LZg" role="2iSdaV" />
1649+
<node concept="3XFhqQ" id="5KtU3pZ8LZh" role="3EZMnx" />
1650+
<node concept="3F2HdR" id="5KtU3pZ8O16" role="3EZMnx">
1651+
<ref role="1NtTu8" to="zaxg:5KtU3pZ8Kft" resolve="items" />
1652+
<node concept="2EHx9g" id="5KtU3pZ8OjF" role="2czzBx" />
1653+
</node>
1654+
</node>
1655+
<node concept="3F0ifn" id="5KtU3pZ8LZj" role="3EZMnx">
1656+
<property role="3F0ifm" value="}" />
1657+
</node>
1658+
</node>
1659+
</node>
15411660
</model>
15421661

0 commit comments

Comments
 (0)