Mirrors
/
matrix-public-archive
mirror of https://github.com/matrix-org/matrix-public-archive.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up spurious logs when SSR rendering Hydrogen (#106) 

**Before:**

```
Child printed something to stdout: Mounting Hydrogen...

Child printed something to stderr: Skipping `addedHomservers` read from LocalStorage since LocalStorage is not available

Child printed something to stdout: Completed mounting Hydrogen: 22.188ms

Child printed something to stdout: 2 uncaughtException TypeError: this.dialogNode.close is not a function
    at ModalView.closeModal (C:\Users\MLM\Documents\GitHub\element\matrix-public-archive\shared\views\ModalView.js:115:21)
    at Timeout._onTimeout (C:\Users\MLM\Documents\GitHub\element\matrix-public-archive\shared\views\ModalView.js:87:18)
    at listOnTimeout (node:internal/timers:559:17)
    at processTimers (node:internal/timers:502:7)
```


**After:**

```
Child printed something to stdout: Mounting Hydrogen...

Child printed something to stderr: Skipping `addedHomservers` read from LocalStorage since LocalStorage is not available

Child printed something to stdout: Completed mounting Hydrogen: 14.2ms
```
This commit is contained in:
Eric Eastwood 2022-10-21 17:27:10 -05:00 committed by GitHub
parent 7c09ac13f9
commit 2bda335f1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shared/lib/archive-history.js
View File

@ -28,20 +28,20 @@ class ArchiveHistory extends History {
// downstream call of `urlRouter.attach()` which we do when bootstraping // downstream call of `urlRouter.attach()` which we do when bootstraping
// everything. // everything.
if (window.history) { if (window.history) {
let replacingUrl = window.location.search + url; let replacingUrl = document?.location?.search + url;
// This is a way to make sure the hash gets cleared out // This is a way to make sure the hash gets cleared out
if (url === '') { if (url === '') {
replacingUrl = window.location.pathname + window.location.search; replacingUrl = document?.location?.pathname + document?.location?.search;
} }
super.replaceUrlSilently(replacingUrl); super.replaceUrlSilently(replacingUrl);
} }
} }
pushUrlSilently(url) { pushUrlSilently(url) {
let replacingUrl = window.location.search + url; let replacingUrl = document?.location?.search + url;
// This is a way to make sure the hash gets cleared out // This is a way to make sure the hash gets cleared out
if (url === '') { if (url === '') {
replacingUrl = window.location.pathname + window.location.search; replacingUrl = document?.location?.pathname + document?.location?.search;
} }
super.pushUrlSilently(replacingUrl); super.pushUrlSilently(replacingUrl);
} }

11
shared/views/ModalView.js
View File

@ -81,9 +81,12 @@ class ModalView extends TemplateView {
// The dialog has to be in the DOM before we can call `showModal`, etc. // The dialog has to be in the DOM before we can call `showModal`, etc.
// Assume this view will be mounted in the parent DOM straight away. // Assume this view will be mounted in the parent DOM straight away.
requestAnimationFrame(() => { requestAnimationFrame(() => {
if (open) { // Prevent doing extra work if the modal is already closed or open and already
// matches our intention
const isAlreadyOpen = !!dialog.getAttribute('open');
if (open && !isAlreadyOpen) {
this.showModal(); this.showModal();
} else { } else if (isAlreadyOpen) {
this.closeModal(); this.closeModal();
} }
}); });
@ -98,6 +101,10 @@ class ModalView extends TemplateView {
} }
onDialogClicked(event) { onDialogClicked(event) {
// Close the dialog when the backdrop is clicked. The `::backdrop` is considered
// part of the `dialogNode` but we have a `modalInner` element that stops clicks on
// the dialog content itself counting as a click on it. So the only clicks to the
// dialog will be on the backdrop and we can safely assume they meant to close it.
if (event.target === this.dialogNode) { if (event.target === this.dialogNode) {
this.closeModal(); this.closeModal();
} }