use type guard on html element

This commit is contained in:
Tony Amirault 2021-01-27 18:33:40 +01:00
parent 86f1099247
commit cdbae5fa43
2 changed files with 8207 additions and 9 deletions

8196
front/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,21 +1,19 @@
export class HtmlUtils { export class HtmlUtils {
public static getElementByIdOrFail<T extends HTMLElement>(id: string): T { public static getElementByIdOrFail<T extends HTMLElement>(id: string): T {
const elem = document.getElementById(id); const elem = document.getElementById(id);
if (elem === null) { if (HtmlUtils.isHtmlElement<T>(elem)) {
throw new Error("Cannot find HTML element with id '"+id+"'"); return elem
} }
// FIXME: does not check the type of the returned type throw new Error("Cannot find HTML element with id '"+id+"'");
return elem as T;
} }
public static removeElementByIdOrFail<T extends HTMLElement>(id: string): T { public static removeElementByIdOrFail<T extends HTMLElement>(id: string): T {
const elem = document.getElementById(id); const elem = document.getElementById(id);
if (elem === null) { if (HtmlUtils.isHtmlElement<T>(elem)) {
throw new Error("Cannot find HTML element with id '"+id+"'"); elem.remove();
return elem
} }
// FIXME: does not check the type of the returned type throw new Error("Cannot find HTML element with id '"+id+"'");
elem.remove();
return elem as T;
} }
public static urlify(text: string): string { public static urlify(text: string): string {
@ -24,4 +22,8 @@ export class HtmlUtils {
return '<a href="' + url + '" target="_blank" style=":visited {color: white}">' + url + '</a>'; return '<a href="' + url + '" target="_blank" style=":visited {color: white}">' + url + '</a>';
}) })
} }
private static isHtmlElement<T extends HTMLElement>(elem: HTMLElement | null): elem is T {
return elem !== null
}
} }