Skip to content

Commit 662b3f3

Browse files
authored
Merge branch 'v1/contrib' into feature/toggle-switch
2 parents 3119761 + 57abde0 commit 662b3f3

File tree

8 files changed

+32
-10
lines changed

8 files changed

+32
-10
lines changed

packages/uui-base/lib/utils/drag.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ export const drag = (
2525
// TouchEvent is not available in Firefox
2626
if ('TouchEvent' in window && event instanceof TouchEvent) {
2727
pointerEvent = event.touches[0];
28-
} else if ( event instanceof PointerEvent ) {
28+
} else if (event instanceof PointerEvent) {
2929
pointerEvent = event;
30-
}
31-
else {
30+
} else {
3231
return;
3332
}
3433

packages/uui-icon/lib/uui-icon.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ export class UUIIconElement extends LitElement {
149149
:host svg,
150150
::slotted(svg) {
151151
color: var(--uui-icon-color, currentColor);
152+
width: 100%;
152153
}
153154
154155
:host-context(div[slot='prepend']) {

packages/uui-icon/lib/uui-icon.test.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,5 +224,13 @@ describe('UUIIconElement', () => {
224224
it('Child uui-icon passes the a11y audit', async () => {
225225
await expect(testElement.iconElement).shadowDom.to.be.accessible();
226226
});
227+
228+
it('svg has a size of 18px for both width and height', () => {
229+
const svgElement =
230+
testElement.iconElement.shadowRoot!.querySelector('svg')!;
231+
const computedStyle = getComputedStyle(svgElement);
232+
expect(computedStyle.width).to.equal('18px');
233+
expect(computedStyle.height).to.equal('18px');
234+
});
227235
});
228236
});

packages/uui-input/lib/uui-input.element.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ export class UUIInputElement extends UUIFormControlMixin(
348348
);
349349
border: var(--uui-input-border-width, 1px) solid
350350
var(--uui-input-border-color, var(--uui-color-border));
351+
border-radius: var(--uui-border-radius);
351352
352353
--uui-button-height: 100%;
353354
--auto-width-text-margin-right: 0;
@@ -439,7 +440,7 @@ export class UUIInputElement extends UUIFormControlMixin(
439440
padding: var(--uui-size-1) var(--uui-size-space-3);
440441
font-size: inherit;
441442
color: inherit;
442-
border-radius: 0;
443+
border-radius: var(--uui-border-radius);
443444
box-sizing: border-box;
444445
border: none;
445446
background: none;

packages/uui-select/lib/uui-select.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ export class UUISelectElement extends UUIFormControlMixin(LitElement, '') {
286286
var(--uui-select-padding-x, var(--uui-size-2));
287287
color: var(--uui-select-text-color, var(--uui-color-text));
288288
box-sizing: border-box;
289-
border-radius: 0;
289+
border-radius: var(--uui-border-radius);
290290
border: 1px solid
291291
var(--uui-select-border-color, var(--uui-color-border));
292292
transition: all 150ms ease;

packages/uui-tabs/lib/uui-tab-group.element.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ export class UUITabGroupElement extends LitElement {
7777
demandCustomElement(this, 'uui-popover-container');
7878
demandCustomElement(this, 'uui-symbol-more');
7979

80-
if (!this.hasAttribute('role')) this.setAttribute('role', 'tablist');
81-
8280
await this.updateComplete;
8381
this.#resizeObserver.observe(this._mainElement);
8482
}
@@ -268,7 +266,7 @@ export class UUITabGroupElement extends LitElement {
268266
render() {
269267
return html`
270268
<div id="main">
271-
<div id="grid">
269+
<div id="grid" role="tablist">
272270
<slot @slotchange=${this.#onSlotChange}></slot>
273271
</div>
274272
<uui-button
@@ -284,7 +282,7 @@ export class UUITabGroupElement extends LitElement {
284282
id="popover-container"
285283
popover
286284
placement="bottom-end">
287-
<div id="hidden-tabs-container">
285+
<div id="hidden-tabs-container" role="tablist">
288286
${repeat(this.#hiddenTabElements, el => html`${el}`)}
289287
</div>
290288
</uui-popover-container>

packages/uui-tabs/lib/uui-tabs.test.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@ describe('UuiTab', () => {
1717
<uui-tab label="Content">Content</uui-tab>
1818
<uui-tab label="Packages">Packages</uui-tab>
1919
<uui-tab label="Media" active>Media</uui-tab>
20+
<uui-tab label="Content1">Content to force a more button</uui-tab>
21+
<uui-tab label="Content2">Content to force a more button</uui-tab>
22+
<uui-tab label="Content3">Content to force a more button</uui-tab>
23+
<uui-tab label="Content4">Content to force a more button</uui-tab>
24+
<uui-tab label="Content5">Content to force a more button</uui-tab>
25+
<uui-tab label="Content6">Content to force a more button</uui-tab>
26+
<uui-tab label="Content7">Content to force a more button</uui-tab>
27+
<uui-tab label="Content8">Content to force a more button</uui-tab>
28+
<uui-tab label="Content9">Content to force a more button</uui-tab>
29+
<uui-tab label="Content10">Content to force a more button</uui-tab>
30+
<uui-tab label="Content11">Content to force a more button</uui-tab>
31+
<uui-tab label="Content12">Content to force a more button</uui-tab>
32+
<uui-tab label="Content13">Content to force a more button</uui-tab>
33+
<uui-tab label="Content14">Content to force a more button</uui-tab>
34+
<uui-tab label="Content15">Content to force a more button</uui-tab>
2035
</uui-tab-group>
2136
`);
2237

packages/uui-textarea/lib/uui-textarea.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ export class UUITextareaElement extends UUIFormControlMixin(LitElement, '') {
330330
padding: var(--uui-size-2);
331331
border: 1px solid
332332
var(--uui-textarea-border-color, var(--uui-color-border)); /** Note: Specified border size is needed and hardcoded in autoUpdateHeight() */
333-
border-radius: 0;
333+
border-radius: var(--uui-border-radius);
334334
outline: none;
335335
min-height: var(--uui-textarea-min-height);
336336
max-height: var(--uui-textarea-max-height);

0 commit comments

Comments
 (0)