Skip to content

Decimal umb-property-editor-ui-number fixes #18233

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
leekelleher merged 4 commits into from
Feb 5, 2025
Merged

Decimal umb-property-editor-ui-number fixes #18233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1bdd30
Numeric: renamed `#parseInt` function to `#parseNumber`
leekelleher Feb 4, 2025
a44b191
Numeric: Changed to use `@change` event
leekelleher Feb 4, 2025
4ba4865
Number input: `max="Infinity"` was invalid markup
leekelleher Feb 5, 2025
a8c47bb
Decimal: adds input `step` config
leekelleher Feb 5, 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
12 changes: 6 additions & 6 deletions src/Umbraco.Web.UI.Client/src/packages/property-editors/number/Umbraco.Decimal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@ export const manifests: Array<UmbExtensionManifest> = [
label: 'Minimum',
description: 'Enter the minimum amount of number to be entered',
propertyEditorUiAlias: 'Umb.PropertyEditorUi.Decimal',
config: [{ alias: 'step', value: '0.001' }],
},
{
alias: 'max',
label: 'Maximum',
description: 'Enter the maximum amount of number to be entered',
propertyEditorUiAlias: 'Umb.PropertyEditorUi.Decimal',
config: [
{ alias: 'placeholder', value: '∞' },
{ alias: 'step', value: '0.001' },
],
},
{
alias: 'step',
label: 'Step size',
description: 'Enter the intervals amount between each step of number to be entered',
propertyEditorUiAlias: 'Umb.PropertyEditorUi.Decimal',
config: [
{
alias: 'step',
value: '0.01',
},
],
config: [{ alias: 'step', value: '0.001' }],
},
],
},
Expand Down
1 change: 1 addition & 0 deletions src/Umbraco.Web.UI.Client/src/packages/property-editors/number/Umbraco.Integer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export const manifests: Array<UmbExtensionManifest> = [
label: 'Maximum',
description: 'Enter the maximum amount of number to be entered',
propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
config: [{ alias: 'placeholder', value: '∞' }],
},
{
alias: 'step',
Expand Down
20 changes: 11 additions & 9 deletions ...o.Web.UI.Client/src/packages/property-editors/number/property-editor-ui-number.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ export class UmbPropertyEditorUINumberElement

public set config(config: UmbPropertyEditorConfigCollection | undefined) {
if (!config) return;
this._min = this.#parseInt(config.getValueByAlias('min')) || 0;
this._max = this.#parseInt(config.getValueByAlias('max')) || Infinity;
this._step = this.#parseInt(config.getValueByAlias('step'));
this._min = this.#parseNumber(config.getValueByAlias('min'));
this._max = this.#parseNumber(config.getValueByAlias('max'));
this._step = this.#parseNumber(config.getValueByAlias('step'));
this._placeholder = config.getValueByAlias('placeholder');
}

Expand Down Expand Up @@ -80,13 +80,15 @@ export class UmbPropertyEditorUINumberElement
}
}

#parseInt(input: unknown): number | undefined {
#parseNumber(input: unknown): number | undefined {
const num = Number(input);
return Number.isNaN(num) ? undefined : num;
return Number.isFinite(num) ? num : undefined;
}

#onInput(e: InputEvent & { target: HTMLInputElement }) {
this.value = this.#parseInt(e.target.value);
#onChange(event: InputEvent & { target: HTMLInputElement }) {
const newValue = event.target.value === '' ? undefined : this.#parseNumber(event.target.value);
if (newValue === this.value) return;
this.value = newValue;
this.dispatchEvent(new UmbPropertyValueChangeEvent());
}

Expand All @@ -99,8 +101,8 @@ export class UmbPropertyEditorUINumberElement
max=${ifDefined(this._max)}
step=${ifDefined(this._step)}
placeholder=${ifDefined(this._placeholder)}
value=${this.value?.toString() ?? (this._placeholder ? '' : '0')}
@input=${this.#onInput}
value=${this.value?.toString() ?? ''}
@change=${this.#onChange}
?readonly=${this.readonly}>
</uui-input>
`;
Expand Down