@noctuatech/uswds 1.4.7 → 1.4.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/lib/icon/icon.element.ts +1 -12
- package/src/lib/services/icon.service.ts +2 -4
- package/target/lib/icon/icon.element.d.ts +0 -1
- package/target/lib/icon/icon.element.js +3 -14
- package/target/lib/icon/icon.element.js.map +1 -1
- package/target/lib/services/icon.service.d.ts +1 -1
- package/target/lib/services/icon.service.js +2 -4
- package/target/lib/services/icon.service.js.map +1 -1
package/package.json
CHANGED
|
@@ -3,7 +3,6 @@ import { attr, css, element } from '@joist/element';
|
|
|
3
3
|
|
|
4
4
|
import { IconService } from '../services/icon.service.js';
|
|
5
5
|
import type { USAIcon } from './icon-types.js';
|
|
6
|
-
import { effect, observe } from '@joist/observable';
|
|
7
6
|
|
|
8
7
|
declare global {
|
|
9
8
|
interface HTMLElementTagNameMap {
|
|
@@ -35,27 +34,17 @@ declare global {
|
|
|
35
34
|
})
|
|
36
35
|
export class USAIconElement extends HTMLElement {
|
|
37
36
|
@attr()
|
|
38
|
-
@observe()
|
|
39
37
|
accessor icon: USAIcon | '' = '';
|
|
40
38
|
|
|
41
39
|
ariaHidden: string | null = 'true';
|
|
42
40
|
|
|
43
41
|
#icon = inject(IconService);
|
|
44
|
-
#abortController: AbortController | null = null;
|
|
45
42
|
|
|
46
43
|
connectedCallback() {
|
|
47
44
|
this.#updateIcon();
|
|
48
45
|
}
|
|
49
46
|
|
|
50
|
-
@effect()
|
|
51
|
-
onIconUpdate() {
|
|
52
|
-
this.#updateIcon();
|
|
53
|
-
}
|
|
54
|
-
|
|
55
47
|
async #updateIcon() {
|
|
56
|
-
this.#abortController?.abort();
|
|
57
|
-
this.#abortController = new AbortController();
|
|
58
|
-
|
|
59
48
|
if (!this.icon) {
|
|
60
49
|
return;
|
|
61
50
|
}
|
|
@@ -63,7 +52,7 @@ export class USAIconElement extends HTMLElement {
|
|
|
63
52
|
const icon = this.#icon();
|
|
64
53
|
|
|
65
54
|
icon
|
|
66
|
-
.getIcon(this.icon
|
|
55
|
+
.getIcon(this.icon)
|
|
67
56
|
.then((currentIcon) => {
|
|
68
57
|
if (this.shadowRoot) {
|
|
69
58
|
if (this.shadowRoot.firstElementChild) {
|
|
@@ -10,7 +10,7 @@ export class IconService {
|
|
|
10
10
|
#http = inject(HttpService);
|
|
11
11
|
#iconCache: Map<USAIcon, Promise<HTMLTemplateElement>> = new Map();
|
|
12
12
|
|
|
13
|
-
async getIcon(icon: USAIcon
|
|
13
|
+
async getIcon(icon: USAIcon): Promise<Node> {
|
|
14
14
|
const config = this.#config();
|
|
15
15
|
const http = this.#http();
|
|
16
16
|
|
|
@@ -27,9 +27,7 @@ export class IconService {
|
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
const svg = http
|
|
30
|
-
.fetch(`${config.iconPath}${icon}.svg
|
|
31
|
-
signal: abortSignal,
|
|
32
|
-
})
|
|
30
|
+
.fetch(`${config.iconPath}${icon}.svg`)
|
|
33
31
|
.then((res) => {
|
|
34
32
|
switch (res.status) {
|
|
35
33
|
case 200:
|
|
@@ -2,7 +2,6 @@ import { __esDecorate, __runInitializers } from "tslib";
|
|
|
2
2
|
import { inject, injectable } from '@joist/di';
|
|
3
3
|
import { attr, css, element } from '@joist/element';
|
|
4
4
|
import { IconService } from '../services/icon.service.js';
|
|
5
|
-
import { effect, observe } from '@joist/observable';
|
|
6
5
|
let USAIconElement = (() => {
|
|
7
6
|
let _classDecorators = [element({
|
|
8
7
|
tagName: 'usa-icon',
|
|
@@ -16,45 +15,35 @@ let USAIconElement = (() => {
|
|
|
16
15
|
let _classExtraInitializers = [];
|
|
17
16
|
let _classThis;
|
|
18
17
|
let _classSuper = HTMLElement;
|
|
19
|
-
let _instanceExtraInitializers = [];
|
|
20
18
|
let _icon_decorators;
|
|
21
19
|
let _icon_initializers = [];
|
|
22
20
|
let _icon_extraInitializers = [];
|
|
23
|
-
let _onIconUpdate_decorators;
|
|
24
21
|
var USAIconElement = class extends _classSuper {
|
|
25
22
|
static { _classThis = this; }
|
|
26
23
|
static {
|
|
27
24
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
28
|
-
_icon_decorators = [attr()
|
|
29
|
-
_onIconUpdate_decorators = [effect()];
|
|
25
|
+
_icon_decorators = [attr()];
|
|
30
26
|
__esDecorate(this, null, _icon_decorators, { kind: "accessor", name: "icon", static: false, private: false, access: { has: obj => "icon" in obj, get: obj => obj.icon, set: (obj, value) => { obj.icon = value; } }, metadata: _metadata }, _icon_initializers, _icon_extraInitializers);
|
|
31
|
-
__esDecorate(this, null, _onIconUpdate_decorators, { kind: "method", name: "onIconUpdate", static: false, private: false, access: { has: obj => "onIconUpdate" in obj, get: obj => obj.onIconUpdate }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
32
27
|
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
33
28
|
USAIconElement = _classThis = _classDescriptor.value;
|
|
34
29
|
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
35
30
|
__runInitializers(_classThis, _classExtraInitializers);
|
|
36
31
|
}
|
|
37
|
-
#icon_accessor_storage =
|
|
32
|
+
#icon_accessor_storage = __runInitializers(this, _icon_initializers, '');
|
|
38
33
|
get icon() { return this.#icon_accessor_storage; }
|
|
39
34
|
set icon(value) { this.#icon_accessor_storage = value; }
|
|
40
35
|
ariaHidden = (__runInitializers(this, _icon_extraInitializers), 'true');
|
|
41
36
|
#icon = inject(IconService);
|
|
42
|
-
#abortController = null;
|
|
43
37
|
connectedCallback() {
|
|
44
38
|
this.#updateIcon();
|
|
45
39
|
}
|
|
46
|
-
onIconUpdate() {
|
|
47
|
-
this.#updateIcon();
|
|
48
|
-
}
|
|
49
40
|
async #updateIcon() {
|
|
50
|
-
this.#abortController?.abort();
|
|
51
|
-
this.#abortController = new AbortController();
|
|
52
41
|
if (!this.icon) {
|
|
53
42
|
return;
|
|
54
43
|
}
|
|
55
44
|
const icon = this.#icon();
|
|
56
45
|
icon
|
|
57
|
-
.getIcon(this.icon
|
|
46
|
+
.getIcon(this.icon)
|
|
58
47
|
.then((currentIcon) => {
|
|
59
48
|
if (this.shadowRoot) {
|
|
60
49
|
if (this.shadowRoot.firstElementChild) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"icon.element.js","sourceRoot":"","sources":["../../../src/lib/icon/icon.element.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"icon.element.js","sourceRoot":"","sources":["../../../src/lib/icon/icon.element.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;IA+B7C,cAAc;4BAtB1B,OAAO,CAAC;YACP,OAAO,EAAE,UAAU;YACnB,SAAS,EAAE;gBACT,GAAG,CAAA;;;;;;;;;;;;;KAaF;aACF;SACF,CAAC,EACD,UAAU,CAAC;YACV,IAAI,EAAE,cAAc;SACrB,CAAC;;;;sBACkC,WAAW;;;;8BAAnB,SAAQ,WAAW;;;;gCAC5C,IAAI,EAAE;YACP,iKAAS,IAAI,6BAAJ,IAAI,mFAAoB;YAFnC,6KAgCC;;;YAhCY,uDAAc;;QAEzB,qEAA8B,EAAE,EAAC;QAAjC,IAAS,IAAI,0CAAoB;QAAjC,IAAS,IAAI,gDAAoB;QAEjC,UAAU,sDAAkB,MAAM,EAAC;QAEnC,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QAE5B,iBAAiB;YACf,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC;QAED,KAAK,CAAC,WAAW;YACf,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAE1B,IAAI;iBACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;iBAClB,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;gBACpB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,IAAI,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;wBACtC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;oBAC7D,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;oBACtC,CAAC;gBACH,CAAC;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACrB,CAAC;;;;SA/BU,cAAc"}
|
|
@@ -19,7 +19,7 @@ let IconService = (() => {
|
|
|
19
19
|
#config = inject(USAConfig);
|
|
20
20
|
#http = inject(HttpService);
|
|
21
21
|
#iconCache = new Map();
|
|
22
|
-
async getIcon(icon
|
|
22
|
+
async getIcon(icon) {
|
|
23
23
|
const config = this.#config();
|
|
24
24
|
const http = this.#http();
|
|
25
25
|
const cached = this.#iconCache.get(icon);
|
|
@@ -31,9 +31,7 @@ let IconService = (() => {
|
|
|
31
31
|
return res.content.firstElementChild.cloneNode(true);
|
|
32
32
|
}
|
|
33
33
|
const svg = http
|
|
34
|
-
.fetch(`${config.iconPath}${icon}.svg
|
|
35
|
-
signal: abortSignal,
|
|
36
|
-
})
|
|
34
|
+
.fetch(`${config.iconPath}${icon}.svg`)
|
|
37
35
|
.then((res) => {
|
|
38
36
|
switch (res.status) {
|
|
39
37
|
case 200:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"icon.service.js","sourceRoot":"","sources":["../../../src/lib/services/icon.service.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;IAInC,WAAW;4BADvB,UAAU,EAAE;;;;;;;;YACb,
|
|
1
|
+
{"version":3,"file":"icon.service.js","sourceRoot":"","sources":["../../../src/lib/services/icon.service.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;IAInC,WAAW;4BADvB,UAAU,EAAE;;;;;;;;YACb,6KA+CC;;;YA/CY,uDAAW;;QACtB,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QAC5B,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QAC5B,UAAU,GAA+C,IAAI,GAAG,EAAE,CAAC;QAEnE,KAAK,CAAC,OAAO,CAAC,IAAa;YACzB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEzC,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC;gBAEzB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;oBACnC,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAC;gBAC3C,CAAC;gBAED,OAAO,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACvD,CAAC;YAED,MAAM,GAAG,GAAG,IAAI;iBACb,KAAK,CAAC,GAAG,MAAM,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC;iBACtC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;gBACZ,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC;oBACnB,KAAK,GAAG;wBACN,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;gBACtB,CAAC;gBAED,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC;iBACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;gBACZ,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;gBACpD,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC;gBACzB,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAC,CAAC;YAEL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAE/B,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;oBACnC,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBACnC,CAAC;gBAED,OAAO,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;QACL,CAAC;;;;SA9CU,WAAW"}
|