Skip to content

Commit 68fc7a6

Browse files
markusvoeltermarkusvoelter
committed
implemented Accordion Component and an example tree. Plus cosmetics.
1 parent b4757a4 commit 68fc7a6

File tree

9 files changed

+771
-134
lines changed

9 files changed

+771
-134
lines changed

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

Lines changed: 78 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
3939
<child id="5355184975881056561" name="parameters" index="2rHO5H" />
4040
<child id="5355184975881056562" name="component" index="2rHO5I" />
4141
</concept>
42+
<concept id="2833354970324652966" name="org.modelix.mps.react.structure.When" flags="ng" index="1nAWFN">
43+
<child id="2833354970324652969" name="else" index="1nAWFW" />
44+
<child id="2833354970324652971" name="cases" index="1nAWFY" />
45+
</concept>
46+
<concept id="2833354970324652974" name="org.modelix.mps.react.structure.WhenCase" flags="ng" index="1nAWFV">
47+
<child id="2833354970324652977" name="compnent" index="1nAWF$" />
48+
<child id="2833354970324652975" name="condition" index="1nAWFU" />
49+
</concept>
4250
<concept id="2833354970324905743" name="org.modelix.mps.react.structure.RenderNode" flags="ng" index="1nBVpq">
4351
<child id="2833354970324905746" name="nodeToRender" index="1nBVp7" />
4452
</concept>
@@ -64,14 +72,25 @@
6472
</concept>
6573
</language>
6674
<language id="09a61cec-0c2d-4a90-b590-25e493b12f35" name="org.modelix.mps.react.muicomponents">
67-
<concept id="2879488090872882957" name="org.modelix.mps.react.muicomponents.structure.IContainerComponent" flags="ngI" index="2KxXw$">
75+
<concept id="2879488090877505016" name="org.modelix.mps.react.muicomponents.structure.Box" flags="ng" index="2Kjlbh" />
76+
<concept id="2879488090877505018" name="org.modelix.mps.react.muicomponents.structure.IContainerSingleComponent" flags="ngI" index="2Kjlbj">
77+
<child id="2879488090877505021" name="child" index="2Kjlbk" />
78+
</concept>
79+
<concept id="2879488090875868026" name="org.modelix.mps.react.muicomponents.structure.Icon" flags="ng" index="2Kq$Lj">
80+
<property id="2879488090875868027" name="name" index="2Kq$Li" />
81+
</concept>
82+
<concept id="2879488090875868019" name="org.modelix.mps.react.muicomponents.structure.Accordion" flags="ng" index="2Kq$Lq">
83+
<child id="2879488090876606450" name="icon" index="2KnKzr" />
84+
<child id="2879488090875868021" name="summary" index="2Kq$Ls" />
85+
</concept>
86+
<concept id="2879488090872882957" name="org.modelix.mps.react.muicomponents.structure.IContainerMultiComponent" flags="ngI" index="2KxXw$">
6887
<child id="2879488090859879792" name="children" index="2Ln$9p" />
6988
</concept>
7089
<concept id="2879488090869195431" name="org.modelix.mps.react.muicomponents.structure.Command" flags="ng" index="2KN1Qe">
7190
<child id="2879488090869195432" name="statements" index="2KN1Q1" />
7291
</concept>
7392
<concept id="2879488090867630820" name="org.modelix.mps.react.muicomponents.structure.ButtonLabelIcon" flags="ng" index="2KPZRd">
74-
<property id="2879488090867630821" name="icon" index="2KPZRc" />
93+
<child id="2879488090875870057" name="icon" index="2Kq$h0" />
7594
</concept>
7695
<concept id="2879488090865052965" name="org.modelix.mps.react.muicomponents.structure.Button" flags="ng" index="2L3P8c">
7796
<child id="2879488090869195443" name="command" index="2KN1Qq" />
@@ -89,6 +108,7 @@
89108
<child id="2879488090860989104" name="text" index="2Lilmp" />
90109
</concept>
91110
<concept id="2879488090859464565" name="org.modelix.mps.react.muicomponents.structure.Label" flags="ng" index="2Lk9xs">
111+
<property id="2879488090875133144" name="style" index="2KoofL" />
92112
<child id="2879488090859488762" name="value" index="2Lk3Fj" />
93113
</concept>
94114
<concept id="2879488090859879787" name="org.modelix.mps.react.muicomponents.structure.LayoutHorizontal" flags="ng" index="2Ln$92" />
@@ -139,38 +159,61 @@
139159
<child id="540871147943773366" name="argument" index="25WWJ7" />
140160
</concept>
141161
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
162+
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
142163
</language>
143164
</registry>
144165
<node concept="gl9ry" id="2CeLAhmFoil">
145166
<property role="TrG5h" value="ReactDemo" />
146167
<node concept="gmrQT" id="2vPZMAnsypp" role="gmrQt">
147168
<ref role="3JBHV4" to="oyym:2vPZMAnpuJg" resolve="TreeNode" />
148-
<node concept="2LhRxX" id="2vPZMAnsypw" role="gmrTS">
149-
<property role="2LhGOR" value="20px" />
150-
<node concept="2Ln$92" id="2vPZMAnturx" role="2Ln$9p">
151-
<node concept="2Lk9xs" id="2vPZMAnsypy" role="2Ln$9p">
152-
<node concept="Xl_RD" id="2vPZMAnsyp$" role="2Lk3Fj">
153-
<property role="Xl_RC" value="TreeNode" />
169+
<node concept="1nAWFN" id="2vPZMAnyUWT" role="gmrTS">
170+
<node concept="1nAWFV" id="2vPZMAnF2mI" role="1nAWFY">
171+
<node concept="2Kq$Lq" id="2vPZMAnF2pM" role="1nAWF$">
172+
<node concept="rrkbs" id="2vPZMAnF2qe" role="2Ln$9p">
173+
<property role="TrG5h" value="c" />
174+
<node concept="2OqwBi" id="2vPZMAnF2qf" role="rrkk9">
175+
<node concept="ggAI9" id="2vPZMAnF2qg" role="2Oq$k0" />
176+
<node concept="3Tsc0h" id="2vPZMAnF2qh" role="2OqNvi">
177+
<ref role="3TtcxE" to="oyym:2vPZMAnpuJi" resolve="children" />
178+
</node>
179+
</node>
180+
<node concept="1nBVpq" id="2vPZMAnF2qi" role="rrkkB">
181+
<node concept="rqPyE" id="2vPZMAnF2qj" role="1nBVp7">
182+
<ref role="rqPyD" node="2vPZMAnF2qe" resolve="c" />
183+
</node>
184+
</node>
154185
</node>
155-
</node>
156-
<node concept="2Ly8ie" id="2vPZMAnturA" role="2Ln$9p">
157-
<node concept="2Ly3GW" id="2vPZMAnturC" role="2Ly3GP">
158-
<ref role="2Ly3GY" to="tpck:h0TrG11" resolve="name" />
159-
<node concept="ggAI9" id="2vPZMAnturG" role="2Ly3GZ" />
186+
<node concept="2Kq$Lj" id="2vPZMAnF2pN" role="2KnKzr">
187+
<property role="2Kq$Li" value="mui.icons.ExpandMore" />
188+
</node>
189+
<node concept="2Lk9xs" id="2vPZMAnF2pQ" role="2Kq$Ls">
190+
<property role="2KoofL" value="2vPZMAn_7Nn/bold" />
191+
<node concept="2OqwBi" id="2vPZMAnF2pR" role="2Lk3Fj">
192+
<node concept="ggAI9" id="2vPZMAnF2pS" role="2Oq$k0" />
193+
<node concept="3TrcHB" id="2vPZMAnF2pT" role="2OqNvi">
194+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
195+
</node>
196+
</node>
160197
</node>
161198
</node>
162-
</node>
163-
<node concept="rrkbs" id="2vPZMAnturS" role="2Ln$9p">
164-
<property role="TrG5h" value="c" />
165-
<node concept="1nBVpq" id="2vPZMAntuNR" role="rrkkB">
166-
<node concept="rqPyE" id="2vPZMAntuPO" role="1nBVp7">
167-
<ref role="rqPyD" node="2vPZMAnturS" resolve="c" />
199+
<node concept="2OqwBi" id="2vPZMAnGslA" role="1nAWFU">
200+
<node concept="2OqwBi" id="2vPZMAnGslB" role="2Oq$k0">
201+
<node concept="ggAI9" id="2vPZMAnGslC" role="2Oq$k0" />
202+
<node concept="3Tsc0h" id="2vPZMAnGslD" role="2OqNvi">
203+
<ref role="3TtcxE" to="oyym:2vPZMAnpuJi" resolve="children" />
204+
</node>
168205
</node>
206+
<node concept="3GX2aA" id="2vPZMAnGslE" role="2OqNvi" />
169207
</node>
170-
<node concept="2OqwBi" id="2vPZMAntuAo" role="rrkk9">
171-
<node concept="ggAI9" id="2vPZMAntus6" role="2Oq$k0" />
172-
<node concept="3Tsc0h" id="2vPZMAntuJV" role="2OqNvi">
173-
<ref role="3TtcxE" to="oyym:2vPZMAnpuJi" resolve="children" />
208+
</node>
209+
<node concept="2Kjlbh" id="2vPZMAnIH2O" role="1nAWFW">
210+
<node concept="2Lk9xs" id="2vPZMAnzf2p" role="2Kjlbk">
211+
<property role="2KoofL" value="2vPZMAn_7Nm/plain" />
212+
<node concept="2OqwBi" id="2vPZMAnzfdC" role="2Lk3Fj">
213+
<node concept="ggAI9" id="2vPZMAnzf5q" role="2Oq$k0" />
214+
<node concept="3TrcHB" id="2vPZMAnzfw6" role="2OqNvi">
215+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
216+
</node>
174217
</node>
175218
</node>
176219
</node>
@@ -191,6 +234,7 @@
191234
</node>
192235
<node concept="2Ln$92" id="2vPZMAmPw0_" role="2Ln$9p">
193236
<node concept="2Lk9xs" id="2vPZMAmPw4D" role="2Ln$9p">
237+
<property role="2KoofL" value="2vPZMAn_7Nm/plain" />
194238
<node concept="Xl_RD" id="2vPZMAmPw4K" role="2Lk3Fj">
195239
<property role="Xl_RC" value="Name of the thing" />
196240
</node>
@@ -256,6 +300,7 @@
256300
<property role="TrG5h" value="rr" />
257301
<node concept="2Ln$92" id="2vPZMAnl7aU" role="2rHO5I">
258302
<node concept="2Lk9xs" id="2vPZMAnl7aW" role="2Ln$9p">
303+
<property role="2KoofL" value="2vPZMAn_7Nm/plain" />
259304
<node concept="3cpWs3" id="2vPZMAnl7aX" role="2Lk3Fj">
260305
<node concept="2OqwBi" id="2vPZMAnl7aY" role="3uHU7w">
261306
<node concept="2rHscw" id="2vPZMAnl7dt" role="2Oq$k0">
@@ -278,9 +323,6 @@
278323
</node>
279324
</node>
280325
<node concept="2L3P8c" id="2vPZMAnl7b6" role="2Ln$9p">
281-
<node concept="2KPZRd" id="2vPZMAnl7b7" role="2L3P8e">
282-
<property role="2KPZRc" value="mui.icons.Delete" />
283-
</node>
284326
<node concept="2KN1Qe" id="2vPZMAnl7b8" role="2KN1Qq">
285327
<node concept="3clFbS" id="2vPZMAnl7b9" role="2KN1Q1">
286328
<node concept="3clFbF" id="2vPZMAnl7ba" role="3cqZAp">
@@ -293,6 +335,11 @@
293335
</node>
294336
</node>
295337
</node>
338+
<node concept="2KPZRd" id="2vPZMAnEJvc" role="2L3P8e">
339+
<node concept="2Kq$Lj" id="2vPZMAnEJvg" role="2Kq$h0">
340+
<property role="2Kq$Li" value="mui.icons.Delete" />
341+
</node>
342+
</node>
296343
</node>
297344
</node>
298345
<node concept="2rzwrA" id="2vPZMAnkzyO" role="2rHO5H">
@@ -306,6 +353,7 @@
306353
<ref role="3JBHV4" to="oyym:2vPZMAmue7m" resolve="Element" />
307354
<node concept="2Ln$92" id="2vPZMAnl6TL" role="gmrTS">
308355
<node concept="2Lk9xs" id="2vPZMAnl6TM" role="2Ln$9p">
356+
<property role="2KoofL" value="2vPZMAn_7Nm/plain" />
309357
<node concept="3cpWs3" id="2vPZMAnl6TN" role="2Lk3Fj">
310358
<node concept="2OqwBi" id="2vPZMAnl6TO" role="3uHU7w">
311359
<node concept="ggAI9" id="2vPZMAnl6TP" role="2Oq$k0" />
@@ -324,8 +372,10 @@
324372
</node>
325373
</node>
326374
<node concept="2L3P8c" id="2vPZMAnl6TW" role="2Ln$9p">
327-
<node concept="2KPZRd" id="2vPZMAnl6TX" role="2L3P8e">
328-
<property role="2KPZRc" value="mui.icons.Delete" />
375+
<node concept="2KPZRd" id="2vPZMAnEJvw" role="2L3P8e">
376+
<node concept="2Kq$Lj" id="2vPZMAnDoXN" role="2Kq$h0">
377+
<property role="2Kq$Li" value="mui.icons.Delete" />
378+
</node>
329379
</node>
330380
<node concept="2KN1Qe" id="2vPZMAnl6TY" role="2KN1Qq">
331381
<node concept="3clFbS" id="2vPZMAnl6TZ" role="2KN1Q1">

