@@ -42,19 +42,24 @@ const observable = require('./util/observable.js')
4242const dbEnum = require (` ../src-shared/db-enum.js` )
4343const storage = require (' ./util/storage.js' )
4444
45- window .addEventListener (' message' , (event ) => {
45+ window .addEventListener (
46+ ' message' ,
47+ (event ) => {
4648 const eventData = event ? .data ? .eventData
4749 switch (event ? .data ? .eventId ) {
4850 case ' theme' :
49- window [rendApi .GLOBAL_SYMBOL_EXECUTE ](rendApi .id .setDarkTheme , eventData .theme === ' dark' )
51+ window [rendApi .GLOBAL_SYMBOL_EXECUTE ](
52+ rendApi .id .setDarkTheme ,
53+ eventData .theme === ' dark'
54+ )
5055 break
5156 case ' save' :
5257 if (eventData .shouldSave ) {
5358 window [rendApi .GLOBAL_SYMBOL_EXECUTE ](rendApi .id .save )
5459 }
5560 break
5661 }
57- },
62+ },
5863 false
5964)
6065
@@ -131,7 +136,13 @@ export default defineComponent({
131136 },
132137 uiThemeCategory: {
133138 get () {
134- return this .$store .state .zap .selectedZapConfig ? .zclProperties .category
139+ let zclProps = this .$store .state .zap .selectedZapConfig ? .zclProperties
140+ // Picking the first category in the case of multi-protocol(zigbee/matter)
141+ if (Array .isArray (zclProps) && zclProps .length > 0 ) {
142+ return zclProps[0 ].category
143+ } else {
144+ return this .$store .state .zap .selectedZapConfig ? .zclProperties .category
145+ }
135146 },
136147 },
137148 },
@@ -231,12 +242,9 @@ export default defineComponent({
231242 }
232243 )
233244
234- this .$onWebSocket (
235- dbEnum .wsCategory .dirtyFlag ,
236- (resp ) => {
237- this .$store .dispatch (' zap/setDirtyState' , resp)
238- }
239- )
245+ this .$onWebSocket (dbEnum .wsCategory .dirtyFlag , (resp ) => {
246+ this .$store .dispatch (' zap/setDirtyState' , resp)
247+ })
240248 },
241249 addClassToBody () {
242250 if (this .uiThemeCategory === ' zigbee' ) {
@@ -264,13 +272,15 @@ export default defineComponent({
264272 },
265273 mounted () {
266274 this .addClassToBody ()
267- window ? .parent ? .postMessage ({
275+ window ? .parent ? .postMessage (
276+ {
268277 eventId: ' mounted' ,
269278 eventData: {
270- hasMounted: true
271- }
279+ hasMounted: true ,
280+ },
272281 },
273- ' *' )
282+ ' *'
283+ )
274284 },
275285 unmounted () {
276286 if (this .uiThemeCategory === ' zigbee' ) {
0 commit comments