Commit f8edee7
* Initial plan
* Fix *Select state sync on JS DOM by using value-based selection
- Pass value=textFieldArgs.valueComposeUi to MdFilledSelect/MdOutlinedSelect
so Material Web uses value property setter (select(value)) to reliably
set displayed selection from Compose state
- Remove selected attribute approach in SelectOption JS impl since
selection is now controlled via the parent select's value attribute
- Add valueJsDom param to SelectOptionWithMaterialIcons
- Update demo SelectMenuContent to pass valueJsDom=it?.name?:'' so each
option has a proper value matching the select element's value
Co-authored-by: ShreckYe <27768951+ShreckYe@users.noreply.github.com>
* Add valueJsDom param to FilledSelect/OutlinedSelect; use it instead of valueComposeUi
The valueComposeUi field in SelectTextFieldArgs is the Compose UI text-field
display string, while Material Web's value attribute is an HTML form key used
for programmatic option selection — semantically different.
- Select.kt: add valueJsDom: String to FilledSelect and OutlinedSelect
- Select.js.kt: use valueJsDom instead of textFieldArgs.valueComposeUi
- Select.composeUi.kt: accept valueJsDom param (suppressed; unused on this platform)
- Demo: pass value (selection?.name ?: "") as valueJsDom
Co-authored-by: ShreckYe <27768951+ShreckYe@users.noreply.github.com>
* Clarify valueJsDom vs valueComposeUi distinction in comments
Co-authored-by: ShreckYe <27768951+ShreckYe@users.noreply.github.com>
* Review all the changes in this PR and fix unindented changes
- Manually test and make `valueJsDom` not-null across all functions.
- Adjust the parameter order in `SelectOption`.
* Move inline comments to KDoc; move selection comment above commented-out selected line
Co-authored-by: ShreckYe <27768951+ShreckYe@users.noreply.github.com>
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: ShreckYe <27768951+ShreckYe@users.noreply.github.com>
Co-authored-by: Yongshun Ye <ShreckYe@gmail.com>
1 parent c8eaaf4 commit f8edee7
File tree
4 files changed
+48
-32
lines changed- demo/src/commonMain/kotlin/com/huanshankeji/compose/material/demo
- material3/src
- commonMain/kotlin/com/huanshankeji/compose/material3/ext
- composeUiMain/kotlin/com/huanshankeji/compose/material3/ext
- jsMain/kotlin/com/huanshankeji/compose/material3/ext
4 files changed
+48
-32
lines changedLines changed: 11 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
202 | 202 | | |
203 | 203 | | |
204 | 204 | | |
205 | | - | |
| 205 | + | |
206 | 206 | | |
207 | 207 | | |
208 | 208 | | |
209 | 209 | | |
210 | 210 | | |
211 | 211 | | |
212 | 212 | | |
213 | | - | |
| 213 | + | |
214 | 214 | | |
215 | | - | |
| 215 | + | |
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
| |||
245 | 245 | | |
246 | 246 | | |
247 | 247 | | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
248 | 252 | | |
249 | 253 | | |
250 | 254 | | |
251 | 255 | | |
252 | 256 | | |
| 257 | + | |
253 | 258 | | |
254 | 259 | | |
255 | | - | |
| 260 | + | |
256 | 261 | | |
257 | 262 | | |
258 | 263 | | |
| |||
261 | 266 | | |
262 | 267 | | |
263 | 268 | | |
| 269 | + | |
264 | 270 | | |
265 | 271 | | |
266 | | - | |
| 272 | + | |
267 | 273 | | |
268 | 274 | | |
269 | 275 | | |
| |||
Lines changed: 25 additions & 21 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
39 | | - | |
40 | 38 | | |
41 | | - | |
42 | | - | |
43 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
| |||
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | 55 | | |
61 | | - | |
62 | | - | |
| 56 | + | |
63 | 57 | | |
64 | 58 | | |
65 | 59 | | |
| |||
68 | 62 | | |
69 | 63 | | |
70 | 64 | | |
| 65 | + | |
| 66 | + | |
71 | 67 | | |
72 | 68 | | |
73 | 69 | | |
74 | 70 | | |
75 | 71 | | |
76 | 72 | | |
| 73 | + | |
| 74 | + | |
77 | 75 | | |
78 | 76 | | |
79 | 77 | | |
| |||
87 | 85 | | |
88 | 86 | | |
89 | 87 | | |
90 | | - | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
91 | 92 | | |
92 | 93 | | |
93 | 94 | | |
94 | 95 | | |
95 | 96 | | |
96 | | - | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
97 | 100 | | |
98 | 101 | | |
99 | 102 | | |
100 | 103 | | |
101 | | - | |
102 | | - | |
| 104 | + | |
103 | 105 | | |
104 | 106 | | |
105 | 107 | | |
106 | 108 | | |
107 | 109 | | |
108 | 110 | | |
109 | | - | |
| 111 | + | |
| 112 | + | |
110 | 113 | | |
111 | 114 | | |
112 | 115 | | |
113 | | - | |
| 116 | + | |
114 | 117 | | |
115 | 118 | | |
116 | 119 | | |
117 | 120 | | |
118 | | - | |
| 121 | + | |
| 122 | + | |
119 | 123 | | |
120 | 124 | | |
121 | 125 | | |
122 | | - | |
| 126 | + | |
123 | 127 | | |
Lines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
| 45 | + | |
44 | 46 | | |
45 | 47 | | |
46 | 48 | | |
| |||
57 | 59 | | |
58 | 60 | | |
59 | 61 | | |
60 | | - | |
| 62 | + | |
| 63 | + | |
61 | 64 | | |
62 | 65 | | |
63 | 66 | | |
64 | 67 | | |
65 | | - | |
66 | 68 | | |
67 | 69 | | |
Lines changed: 8 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
37 | 38 | | |
38 | 39 | | |
39 | 40 | | |
| |||
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
| 47 | + | |
46 | 48 | | |
47 | 49 | | |
48 | 50 | | |
| |||
53 | 55 | | |
54 | 56 | | |
55 | 57 | | |
| 58 | + | |
56 | 59 | | |
57 | 60 | | |
58 | 61 | | |
| |||
62 | 65 | | |
63 | 66 | | |
64 | 67 | | |
| 68 | + | |
65 | 69 | | |
66 | 70 | | |
67 | 71 | | |
| |||
75 | 79 | | |
76 | 80 | | |
77 | 81 | | |
78 | | - | |
| 82 | + | |
| 83 | + | |
79 | 84 | | |
80 | 85 | | |
81 | 86 | | |
82 | 87 | | |
83 | | - | |
84 | 88 | | |
85 | 89 | | |
86 | 90 | | |
87 | 91 | | |
88 | | - | |
89 | | - | |
| 92 | + | |
| 93 | + | |
90 | 94 | | |
91 | 95 | | |
92 | 96 | | |
| |||
0 commit comments