‎mps/modules/ReactDemoLanguage.sandbox/models/ReactDemoLanguage.sandbox.m1.mps‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,69 @@
4343
<node concept="2K$1jT" id="2vPZMAnpySr" role="2K$1jV">
4444
<property role="TrG5h" value="N21" />
4545
</node>
46+
<node concept="2K$1jT" id="2vPZMAnBVc9" role="2K$1jV">
47+
<property role="TrG5h" value="N21" />
48+
</node>
49+
<node concept="2K$1jT" id="2vPZMAnBVca" role="2K$1jV">
50+
<property role="TrG5h" value="N21" />
51+
<node concept="2K$1jT" id="2vPZMAnBVcc" role="2K$1jV">
52+
<property role="TrG5h" value="N22" />
53+
<node concept="2K$1jT" id="2vPZMAnBVcd" role="2K$1jV">
54+
<property role="TrG5h" value="N3" />
55+
</node>
56+
</node>
57+
<node concept="2K$1jT" id="2vPZMAnBVce" role="2K$1jV">
58+
<property role="TrG5h" value="N22" />
59+
<node concept="2K$1jT" id="2vPZMAnBVcf" role="2K$1jV">
60+
<property role="TrG5h" value="N3" />
61+
<node concept="2K$1jT" id="2vPZMAnBVcg" role="2K$1jV">
62+
<property role="TrG5h" value="N22" />
63+
<node concept="2K$1jT" id="2vPZMAnBVch" role="2K$1jV">
64+
<property role="TrG5h" value="N3" />
65+
</node>
66+
</node>
67+
<node concept="2K$1jT" id="2vPZMAnBVci" role="2K$1jV">
68+
<property role="TrG5h" value="N22" />
69+
<node concept="2K$1jT" id="2vPZMAnBVcj" role="2K$1jV">
70+
<property role="TrG5h" value="N3" />
71+
<node concept="2K$1jT" id="2vPZMAnBVck" role="2K$1jV">
72+
<property role="TrG5h" value="N22" />
73+
<node concept="2K$1jT" id="2vPZMAnBVcl" role="2K$1jV">
74+
<property role="TrG5h" value="N3" />
75+
</node>
76+
</node>
77+
<node concept="2K$1jT" id="2vPZMAnBVcm" role="2K$1jV">
78+
<property role="TrG5h" value="N22" />
79+
<node concept="2K$1jT" id="2vPZMAnBVcn" role="2K$1jV">
80+
<property role="TrG5h" value="N3" />
81+
</node>
82+
</node>
83+
</node>
84+
</node>
85+
</node>
86+
</node>
87+
</node>
88+
<node concept="2K$1jT" id="2vPZMAnBVcb" role="2K$1jV">
89+
<property role="TrG5h" value="N21" />
90+
</node>
4691
<node concept="2K$1jT" id="2vPZMAnpySq" role="2K$1jV">
4792
<property role="TrG5h" value="N22" />
4893
<node concept="2K$1jT" id="2vPZMAnpySs" role="2K$1jV">
4994
<property role="TrG5h" value="N3" />
5095
</node>
5196
</node>
97+
<node concept="2K$1jT" id="2vPZMAnBVc5" role="2K$1jV">
98+
<property role="TrG5h" value="N22" />
99+
<node concept="2K$1jT" id="2vPZMAnBVc6" role="2K$1jV">
100+
<property role="TrG5h" value="N3" />
101+
</node>
102+
</node>
103+
<node concept="2K$1jT" id="2vPZMAnBVc7" role="2K$1jV">
104+
<property role="TrG5h" value="N22" />
105+
<node concept="2K$1jT" id="2vPZMAnBVc8" role="2K$1jV">
106+
<property role="TrG5h" value="N3" />
107+
</node>
108+
</node>
52109
</node>
53110
</model>
54111

0 commit comments

Comments
 (0)