Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
return this._minValue;
}

@property({ type: Boolean })
required = false;

@state()
private _maxValue?: number;

Expand Down Expand Up @@ -99,6 +102,12 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
return this._minValue !== undefined && this._maxValue !== undefined ? this._minValue > this._maxValue : false;
},
);

this.addValidator(
'valueMissing',
() => '#validation_fieldIsMandatory',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To keep things consistent with the other inputs, we need to add a requiredMessage property. If it's not provided, we'll fall back to UMB_VALIDATION_EMPTY_LOCALIZATION_KEY.

() => this.required && (this._minValue == null || this._maxValue == null),
);
}

override firstUpdated() {
Expand Down Expand Up @@ -129,7 +138,8 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
min=${ifDefined(this.validationRange?.min)}
max=${ifDefined(this.validationRange?.max)}
placeholder=${this._minPlaceholder}
.value=${this._minValue}
?required=${this.required}
.value=${this._minValue?.toString() ?? ''}
@input=${this.#onMinInput}></uui-input>
<b>–</b>
<uui-input
Expand All @@ -138,7 +148,8 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
min=${ifDefined(this.validationRange?.min)}
max=${ifDefined(this.validationRange?.max)}
placeholder=${this._maxPlaceholder}
.value=${this._maxValue}
?required=${this.required}
.value=${this._maxValue?.toString() ?? ''}
@input=${this.#onMaxInput}></uui-input>
`;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@ export class UmbPropertyEditorUINumberRangeElement
@state()
private _validationRange?: UmbNumberRangeValueType;

@property({ type: Boolean })
mandatory = false;

@property({ type: Object })
public override set value(value: UmbNumberRangeValueType | undefined) {
super.value = value || { min: undefined, max: undefined };
super.value = value;
this._minValue = value?.min;
this._maxValue = value?.max;
}
Expand All @@ -42,7 +45,9 @@ export class UmbPropertyEditorUINumberRangeElement
}

#onChange(event: CustomEvent & { target: UmbInputNumberRangeElement }) {
this.value = { min: event.target.minValue, max: event.target.maxValue };
const min = event.target.minValue;
const max = event.target.maxValue;
this.value = min == null && max == null ? undefined : { min, max };
this.dispatchEvent(new UmbChangeEvent());
}

Expand All @@ -59,6 +64,7 @@ export class UmbPropertyEditorUINumberRangeElement
<umb-input-number-range
.minValue=${this._minValue}
.maxValue=${this._maxValue}
?required=${this.mandatory}
.validationRange=${this._validationRange}
@change=${this.#onChange}>
</umb-input-number-range>
Expand Down
Loading