re-add notif force dismissal (#215)

This commit is contained in:
end-4
2024-02-03 08:06:37 +07:00
parent 9cf27e6d2c
commit bb4f50bd7b
2 changed files with 18 additions and 16 deletions
+12 -12
View File
@@ -435,17 +435,17 @@ export default ({
})
widget.add(notificationBox);
wholeThing.child.children = [widget];
// if (isPopup) Utils.timeout(popupTimeout, () => {
// if (wholeThing) {
// wholeThing.revealChild = false;
// Utils.timeout(200, () => {
// if (wholeThing) {
// wholeThing.destroy();
// wholeThing = null;
// }
// command();
// }, wholeThing);
// }
// })
if (isPopup) Utils.timeout(popupTimeout, () => {
if (wholeThing) {
wholeThing.revealChild = false;
Utils.timeout(200, () => {
if (wholeThing) {
wholeThing.destroy();
wholeThing = null;
}
command();
}, wholeThing);
}
})
return wholeThing;
}
@@ -10,12 +10,14 @@ export default () => Box({
attribute: {
'map': new Map(),
'dismiss': (box, id, force = false) => {
if (!id || !box.attribute.map.has(id) || box.attribute.map.get(id).attribute.hovered && !force)
if (!id || !box.attribute.map.has(id))
return;
const notifWidget = box.attribute.map.get(id);
if (notifWidget == null || notifWidget.attribute.hovered && !force)
return; // cuz already destroyed
const notif = box.attribute.map.get(id);
notif.revealChild = false;
notif.attribute.destroyWithAnims();
notifWidget.revealChild = false;
notifWidget.attribute.destroyWithAnims();
box.attribute.map.delete(id);
},
'notify': (box, id) => {