File tree Expand file tree Collapse file tree 1 file changed +33
-11
lines changed Expand file tree Collapse file tree 1 file changed +33
-11
lines changed Original file line number Diff line number Diff line change @@ -90,15 +90,35 @@ const Lighting: React.FC<{
90
90
"dmx_autoActivate" ,
91
91
false ,
92
92
) ;
93
- const [ dmxWebDevice , setDMXWebDevice ] = React . useState < { serialNumber : string , productName : string } > ( ) ;
93
+ const [ dmxWebDevices , setDMXWebDevices ] = React . useState <
94
+ {
95
+ serialNumber : string ;
96
+ productName : string ;
97
+ } [ ]
98
+ > ( ) ;
94
99
React . useEffect ( ( ) => {
95
- window . thorium . getDMXDeviceList ?.( ) . then ( ( res : { serialNumber : string , productName : string } ) => {
96
- setDMXWebDevice ( { serialNumber : res ?. serialNumber || "" , productName : res ?. productName || "" } ) ;
97
- setDmxDevice ( ( dmxDevice : string ) => {
98
- if ( ! dmxDevice && res ?. serialNumber ) return res ?. serialNumber ;
99
- return dmxDevice ;
100
- } ) ;
101
- } ) ;
100
+ window . thorium . getDMXDeviceList ?.( ) . then (
101
+ (
102
+ res : {
103
+ serialNumber : string ;
104
+ productName : string ;
105
+ deviceName : string ;
106
+ } [ ] ,
107
+ ) => {
108
+ console . log ( res ) ;
109
+ setDMXWebDevices (
110
+ res . map ( res => ( {
111
+ serialNumber : res ?. serialNumber || "" ,
112
+ productName : res ?. productName || res ?. deviceName || "" ,
113
+ } ) ) ,
114
+ ) ;
115
+ setDmxDevice ( ( dmxDevice : string ) => {
116
+ if ( ! dmxDevice && res ?. [ 0 ] ?. serialNumber )
117
+ return res ?. [ 0 ] ?. serialNumber ;
118
+ return dmxDevice ;
119
+ } ) ;
120
+ } ,
121
+ ) ;
102
122
} , [ setDmxDevice ] ) ;
103
123
104
124
React . useEffect ( ( ) => {
@@ -221,9 +241,11 @@ const Lighting: React.FC<{
221
241
setDmxDevice ( e . target . value ) ;
222
242
} }
223
243
>
224
- < option key = { dmxWebDevice ?. serialNumber } value = { dmxWebDevice ?. serialNumber } >
225
- { dmxWebDevice ?. productName }
226
- </ option >
244
+ { dmxWebDevices ?. map ( d => (
245
+ < option key = { d ?. serialNumber } value = { d ?. serialNumber } >
246
+ { d ?. productName }
247
+ </ option >
248
+ ) ) }
227
249
</ Input >
228
250
</ label >
229
251
) }
You can’t perform that action at this time.
0 commit comments