Cutlery/beestat
1
0
Fork 0
mirror of https://github.com/beestat/app.git synced 2025-07-09 03:04:07 -04:00
Code Actions Packages Releases Activity

Fixed active room not always rendering on top

Browse Source
This commit is contained in:
Jon Ziebell 2022-08-10 21:38:16 -04:00
parent a579e26b14
commit 1b33b34d18
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
js/component/card/floor_plan_editor.js
View File

@ -36,12 +36,12 @@ beestat.component.card.floor_plan_editor = function(thermostat_id) {
} }
// The first time this component renders center the content. // The first time this component renders center the content.
this.addEventListener('render', function() { this.addEventListener('render', function() {
if (this.floor_plan_ !== undefined) { if (this.floor_plan_ !== undefined) {
self.floor_plan_.center_content(); self.floor_plan_.center_content();
self.removeEventListener('render'); self.removeEventListener('render');
} }
}); });
}; };
beestat.extend(beestat.component.card.floor_plan_editor, beestat.component.card); beestat.extend(beestat.component.card.floor_plan_editor, beestat.component.card);
@ -178,11 +178,6 @@ beestat.component.card.floor_plan_editor.prototype.decorate_drawing_pane_ = func
}); });
this.floor_plan_.addEventListener('change_group', self.rerender.bind(this)); this.floor_plan_.addEventListener('change_group', self.rerender.bind(this));
// Add all of the entities to the SVG.
this.entities_ = {
'room': []
};
const group_below = this.floor_plan_.get_group_below(this.state_.active_group); const group_below = this.floor_plan_.get_group_below(this.state_.active_group);
if (group_below !== undefined) { if (group_below !== undefined) {
group_below.rooms.forEach(function(room) { group_below.rooms.forEach(function(room) {
@ -195,6 +190,7 @@ beestat.component.card.floor_plan_editor.prototype.decorate_drawing_pane_ = func
} }
// Loop over the rooms in this group and add them. // Loop over the rooms in this group and add them.
let active_room_entity;
this.state_.active_group.rooms.forEach(function(room) { this.state_.active_group.rooms.forEach(function(room) {
const room_entity = new beestat.component.floor_plan_entity.room(self.floor_plan_, self.state_) const room_entity = new beestat.component.floor_plan_entity.room(self.floor_plan_, self.state_)
.set_room(room) .set_room(room)
@ -221,19 +217,29 @@ beestat.component.card.floor_plan_editor.prototype.decorate_drawing_pane_ = func
self.update_info_pane_(); self.update_info_pane_();
}); });
// Activate the currently active room (mostly for rerenders). /**
* If there is currently an active room, use it to match to the newly
* created room entities and then store it. After this loop is done
* activate it to avoid other rooms getting written on top. Also delete
* the active room from the state or it will needlessly be inactivated in
* the set_active function.
*/
if ( if (
self.state_.active_room_entity !== undefined && self.state_.active_room_entity !== undefined &&
room.room_id === self.state_.active_room_entity.get_room().room_id room.room_id === self.state_.active_room_entity.get_room().room_id
) { ) {
room_entity.set_active(true); delete self.state_.active_room_entity;
active_room_entity = room_entity;
} }
// Render the room and save to the list of current entities. // Render the room and save to the list of current entities.
room_entity.render(self.floor_plan_.get_g()); room_entity.render(self.floor_plan_.get_g());
self.entities_.room.push(room_entity);
}); });
if (active_room_entity !== undefined) {
active_room_entity.set_active(true);
}
/** /**
* If there was an active room, defer to adding it last so it ends up on * If there was an active room, defer to adding it last so it ends up on
* top. The set_active function doesn't do anything if the room isn't * top. The set_active function doesn't do anything if the room isn't
@ -241,7 +247,6 @@ beestat.component.card.floor_plan_editor.prototype.decorate_drawing_pane_ = func
*/ */
if (this.state_.active_room_entity !== undefined) { if (this.state_.active_room_entity !== undefined) {
this.state_.active_room_entity.render(this.floor_plan_.get_g()); this.state_.active_room_entity.render(this.floor_plan_.get_g());
this.entities_.room.push(this.state_.active_room_entity);
} }
}; };