ilja_space/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Finishing refactoring

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-07-20 21:39:07 +02:00
parent 8026e99824
commit 00d95c4be1
8 changed files with 86 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Customizations/TagRendering.ts
View file

@ -263,7 +263,7 @@ class TagRendering extends UIElement implements TagDependantUIElement {
this._editButton = new FixedUiElement("<img class='editbutton' src='./assets/pencil.svg' alt='edit'>")
.onClick(() => {
self._editMode.setData(true);
self._questionElement.ShowValue(self.CurrentValue());
self._questionElement.GetValue().setData(self.CurrentValue());
});
}

4
UI/ImageUploadFlow.ts
View file

@ -41,7 +41,7 @@ export class ImageUploadFlow extends UIElement {
preferedLicense
);
this._licensePicker = licensePicker;
this._selectedLicence = licensePicker.selectedElement;
this._selectedLicence = licensePicker.GetValue();
const licenseExplanations = {
@ -62,7 +62,7 @@ export class ImageUploadFlow extends UIElement {
}
protected InnerRender(): string {
InnerRender(): string {
if (!this._userdetails.data.loggedIn) {
return "<div class='activate-osm-authentication'>Gelieve je aan te melden om een foto toe te voegen of vragen te beantwoorden</div>";

92
UI/Input/DropDown.ts
View file

@ -1,35 +1,61 @@
import {UIEventSource} from "../UIEventSource";
import {UIElement} from "../UIElement";
import {InputElement} from "./InputElement";
import instantiate = WebAssembly.instantiate;
import {FixedUiElement} from "../Base/FixedUiElement";
export class DropDown extends UIElement {
export class DropDown<T> extends InputElement<T> {
selectedElement: UIEventSource<string>
private _label: string;
private _values: { value: string; shown: string }[];
private readonly _label: string;
private readonly _values: { value: T; shown: UIElement }[];
constructor(label: string, values: { value: string, shown: string }[],
selectedElement: UIEventSource<string> = undefined) {
private readonly _value;
constructor(label: string,
values: { value: T, shown: string | UIElement }[],
value: UIEventSource<T> = undefined) {
super(undefined);
this._value = value ?? new UIEventSource<T>(undefined);
this._label = label;
this._values = values;
this.selectedElement = selectedElement ?? new UIEventSource<string>(values[0].value);
if(selectedElement.data === undefined){
this.selectedElement.setData(values[0].value)
this._values = values.map(v => {
return {
value: v.value,
shown: v.shown instanceof UIElement ? v.shown : new FixedUiElement(v.shown)
}
const self = this;
this.selectedElement.addCallback(() => {
self.InnerUpdate();
});
}
);
this.ListenTo(this._value)
}
GetValue(): UIEventSource<T> {
return this._value;
}
ShowValue(t: T): boolean {
if (!this.IsValid(t)) {
return false;
}
this._value.setData(t);
}
IsValid(t: T): boolean {
for (const value of this._values) {
if (value.value === t) {
return true;
}
}
return false
}
protected InnerRender(): string {
InnerRender(): string {
let options = "";
for (const value of this._values) {
options += "<option value='" + value.value + "'>" + value.shown + "</option>"
}
for (let i = 0; i < this._values.length; i++) {
options += "<option value='" + i + "'>" + this._values[i].shown.InnerRender() + "</option>"
}
return "<form>" +
"<label for='dropdown-" + this.id + "'>" + this._label + "</label>" +
"<select name='dropdown-" + this.id + "' id='dropdown-" + this.id + "'>" +
@ -38,22 +64,24 @@ export class DropDown extends UIElement {
"</form>";
}
InnerUpdate() {
protected InnerUpdate(element) {
var e = document.getElementById("dropdown-" + this.id);
const self = this;
const e = document.getElementById("dropdown-" + this.id);
if(e === null){
return;
e.onchange = (() => {
// @ts-ignore
var index = parseInt(e.selectedIndex);
self._value.setData(self._values[index].value);
});
var t = this._value.data;
for (let i = 0; i < this._values.length ; i++) {
const value = this._values[i];
if (value.value == t) {
// @ts-ignore
e.selectedIndex = i;
}
// @ts-ignore
if (this.selectedElement.data !== e.value) {
// @ts-ignore
e.value = this.selectedElement.data;
}
e.onchange = function () {
// @ts-ignore
const selectedValue = e.options[e.selectedIndex].value;
console.log("Putting data", selectedValue)
self.selectedElement.setData(selectedValue);
}
}

2
UI/Input/InputElement.ts
View file

@ -8,6 +8,4 @@ export abstract class InputElement<T> extends UIElement{
abstract IsValid(t: T) : boolean;
abstract ShowValue(t: T) : boolean;
}

3
UI/Input/RadioButton.ts
View file

@ -27,8 +27,7 @@ export class RadioButton<T> extends InputElement<T> {
return elements[selectedIndex].GetValue()
}
}
), elements.map(e => e.GetValue()))
;
), elements.map(e => e.GetValue()));
this.value.addCallback((t) => {
self.ShowValue(t);

13
UI/Input/TextField.ts
View file

@ -23,9 +23,11 @@ export class TextField<T> extends InputElement<T> {
value?: UIEventSource<T>
}) {
super(undefined);
const self = this;
this.value = new UIEventSource<string>("");
this.mappedValue = options?.value ?? new UIEventSource<T>(undefined);
this.mappedValue = options?.value ?? new UIEventSource<T>(undefined);
this.mappedValue.addCallback(() => self.InnerUpdate());
// @ts-ignore
this._fromString = options.fromString ?? ((str) => (str))
@ -42,7 +44,6 @@ export class TextField<T> extends InputElement<T> {
this._toString = options.toString ?? ((t) => ("" + t));
const self = this;
this.mappedValue.addCallback((t) => {
if (t === undefined || t === null) {
return;
@ -73,7 +74,7 @@ export class TextField<T> extends InputElement<T> {
"</form>";
}
InnerUpdate(htmlElement: HTMLElement) {
InnerUpdate() {
const field = document.getElementById('text-' + this.id);
if (field === null) {
return;
@ -92,8 +93,12 @@ export class TextField<T> extends InputElement<T> {
});
if (this.IsValid(this.mappedValue.data)) {
const expected = this._toString(this.mappedValue.data);
// @ts-ignore
field.value = this._toString(this.mappedValue.data);
if (field.value !== expected) {
// @ts-ignore
field.value = expected;
}
}

3
UI/UIElement.ts
View file

@ -83,7 +83,8 @@ export abstract class UIElement {
}
// Called after the HTML has been replaced. Can be used for css tricks
InnerUpdate(htmlElement : HTMLElement){}
protected InnerUpdate(htmlElement: HTMLElement) {
}
Render(): string {
return "<span class='uielement' id='" + this.id + "'>" + this.InnerRender() + "</span>"

22
test.ts
View file

@ -10,17 +10,15 @@ import {VariableUiElement} from "./UI/Base/VariableUIElement";
import {TextField} from "./UI/Input/TextField";
import {FixedInputElement} from "./UI/Input/FixedInputElement";
import {RadioButton} from "./UI/Input/RadioButton";
import {DropDown} from "./UI/Input/DropDown";
import {FixedUiElement} from "./UI/Base/FixedUiElement";
const buttons = new RadioButton<number>(
[new FixedInputElement("Five", 5),
new FixedInputElement("Ten", 10),
new TextField<number>({
fromString: (str) => parseInt(str),
toString: (i) => ("" + i),
})
], false
const dropdown = new RadioButton<string>(
[new FixedInputElement("5","5"),
new TextField({
toString: ((str) => str),
fromString: ((str) => str),
})]
).AttachTo("maindiv");
buttons.GetValue().addCallback(console.log);
const value = dropdown.GetValue();
value.setData("asldkjvmqlksjdf")