Skip to content
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

Jump to bottom

fix: Relative input-widths use container's size #5016

Merged
merged 4 commits into from
Sep 27, 2024
Merged

fix: Relative input-widths use container's size #5016

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98e1ef3
fix: Relative input-widths use container's size
GZolla Sep 27, 2024
50565a1
Updating vdiff goldens (#5017)
github-actions[bot] Sep 27, 2024
eee6ba2
From review
GZolla Sep 27, 2024
0f03938
Remove await
GZolla Sep 27, 2024
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
20 changes: 18 additions & 2 deletions components/inputs/input-number.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { ifDefined } from 'lit/directives/if-defined.js';
import { LabelledMixin } from '../../mixins/labelled/labelled-mixin.js';
import { LocalizeCoreElement } from '../../helpers/localize-core-element.js';
import { SkeletonMixin } from '../skeleton/skeleton-mixin.js';
import { styleMap } from 'lit/directives/style-map.js';

const HINT_TYPES = {
NONE: 0,
Expand Down Expand Up @@ -178,6 +179,7 @@ class InputNumber extends FocusMixin(LabelledMixin(SkeletonMixin(FormElementMixi
* @ignore
*/
valueTrailingZeroes: { type: String, attribute: 'value-trailing-zeroes' },
_afterSlotWidth: { type: Number },
Copy link
Member

Choose a reason for hiding this comment

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

Consumers don't need to set this but we do want changes to it to trigger a render, so it's a good use case for a reactive state property. The others here (_hintType, _formattedValue) should be the same but this code was written before state properties were a thing.

Suggested change
_afterSlotWidth: { type: Number },
_afterSlotWidth: { state: true },

_hintType: { type: Number },
_formattedValue: { type: String }
};
Expand Down Expand Up @@ -218,6 +220,7 @@ class InputNumber extends FocusMixin(LabelledMixin(SkeletonMixin(FormElementMixi
this._trailingZeroes = false;
this._valueTrailingZeroes = '';
this._descriptor = getNumberDescriptor();
this._afterSlotWidth = 0;
}

get maxFractionDigits() {
Expand Down Expand Up @@ -337,6 +340,11 @@ class InputNumber extends FocusMixin(LabelledMixin(SkeletonMixin(FormElementMixi

render() {
const valueAlign = (this.valueAlign === 'end') ? 'end' : 'start';
const hasRelativeInputWidth = this.inputWidth.includes('%');
dlockhart marked this conversation as resolved.
Show resolved Hide resolved
const inputWidthStyle = {
width : '100%',
maxWidth: `calc(${this.inputWidth} + ${this._afterSlotWidth}px)`
};
return html`
<d2l-input-text
autocomplete="${ifDefined(this.autocomplete)}"
Expand All @@ -351,7 +359,7 @@ class InputNumber extends FocusMixin(LabelledMixin(SkeletonMixin(FormElementMixi
.forceInvalid="${this.invalid}"
?hide-invalid-icon="${this.hideInvalidIcon}"
id="${this._inputId}"
input-width="${this.inputWidth}"
input-width="${hasRelativeInputWidth ? 'none' : this.inputWidth}"
@invalid-change="${this._handleInvalidChange}"
label="${ifDefined(this.label)}"
?label-hidden="${this.labelHidden || this.labelledBy}"
Expand All @@ -360,13 +368,14 @@ class InputNumber extends FocusMixin(LabelledMixin(SkeletonMixin(FormElementMixi
placeholder="${ifDefined(this.placeholder)}"
?required="${this.required}"
?skeleton="${this.skeleton}"
style="${ifDefined(hasRelativeInputWidth ? styleMap(inputWidthStyle) : undefined)}"
unit="${ifDefined(this.unit)}"
unit-label="${ifDefined(this.unitLabel)}"
.value="${this._formattedValue}"
value-align="${valueAlign}">
<slot slot="left" name="left"></slot>
<slot slot="right" name="right"></slot>
<slot slot="after" name="after"></slot>
<slot slot="after" name="after" @slotchange=${this._handleAfterSlotChange}></slot>
dlockhart marked this conversation as resolved.
Show resolved Hide resolved
<slot slot="inline-help" name="inline-help"></slot>
</d2l-input-text>
${this._getTooltip()}
Expand Down Expand Up @@ -439,6 +448,13 @@ class InputNumber extends FocusMixin(LabelledMixin(SkeletonMixin(FormElementMixi
}
}

async _handleAfterSlotChange(e) {
const nodes = e.target.assignedNodes();
const inputTextElem = this.shadowRoot.querySelector('d2l-input-text');
await inputTextElem.updateComplete;
this._afterSlotWidth = nodes.reduce((width, ele) => width + ele.clientWidth, 0);
}

_handleBlur() {
this._hintType = HINT_TYPES.NONE;
}
Expand Down
Binary file added .../inputs/test/golden/input-number/chromium/percentage-input-width-after-slot.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added components/inputs/test/golden/input-number/chromium/percentage-input-width.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...golden/input-number/chromium/right-side-tooltip-with-percentage-input-width.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added components/inputs/test/golden/input-number/chromium/right-side-tooltip.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions components/inputs/test/input-number.vdiff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ describe('d2l-input-number', () => {
{ name: 'disabled', template: html`<d2l-input-number label="Number" value="10" disabled></d2l-input-number>` },
{ name: 'placeholder', template: html`<d2l-input-number label="Number" placeholder="Number..."></d2l-input-number>` },
{ name: 'default-value', template: html`<d2l-input-number label="Number" value="10"></d2l-input-number>` },
{ name: 'percentage-input-width', template: html`<d2l-input-number input-width="50%"></d2l-input-number>` },
{
name: 'after-slot',
template: html`
Expand All @@ -25,6 +26,14 @@ describe('d2l-input-number', () => {
</d2l-input-number>
`
},
{
name: 'percentage-input-width-after-slot',
template: html`
<d2l-input-number label="Help Text" input-width="50%">
<d2l-button-icon icon="tier1:help" text="help" slot="after"></d2l-button-icon>
</d2l-input-number>
dlockhart marked this conversation as resolved.
Show resolved Hide resolved
`
},
{ name: 'trailing-zeroes', template: html`<d2l-input-number label="Number" value-trailing-zeroes="1.000" trailing-zeroes></d2l-input-number>` },
{
name: 'inline-help',
Expand Down Expand Up @@ -91,6 +100,26 @@ describe('d2l-input-number', () => {
await expect(elem).to.be.golden();
});

it('right side tooltip', async() => {
const elem = await fixture(
html`<d2l-input-number label="Label" value=1 max=0 label-hidden></d2l-input-number>`,
{ viewport: { width:600, height:80 } }
);
await focusElem(elem);
await oneEvent(elem, 'd2l-tooltip-show');
dlockhart marked this conversation as resolved.
Show resolved Hide resolved
await expect(elem).to.be.golden();
});

it('right side tooltip with percentage input-width', async() => {
const elem = await fixture(
html`<d2l-input-number label="Label" value=1 max=0 label-hidden input-width="50%"></d2l-input-number>`,
{ viewport: { width:800, height:80 } }
);
await focusElem(elem);
await oneEvent(elem, 'd2l-tooltip-show');
dlockhart marked this conversation as resolved.
Show resolved Hide resolved
await expect(elem).to.be.golden();
});

describe('skeleton', () => {
[
{ name: 'simple', template: html`<d2l-input-number skeleton label="Number"></d2l-input-number>` },
Expand Down
Loading