Skip to content

Commit b4d5c8f

Browse files
input with alias and input range style corrections (#19441)
* fix alias input * number range style fix + placeholder inconsistency fix * build(deps): bump @umbraco-ui/uui to 1.14.0-rc.3 * fix property declaration * Update src/Umbraco.Web.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts --------- Co-authored-by: Jacob Overgaard <[email protected]>
1 parent da436f8 commit b4d5c8f

File tree

4 files changed

+44
-25
lines changed

4 files changed

+44
-25
lines changed

src/Umbraco.Web.UI.Client/package-lock.json

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Umbraco.Web.UI.Client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
"@tiptap/extension-underline": "2.11.7",
216216
"@tiptap/pm": "2.11.7",
217217
"@tiptap/starter-kit": "2.11.7",
218-
"@umbraco-ui/uui": "1.14.0-rc.2",
218+
"@umbraco-ui/uui": "1.14.0-rc.3",
219219
"@umbraco-ui/uui-css": "1.14.0-rc.2",
220220
"dompurify": "^3.2.5",
221221
"element-internals-polyfill": "^3.0.2",
@@ -288,4 +288,4 @@
288288
"access": "public",
289289
"registry": "https://registry.npmjs.org/"
290290
}
291-
}
291+
}

src/Umbraco.Web.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,21 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
4747
}
4848

4949
@property({ type: Object })
50-
validationRange?: UmbNumberRangeValueType;
50+
public set validationRange(value: UmbNumberRangeValueType | undefined) {
51+
this.#validationRange = value;
52+
this._minPlaceholder = value?.min !== undefined ? String(value?.min) : '';
53+
this._maxPlaceholder = value?.max !== undefined && value.max !== Infinity ? String(value.max) : '∞';
54+
}
55+
public get validationRange(): UmbNumberRangeValueType | undefined {
56+
return this.#validationRange;
57+
}
58+
#validationRange?: UmbNumberRangeValueType | undefined;
59+
60+
@state()
61+
private _minPlaceholder: string = '';
62+
63+
@state()
64+
private _maxPlaceholder: string = '';
5165

5266
private updateValue() {
5367
const newValue =
@@ -114,7 +128,7 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
114128
label=${this.minLabel}
115129
min=${ifDefined(this.validationRange?.min)}
116130
max=${ifDefined(this.validationRange?.max)}
117-
placeholder=${this.validationRange?.min ?? ''}
131+
placeholder=${this._minPlaceholder}
118132
.value=${this._minValue}
119133
@input=${this.#onMinInput}></uui-input>
120134
<b>–</b>
@@ -123,13 +137,20 @@ export class UmbInputNumberRangeElement extends UmbFormControlMixin(UmbLitElemen
123137
label=${this.maxLabel}
124138
min=${ifDefined(this.validationRange?.min)}
125139
max=${ifDefined(this.validationRange?.max)}
126-
placeholder=${this.validationRange?.max ?? '∞'}
140+
placeholder=${this._maxPlaceholder}
127141
.value=${this._maxValue}
128142
@input=${this.#onMaxInput}></uui-input>
129143
`;
130144
}
131145

132146
static override styles = css`
147+
:host {
148+
display: flex;
149+
align-items: center;
150+
}
151+
b {
152+
margin: 0 var(--uui-size-space-1);
153+
}
133154
:host(:invalid:not([pristine])) {
134155
color: var(--uui-color-invalid);
135156
}

src/Umbraco.Web.UI.Client/src/packages/core/components/input-with-alias/input-with-alias.element.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ export class UmbInputWithAliasElement extends UmbFormControlMixin<string, typeof
138138
}
139139
140140
#alias {
141-
max-width: 50%;
142-
143141
&.muted {
144142
opacity: 0.55;
145143
padding: var(--uui-size-1, 3px) var(--uui-size-space-3, 9px);

0 commit comments

Comments
 (0)