Further work, add checkboxes as option

This commit is contained in:
Pieter Vander Vennet 2020-09-10 19:33:06 +02:00
parent 8bb9b1228b
commit c944156d87
28 changed files with 364 additions and 149 deletions

View file

@ -13,17 +13,16 @@ export class CheckBoxes<T> extends InputElement<T[]> {
private readonly value: UIEventSource<T[]>;
private readonly _elements: InputElement<T>[]
private readonly _selectFirstAsDefault: boolean;
constructor(elements: InputElement<T>[],
selectFirstAsDefault = true) {
constructor(elements: InputElement<T>[]) {
super(undefined);
this._elements = Utils.NoNull(elements);
this._selectFirstAsDefault = selectFirstAsDefault;
this.dumbMode = false;
this.value = new UIEventSource<T[]>([])
this.ListenTo(this.value);
this.value.addCallback(latest => console.log("Latest is ", latest))
}
@ -35,6 +34,7 @@ export class CheckBoxes<T> extends InputElement<T[]> {
let matchFound = false;
for (const element of this._elements) {
if (element.IsValid(t)) {
element.GetValue().setData(t);
matchFound = true;
break
}
@ -56,7 +56,6 @@ export class CheckBoxes<T> extends InputElement<T[]> {
}
InnerRender(): string {
let body = "";
for (let i = 0; i < this._elements.length; i++) {
let el = this._elements[i];
@ -66,27 +65,30 @@ export class CheckBoxes<T> extends InputElement<T[]> {
}
return `<form id='${this.id}-form'>${body}</form>`;
return `<form id='${this.id}'>${body}</form>`;
}
protected InnerUpdate(htmlElement: HTMLElement) {
super.InnerUpdate(htmlElement);
const self = this;
for (let i = 0; i < this._elements.length; i++) {
const el = document.getElementById(this.IdFor(i));
const inputEl = this._elements[i];
{
const v = inputEl.GetValue().data;
const index = self.value.data.indexOf(v);
if(index >= 0){
// @ts-ignore
el.checked = true;
for (const t of this.value.data ?? []) {
if(t === undefined){
continue;
}
let isValid = inputEl.IsValid(t);
// @ts-ignore
el.checked = isValid;
if(isValid){
break;
}
}
el.onchange = e => {
const v = inputEl.GetValue().data;
const index = self.value.data.indexOf(v);

View file

@ -0,0 +1,53 @@
import {InputElement} from "./InputElement";
import {UIEventSource} from "../../Logic/UIEventSource";
export default class InputElementMap<T, X> extends InputElement<X> {
private readonly _inputElement: InputElement<T>;
private isSame: (x0: X, x1: X) => boolean;
private readonly fromX: (x: X) => T;
private readonly toX: (t: T) => X;
private readonly _value: UIEventSource<X>;
constructor(inputElement: InputElement<T>,
isSame: (x0: X, x1: X) => boolean,
toX: (t: T) => X,
fromX: (x: X) => T
) {
super();
this.isSame = isSame;
this.fromX = fromX;
this.toX = toX;
this._inputElement = inputElement;
this.IsSelected = inputElement.IsSelected;
const self = this;
this._value = inputElement.GetValue().map(
(t => {
const currentX = self.GetValue()?.data;
const newX = toX(t);
if (isSame(currentX, newX)) {
return currentX;
}
return newX;
}), [], x => {
const newT = fromX(x);
return newT;
});
}
GetValue(): UIEventSource<X> {
return this._value;
}
InnerRender(): string {
return this._inputElement.InnerRender();
}
IsSelected: UIEventSource<boolean>;
IsValid(x: X): boolean {
return this._inputElement.IsValid(this.fromX(x));
}
}