Skip to content

Commit 81fade3

Browse files
authored
Merge pull request #703 from umbraco/v1/bugfix/no-direct-imports
fix: direct imports are not allowed
2 parents 5333193 + 3b4b4dd commit 81fade3

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

packages/uui-card-media/lib/uui-card-media.element.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ import { css, html, nothing } from 'lit';
55
import { property, state } from 'lit/decorators.js';
66
import { ifDefined } from 'lit/directives/if-defined.js';
77

8-
import '@umbraco-ui/uui-symbol-folder/lib';
9-
import '@umbraco-ui/uui-symbol-file/lib';
10-
118
/**
129
* @element uui-card-media
1310
* @description - Card component for displaying a media item.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
UUIComboboxListEvent,
77
} from '@umbraco-ui/uui-combobox-list/lib';
88
import { iconRemove } from '@umbraco-ui/uui-icon-registry-essential/lib/svgs';
9+
import type { UUIPopoverContainerElement } from '@umbraco-ui/uui-popover-container/lib';
910
import { css, html, LitElement } from 'lit';
1011
import {
1112
property,
@@ -16,8 +17,6 @@ import {
1617

1718
import { UUIComboboxEvent } from './UUIComboboxEvent';
1819

19-
import type { UUIPopoverContainerElement } from '@umbraco-ui/uui-popover-container/lib';
20-
2120
/**
2221
* @element uui-combobox
2322
* @fires {UUIComboboxEvent} input - fires when search input is changed

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
import { defineElement } from '@umbraco-ui/uui-base/lib/registration';
2+
import { demandCustomElement } from '@umbraco-ui/uui-base/lib/utils';
3+
import type { UUIButtonElement } from '@umbraco-ui/uui-button/lib';
4+
import type { UUIPopoverContainerElement } from '@umbraco-ui/uui-popover-container/lib';
25
import { css, html, LitElement } from 'lit';
36
import { property, query, queryAssignedElements } from 'lit/decorators.js';
47
import { repeat } from 'lit/directives/repeat.js';
58

6-
import type { UUIButtonElement } from '@umbraco-ui/uui-button/lib';
7-
import '@umbraco-ui/uui-button/lib';
8-
import '@umbraco-ui/uui-popover-container/lib';
9-
import '@umbraco-ui/uui-symbol-more/lib';
10-
11-
import { UUITabElement } from './uui-tab.element';
12-
import { UUIPopoverContainerElement } from '@umbraco-ui/uui-popover-container/lib';
9+
import type { UUITabElement } from './uui-tab.element';
1310

1411
/**
15-
* @element uui-tab-group
16-
* @slot - Default slot for the tab group
12+
* @element uui-tab-group
13+
* @slot - Default slot for the tab group
1714
* @cssprop --uui-tab-group-dropdown-tab-text - Define the tab text color in the dropdown
1815
* @cssprop --uui-tab-group-dropdown-tab-text-hover - Define the tab text hover color in the dropdown
1916
* @cssprop --uui-tab-group-dropdown-tab-text-active - Define the tab text active color in the dropdown
@@ -53,12 +50,15 @@ export class UUITabGroupElement extends LitElement {
5350

5451
#visibilityBreakpoints: number[] = [];
5552

56-
#resizeObserver: ResizeObserver = new ResizeObserver(
57-
this.#onResize.bind(this)
58-
);
53+
#resizeObserver = new ResizeObserver(this.#onResize.bind(this));
5954

6055
connectedCallback() {
6156
super.connectedCallback();
57+
58+
demandCustomElement(this, 'uui-button');
59+
demandCustomElement(this, 'uui-popover-container');
60+
demandCustomElement(this, 'uui-symbol-more');
61+
6262
this.#resizeObserver.observe(this);
6363
if (!this.hasAttribute('role')) this.setAttribute('role', 'tablist');
6464
}
@@ -205,7 +205,9 @@ export class UUITabGroupElement extends LitElement {
205205
}
206206

207207
#isElementTabLike(el: any): el is UUITabElement {
208-
return el instanceof UUITabElement || 'active' in el;
208+
return (
209+
typeof el === 'object' && 'active' in el && typeof el.active === 'boolean'
210+
);
209211
}
210212

211213
render() {

0 commit comments

Comments
 (0)