fix(select-rich): set invoker width same as content width
This commit is contained in:
parent
c61be3a844
commit
ad2f90f43d
5 changed files with 67 additions and 5 deletions
5
.changeset/brave-beans-hang.md
Normal file
5
.changeset/brave-beans-hang.md
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
'@lion/select-rich': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
set invoker width same as content width
|
||||||
|
|
@ -343,7 +343,7 @@ class SingleOptionRemoveAdd extends LitElement {
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
this.options = ['Option 1'];
|
this.options = ['Option 1', 'Option 2'];
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
|
@ -361,16 +361,18 @@ class SingleOptionRemoveAdd extends LitElement {
|
||||||
}
|
}
|
||||||
|
|
||||||
addOption() {
|
addOption() {
|
||||||
this.options.push(`Option ${this.options.length + 1}`);
|
this.options.push(`Option ${this.options.length + 1} with a long title`);
|
||||||
this.options = [...this.options];
|
this.options = [...this.options];
|
||||||
this.requestUpdate();
|
this.requestUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
removeOption() {
|
removeOption() {
|
||||||
|
if (this.options.length >= 2) {
|
||||||
this.options.pop();
|
this.options.pop();
|
||||||
this.options = [...this.options];
|
this.options = [...this.options];
|
||||||
this.requestUpdate();
|
this.requestUpdate();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
customElements.define('single-option-remove-add', SingleOptionRemoveAdd);
|
customElements.define('single-option-remove-add', SingleOptionRemoveAdd);
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,10 @@ export class LionSelectInvoker extends LionButton {
|
||||||
return [
|
return [
|
||||||
super.styles,
|
super.styles,
|
||||||
css`
|
css`
|
||||||
|
:host {
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
|
||||||
#content-wrapper {
|
#content-wrapper {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -112,6 +112,7 @@ export class LionSelectRich extends SlotMixin(ScopedElementsMixin(OverlayMixin(L
|
||||||
this.interactionMode = 'auto';
|
this.interactionMode = 'auto';
|
||||||
|
|
||||||
this.singleOption = false;
|
this.singleOption = false;
|
||||||
|
this._arrowWidth = 28;
|
||||||
|
|
||||||
this.__onKeyUp = this.__onKeyUp.bind(this);
|
this.__onKeyUp = this.__onKeyUp.bind(this);
|
||||||
this.__invokerOnBlur = this.__invokerOnBlur.bind(this);
|
this.__invokerOnBlur = this.__invokerOnBlur.bind(this);
|
||||||
|
|
@ -217,6 +218,8 @@ export class LionSelectRich extends SlotMixin(ScopedElementsMixin(OverlayMixin(L
|
||||||
/* eslint-enable no-param-reassign */
|
/* eslint-enable no-param-reassign */
|
||||||
this.__hasInitialSelectedFormElement = true;
|
this.__hasInitialSelectedFormElement = true;
|
||||||
}
|
}
|
||||||
|
this._alignInvokerWidth();
|
||||||
|
|
||||||
this._onFormElementsChanged();
|
this._onFormElementsChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -226,6 +229,7 @@ export class LionSelectRich extends SlotMixin(ScopedElementsMixin(OverlayMixin(L
|
||||||
*/
|
*/
|
||||||
removeFormElement(child) {
|
removeFormElement(child) {
|
||||||
super.removeFormElement(child);
|
super.removeFormElement(child);
|
||||||
|
this._alignInvokerWidth();
|
||||||
this._onFormElementsChanged();
|
this._onFormElementsChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -352,6 +356,7 @@ export class LionSelectRich extends SlotMixin(ScopedElementsMixin(OverlayMixin(L
|
||||||
_setupOverlayCtrl() {
|
_setupOverlayCtrl() {
|
||||||
super._setupOverlayCtrl();
|
super._setupOverlayCtrl();
|
||||||
this._initialInheritsReferenceWidth = this._overlayCtrl.inheritsReferenceWidth;
|
this._initialInheritsReferenceWidth = this._overlayCtrl.inheritsReferenceWidth;
|
||||||
|
this._alignInvokerWidth();
|
||||||
|
|
||||||
this._overlayCtrl.addEventListener('before-show', this.__overlayBeforeShow);
|
this._overlayCtrl.addEventListener('before-show', this.__overlayBeforeShow);
|
||||||
this._overlayCtrl.addEventListener('show', this.__overlayOnShow);
|
this._overlayCtrl.addEventListener('show', this.__overlayOnShow);
|
||||||
|
|
@ -369,6 +374,27 @@ export class LionSelectRich extends SlotMixin(ScopedElementsMixin(OverlayMixin(L
|
||||||
this._overlayCtrl.removeEventListener('hide', this.__overlayOnHide);
|
this._overlayCtrl.removeEventListener('hide', this.__overlayOnHide);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Align invoker width with content width
|
||||||
|
* Make sure display is not set to "none" while calculating the content width
|
||||||
|
*/
|
||||||
|
async _alignInvokerWidth() {
|
||||||
|
if (this._overlayCtrl && this._overlayCtrl.content) {
|
||||||
|
await this.updateComplete;
|
||||||
|
const initContentDisplay = this._overlayCtrl.content.style.display;
|
||||||
|
const initContentMinWidth = this._overlayCtrl.content.style.minWidth;
|
||||||
|
const initContentWidth = this._overlayCtrl.content.style.width;
|
||||||
|
this._overlayCtrl.content.style.display = '';
|
||||||
|
this._overlayCtrl.content.style.minWidth = 'auto';
|
||||||
|
this._overlayCtrl.content.style.width = 'auto';
|
||||||
|
const contentWidth = this._overlayCtrl.content.getBoundingClientRect().width;
|
||||||
|
this._invokerNode.style.width = `${contentWidth + this._arrowWidth}px`;
|
||||||
|
this._overlayCtrl.content.style.display = initContentDisplay;
|
||||||
|
this._overlayCtrl.content.style.minWidth = initContentMinWidth;
|
||||||
|
this._overlayCtrl.content.style.width = initContentWidth;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @configure FormControlMixin
|
* @configure FormControlMixin
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -189,6 +189,31 @@ describe('lion-select-rich', () => {
|
||||||
// @ts-ignore allow protected access in tests
|
// @ts-ignore allow protected access in tests
|
||||||
expect(el._invokerNode.shadowRoot.firstElementChild.textContent).to.equal('30');
|
expect(el._invokerNode.shadowRoot.firstElementChild.textContent).to.equal('30');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('inherits the content width including arrow width', async () => {
|
||||||
|
const el = /** @type {LionSelectRich} */ (await fixture(html`
|
||||||
|
<lion-select-rich>
|
||||||
|
<lion-option .choiceValue=${10}>Item 1</lion-option>
|
||||||
|
<lion-option .choiceValue=${10}>Item 2 with long label</lion-option>
|
||||||
|
</lion-select-rich>
|
||||||
|
`));
|
||||||
|
el.opened = true;
|
||||||
|
const options = el.formElements;
|
||||||
|
await el.updateComplete;
|
||||||
|
expect(el._invokerNode.clientWidth).to.equal(options[1].clientWidth);
|
||||||
|
|
||||||
|
const newOption = /** @type {LionOption} */ (document.createElement('lion-option'));
|
||||||
|
newOption.choiceValue = 30;
|
||||||
|
newOption.textContent = '30 with longer label';
|
||||||
|
|
||||||
|
el._inputNode.appendChild(newOption);
|
||||||
|
await el.updateComplete;
|
||||||
|
expect(el._invokerNode.clientWidth).to.equal(options[2].clientWidth);
|
||||||
|
|
||||||
|
el._inputNode.removeChild(newOption);
|
||||||
|
await el.updateComplete;
|
||||||
|
expect(el._invokerNode.clientWidth).to.equal(options[1].clientWidth);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('overlay', () => {
|
describe('overlay', () => {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue