Skip to content

Property Editors: Add mandatory support to Number Range (Refactor). #20570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 3, 2025
Merged

Property Editors: Add mandatory support to Number Range (Refactor). #20570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5ba6bc
Added mandatory property to number range property editor and bind it …
engijlr Oct 20, 2025
df9d463
Merge branch 'v17/dev' into v17/improvement/number-range-property-edi…
madsrasmussen Oct 28, 2025
d82225f
Added mandatory message support.
engijlr Oct 30, 2025
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
19 changes: 16 additions & 3 deletions ...b.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { css, customElement, html, ifDefined, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import type { UmbNumberRangeValueType } from '@umbraco-cms/backoffice/models';
import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
Expand Down Expand Up @@ -34,6 +34,11 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
return this._minValue;
}

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

@state()
private _maxValue?: number;

Expand Down Expand Up @@ -90,6 +95,12 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
constructor() {
super();

this.addValidator(
'valueMissing',
() => this.requiredMessage,
() => this.required && (this._minValue == null || this._maxValue == null),
);

this.addValidator(
'patternMismatch',
() => {
Expand Down Expand Up @@ -129,7 +140,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 +150,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
15 changes: 12 additions & 3 deletions ...ent/src/packages/property-editors/number-range/property-editor-ui-number-range.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { UmbInputNumberRangeElement } from '@umbraco-cms/backoffice/components';
import { customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import type { UmbNumberRangeValueType } from '@umbraco-cms/backoffice/models';
Expand All @@ -26,9 +26,14 @@ export class UmbPropertyEditorUINumberRangeElement
@state()
private _validationRange?: UmbNumberRangeValueType;

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

@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 +47,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 +66,8 @@ export class UmbPropertyEditorUINumberRangeElement
<umb-input-number-range
.minValue=${this._minValue}
.maxValue=${this._maxValue}
?required=${this.mandatory}
.requiredMessage=${this.mandatoryMessage}
.validationRange=${this._validationRange}
@change=${this.#onChange}>
</umb-input-number-range>
Expand Down
Loading