mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 03:25:12 +01:00
Code Issues Projects Releases Wiki Activity

make className binding always have a value (may be undefined through T)

Browse Source
This commit is contained in:
Bruno Windels 2021-09-16 15:38:44 +02:00
parent 68fb093c9e
commit 040efa970c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/web/ui/general/html.ts
View File

@ -17,7 +17,7 @@ limitations under the License.
// DOM helper functions // DOM helper functions
export type ClassNames<T> = { [className: string]: boolean | ((value?: T) => boolean) } export type ClassNames<T> = { [className: string]: boolean | ((value: T) => boolean) }
export type BasicAttributes<T> = { [attribute: string]: ClassNames<T> | boolean | string } export type BasicAttributes<T> = { [attribute: string]: ClassNames<T> | boolean | string }
export type Child = string | Text | Element export type Child = string | Text | Element
@ -26,7 +26,7 @@ export function isChildren(children: object | Child | Child[]): children is Chil
return typeof children !== "object" || "nodeType" in children || Array.isArray(children); return typeof children !== "object" || "nodeType" in children || Array.isArray(children);
} }
export function classNames<T>(obj: ClassNames<T>, value?: T): string { export function classNames<T>(obj: ClassNames<T>, value: T): string {
return Object.entries(obj).reduce((cn, [name, enabled]) => { return Object.entries(obj).reduce((cn, [name, enabled]) => {
if (typeof enabled === "function") { if (typeof enabled === "function") {
enabled = enabled(value); enabled = enabled(value);
@ -70,7 +70,7 @@ export function elNS(ns: string, elementName: string, attributes?: BasicAttribut
if (typeof value === "object") { if (typeof value === "object") {
// Only className should ever be an object; be careful // Only className should ever be an object; be careful
// here anyway and ignore object-valued non-className attributes. // here anyway and ignore object-valued non-className attributes.
value = (value !== null && name === "className") ? classNames(value) : false; value = (value !== null && name === "className") ? classNames(value, undefined) : false;
} }
setAttribute(e, name, value); setAttribute(e, name, value);
} }