@ons/design-system 65.0.0 → 65.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/components/address-input/autosuggest.address.error.js +1 -1
- package/components/address-input/autosuggest.address.js +2 -2
- package/components/address-input/autosuggest.address.spec.js +5 -5
- package/components/autosuggest/_autosuggest.scss +11 -6
- package/components/autosuggest/_macro.njk +32 -31
- package/components/autosuggest/_macro.spec.js +18 -18
- package/components/autosuggest/autosuggest.spec.js +31 -31
- package/components/autosuggest/autosuggest.ui.js +8 -9
- package/components/card/_card.scss +14 -0
- package/components/card/_macro.njk +7 -8
- package/components/checkboxes/example-checkboxes-with-revealed-checkboxes-expanded.njk +88 -0
- package/components/checkboxes/example-checkboxes-with-revealed-radios-expanded.njk +70 -0
- package/components/checkboxes/example-checkboxes-with-revealed-select-expanded.njk +72 -0
- package/components/checkboxes/example-checkboxes-with-revealed-text-input-expanded.njk +60 -0
- package/components/content-pagination/_content-pagination.scss +1 -1
- package/components/document-list/_macro.njk +5 -7
- package/components/document-list/_macro.spec.js +2 -2
- package/components/document-list/example-document-list-search-result-featured.njk +1 -1
- package/components/document-list/example-document-list-search-results.njk +3 -3
- package/components/fieldset/_fieldset.scss +1 -1
- package/components/header/_macro.njk +4 -4
- package/components/header/example-header-external-with-navigation.njk +5 -5
- package/components/header/example-header-external-with-service-links.njk +3 -3
- package/components/header/example-header-external-with-sub-navigation.njk +10 -10
- package/components/header/example-header-internal.njk +2 -2
- package/components/header/example-header-neutral-for-multicoloured-logo.njk +6 -6
- package/components/list/_list.scss +5 -2
- package/components/list/_macro.njk +22 -10
- package/components/list/_macro.spec.js +42 -0
- package/components/navigation/_macro.njk +6 -6
- package/components/navigation/_macro.spec.js +4 -4
- package/components/pagination/_macro.njk +17 -2
- package/components/pagination/_pagination.scss +14 -0
- package/components/question/example-question-interviewer-note.njk +1 -1
- package/components/radios/example-radios-with-clear-button-expanded.njk +98 -0
- package/components/radios/example-radios-with-revealed-checkboxes-expanded.njk +70 -0
- package/components/radios/example-radios-with-revealed-radios-expanded.njk +69 -0
- package/components/radios/example-radios-with-revealed-select-expanded.njk +70 -0
- package/components/radios/example-radios-with-revealed-text-input-expanded.njk +81 -0
- package/components/relationships/_macro.spec.js +9 -11
- package/components/relationships/example-relationships-error.njk +28 -28
- package/components/relationships/example-relationships-you.njk +29 -29
- package/components/relationships/example-relationships.njk +28 -28
- package/components/relationships/relationships.spec.js +13 -13
- package/components/reply/_macro.njk +5 -2
- package/components/reply/_macro.spec.js +7 -1
- package/components/section-navigation/_macro.njk +2 -1
- package/components/section-navigation/_macro.spec.js +2 -13
- package/components/tabs/_macro.njk +5 -5
- package/components/tabs/_macro.spec.js +1 -1
- package/components/tabs/example-tabs-details.njk +3 -0
- package/components/tabs/example-tabs.njk +0 -1
- package/components/textarea/example-textarea-error.njk +4 -4
- package/css/main.css +2 -2
- package/css/print.css +1 -1
- package/js/cookies-settings.js +1 -1
- package/package.json +19 -21
- package/scripts/main.es5.js +1 -1
- package/scripts/main.js +1 -1
- package/scss/overrides/hcm.scss +4 -4
- package/scss/print.scss +1 -1
|
@@ -2,7 +2,7 @@ import inPageLinks from '../../js/inpagelink';
|
|
|
2
2
|
|
|
3
3
|
const classAutosuggest = 'ons-js-address-autosuggest';
|
|
4
4
|
const classErrorPanel = 'ons-js-autosuggest-error-panel';
|
|
5
|
-
const classInputContainer = 'ons-autosuggest
|
|
5
|
+
const classInputContainer = 'ons-autosuggest';
|
|
6
6
|
const classInput = 'ons-js-autosuggest-input';
|
|
7
7
|
const classSearch = 'ons-js-address-input__search';
|
|
8
8
|
|
|
@@ -4,7 +4,7 @@ import AutosuggestUI from '../autosuggest/autosuggest.ui';
|
|
|
4
4
|
import AddressError from './autosuggest.address.error';
|
|
5
5
|
import AddressSetter from './autosuggest.address.setter';
|
|
6
6
|
|
|
7
|
-
export const classInputContainer = 'ons-autosuggest
|
|
7
|
+
export const classInputContainer = 'ons-autosuggest';
|
|
8
8
|
export const classNotEditable = 'ons-js-address-not-editable';
|
|
9
9
|
export const classMandatory = 'ons-js-address-mandatory';
|
|
10
10
|
export const classSearch = 'ons-js-address-input__search';
|
|
@@ -205,7 +205,7 @@ export default class AutosuggestAddress {
|
|
|
205
205
|
(townName === postTown ? postTown : townName + ', ' + postTown) +
|
|
206
206
|
', ' +
|
|
207
207
|
postcode +
|
|
208
|
-
' (<span class="ons-
|
|
208
|
+
' (<span class="ons-autosuggest__group">' +
|
|
209
209
|
this.groupCount.replace(`{n}`, addressCount) +
|
|
210
210
|
'</span>)',
|
|
211
211
|
postcode,
|
|
@@ -241,7 +241,7 @@ describe('script: address-input', () => {
|
|
|
241
241
|
await page.type('.ons-js-autosuggest-input', '2', { delay: 20 });
|
|
242
242
|
await page.keyboard.press('ArrowDown');
|
|
243
243
|
|
|
244
|
-
const selectedOption = await page.$eval('.ons-
|
|
244
|
+
const selectedOption = await page.$eval('.ons-autosuggest__option--focused', node => node.textContent);
|
|
245
245
|
expect(selectedOption.trim()).toBe('196 College Road, Birmingham, B44 8HF');
|
|
246
246
|
});
|
|
247
247
|
|
|
@@ -267,7 +267,7 @@ describe('script: address-input', () => {
|
|
|
267
267
|
});
|
|
268
268
|
|
|
269
269
|
it('has expected suggestion entries', async () => {
|
|
270
|
-
const suggestions = await page.$$eval('.ons-
|
|
270
|
+
const suggestions = await page.$$eval('.ons-autosuggest__option', nodes => nodes.map(node => node.textContent.trim()));
|
|
271
271
|
expect(suggestions).toEqual(['196 College Road, Birmingham, B44 8HF', '196 College Road, Whitchurch, Cardiff, CF14 2NZ']);
|
|
272
272
|
});
|
|
273
273
|
});
|
|
@@ -313,7 +313,7 @@ describe('script: address-input', () => {
|
|
|
313
313
|
});
|
|
314
314
|
|
|
315
315
|
it('has expected suggestion entries', async () => {
|
|
316
|
-
const suggestions = await page.$$eval('.ons-
|
|
316
|
+
const suggestions = await page.$$eval('.ons-autosuggest__option', nodes => nodes.map(node => node.textContent.trim()));
|
|
317
317
|
expect(suggestions).toEqual(['1 Penlline Road, Whitchurch, Cardiff, CF14 2NZ', '2 Penlline Road, Whitchurch, Cardiff, CF14 2NZ']);
|
|
318
318
|
});
|
|
319
319
|
|
|
@@ -353,7 +353,7 @@ describe('script: address-input', () => {
|
|
|
353
353
|
});
|
|
354
354
|
|
|
355
355
|
it('has expected suggestion entries', async () => {
|
|
356
|
-
const suggestions = await page.$$eval('.ons-
|
|
356
|
+
const suggestions = await page.$$eval('.ons-autosuggest__option', nodes => nodes.map(node => node.textContent.trim()));
|
|
357
357
|
expect(suggestions).toEqual([
|
|
358
358
|
'Penlline Road, Whitchurch, Cardiff, CF14 2AA (41 addresses)',
|
|
359
359
|
'197 College Road, Whitchurch, Cardiff, CF14 2AB',
|
|
@@ -376,7 +376,7 @@ describe('script: address-input', () => {
|
|
|
376
376
|
});
|
|
377
377
|
|
|
378
378
|
it('has expected suggestion entries', async () => {
|
|
379
|
-
const suggestions = await page.$$eval('.ons-
|
|
379
|
+
const suggestions = await page.$$eval('.ons-autosuggest__option', nodes => nodes.map(node => node.textContent.trim()));
|
|
380
380
|
expect(suggestions).toEqual(['197 College Road, Whitchurch, Cardiff, CF14 2AB']);
|
|
381
381
|
});
|
|
382
382
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
.ons-autosuggest
|
|
1
|
+
.ons-autosuggest {
|
|
2
2
|
position: relative;
|
|
3
3
|
|
|
4
4
|
&__combobox {
|
|
@@ -57,8 +57,8 @@
|
|
|
57
57
|
border-color: var(--ons-color-text-link-hover);
|
|
58
58
|
color: var(--ons-color-white);
|
|
59
59
|
|
|
60
|
-
.ons-
|
|
61
|
-
.ons-
|
|
60
|
+
.ons-autosuggest__group,
|
|
61
|
+
.ons-autosuggest__category {
|
|
62
62
|
color: var(--ons-color-white);
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -67,8 +67,8 @@
|
|
|
67
67
|
background: var(--ons-color-focus);
|
|
68
68
|
color: var(--ons-color-text-link-focus);
|
|
69
69
|
|
|
70
|
-
.ons-
|
|
71
|
-
.ons-
|
|
70
|
+
.ons-autosuggest__group,
|
|
71
|
+
.ons-autosuggest__category {
|
|
72
72
|
color: var(--ons-color-text-link-focus);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
@@ -91,6 +91,11 @@
|
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
93
|
|
|
94
|
+
&__wrapper {
|
|
95
|
+
max-width: max-content;
|
|
96
|
+
width: 100%;
|
|
97
|
+
}
|
|
98
|
+
|
|
94
99
|
&__panel.ons-panel--warn {
|
|
95
100
|
background: none;
|
|
96
101
|
border: 0;
|
|
@@ -126,7 +131,7 @@
|
|
|
126
131
|
}
|
|
127
132
|
|
|
128
133
|
&--header {
|
|
129
|
-
.ons-
|
|
134
|
+
.ons-autosuggest__results {
|
|
130
135
|
border: none;
|
|
131
136
|
box-shadow: 0 0 5px 0 rgba(34, 34, 34, 0.6);
|
|
132
137
|
left: 0;
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
{% macro onsAutosuggest(params) %}
|
|
4
4
|
<div
|
|
5
5
|
id="{{ params.id }}-container"
|
|
6
|
-
class="{% if not params.externalInitialiser %}ons-js-autosuggest {% endif %}{% if params.isEditable == false %}ons-js-address-not-editable{% endif %}{% if params.mandatory == true %} ons-js-address-mandatory{% endif %} {% if params.containerClasses %} {{ params.containerClasses }}{% endif %} ons-autosuggest
|
|
6
|
+
class="{% if not params.externalInitialiser %}ons-js-autosuggest {% endif %}{% if params.isEditable == false %}ons-js-address-not-editable{% endif %}{% if params.mandatory == true %} ons-js-address-mandatory{% endif %} {% if params.containerClasses %} {{ params.containerClasses }}{% endif %} ons-autosuggest"
|
|
7
7
|
data-instructions="{{ params.instructions }}"
|
|
8
8
|
data-aria-you-have-selected="{{ params.ariaYouHaveSelected }}"
|
|
9
9
|
data-min-chars="{{ params.minChars }}"
|
|
@@ -36,38 +36,39 @@
|
|
|
36
36
|
>
|
|
37
37
|
|
|
38
38
|
{% set autosuggestResults %}
|
|
39
|
-
<div class="ons-
|
|
40
|
-
<div id="{{ params.resultsTitleId }}" class="ons-
|
|
41
|
-
<ul class="ons-
|
|
39
|
+
<div class="ons-autosuggest__results ons-js-autosuggest-results">
|
|
40
|
+
<div id="{{ params.resultsTitleId }}" class="ons-autosuggest__results-title ons-u-fs-s">{{ params.resultsTitle }}</div>
|
|
41
|
+
<ul class="ons-autosuggest__listbox ons-js-autosuggest-listbox" title="{{ params.resultsTitle }}" role="listbox" id="{{ params.id }}-listbox" tabindex="-1"></ul>
|
|
42
42
|
</div>
|
|
43
|
-
<div class="ons-
|
|
44
|
-
<div class="ons-
|
|
43
|
+
<div class="ons-autosuggest__instructions ons-u-vh ons-js-autosuggest-instructions" id="{{ params.id }}-instructions" tabindex="-1">{{ params.instructions }}</div>
|
|
44
|
+
<div class="ons-autosuggest__status ons-u-vh ons-js-autosuggest-aria-status" aria-live="assertive" aria-atomic="true" role="status" tabindex="-1"></div>
|
|
45
45
|
{% endset %}
|
|
46
|
+
<div class="ons-autosuggest__wrapper">
|
|
47
|
+
{{ onsInput({
|
|
48
|
+
"id": params.id,
|
|
49
|
+
"classes": "ons-js-autosuggest-input " + (params.classes if params.classes else ''),
|
|
50
|
+
"width": params.width,
|
|
51
|
+
"label": {
|
|
52
|
+
"text": params.label.text,
|
|
53
|
+
"description": params.label.description,
|
|
54
|
+
"id": params.label.id,
|
|
55
|
+
"classes": params.label.classes
|
|
56
|
+
},
|
|
57
|
+
"autocomplete": params.autocomplete,
|
|
58
|
+
"legend": params.legend,
|
|
59
|
+
"legendClasses": params.legendClasses,
|
|
60
|
+
"value": params.value,
|
|
61
|
+
"attributes": params.attributes,
|
|
62
|
+
"error": params.error,
|
|
63
|
+
"mutuallyExclusive": params.mutuallyExclusive,
|
|
64
|
+
"accessiblePlaceholder": params.accessiblePlaceholder,
|
|
65
|
+
"name": params.name,
|
|
66
|
+
"autosuggestResults": autosuggestResults
|
|
67
|
+
}) }}
|
|
46
68
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
"label": {
|
|
52
|
-
"text": params.label.text,
|
|
53
|
-
"description": params.label.description,
|
|
54
|
-
"id": params.label.id,
|
|
55
|
-
"classes": params.label.classes
|
|
56
|
-
},
|
|
57
|
-
"autocomplete": params.autocomplete,
|
|
58
|
-
"legend": params.legend,
|
|
59
|
-
"legendClasses": params.legendClasses,
|
|
60
|
-
"value": params.value,
|
|
61
|
-
"attributes": params.attributes,
|
|
62
|
-
"error": params.error,
|
|
63
|
-
"mutuallyExclusive": params.mutuallyExclusive,
|
|
64
|
-
"accessiblePlaceholder": params.accessiblePlaceholder,
|
|
65
|
-
"name": params.name,
|
|
66
|
-
"autosuggestResults": autosuggestResults
|
|
67
|
-
}) }}
|
|
68
|
-
|
|
69
|
-
{% if not params.mutuallyExclusive %}
|
|
70
|
-
{{ autosuggestResults | safe }}
|
|
71
|
-
{% endif %}
|
|
69
|
+
{% if not params.mutuallyExclusive %}
|
|
70
|
+
{{ autosuggestResults | safe }}
|
|
71
|
+
{% endif %}
|
|
72
|
+
</div>
|
|
72
73
|
</div>
|
|
73
74
|
{% endmacro %}
|
|
@@ -41,13 +41,13 @@ describe('macro: autosuggest', () => {
|
|
|
41
41
|
it('has expected id on container element', () => {
|
|
42
42
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
43
43
|
|
|
44
|
-
expect($('.ons-autosuggest
|
|
44
|
+
expect($('.ons-autosuggest').attr('id')).toBe('country-of-birth-container');
|
|
45
45
|
});
|
|
46
46
|
|
|
47
47
|
it('has the provided data attributes', () => {
|
|
48
48
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
49
49
|
|
|
50
|
-
const $element = $('.ons-autosuggest
|
|
50
|
+
const $element = $('.ons-autosuggest');
|
|
51
51
|
expect($element.attr('data-allow-multiple')).toBeUndefined();
|
|
52
52
|
expect($element.attr('data-min-chars')).toBe('2');
|
|
53
53
|
expect($element.attr('data-aria-limited-results')).toBe('Type more characters to improve your search');
|
|
@@ -71,13 +71,13 @@ describe('macro: autosuggest', () => {
|
|
|
71
71
|
}),
|
|
72
72
|
);
|
|
73
73
|
|
|
74
|
-
expect($('.ons-autosuggest
|
|
74
|
+
expect($('.ons-autosuggest').attr('data-allow-multiple')).toBe('true');
|
|
75
75
|
});
|
|
76
76
|
|
|
77
77
|
it('has a special class that indicates the component should initialise itself', () => {
|
|
78
78
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
79
79
|
|
|
80
|
-
expect($('.ons-autosuggest
|
|
80
|
+
expect($('.ons-autosuggest').hasClass('ons-js-autosuggest')).toBe(true);
|
|
81
81
|
});
|
|
82
82
|
|
|
83
83
|
it('does not have a special class when the component has an external initialiser', () => {
|
|
@@ -88,7 +88,7 @@ describe('macro: autosuggest', () => {
|
|
|
88
88
|
}),
|
|
89
89
|
);
|
|
90
90
|
|
|
91
|
-
expect($('.ons-autosuggest
|
|
91
|
+
expect($('.ons-autosuggest').hasClass('ons-js-autosuggest')).toBe(false);
|
|
92
92
|
});
|
|
93
93
|
|
|
94
94
|
it('has special class to indicate that component is not editable', () => {
|
|
@@ -99,7 +99,7 @@ describe('macro: autosuggest', () => {
|
|
|
99
99
|
}),
|
|
100
100
|
);
|
|
101
101
|
|
|
102
|
-
expect($('.ons-autosuggest
|
|
102
|
+
expect($('.ons-autosuggest').hasClass('ons-js-address-not-editable')).toBe(true);
|
|
103
103
|
});
|
|
104
104
|
|
|
105
105
|
it('has special class to indicate that component input is mandatory', () => {
|
|
@@ -110,7 +110,7 @@ describe('macro: autosuggest', () => {
|
|
|
110
110
|
}),
|
|
111
111
|
);
|
|
112
112
|
|
|
113
|
-
expect($('.ons-autosuggest
|
|
113
|
+
expect($('.ons-autosuggest').hasClass('ons-js-address-mandatory')).toBe(true);
|
|
114
114
|
});
|
|
115
115
|
|
|
116
116
|
it('has additionally provided container style classes', () => {
|
|
@@ -121,8 +121,8 @@ describe('macro: autosuggest', () => {
|
|
|
121
121
|
}),
|
|
122
122
|
);
|
|
123
123
|
|
|
124
|
-
expect($('.ons-autosuggest
|
|
125
|
-
expect($('.ons-autosuggest
|
|
124
|
+
expect($('.ons-autosuggest').hasClass('extra-class')).toBe(true);
|
|
125
|
+
expect($('.ons-autosuggest').hasClass('another-extra-class')).toBe(true);
|
|
126
126
|
});
|
|
127
127
|
|
|
128
128
|
describe('input', () => {
|
|
@@ -168,7 +168,7 @@ describe('macro: autosuggest', () => {
|
|
|
168
168
|
it('is rendered `mutallyExclusive` parameter is not defined', () => {
|
|
169
169
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
170
170
|
|
|
171
|
-
expect($('.ons-
|
|
171
|
+
expect($('.ons-autosuggest__results').length).toBe(1);
|
|
172
172
|
});
|
|
173
173
|
|
|
174
174
|
it('is not rendered when `mutallyExclusive` parameter is defined', () => {
|
|
@@ -179,20 +179,20 @@ describe('macro: autosuggest', () => {
|
|
|
179
179
|
}),
|
|
180
180
|
);
|
|
181
181
|
|
|
182
|
-
expect($('.ons-
|
|
182
|
+
expect($('.ons-autosuggest__results').length).toBe(0);
|
|
183
183
|
});
|
|
184
184
|
|
|
185
185
|
it('renders div with the provided title identifier', () => {
|
|
186
186
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
187
187
|
|
|
188
|
-
expect($('.ons-
|
|
188
|
+
expect($('.ons-autosuggest__results-title').attr('id')).toBe('country-of-birth-suggestions');
|
|
189
189
|
});
|
|
190
190
|
|
|
191
191
|
it('renders div with the provided title text', () => {
|
|
192
192
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
193
193
|
|
|
194
194
|
expect(
|
|
195
|
-
$('.ons-
|
|
195
|
+
$('.ons-autosuggest__results-title')
|
|
196
196
|
.text()
|
|
197
197
|
.trim(),
|
|
198
198
|
).toBe('Suggestions');
|
|
@@ -201,32 +201,32 @@ describe('macro: autosuggest', () => {
|
|
|
201
201
|
it('renders list with a generated identifier', () => {
|
|
202
202
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
203
203
|
|
|
204
|
-
expect($('.ons-
|
|
204
|
+
expect($('.ons-autosuggest__listbox').attr('id')).toBe('country-of-birth-listbox');
|
|
205
205
|
});
|
|
206
206
|
|
|
207
207
|
it('renders an accessible list', () => {
|
|
208
208
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
209
209
|
|
|
210
|
-
expect($('.ons-
|
|
210
|
+
expect($('.ons-autosuggest__listbox').attr('title')).toBe('Suggestions');
|
|
211
211
|
});
|
|
212
212
|
|
|
213
213
|
it('renders instructions with a generated identifier', () => {
|
|
214
214
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
215
215
|
|
|
216
|
-
expect($('.ons-
|
|
216
|
+
expect($('.ons-autosuggest__instructions').attr('id')).toBe('country-of-birth-instructions');
|
|
217
217
|
});
|
|
218
218
|
|
|
219
219
|
it('adds aria-atomic=true value to status container', () => {
|
|
220
220
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
221
221
|
|
|
222
|
-
expect($('.ons-
|
|
222
|
+
expect($('.ons-autosuggest__status').attr('aria-atomic')).toBe('true');
|
|
223
223
|
});
|
|
224
224
|
|
|
225
225
|
it('renders instructions text', () => {
|
|
226
226
|
const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
227
227
|
|
|
228
228
|
expect(
|
|
229
|
-
$('.ons-
|
|
229
|
+
$('.ons-autosuggest__instructions')
|
|
230
230
|
.text()
|
|
231
231
|
.trim(),
|
|
232
232
|
).toBe('Use up and down keys to navigate.');
|
|
@@ -88,7 +88,7 @@ describe('script: autosuggest', () => {
|
|
|
88
88
|
await page.type('.ons-js-autosuggest-input', 'Unite', { delay: 20 });
|
|
89
89
|
await page.keyboard.press('ArrowDown');
|
|
90
90
|
|
|
91
|
-
const selectedOption = await page.$eval('.ons-
|
|
91
|
+
const selectedOption = await page.$eval('.ons-autosuggest__option--focused', node => node.textContent);
|
|
92
92
|
expect(selectedOption.trim()).toBe('United States of America');
|
|
93
93
|
});
|
|
94
94
|
|
|
@@ -99,7 +99,7 @@ describe('script: autosuggest', () => {
|
|
|
99
99
|
await page.keyboard.press('ArrowDown');
|
|
100
100
|
await page.keyboard.press('ArrowDown');
|
|
101
101
|
|
|
102
|
-
const selectedOption = await page.$eval('.ons-
|
|
102
|
+
const selectedOption = await page.$eval('.ons-autosuggest__option--focused', node => node.textContent);
|
|
103
103
|
expect(selectedOption.trim()).toBe('United States Virgin Islands');
|
|
104
104
|
});
|
|
105
105
|
|
|
@@ -110,10 +110,10 @@ describe('script: autosuggest', () => {
|
|
|
110
110
|
await page.keyboard.press('ArrowDown');
|
|
111
111
|
await page.keyboard.press('ArrowDown');
|
|
112
112
|
|
|
113
|
-
const ariaSelectedValue = await page.$eval('.ons-
|
|
113
|
+
const ariaSelectedValue = await page.$eval('.ons-autosuggest__option--focused', node => node.getAttribute('aria-selected'));
|
|
114
114
|
expect(ariaSelectedValue).toBe('true');
|
|
115
115
|
|
|
116
|
-
const selectedOptionId = await page.$eval('.ons-
|
|
116
|
+
const selectedOptionId = await page.$eval('.ons-autosuggest__option--focused', node => node.getAttribute('id'));
|
|
117
117
|
const ariaActiveDescendant = await page.$eval('.ons-js-autosuggest-input', node => node.getAttribute('aria-activedescendant'));
|
|
118
118
|
expect(ariaActiveDescendant).toBe(selectedOptionId);
|
|
119
119
|
});
|
|
@@ -135,7 +135,7 @@ describe('script: autosuggest', () => {
|
|
|
135
135
|
await page.keyboard.press('ArrowDown');
|
|
136
136
|
await page.keyboard.press('ArrowDown');
|
|
137
137
|
|
|
138
|
-
const selectedSuggestionCount = await page.$$eval('.ons-
|
|
138
|
+
const selectedSuggestionCount = await page.$$eval('.ons-autosuggest__option[aria-selected=true]', nodes => nodes.length);
|
|
139
139
|
expect(selectedSuggestionCount).toBe(1);
|
|
140
140
|
});
|
|
141
141
|
|
|
@@ -147,7 +147,7 @@ describe('script: autosuggest', () => {
|
|
|
147
147
|
await page.keyboard.press('ArrowDown');
|
|
148
148
|
await page.keyboard.press('ArrowDown');
|
|
149
149
|
|
|
150
|
-
const selectedOption = await page.$eval('.ons-
|
|
150
|
+
const selectedOption = await page.$eval('.ons-autosuggest__option--focused', node => node.textContent);
|
|
151
151
|
expect(selectedOption.trim()).toBe('United States Virgin Islands');
|
|
152
152
|
});
|
|
153
153
|
|
|
@@ -174,7 +174,7 @@ describe('script: autosuggest', () => {
|
|
|
174
174
|
await page.type('.ons-js-autosuggest-input', 'Unite', { delay: 20 });
|
|
175
175
|
await page.keyboard.press('ArrowUp');
|
|
176
176
|
|
|
177
|
-
const selectedOption = await page.$eval('.ons-
|
|
177
|
+
const selectedOption = await page.$eval('.ons-autosuggest__option--focused', node => node.textContent);
|
|
178
178
|
expect(selectedOption.trim()).toBe('United States of America');
|
|
179
179
|
});
|
|
180
180
|
|
|
@@ -186,7 +186,7 @@ describe('script: autosuggest', () => {
|
|
|
186
186
|
await page.keyboard.press('ArrowDown');
|
|
187
187
|
await page.keyboard.press('ArrowUp');
|
|
188
188
|
|
|
189
|
-
const selectedOption = await page.$eval('.ons-
|
|
189
|
+
const selectedOption = await page.$eval('.ons-autosuggest__option--focused', node => node.textContent);
|
|
190
190
|
expect(selectedOption.trim()).toBe('United States of America');
|
|
191
191
|
});
|
|
192
192
|
|
|
@@ -198,10 +198,10 @@ describe('script: autosuggest', () => {
|
|
|
198
198
|
await page.keyboard.press('ArrowDown');
|
|
199
199
|
await page.keyboard.press('ArrowUp');
|
|
200
200
|
|
|
201
|
-
const ariaSelectedValue = await page.$eval('.ons-
|
|
201
|
+
const ariaSelectedValue = await page.$eval('.ons-autosuggest__option--focused', node => node.getAttribute('aria-selected'));
|
|
202
202
|
expect(ariaSelectedValue).toBe('true');
|
|
203
203
|
|
|
204
|
-
const selectedOptionId = await page.$eval('.ons-
|
|
204
|
+
const selectedOptionId = await page.$eval('.ons-autosuggest__option--focused', node => node.getAttribute('id'));
|
|
205
205
|
const ariaActiveDescendant = await page.$eval('.ons-js-autosuggest-input', node => node.getAttribute('aria-activedescendant'));
|
|
206
206
|
expect(ariaActiveDescendant).toBe(selectedOptionId);
|
|
207
207
|
});
|
|
@@ -214,7 +214,7 @@ describe('script: autosuggest', () => {
|
|
|
214
214
|
await page.keyboard.press('ArrowDown');
|
|
215
215
|
await page.keyboard.press('ArrowUp');
|
|
216
216
|
|
|
217
|
-
const selectedSuggestionCount = await page.$$eval('.ons-
|
|
217
|
+
const selectedSuggestionCount = await page.$$eval('.ons-autosuggest__option[aria-selected=true]', nodes => nodes.length);
|
|
218
218
|
expect(selectedSuggestionCount).toBe(1);
|
|
219
219
|
});
|
|
220
220
|
|
|
@@ -225,7 +225,7 @@ describe('script: autosuggest', () => {
|
|
|
225
225
|
await page.keyboard.press('ArrowUp');
|
|
226
226
|
await page.keyboard.press('ArrowUp');
|
|
227
227
|
|
|
228
|
-
const selectedOption = await page.$eval('.ons-
|
|
228
|
+
const selectedOption = await page.$eval('.ons-autosuggest__option--focused', node => node.textContent);
|
|
229
229
|
expect(selectedOption.trim()).toBe('United States of America');
|
|
230
230
|
});
|
|
231
231
|
|
|
@@ -264,15 +264,15 @@ describe('script: autosuggest', () => {
|
|
|
264
264
|
await page.type('.ons-js-autosuggest-input', 'Unite', { delay: 20 });
|
|
265
265
|
await page.keyboard.press('Tab');
|
|
266
266
|
|
|
267
|
-
const suggestionCountSample1 = await page.$$eval('.ons-
|
|
267
|
+
const suggestionCountSample1 = await page.$$eval('.ons-autosuggest__option', nodes => nodes.length);
|
|
268
268
|
expect(suggestionCountSample1).toBe(2);
|
|
269
269
|
|
|
270
270
|
await page.waitForTimeout(200);
|
|
271
|
-
const suggestionCountSample2 = await page.$$eval('.ons-
|
|
271
|
+
const suggestionCountSample2 = await page.$$eval('.ons-autosuggest__option', nodes => nodes.length);
|
|
272
272
|
expect(suggestionCountSample2).toBe(2);
|
|
273
273
|
|
|
274
274
|
await page.waitForTimeout(320);
|
|
275
|
-
const suggestionCountSample3 = await page.$$eval('.ons-
|
|
275
|
+
const suggestionCountSample3 = await page.$$eval('.ons-autosuggest__option', nodes => nodes.length);
|
|
276
276
|
expect(suggestionCountSample3).toBe(0);
|
|
277
277
|
});
|
|
278
278
|
|
|
@@ -294,7 +294,7 @@ describe('script: autosuggest', () => {
|
|
|
294
294
|
await page.keyboard.press('Tab');
|
|
295
295
|
await page.waitForTimeout(320);
|
|
296
296
|
|
|
297
|
-
const hasClass = await page.$eval('.ons-autosuggest
|
|
297
|
+
const hasClass = await page.$eval('.ons-autosuggest', node => node.classList.contains('ons-autosuggest--has-results'));
|
|
298
298
|
expect(hasClass).toBe(false);
|
|
299
299
|
});
|
|
300
300
|
|
|
@@ -316,7 +316,7 @@ describe('script: autosuggest', () => {
|
|
|
316
316
|
await setTestPage('/test', renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
|
|
317
317
|
|
|
318
318
|
await page.type('.ons-js-autosuggest-input', 'Unite', { delay: 20 });
|
|
319
|
-
await page.click('.ons-
|
|
319
|
+
await page.click('.ons-autosuggest__option:nth-child(2)');
|
|
320
320
|
|
|
321
321
|
const inputValue = await page.$eval('.ons-js-autosuggest-input', node => node.value);
|
|
322
322
|
expect(inputValue).toBe('United States Virgin Islands');
|
|
@@ -329,7 +329,7 @@ describe('script: autosuggest', () => {
|
|
|
329
329
|
|
|
330
330
|
await page.type('.ons-js-autosuggest-input', 'En', { delay: 20 });
|
|
331
331
|
|
|
332
|
-
const suggestionCount = await page.$$eval('.ons-
|
|
332
|
+
const suggestionCount = await page.$$eval('.ons-autosuggest__option', nodes => nodes.length);
|
|
333
333
|
expect(suggestionCount).toBe(0);
|
|
334
334
|
});
|
|
335
335
|
|
|
@@ -338,7 +338,7 @@ describe('script: autosuggest', () => {
|
|
|
338
338
|
|
|
339
339
|
await page.type('.ons-js-autosuggest-input', 'Eng', { delay: 20 });
|
|
340
340
|
|
|
341
|
-
const suggestionCount = await page.$$eval('.ons-
|
|
341
|
+
const suggestionCount = await page.$$eval('.ons-autosuggest__option', nodes => nodes.length);
|
|
342
342
|
expect(suggestionCount).toBe(1);
|
|
343
343
|
});
|
|
344
344
|
});
|
|
@@ -349,9 +349,9 @@ describe('script: autosuggest', () => {
|
|
|
349
349
|
|
|
350
350
|
await page.type('.ons-js-autosuggest-input', 'state', { delay: 20 });
|
|
351
351
|
await page.keyboard.press('ArrowDown');
|
|
352
|
-
await page.hover('.ons-
|
|
352
|
+
await page.hover('.ons-autosuggest__option:nth-child(2)');
|
|
353
353
|
|
|
354
|
-
const focusedClassCount = await page.$$eval('.ons-
|
|
354
|
+
const focusedClassCount = await page.$$eval('.ons-autosuggest__option--focused', nodes => nodes.length);
|
|
355
355
|
expect(focusedClassCount).toBe(0);
|
|
356
356
|
});
|
|
357
357
|
});
|
|
@@ -368,10 +368,10 @@ describe('script: autosuggest', () => {
|
|
|
368
368
|
|
|
369
369
|
await page.type('.ons-js-autosuggest-input', 'state', { delay: 20 });
|
|
370
370
|
await page.keyboard.press('ArrowDown');
|
|
371
|
-
await page.hover('.ons-
|
|
371
|
+
await page.hover('.ons-autosuggest__option:nth-child(2)');
|
|
372
372
|
await page.hover('#dummy');
|
|
373
373
|
|
|
374
|
-
const focusedClassCount = await page.$$eval('.ons-
|
|
374
|
+
const focusedClassCount = await page.$$eval('.ons-autosuggest__option--focused', nodes => nodes.length);
|
|
375
375
|
expect(focusedClassCount).toBe(1);
|
|
376
376
|
});
|
|
377
377
|
});
|
|
@@ -384,7 +384,7 @@ describe('script: autosuggest', () => {
|
|
|
384
384
|
await page.keyboard.press('ArrowDown');
|
|
385
385
|
await page.type('.ons-js-autosuggest-input', 'd', { delay: 20 });
|
|
386
386
|
|
|
387
|
-
const focusedNodeCount = await page.$$eval('.ons-
|
|
387
|
+
const focusedNodeCount = await page.$$eval('.ons-autosuggest__option--focused', nodes => nodes.length);
|
|
388
388
|
expect(focusedNodeCount).toBe(0);
|
|
389
389
|
});
|
|
390
390
|
|
|
@@ -402,7 +402,7 @@ describe('script: autosuggest', () => {
|
|
|
402
402
|
|
|
403
403
|
await page.type('.ons-js-autosuggest-input', 'Unite', { delay: 20 });
|
|
404
404
|
|
|
405
|
-
const emboldened = await page.$$eval('.ons-
|
|
405
|
+
const emboldened = await page.$$eval('.ons-autosuggest__option strong', nodes => nodes.map(node => node.textContent));
|
|
406
406
|
expect(emboldened).toEqual(['Unite', 'Unite']);
|
|
407
407
|
});
|
|
408
408
|
|
|
@@ -411,9 +411,9 @@ describe('script: autosuggest', () => {
|
|
|
411
411
|
|
|
412
412
|
await page.type('.ons-js-autosuggest-input', 'tland', { delay: 20 });
|
|
413
413
|
|
|
414
|
-
const matchCount = await page.$$eval('.ons-
|
|
414
|
+
const matchCount = await page.$$eval('.ons-autosuggest__option', nodes => nodes.length);
|
|
415
415
|
expect(matchCount).toBe(2);
|
|
416
|
-
const emboldened = await page.$$eval('.ons-
|
|
416
|
+
const emboldened = await page.$$eval('.ons-autosuggest__option strong', nodes => nodes.map(node => node.textContent));
|
|
417
417
|
expect(emboldened).toEqual(['tland']);
|
|
418
418
|
});
|
|
419
419
|
|
|
@@ -452,7 +452,7 @@ describe('script: autosuggest', () => {
|
|
|
452
452
|
|
|
453
453
|
await page.type('.ons-js-autosuggest-input', 'abc', { delay: 20 });
|
|
454
454
|
|
|
455
|
-
const noResultsContent = await page.$eval('.ons-
|
|
455
|
+
const noResultsContent = await page.$eval('.ons-autosuggest__option--no-results', node => node.textContent);
|
|
456
456
|
expect(noResultsContent).toBe('No suggestions found.');
|
|
457
457
|
});
|
|
458
458
|
|
|
@@ -496,7 +496,7 @@ describe('script: autosuggest', () => {
|
|
|
496
496
|
|
|
497
497
|
await page.type('.ons-js-autosuggest-input', 'abc', { delay: 20 });
|
|
498
498
|
|
|
499
|
-
const matchCount = await page.$$eval('.ons-
|
|
499
|
+
const matchCount = await page.$$eval('.ons-autosuggest__option', nodes => nodes.length);
|
|
500
500
|
expect(matchCount).toBe(0);
|
|
501
501
|
});
|
|
502
502
|
|
|
@@ -534,7 +534,7 @@ describe('script: autosuggest', () => {
|
|
|
534
534
|
it('shows the type more message', async () => {
|
|
535
535
|
const listItemCount = await page.$$eval('.ons-js-autosuggest-listbox > *', nodes => nodes.length);
|
|
536
536
|
expect(listItemCount).toBe(1);
|
|
537
|
-
const noResultsText = await page.$eval('.ons-
|
|
537
|
+
const noResultsText = await page.$eval('.ons-autosuggest__option--no-results', node => node.innerText);
|
|
538
538
|
expect(noResultsText.trim()).toBe('Continue entering to get suggestions');
|
|
539
539
|
});
|
|
540
540
|
});
|
|
@@ -565,7 +565,7 @@ describe('script: autosuggest', () => {
|
|
|
565
565
|
it('shows the API error message', async () => {
|
|
566
566
|
const listItemCount = await page.$$eval('.ons-js-autosuggest-listbox > *', nodes => nodes.length);
|
|
567
567
|
expect(listItemCount).toBe(1);
|
|
568
|
-
const warningText = await page.$eval('.ons-
|
|
568
|
+
const warningText = await page.$eval('.ons-autosuggest__warning', node => node.textContent);
|
|
569
569
|
expect(warningText.trim()).toBe('!Sorry, there is a problem.');
|
|
570
570
|
});
|
|
571
571
|
|
|
@@ -4,12 +4,12 @@ import runFuse from './fuse-config';
|
|
|
4
4
|
|
|
5
5
|
export const baseClass = 'ons-js-autosuggest';
|
|
6
6
|
|
|
7
|
-
export const classAutosuggestOption = 'ons-
|
|
7
|
+
export const classAutosuggestOption = 'ons-autosuggest__option';
|
|
8
8
|
export const classAutosuggestOptionFocused = `${classAutosuggestOption}--focused`;
|
|
9
9
|
export const classAutosuggestOptionNoResults = `${classAutosuggestOption}--no-results`;
|
|
10
10
|
export const classAutosuggestOptionMoreResults = `${classAutosuggestOption}--more-results ons-u-fs-s`;
|
|
11
|
-
export const classAutosuggestHasResults = 'ons-autosuggest
|
|
12
|
-
export const classAutosuggestResultsTitle = 'ons-
|
|
11
|
+
export const classAutosuggestHasResults = 'ons-autosuggest--has-results';
|
|
12
|
+
export const classAutosuggestResultsTitle = 'ons-autosuggest__results-title';
|
|
13
13
|
|
|
14
14
|
export default class AutosuggestUI {
|
|
15
15
|
constructor({
|
|
@@ -117,7 +117,7 @@ export default class AutosuggestUI {
|
|
|
117
117
|
this.input.setAttribute('autocomplete', this.input.getAttribute('autocomplete') || 'off');
|
|
118
118
|
this.input.setAttribute('role', 'combobox');
|
|
119
119
|
|
|
120
|
-
this.context.classList.add('ons-autosuggest
|
|
120
|
+
this.context.classList.add('ons-autosuggest--initialised');
|
|
121
121
|
|
|
122
122
|
this.bindEventListeners();
|
|
123
123
|
}
|
|
@@ -350,8 +350,7 @@ export default class AutosuggestUI {
|
|
|
350
350
|
listElement.setAttribute('id', `${this.listboxId}__option--${index}`);
|
|
351
351
|
listElement.setAttribute('role', 'option');
|
|
352
352
|
if (result.category) {
|
|
353
|
-
innerHTML =
|
|
354
|
-
innerHTML + `<span class="ons-autosuggest-input__category ons-u-lighter ons-u-fs-s ons-u-db">${result.category}</span>`;
|
|
353
|
+
innerHTML = innerHTML + `<span class="ons-autosuggest__category ons-u-lighter ons-u-fs-s ons-u-db">${result.category}</span>`;
|
|
355
354
|
}
|
|
356
355
|
listElement.innerHTML = innerHTML;
|
|
357
356
|
listElement.addEventListener('click', () => {
|
|
@@ -434,7 +433,7 @@ export default class AutosuggestUI {
|
|
|
434
433
|
option.classList.add(classAutosuggestOptionFocused);
|
|
435
434
|
option.setAttribute('aria-selected', true);
|
|
436
435
|
this.input.setAttribute('aria-activedescendant', option.getAttribute('id'));
|
|
437
|
-
const groupedResult = option.querySelector('.ons-
|
|
436
|
+
const groupedResult = option.querySelector('.ons-autosuggest__group');
|
|
438
437
|
const optionText = option.innerHTML.replace('<strong>', '').replace('</strong>', '');
|
|
439
438
|
if (groupedResult) {
|
|
440
439
|
let groupedAriaMsg = this.ariaGroupedResults.replace('{n}', groupedResult.innerHTML);
|
|
@@ -503,8 +502,8 @@ export default class AutosuggestUI {
|
|
|
503
502
|
const warningBodyElement = document.createElement('div');
|
|
504
503
|
|
|
505
504
|
warningListElement.setAttribute('aria-hidden', 'true');
|
|
506
|
-
warningListElement.className = 'ons-
|
|
507
|
-
warningElement.className = 'ons-panel ons-panel--warn ons-
|
|
505
|
+
warningListElement.className = 'ons-autosuggest__warning';
|
|
506
|
+
warningElement.className = 'ons-panel ons-panel--warn ons-autosuggest__panel';
|
|
508
507
|
|
|
509
508
|
warningSpanElement.className = 'ons-panel__icon';
|
|
510
509
|
warningSpanElement.setAttribute('aria-hidden', 'true');
|
|
@@ -1,6 +1,20 @@
|
|
|
1
1
|
.ons-card {
|
|
2
2
|
margin: 0 0 2rem;
|
|
3
3
|
width: 100%;
|
|
4
|
+
|
|
5
|
+
&__link {
|
|
6
|
+
display: flex;
|
|
7
|
+
flex-direction: column;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
&__image--reorder {
|
|
11
|
+
order: 1;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
&__title--reorder {
|
|
15
|
+
order: 2;
|
|
16
|
+
}
|
|
17
|
+
|
|
4
18
|
&__link:hover {
|
|
5
19
|
text-decoration-thickness: 3px;
|
|
6
20
|
}
|