forked from MapComplete/MapComplete
Refactoring: move svelte component out of UIElement
This commit is contained in:
parent
53cbcfe1e7
commit
379f472adf
2 changed files with 7 additions and 3 deletions
|
@ -5,8 +5,11 @@
|
||||||
import { UIEventSource } from "../../../Logic/UIEventSource"
|
import { UIEventSource } from "../../../Logic/UIEventSource"
|
||||||
import ToSvelte from "../../Base/ToSvelte.svelte"
|
import ToSvelte from "../../Base/ToSvelte.svelte"
|
||||||
import OpeningHoursInput from "../../OpeningHours/OpeningHoursInput"
|
import OpeningHoursInput from "../../OpeningHours/OpeningHoursInput"
|
||||||
|
import PublicHolidaySelector from "../../OpeningHours/PublicHolidaySelector.svelte"
|
||||||
|
|
||||||
export let value: UIEventSource<string>
|
export let value: UIEventSource<string>
|
||||||
|
export let phSelectorValue = new UIEventSource("")
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<ToSvelte construct={new OpeningHoursInput(value)} />
|
<ToSvelte construct={new OpeningHoursInput(value, phSelectorValue)} />
|
||||||
|
<PublicHolidaySelector value={phSelectorValue}/>
|
||||||
|
|
|
@ -21,6 +21,7 @@ export default class OpeningHoursInput extends InputElement<string> {
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
value: UIEventSource<string> = new UIEventSource<string>(""),
|
value: UIEventSource<string> = new UIEventSource<string>(""),
|
||||||
|
phSelectorValue: UIEventSource<string> = new UIEventSource<string>(undefined),
|
||||||
prefix = "",
|
prefix = "",
|
||||||
postfix = ""
|
postfix = ""
|
||||||
) {
|
) {
|
||||||
|
@ -88,7 +89,8 @@ export default class OpeningHoursInput extends InputElement<string> {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const phSelectorValue = new UIEventSource<string>(ph ?? "")
|
|
||||||
|
phSelectorValue.set(ph ?? "")
|
||||||
|
|
||||||
// Note: MUST be bound AFTER the leftover rules!
|
// Note: MUST be bound AFTER the leftover rules!
|
||||||
const rulesFromOhPicker: UIEventSource<OpeningHour[]> = valueWithoutPrefix.sync(
|
const rulesFromOhPicker: UIEventSource<OpeningHour[]> = valueWithoutPrefix.sync(
|
||||||
|
@ -142,7 +144,6 @@ export default class OpeningHoursInput extends InputElement<string> {
|
||||||
this._element = new Combine([
|
this._element = new Combine([
|
||||||
leftoverWarning,
|
leftoverWarning,
|
||||||
ohPicker,
|
ohPicker,
|
||||||
new SvelteUIElement(PublicHolidaySelector, { value: phSelectorValue }),
|
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue