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

Link value of OHInput, make combinedInputElement more resilient; formatting

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-06-24 02:33:26 +02:00
parent 6efc928bb5
commit 570cbc67ce
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
UI/Input/CombinedInputElement.ts
View file

@ -24,13 +24,13 @@ export default class CombinedInputElement<T, J, X> extends InputElement<X> {
}, [b.IsSelected]) }, [b.IsSelected])
this._combined = new Combine([this._a, this._b]); this._combined = new Combine([this._a, this._b]);
this._value = this._a.GetValue().map( this._value = this._a.GetValue().map(
t => combine(t, this._b.GetValue().data), t => combine(t, this._b?.GetValue()?.data),
[this._b.GetValue()], [this._b.GetValue()],
) )
.addCallback(x => { .addCallback(x => {
const [t, j] = split(x) const [t, j] = split(x)
this._a.GetValue().setData(t) this._a.GetValue()?.setData(t)
this._b.GetValue().setData(j) this._b.GetValue()?.setData(j)
}) })
} }

9
UI/Input/ValidatedTextField.ts
View file

@ -264,11 +264,12 @@ export default class ValidatedTextField {
} }
if (tp.inputHelper) { if (tp.inputHelper) {
input = new CombinedInputElement(input, tp.inputHelper(input.GetValue(), { const helper = tp.inputHelper(input.GetValue(), {
location: options.location, location: options.location,
mapBackgroundLayer: options.mapBackgroundLayer mapBackgroundLayer: options.mapBackgroundLayer
}), })
input = new CombinedInputElement(input, helper,
(a, _) => a, // We can ignore b, as they are linked earlier (a, _) => a, // We can ignore b, as they are linked earlier
a => [a, a] a => [a, a]
); );