@ds-autonomie/web-components 2.0.1 → 2.1.0
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/CHANGELOG.md +23 -0
- package/cdn/chunks/{chunk.QTUCYPM5.js → chunk.3TUFAITJ.js} +18 -0
- package/cdn/chunks/{chunk.ZC2YWJX5.js → chunk.5BF76EO7.js} +1 -1
- package/cdn/chunks/{chunk.HRSNXHEG.js → chunk.5BL6KECM.js} +31 -5
- package/cdn/chunks/{chunk.GDKBZ2H6.js → chunk.6CF6SXDF.js} +1 -2
- package/cdn/chunks/{chunk.Z326Q4YW.js → chunk.6V2FRFCB.js} +1 -1
- package/cdn/chunks/{chunk.KQ5BQRHA.js → chunk.77CWRZEL.js} +6 -0
- package/cdn/chunks/{chunk.5UR3I4O7.js → chunk.BE7PKTJW.js} +1 -1
- package/cdn/chunks/chunk.BNPGOQZ2.js +223 -0
- package/cdn/chunks/{chunk.VR6U4JFG.js → chunk.CUCCBQJX.js} +11 -2
- package/cdn/chunks/{chunk.Q2IGBG6C.js → chunk.CVV4WLBC.js} +16 -8
- package/cdn/chunks/{chunk.2GCON4UO.js → chunk.DSKRAAOI.js} +3 -4
- package/cdn/chunks/{chunk.454LK2SB.js → chunk.E6VF2I6I.js} +9 -4
- package/cdn/chunks/{chunk.JYYFSSR2.js → chunk.EARU4CHS.js} +1 -1
- package/cdn/chunks/{chunk.DTZ62PPT.js → chunk.IGA57P5N.js} +13 -22
- package/cdn/chunks/{chunk.SRCH73UW.js → chunk.JSVJ7J76.js} +24 -1
- package/cdn/chunks/{chunk.QPY2AEFG.js → chunk.JTHUYIYP.js} +9 -5
- package/cdn/chunks/{chunk.PLPMNDIZ.js → chunk.KTAPO27T.js} +1 -1
- package/cdn/chunks/{chunk.3NTS3AEA.js → chunk.LFCUNNYV.js} +34 -30
- package/cdn/chunks/{chunk.GLQFV66F.js → chunk.LRMXGBIU.js} +24 -10
- package/cdn/chunks/{chunk.NW4AAKGG.js → chunk.NPJ5ZOJ4.js} +24 -10
- package/{dist/chunks/chunk.3E6XVTWL.js → cdn/chunks/chunk.P45DWAWT.js} +1 -1
- package/cdn/chunks/{chunk.VIT6ZMSL.js → chunk.PGT2WHXR.js} +2 -3
- package/cdn/chunks/chunk.RJXLIOW7.js +28 -0
- package/cdn/chunks/{chunk.YTHFESMA.js → chunk.S4BW7KNM.js} +5 -1
- package/cdn/chunks/{chunk.PAGENBUA.js → chunk.UR6UOSYK.js} +10 -12
- package/cdn/chunks/{chunk.JY6ROHQN.js → chunk.WOONNSQ2.js} +14 -20
- package/cdn/chunks/{chunk.F2LQ5OCB.js → chunk.XD7G7WIJ.js} +6 -2
- package/cdn/chunks/chunk.XIX7XP2G.js +91 -0
- package/cdn/chunks/{chunk.CSDIRQFE.js → chunk.XLX7QTXT.js} +9 -1
- package/cdn/chunks/{chunk.BTTFPDXL.js → chunk.XPL6N3OJ.js} +3 -2
- package/cdn/chunks/{chunk.2SEDRBTZ.js → chunk.Z2IR3WWE.js} +4 -1
- package/cdn/chunks/{chunk.PS3BQQBO.js → chunk.Z6DEWBVS.js} +7 -3
- package/cdn/chunks/{chunk.FGSGBIL3.js → chunk.ZKPOAPR2.js} +0 -4
- package/cdn/components/accordion/accordion.js +3 -3
- package/cdn/components/alert/alert.js +4 -4
- package/cdn/components/avatar/avatar.js +4 -4
- package/cdn/components/breadcrumb/breadcrumb.js +3 -3
- package/cdn/components/button/button.d.ts +4 -1
- package/cdn/components/button/button.js +4 -4
- package/cdn/components/callout/callout.d.ts +3 -1
- package/cdn/components/callout/callout.js +4 -4
- package/cdn/components/checkbox/checkbox.d.ts +4 -1
- package/cdn/components/checkbox/checkbox.js +4 -4
- package/cdn/components/checkbox-button/checkbox-button.js +3 -3
- package/cdn/components/checkbox-group/checkbox-group.d.ts +4 -0
- package/cdn/components/checkbox-group/checkbox-group.js +6 -4
- package/cdn/components/combobox/combobox.js +3 -3
- package/cdn/components/dialog/dialog.d.ts +5 -1
- package/cdn/components/dialog/dialog.js +5 -5
- package/cdn/components/dialog/dialog.styles.js +1 -1
- package/cdn/components/download-card/download-card.js +5 -5
- package/cdn/components/download-card/download-card.styles.js +1 -1
- package/cdn/components/download-link/download-link.js +5 -5
- package/cdn/components/download-link/download-link.styles.js +1 -1
- package/cdn/components/drawer/drawer.js +3 -3
- package/cdn/components/error-text/error-text.js +3 -3
- package/cdn/components/file-upload/file-upload.js +3 -3
- package/cdn/components/file-upload-item/file-upload-item.js +3 -3
- package/cdn/components/filter-base/filter-base-stories.js +1 -1
- package/cdn/components/filter-base/filter-base.js +3 -3
- package/cdn/components/filter-button/filter-button.js +3 -3
- package/cdn/components/filter-counter/filter-counter.js +4 -4
- package/cdn/components/filter-date/filter-date.js +3 -3
- package/cdn/components/filter-range/filter-range.js +5 -5
- package/cdn/components/filter-select/filter-select.d.ts +1 -0
- package/cdn/components/filter-select/filter-select.js +9 -9
- package/cdn/components/header/header.d.ts +5 -1
- package/cdn/components/header/header.js +2 -2
- package/cdn/components/header/header.styles.js +1 -1
- package/cdn/components/header-search/header-search.d.ts +6 -0
- package/cdn/components/header-search/header-search.js +11 -5
- package/cdn/components/header-search/header-search.styles.js +1 -1
- package/cdn/components/icon/icon.js +3 -3
- package/cdn/components/icon/library.js +2 -2
- package/cdn/components/icon/library.system.js +1 -1
- package/cdn/components/icon-button/icon-button.js +3 -3
- package/cdn/components/input/input.js +3 -3
- package/cdn/components/input-date/input-date.js +3 -3
- package/cdn/components/input-mask/input-mask.js +3 -3
- package/cdn/components/input-phone/input-phone.d.ts +3 -3
- package/cdn/components/input-phone/input-phone.js +8 -14
- package/cdn/components/input-phone/input-phone.styles.js +1 -1
- package/cdn/components/input-phone/input-phone.utils.d.ts +0 -2
- package/cdn/components/input-phone/input-phone.utils.js +1 -7
- package/cdn/components/menu-accordion/menu-accordion.js +3 -3
- package/cdn/components/menu-item/menu-item.js +3 -3
- package/cdn/components/menu-navigation/menu-navigation.js +1 -1
- package/cdn/components/navbar-link/navbar-link.js +4 -4
- package/cdn/components/navbar-menu/navbar-menu.js +4 -4
- package/cdn/components/option/option.js +5 -5
- package/cdn/components/option/option.styles.js +1 -1
- package/cdn/components/pagination/pagination.js +5 -5
- package/cdn/components/profile-button/profile-button.js +4 -4
- package/cdn/components/quote/quote.js +3 -3
- package/cdn/components/radio/radio.js +3 -3
- package/cdn/components/radio-button/radio-button.js +7 -5
- package/cdn/components/radio-group/radio-group.d.ts +4 -0
- package/cdn/components/radio-group/radio-group.js +6 -4
- package/cdn/components/range-slider/range-slider.d.ts +0 -2
- package/cdn/components/range-slider/range-slider.js +1 -1
- package/cdn/components/select/select.js +3 -3
- package/cdn/components/split-panel/split-panel.js +3 -3
- package/cdn/components/step/step.js +3 -3
- package/cdn/components/tab/tab.d.ts +2 -0
- package/cdn/components/tab/tab.js +4 -4
- package/cdn/components/tab-group/tab-group.js +3 -3
- package/cdn/components/table-header-cell/table-header-cell.js +3 -3
- package/cdn/components/table-header-row/table-header-row.js +6 -6
- package/cdn/components/table-row/table-row.js +5 -5
- package/cdn/components/tag/tag.js +3 -3
- package/cdn/components/textarea/textarea.js +3 -3
- package/cdn/components/tree/tree.js +4 -4
- package/cdn/components/tree-item/tree-item.js +4 -4
- package/cdn/custom-elements.json +223 -68
- package/cdn/design-system.js +40 -40
- package/cdn/events/events.d.ts +7 -7
- package/cdn/internal/components/form-toggle-button/form-toggle-button-stories.d.ts +2 -86
- package/cdn/internal/test/disable-a11y-warnings.d.ts +2 -0
- package/cdn/internal/test/disable-a11y-warnings.js +10 -0
- package/cdn/themes/dsa-wc-theme.css +5 -0
- package/cdn/themes/dsa-wc-theme.min.css +1 -1
- package/cdn/themes/dsa-wc-theme.styles.js +5 -0
- package/cdn/utilities/icon-library.js +2 -2
- package/cdn/utilities/storybook.d.ts +1 -0
- package/cdn/utilities/storybook.js +3 -1
- package/cdn/vscode.html-custom-data.json +64 -11
- package/cdn/web-types.json +159 -35
- package/dist/chunks/{chunk.N5DO55QO.js → chunk.2EDNCADP.js} +9 -1
- package/dist/chunks/{chunk.YDXAC3AX.js → chunk.2VH3OZ2T.js} +1 -1
- package/dist/chunks/{chunk.QTUCYPM5.js → chunk.3TUFAITJ.js} +18 -0
- package/dist/chunks/{chunk.VC2F6FEI.js → chunk.4WSA3PVB.js} +1 -1
- package/dist/chunks/{chunk.TB3WT3D4.js → chunk.6QAB5TYJ.js} +6 -0
- package/dist/chunks/{chunk.IAL72I44.js → chunk.AF5WMYR2.js} +5 -1
- package/dist/chunks/{chunk.6RJLT24F.js → chunk.EGH3AVD7.js} +4 -1
- package/dist/chunks/{chunk.JDG6WH3B.js → chunk.EQZ4YFRU.js} +94 -54
- package/dist/chunks/{chunk.CWVZX3HL.js → chunk.FKXOTDTY.js} +1 -1
- package/dist/chunks/{chunk.35M6DDPF.js → chunk.G422H4DZ.js} +7 -3
- package/dist/chunks/chunk.HRIAHWFV.js +89 -0
- package/dist/chunks/{chunk.4FP4K3F5.js → chunk.JDIBYGPL.js} +11 -2
- package/dist/chunks/{chunk.2DJFK3E6.js → chunk.JX7OISYA.js} +24 -10
- package/dist/chunks/{chunk.QEFQHCEK.js → chunk.KFRR2I2P.js} +3 -4
- package/dist/chunks/{chunk.5LBJAKDG.js → chunk.LB54GRRB.js} +31 -5
- package/dist/chunks/{chunk.CQG7MKTO.js → chunk.LDXGSIJP.js} +6 -2
- package/dist/chunks/{chunk.ARYKCY32.js → chunk.MBRRLF6D.js} +34 -30
- package/dist/chunks/{chunk.X6V74J4Y.js → chunk.MEPTPSE5.js} +2 -3
- package/dist/chunks/{chunk.R426GAXO.js → chunk.MJKJSMQX.js} +3 -2
- package/dist/chunks/{chunk.RPZWIHKX.js → chunk.NCECJWN7.js} +1 -1
- package/dist/chunks/{chunk.JUPNFWMF.js → chunk.OHPSPLZO.js} +9 -5
- package/{cdn/chunks/chunk.3E6XVTWL.js → dist/chunks/chunk.P45DWAWT.js} +1 -1
- package/dist/chunks/{chunk.7NPJ25LI.js → chunk.PZXD4VTO.js} +14 -20
- package/dist/chunks/chunk.RJXLIOW7.js +28 -0
- package/dist/chunks/{chunk.35URRZJ2.js → chunk.SYVX56PU.js} +1 -2
- package/dist/chunks/{chunk.K6FDIYMY.js → chunk.UVN7RIEO.js} +0 -4
- package/dist/chunks/{chunk.LWFWCZIX.js → chunk.WQYBYKZ2.js} +9 -4
- package/dist/chunks/{chunk.GOMVXZ72.js → chunk.XRZGSSHY.js} +1 -1
- package/dist/chunks/{chunk.XWFZLRHU.js → chunk.XXHMFUD7.js} +24 -1
- package/dist/chunks/{chunk.Z2SRVRIK.js → chunk.XXN6UBL4.js} +10 -12
- package/dist/chunks/{chunk.DY2W3WPP.js → chunk.Z7DBDDCZ.js} +16 -8
- package/dist/chunks/{chunk.WI3DWLXW.js → chunk.ZTGPYOYG.js} +13 -22
- package/dist/chunks/{chunk.GBRTFFMV.js → chunk.ZYTDWH4E.js} +24 -10
- package/dist/components/accordion/accordion.js +3 -3
- package/dist/components/alert/alert.js +4 -4
- package/dist/components/avatar/avatar.js +4 -4
- package/dist/components/breadcrumb/breadcrumb.js +3 -3
- package/dist/components/button/button.d.ts +4 -1
- package/dist/components/button/button.js +4 -4
- package/dist/components/callout/callout.d.ts +3 -1
- package/dist/components/callout/callout.js +4 -4
- package/dist/components/checkbox/checkbox.d.ts +4 -1
- package/dist/components/checkbox/checkbox.js +4 -4
- package/dist/components/checkbox-button/checkbox-button.js +3 -3
- package/dist/components/checkbox-group/checkbox-group.d.ts +4 -0
- package/dist/components/checkbox-group/checkbox-group.js +6 -4
- package/dist/components/combobox/combobox.js +3 -3
- package/dist/components/dialog/dialog.d.ts +5 -1
- package/dist/components/dialog/dialog.js +5 -5
- package/dist/components/dialog/dialog.styles.js +1 -1
- package/dist/components/download-card/download-card.js +5 -5
- package/dist/components/download-card/download-card.styles.js +1 -1
- package/dist/components/download-link/download-link.js +5 -5
- package/dist/components/download-link/download-link.styles.js +1 -1
- package/dist/components/drawer/drawer.js +3 -3
- package/dist/components/error-text/error-text.js +3 -3
- package/dist/components/file-upload/file-upload.js +3 -3
- package/dist/components/file-upload-item/file-upload-item.js +3 -3
- package/dist/components/filter-base/filter-base-stories.js +1 -1
- package/dist/components/filter-base/filter-base.js +3 -3
- package/dist/components/filter-button/filter-button.js +3 -3
- package/dist/components/filter-counter/filter-counter.js +4 -4
- package/dist/components/filter-date/filter-date.js +3 -3
- package/dist/components/filter-range/filter-range.js +5 -5
- package/dist/components/filter-select/filter-select.d.ts +1 -0
- package/dist/components/filter-select/filter-select.js +9 -9
- package/dist/components/header/header.d.ts +5 -1
- package/dist/components/header/header.js +2 -2
- package/dist/components/header/header.styles.js +1 -1
- package/dist/components/header-search/header-search.d.ts +6 -0
- package/dist/components/header-search/header-search.js +11 -5
- package/dist/components/header-search/header-search.styles.js +1 -1
- package/dist/components/icon/icon.js +3 -3
- package/dist/components/icon/library.js +2 -2
- package/dist/components/icon/library.system.js +1 -1
- package/dist/components/icon-button/icon-button.js +3 -3
- package/dist/components/input/input.js +3 -3
- package/dist/components/input-date/input-date.js +3 -3
- package/dist/components/input-mask/input-mask.js +3 -3
- package/dist/components/input-phone/input-phone.d.ts +3 -3
- package/dist/components/input-phone/input-phone.js +8 -14
- package/dist/components/input-phone/input-phone.styles.js +1 -1
- package/dist/components/input-phone/input-phone.utils.d.ts +0 -2
- package/dist/components/input-phone/input-phone.utils.js +1 -5
- package/dist/components/menu-accordion/menu-accordion.js +3 -3
- package/dist/components/menu-item/menu-item.js +3 -3
- package/dist/components/menu-navigation/menu-navigation.js +1 -1
- package/dist/components/navbar-link/navbar-link.js +4 -4
- package/dist/components/navbar-menu/navbar-menu.js +4 -4
- package/dist/components/option/option.js +5 -5
- package/dist/components/option/option.styles.js +1 -1
- package/dist/components/pagination/pagination.js +5 -5
- package/dist/components/profile-button/profile-button.js +4 -4
- package/dist/components/quote/quote.js +3 -3
- package/dist/components/radio/radio.js +3 -3
- package/dist/components/radio-button/radio-button.js +7 -5
- package/dist/components/radio-group/radio-group.d.ts +4 -0
- package/dist/components/radio-group/radio-group.js +6 -4
- package/dist/components/range-slider/range-slider.d.ts +0 -2
- package/dist/components/range-slider/range-slider.js +1 -1
- package/dist/components/select/select.js +3 -3
- package/dist/components/split-panel/split-panel.js +3 -3
- package/dist/components/step/step.js +3 -3
- package/dist/components/tab/tab.d.ts +2 -0
- package/dist/components/tab/tab.js +4 -4
- package/dist/components/tab-group/tab-group.js +3 -3
- package/dist/components/table-header-cell/table-header-cell.js +3 -3
- package/dist/components/table-header-row/table-header-row.js +6 -6
- package/dist/components/table-row/table-row.js +5 -5
- package/dist/components/tag/tag.js +3 -3
- package/dist/components/textarea/textarea.js +3 -3
- package/dist/components/tree/tree.js +4 -4
- package/dist/components/tree-item/tree-item.js +4 -4
- package/dist/custom-elements.json +223 -68
- package/dist/design-system.js +40 -40
- package/dist/events/events.d.ts +7 -7
- package/dist/internal/components/form-toggle-button/form-toggle-button-stories.d.ts +2 -86
- package/dist/internal/test/disable-a11y-warnings.d.ts +2 -0
- package/dist/internal/test/disable-a11y-warnings.js +10 -0
- package/dist/themes/dsa-wc-theme.css +5 -0
- package/dist/themes/dsa-wc-theme.min.css +1 -1
- package/dist/themes/dsa-wc-theme.styles.js +5 -0
- package/dist/utilities/icon-library.js +2 -2
- package/dist/utilities/storybook.d.ts +1 -0
- package/dist/utilities/storybook.js +3 -1
- package/dist/vscode.html-custom-data.json +64 -11
- package/dist/web-types.json +159 -35
- package/package.json +3 -1
- package/cdn/chunks/chunk.CCL2RZON.js +0 -132
- package/cdn/chunks/chunk.DIF52FDQ.js +0 -183
- package/cdn/chunks/chunk.GVVML3JJ.js +0 -272
- package/dist/chunks/chunk.2T66U3QC.js +0 -270
- package/dist/chunks/chunk.ESYJVRG3.js +0 -129
|
@@ -298,6 +298,9 @@ var input_phone_styles_default = css`
|
|
|
298
298
|
var(--dsa-wc-input-phone-height) - var(--dsa-wc-input-border-width) * 2
|
|
299
299
|
);
|
|
300
300
|
}
|
|
301
|
+
.form-control--medium .input-phone__flag {
|
|
302
|
+
width: 1.25rem;
|
|
303
|
+
}
|
|
301
304
|
|
|
302
305
|
.form-control--large {
|
|
303
306
|
--input-phone__select__min-width: 68px;
|
|
@@ -314,6 +317,9 @@ var input_phone_styles_default = css`
|
|
|
314
317
|
2
|
|
315
318
|
);
|
|
316
319
|
}
|
|
320
|
+
.form-control--large .input-phone__flag {
|
|
321
|
+
width: 1.5rem;
|
|
322
|
+
}
|
|
317
323
|
|
|
318
324
|
/*
|
|
319
325
|
* Clearable
|
|
@@ -126,6 +126,9 @@ var filtersDrawerDecorator = (story) => {
|
|
|
126
126
|
</dsa-drawer>
|
|
127
127
|
`;
|
|
128
128
|
};
|
|
129
|
+
var fullScreenDecorator = (story) => {
|
|
130
|
+
return html` <div style="height: 100vh">${story()}</div>`;
|
|
131
|
+
};
|
|
129
132
|
|
|
130
133
|
export {
|
|
131
134
|
updateCompleteArgTypes,
|
|
@@ -136,5 +139,6 @@ export {
|
|
|
136
139
|
withOnLayerOnBaseDecorator,
|
|
137
140
|
withOnFloatingMenuOnBaseDecorator,
|
|
138
141
|
withBackgroundDecorator,
|
|
139
|
-
filtersDrawerDecorator
|
|
142
|
+
filtersDrawerDecorator,
|
|
143
|
+
fullScreenDecorator
|
|
140
144
|
};
|
|
@@ -81,7 +81,7 @@ var DSATab = class extends ShoelaceElement {
|
|
|
81
81
|
part="close-button"
|
|
82
82
|
exportparts="base:close-button__base"
|
|
83
83
|
name="close"
|
|
84
|
-
label=${this.localize.term("close")}
|
|
84
|
+
label=${this.closeButtonLabel !== "" ? this.closeButtonLabel : this.localize.term("close")}
|
|
85
85
|
class="tab__close-button"
|
|
86
86
|
@click=${this.handleCloseClick}
|
|
87
87
|
library="system"
|
|
@@ -110,6 +110,9 @@ __decorateClass([
|
|
|
110
110
|
__decorateClass([
|
|
111
111
|
property({ type: Boolean })
|
|
112
112
|
], DSATab.prototype, "closable", 2);
|
|
113
|
+
__decorateClass([
|
|
114
|
+
property({ attribute: "close-button-label" })
|
|
115
|
+
], DSATab.prototype, "closeButtonLabel", 2);
|
|
113
116
|
__decorateClass([
|
|
114
117
|
property({ type: Boolean, reflect: true })
|
|
115
118
|
], DSATab.prototype, "disabled", 2);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
header_search_styles_default
|
|
3
|
-
} from "./chunk.
|
|
3
|
+
} from "./chunk.HRIAHWFV.js";
|
|
4
4
|
import {
|
|
5
5
|
LocalizeController
|
|
6
6
|
} from "./chunk.QLA2JXR7.js";
|
|
@@ -23,6 +23,8 @@ var DSAHeaderSearch = class extends ShoelaceElement {
|
|
|
23
23
|
this.hasFocus = false;
|
|
24
24
|
this.value = "";
|
|
25
25
|
this.expanded = false;
|
|
26
|
+
this.alwaysOpen = false;
|
|
27
|
+
this.mobile = false;
|
|
26
28
|
}
|
|
27
29
|
connectedCallback() {
|
|
28
30
|
super.connectedCallback();
|
|
@@ -79,64 +81,96 @@ var DSAHeaderSearch = class extends ShoelaceElement {
|
|
|
79
81
|
this.expandButton.focus();
|
|
80
82
|
}
|
|
81
83
|
render() {
|
|
82
|
-
if (!this.expanded) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
84
|
+
if (!this.expanded && !this.alwaysOpen) {
|
|
85
|
+
if (this.mobile) {
|
|
86
|
+
return html`
|
|
87
|
+
<dsa-icon-button
|
|
88
|
+
id="expand-button"
|
|
89
|
+
part="button button--navigation"
|
|
90
|
+
name="search"
|
|
91
|
+
library="system"
|
|
92
|
+
size="large"
|
|
93
|
+
label=${this.localize.term("search")}
|
|
94
|
+
@click=${this.handleExpandClick}
|
|
95
|
+
></dsa-icon-button>
|
|
96
|
+
`;
|
|
97
|
+
} else {
|
|
98
|
+
return html`
|
|
99
|
+
<dsa-button
|
|
100
|
+
id="expand-button"
|
|
101
|
+
variant="navigation"
|
|
102
|
+
part="button button--navigation"
|
|
103
|
+
}
|
|
104
|
+
@click=${this.handleExpandClick}
|
|
93
105
|
>
|
|
94
|
-
|
|
95
|
-
|
|
106
|
+
<dsa-icon name="search" library="system"></dsa-icon>
|
|
107
|
+
<span>${this.localize.term("search")}</span>
|
|
108
|
+
</dsa-button>
|
|
109
|
+
`;
|
|
110
|
+
}
|
|
96
111
|
}
|
|
97
112
|
return html`
|
|
98
|
-
<div
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
title=${this.localize.term("search")}
|
|
105
|
-
.value=${live(this.value)}
|
|
106
|
-
@change=${this.handleChange}
|
|
107
|
-
@input=${this.handleInput}
|
|
108
|
-
@focus=${this.handleInputFocus}
|
|
109
|
-
@blur=${this.handleInputBlur}
|
|
110
|
-
@keydown=${this.handleKeyDown}
|
|
111
|
-
/>
|
|
112
|
-
${this.value.length > 0 ? html`
|
|
113
|
-
<dsa-icon-button
|
|
114
|
-
id="clear-button"
|
|
115
|
-
part="clear-button"
|
|
116
|
-
name="cancel"
|
|
117
|
-
label=${this.localize.term("clearEntry")}
|
|
118
|
-
@click=${this.handleClearClick}
|
|
119
|
-
library="system"
|
|
120
|
-
></dsa-icon-button>
|
|
121
|
-
` : ""}
|
|
122
|
-
</div>
|
|
123
|
-
|
|
124
|
-
<button
|
|
125
|
-
class="icon-button icon-button--primary"
|
|
126
|
-
id="submit-button"
|
|
127
|
-
@click=${this.handleSubmitClick}
|
|
128
|
-
aria-label=${this.localize.term("search")}
|
|
113
|
+
<div
|
|
114
|
+
class=${classMap({
|
|
115
|
+
"search-bar": true,
|
|
116
|
+
"search-bar--mobile": this.mobile,
|
|
117
|
+
"search-bar--desktop": !this.mobile
|
|
118
|
+
})}
|
|
129
119
|
>
|
|
130
|
-
<
|
|
131
|
-
|
|
120
|
+
<div
|
|
121
|
+
class=${classMap({ input: true, "input--focused": this.hasFocus })}
|
|
122
|
+
>
|
|
123
|
+
<input
|
|
124
|
+
class=${classMap({
|
|
125
|
+
input__control: true,
|
|
126
|
+
"input__control--mobile": this.mobile,
|
|
127
|
+
"input__control--desktop": !this.mobile
|
|
128
|
+
})}
|
|
129
|
+
type="search"
|
|
130
|
+
placeholder=${this.localize.term("search")}
|
|
131
|
+
aria-label=${this.localize.term("search")}
|
|
132
|
+
title=${this.localize.term("search")}
|
|
133
|
+
.value=${live(this.value)}
|
|
134
|
+
@change=${this.handleChange}
|
|
135
|
+
@input=${this.handleInput}
|
|
136
|
+
@focus=${this.handleInputFocus}
|
|
137
|
+
@blur=${this.handleInputBlur}
|
|
138
|
+
@keydown=${this.handleKeyDown}
|
|
139
|
+
/>
|
|
140
|
+
${this.value.length > 0 ? html`
|
|
141
|
+
<dsa-icon-button
|
|
142
|
+
id="clear-button"
|
|
143
|
+
part="clear-button"
|
|
144
|
+
name="cancel"
|
|
145
|
+
label=${this.localize.term("clearEntry")}
|
|
146
|
+
@click=${this.handleClearClick}
|
|
147
|
+
library="system"
|
|
148
|
+
></dsa-icon-button>
|
|
149
|
+
` : ""}
|
|
150
|
+
</div>
|
|
132
151
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
152
|
+
<dsa-icon-button
|
|
153
|
+
id="submit-button"
|
|
154
|
+
name="search"
|
|
155
|
+
library="system"
|
|
156
|
+
label=${this.localize.term("search")}
|
|
157
|
+
variant="primary"
|
|
158
|
+
size=${this.mobile ? "large" : "xlarge"}
|
|
159
|
+
@click=${this.handleSubmitClick}
|
|
160
|
+
>
|
|
161
|
+
</dsa-icon-button>
|
|
162
|
+
|
|
163
|
+
${!this.alwaysOpen ? html`
|
|
164
|
+
<dsa-button
|
|
165
|
+
id="cancel-button"
|
|
166
|
+
variant="tertiary"
|
|
167
|
+
size=${this.mobile ? "small" : "medium"}
|
|
168
|
+
@click=${this.handleCancelClick}
|
|
169
|
+
>
|
|
170
|
+
${this.localize.term("cancel")}
|
|
171
|
+
</dsa-button>
|
|
172
|
+
` : ""}
|
|
173
|
+
</div>
|
|
140
174
|
`;
|
|
141
175
|
}
|
|
142
176
|
};
|
|
@@ -165,6 +199,12 @@ __decorateClass([
|
|
|
165
199
|
__decorateClass([
|
|
166
200
|
property({ reflect: true, type: Boolean })
|
|
167
201
|
], DSAHeaderSearch.prototype, "expanded", 2);
|
|
202
|
+
__decorateClass([
|
|
203
|
+
property({ type: Boolean, attribute: "always-open" })
|
|
204
|
+
], DSAHeaderSearch.prototype, "alwaysOpen", 2);
|
|
205
|
+
__decorateClass([
|
|
206
|
+
property({ type: Boolean })
|
|
207
|
+
], DSAHeaderSearch.prototype, "mobile", 2);
|
|
168
208
|
DSAHeaderSearch = __decorateClass([
|
|
169
209
|
customElement("dsa-header-search")
|
|
170
210
|
], DSAHeaderSearch);
|
|
@@ -54,7 +54,6 @@ var DSACheckbox = class extends ShoelaceElement {
|
|
|
54
54
|
this.errorMessage = "";
|
|
55
55
|
this.form = "";
|
|
56
56
|
this.required = false;
|
|
57
|
-
this.ariaLabel = "";
|
|
58
57
|
}
|
|
59
58
|
/** Gets the validity state object */
|
|
60
59
|
get validity() {
|
|
@@ -182,14 +181,16 @@ var DSACheckbox = class extends ShoelaceElement {
|
|
|
182
181
|
id="input"
|
|
183
182
|
class="checkbox__input"
|
|
184
183
|
type="checkbox"
|
|
185
|
-
title=${
|
|
184
|
+
title=${this.title}
|
|
186
185
|
name=${ifDefinedAndNotEmpty(this.name)}
|
|
187
186
|
value=${ifDefined(this.value)}
|
|
188
187
|
.indeterminate=${live(this.indeterminate)}
|
|
189
188
|
.checked=${live(this.checked)}
|
|
190
189
|
.disabled=${this.disabled}
|
|
191
190
|
.required=${this.required}
|
|
192
|
-
aria-label=${ifDefinedAndNotEmpty(
|
|
191
|
+
aria-label=${ifDefinedAndNotEmpty(
|
|
192
|
+
this.accessibleName || this.ariaLabel
|
|
193
|
+
)}
|
|
193
194
|
aria-checked=${this.checked ? "true" : "false"}
|
|
194
195
|
aria-describedby=${ifDefined(this.error ? "error-text" : void 0)}
|
|
195
196
|
aria-disabled=${ifDefined(
|
|
@@ -296,6 +297,9 @@ __decorateClass([
|
|
|
296
297
|
__decorateClass([
|
|
297
298
|
property({ attribute: "aria-label", reflect: true })
|
|
298
299
|
], DSACheckbox.prototype, "ariaLabel", 2);
|
|
300
|
+
__decorateClass([
|
|
301
|
+
property({ attribute: "accessible-name", reflect: true })
|
|
302
|
+
], DSACheckbox.prototype, "accessibleName", 2);
|
|
299
303
|
__decorateClass([
|
|
300
304
|
watch("disabled", { waitUntilFirstUpdate: true })
|
|
301
305
|
], DSACheckbox.prototype, "handleDisabledChange", 1);
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import {
|
|
2
|
+
component_styles_default
|
|
3
|
+
} from "./chunk.TUVJKY7S.js";
|
|
4
|
+
|
|
5
|
+
// src/components/header-search/header-search.styles.ts
|
|
6
|
+
import { css } from "lit";
|
|
7
|
+
var header_search_styles_default = css`
|
|
8
|
+
${component_styles_default}
|
|
9
|
+
|
|
10
|
+
:host {
|
|
11
|
+
display: contents;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
.search-bar {
|
|
15
|
+
display: flex;
|
|
16
|
+
align-items: center;
|
|
17
|
+
justify-content: flex-end;
|
|
18
|
+
flex: 1;
|
|
19
|
+
width: 100%;
|
|
20
|
+
}
|
|
21
|
+
.search-bar--mobile {
|
|
22
|
+
gap: var(--dsa-spacing-8);
|
|
23
|
+
}
|
|
24
|
+
.search-bar--desktop {
|
|
25
|
+
gap: var(--dsa-spacing-16);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/* Input */
|
|
29
|
+
.input {
|
|
30
|
+
position: relative;
|
|
31
|
+
display: inline-flex;
|
|
32
|
+
flex-direction: row;
|
|
33
|
+
align-items: center;
|
|
34
|
+
vertical-align: middle;
|
|
35
|
+
width: 100%;
|
|
36
|
+
min-width: 0;
|
|
37
|
+
font: var(--dsa-wc-input-text-field-font);
|
|
38
|
+
border-bottom: 1px solid var(--dsa-wc-header-search-input-color);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
.input--focused {
|
|
42
|
+
outline: var(--dsa-wc-focus-ring);
|
|
43
|
+
outline-offset: var(--dsa-wc-focus-ring-offset);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
.input__control {
|
|
47
|
+
display: inline-flex;
|
|
48
|
+
flex-direction: row;
|
|
49
|
+
flex: 1 1 auto;
|
|
50
|
+
min-width: 0;
|
|
51
|
+
height: 100%;
|
|
52
|
+
border: none;
|
|
53
|
+
background: none;
|
|
54
|
+
box-shadow: none;
|
|
55
|
+
margin: 0;
|
|
56
|
+
cursor: inherit;
|
|
57
|
+
-webkit-appearance: none;
|
|
58
|
+
color: var(--dsa-wc-header-search-input-color);
|
|
59
|
+
padding: 8px 0 8px 8px;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
.input__control--mobile {
|
|
63
|
+
height: 34px;
|
|
64
|
+
font: var(--dsa-wc-header-search-mobile-input-font);
|
|
65
|
+
}
|
|
66
|
+
.input__control--desktop {
|
|
67
|
+
height: 40px;
|
|
68
|
+
font: var(--dsa-wc-header-search-input-font);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
.input__control::placeholder {
|
|
72
|
+
color: var(--dsa-wc-input-on-layer-text-field-placeholder-color);
|
|
73
|
+
opacity: 1;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
.input__control::-webkit-search-decoration,
|
|
77
|
+
.input__control::-webkit-search-cancel-button,
|
|
78
|
+
.input__control::-webkit-search-results-button,
|
|
79
|
+
.input__control::-webkit-search-results-decoration {
|
|
80
|
+
-webkit-appearance: none;
|
|
81
|
+
}
|
|
82
|
+
.input__control:focus {
|
|
83
|
+
outline: none;
|
|
84
|
+
}
|
|
85
|
+
`;
|
|
86
|
+
|
|
87
|
+
export {
|
|
88
|
+
header_search_styles_default
|
|
89
|
+
};
|
|
@@ -143,11 +143,20 @@ var option_styles_default = css`
|
|
|
143
143
|
|
|
144
144
|
.option__prefix::slotted(*),
|
|
145
145
|
.option--error .option__error-icon {
|
|
146
|
-
margin-inline-end: var(--dsa-wc-option-
|
|
146
|
+
margin-inline-end: var(--dsa-wc-option-prefix-suffix-inline-padding);
|
|
147
|
+
}
|
|
148
|
+
.option--large .option__prefix::slotted(*),
|
|
149
|
+
.option--large .option--error .option__error-icon {
|
|
150
|
+
margin-inline-end: var(--dsa-wc-option-large-prefix-suffix-inline-padding);
|
|
147
151
|
}
|
|
148
152
|
|
|
149
153
|
.option__suffix::slotted(*) {
|
|
150
|
-
margin-inline-start: var(--dsa-wc-option-
|
|
154
|
+
margin-inline-start: var(--dsa-wc-option-prefix-suffix-inline-padding);
|
|
155
|
+
}
|
|
156
|
+
.option--large .option__suffix::slotted(*) {
|
|
157
|
+
margin-inline-start: var(
|
|
158
|
+
--dsa-wc-option-large-prefix-suffix-inline-padding
|
|
159
|
+
);
|
|
151
160
|
}
|
|
152
161
|
|
|
153
162
|
@media (forced-colors: active) {
|
|
@@ -56,6 +56,7 @@ var DSARadioGroup = class extends ShoelaceElement {
|
|
|
56
56
|
this.horizontal = false;
|
|
57
57
|
this.error = false;
|
|
58
58
|
this.errorMessage = "";
|
|
59
|
+
this.hideLabel = false;
|
|
59
60
|
}
|
|
60
61
|
/** Gets the validity state object */
|
|
61
62
|
get validity() {
|
|
@@ -305,6 +306,11 @@ var DSARadioGroup = class extends ShoelaceElement {
|
|
|
305
306
|
const hasHelpTextSlot = this.hasSlotController.test("help-text");
|
|
306
307
|
const hasLabel = this.label ? true : !!hasLabelSlot;
|
|
307
308
|
const hasHelpText = this.helpText ? true : !!hasHelpTextSlot;
|
|
309
|
+
if (!hasLabel) {
|
|
310
|
+
console.warn(
|
|
311
|
+
"(a11y) <dsa-radio-group> requires a label attribute or a label slot for accessibility"
|
|
312
|
+
);
|
|
313
|
+
}
|
|
308
314
|
return html`
|
|
309
315
|
<fieldset
|
|
310
316
|
part="form-control"
|
|
@@ -323,16 +329,21 @@ var DSARadioGroup = class extends ShoelaceElement {
|
|
|
323
329
|
aria-describedby=${this.error ? "error-text help-text" : "help-text"}
|
|
324
330
|
aria-invalid=${this.error}
|
|
325
331
|
>
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
332
|
+
${this.hideLabel ? html`<dsa-visually-hidden id="label"
|
|
333
|
+
><slot name="label">${this.label}</slot></dsa-visually-hidden
|
|
334
|
+
>` : html`
|
|
335
|
+
<span
|
|
336
|
+
part="form-control-label"
|
|
337
|
+
id="label"
|
|
338
|
+
class="form-control__label"
|
|
339
|
+
aria-hidden=${hasLabel ? "false" : "true"}
|
|
340
|
+
@click=${this.handleLabelClick}
|
|
341
|
+
>
|
|
342
|
+
${this.required ? html`<span class="form-control__label-required">*</span>` : ""}
|
|
343
|
+
<slot name="label">${this.label}</slot>
|
|
344
|
+
</span>
|
|
345
|
+
`}
|
|
346
|
+
|
|
336
347
|
<slot name="tooltip" class="form-control__tooltip"></slot>
|
|
337
348
|
|
|
338
349
|
<div
|
|
@@ -455,6 +466,9 @@ __decorateClass([
|
|
|
455
466
|
}
|
|
456
467
|
})
|
|
457
468
|
], DSARadioGroup.prototype, "errorMessage", 2);
|
|
469
|
+
__decorateClass([
|
|
470
|
+
property({ type: Boolean, attribute: "hide-label" })
|
|
471
|
+
], DSARadioGroup.prototype, "hideLabel", 2);
|
|
458
472
|
__decorateClass([
|
|
459
473
|
watch("value")
|
|
460
474
|
], DSARadioGroup.prototype, "handleValueChange", 1);
|
|
@@ -149,9 +149,8 @@ var DSAAlert = class extends ShoelaceElement {
|
|
|
149
149
|
});
|
|
150
150
|
}
|
|
151
151
|
render() {
|
|
152
|
-
var _a;
|
|
153
152
|
return html`
|
|
154
|
-
<div aria-live="
|
|
153
|
+
<div aria-live="polite" aria-atomic="true">
|
|
155
154
|
<div
|
|
156
155
|
part="base"
|
|
157
156
|
class=${classMap({
|
|
@@ -173,7 +172,7 @@ var DSAAlert = class extends ShoelaceElement {
|
|
|
173
172
|
library="system"
|
|
174
173
|
></dsa-icon>
|
|
175
174
|
<div class="alert__text">
|
|
176
|
-
${this.title
|
|
175
|
+
${this.title || this.alertTitle ? html`
|
|
177
176
|
<div
|
|
178
177
|
part="header"
|
|
179
178
|
id="header"
|
|
@@ -181,7 +180,7 @@ var DSAAlert = class extends ShoelaceElement {
|
|
|
181
180
|
role=${ifDefined(this.headerLevel ? "heading" : void 0)}
|
|
182
181
|
class="alert__title"
|
|
183
182
|
>
|
|
184
|
-
${
|
|
183
|
+
${this.alertTitle || this.title}
|
|
185
184
|
</div>
|
|
186
185
|
` : ""}
|
|
187
186
|
<slot part="message" class="alert__message"></slot>
|
|
@@ -4,7 +4,7 @@ import {
|
|
|
4
4
|
} from "./chunk.JSNVYESF.js";
|
|
5
5
|
import {
|
|
6
6
|
header_styles_default
|
|
7
|
-
} from "./chunk.
|
|
7
|
+
} from "./chunk.2EDNCADP.js";
|
|
8
8
|
import {
|
|
9
9
|
HasSlotController
|
|
10
10
|
} from "./chunk.YIY5RM53.js";
|
|
@@ -39,6 +39,7 @@ var DSAHeader = class extends ShoelaceElement {
|
|
|
39
39
|
this.localize = new LocalizeController(this);
|
|
40
40
|
this.firstLogo = "public";
|
|
41
41
|
this.logoHref = "/";
|
|
42
|
+
this.logoSize = "default";
|
|
42
43
|
this.searchExpanded = false;
|
|
43
44
|
this.mobile = false;
|
|
44
45
|
}
|
|
@@ -68,6 +69,14 @@ var DSAHeader = class extends ShoelaceElement {
|
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
71
|
}
|
|
72
|
+
handleMobile() {
|
|
73
|
+
if (this.hasSlotController.test("search")) {
|
|
74
|
+
const search = this.querySelector("dsa-header-search");
|
|
75
|
+
if (search !== null && this.mobile !== void 0) {
|
|
76
|
+
search.mobile = this.mobile;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
71
80
|
render() {
|
|
72
81
|
const hasBrand = this.hasSlotController.test("second-logo") || this.hasSlotController.test("site-name");
|
|
73
82
|
return html`
|
|
@@ -92,11 +101,22 @@ var DSAHeader = class extends ShoelaceElement {
|
|
|
92
101
|
"header--search-expanded": this.hasSlotController.test("search") && this.searchExpanded
|
|
93
102
|
})}
|
|
94
103
|
>
|
|
95
|
-
<
|
|
96
|
-
|
|
97
|
-
|
|
104
|
+
<slot
|
|
105
|
+
name="first-logo"
|
|
106
|
+
part="first-logo"
|
|
107
|
+
class="logo ${this.logoSize === "large" && "logo-large"}"
|
|
108
|
+
>
|
|
109
|
+
<a href=${this.logoHref} class="logo-link">
|
|
110
|
+
${this.firstLogo === "public" ? dsaLogoSvg(this.localize.term("dsaGoToHomepage")) : cnsaLogoSvg(this.localize.term("cnsaGoToHomepage"))}
|
|
111
|
+
</a>
|
|
112
|
+
</slot>
|
|
98
113
|
<div part="brand">
|
|
99
|
-
${this.hasSlotController.test("second-logo") ? html`
|
|
114
|
+
${this.hasSlotController.test("second-logo") ? html`
|
|
115
|
+
<slot
|
|
116
|
+
name="second-logo"
|
|
117
|
+
class="logo ${this.logoSize === "large" && "logo-large"}"
|
|
118
|
+
></slot>
|
|
119
|
+
` : ""}
|
|
100
120
|
${this.hasSlotController.test("site-name") || this.hasSlotController.test("baseline") ? html`
|
|
101
121
|
<div class="site-info">
|
|
102
122
|
<slot name="site-name" part="site-name"></slot>
|
|
@@ -124,6 +144,9 @@ __decorateClass([
|
|
|
124
144
|
__decorateClass([
|
|
125
145
|
property({ reflect: true, attribute: "logo-href" })
|
|
126
146
|
], DSAHeader.prototype, "logoHref", 2);
|
|
147
|
+
__decorateClass([
|
|
148
|
+
property({ attribute: "logo-size" })
|
|
149
|
+
], DSAHeader.prototype, "logoSize", 2);
|
|
127
150
|
__decorateClass([
|
|
128
151
|
property({ reflect: true, type: Boolean, attribute: "search-expanded" })
|
|
129
152
|
], DSAHeader.prototype, "searchExpanded", 2);
|
|
@@ -133,6 +156,9 @@ __decorateClass([
|
|
|
133
156
|
__decorateClass([
|
|
134
157
|
watch("searchExpanded")
|
|
135
158
|
], DSAHeader.prototype, "handleSearchExpanded", 1);
|
|
159
|
+
__decorateClass([
|
|
160
|
+
watch("mobile")
|
|
161
|
+
], DSAHeader.prototype, "handleMobile", 1);
|
|
136
162
|
DSAHeader = __decorateClass([
|
|
137
163
|
customElement("dsa-header")
|
|
138
164
|
], DSAHeader);
|
|
@@ -17,6 +17,7 @@ var DSACallout = class extends ShoelaceElement {
|
|
|
17
17
|
constructor() {
|
|
18
18
|
super(...arguments);
|
|
19
19
|
this.title = "";
|
|
20
|
+
this.calloutTitle = "";
|
|
20
21
|
}
|
|
21
22
|
render() {
|
|
22
23
|
return html`
|
|
@@ -27,7 +28,7 @@ var DSACallout = class extends ShoelaceElement {
|
|
|
27
28
|
})}
|
|
28
29
|
>
|
|
29
30
|
<div class="callout__text">
|
|
30
|
-
${this.
|
|
31
|
+
${this.calloutTitle || this.title ? html`
|
|
31
32
|
<div
|
|
32
33
|
part="header"
|
|
33
34
|
id="header"
|
|
@@ -35,7 +36,7 @@ var DSACallout = class extends ShoelaceElement {
|
|
|
35
36
|
role=${ifDefined(this.headerLevel ? "heading" : void 0)}
|
|
36
37
|
class="callout__title"
|
|
37
38
|
>
|
|
38
|
-
${this.title}
|
|
39
|
+
${this.calloutTitle || this.title}
|
|
39
40
|
</div>
|
|
40
41
|
` : ""}
|
|
41
42
|
<slot part="message" class="callout__message"></slot>
|
|
@@ -51,6 +52,9 @@ __decorateClass([
|
|
|
51
52
|
__decorateClass([
|
|
52
53
|
property()
|
|
53
54
|
], DSACallout.prototype, "title", 2);
|
|
55
|
+
__decorateClass([
|
|
56
|
+
property({ attribute: "callout-title" })
|
|
57
|
+
], DSACallout.prototype, "calloutTitle", 2);
|
|
54
58
|
__decorateClass([
|
|
55
59
|
property({ attribute: "header-level", reflect: true })
|
|
56
60
|
], DSACallout.prototype, "headerLevel", 2);
|