diff --git a/.travis.yml b/.travis.yml index b2b4f6129d..e2a361341a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: focal language: node_js node_js: - - lts/* + - 12 sudo: false before_install: - sudo apt-get update diff --git a/CHANGELOG.md b/CHANGELOG.md index e6cc917180..323a2a5c67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ The following is a curated list of changes in the Enact sandstone module, newest changes on the top. +## [2.5.12] - 2024-02-02 + +### Fixed + +- `sandstone/WizardPanels` to read out the correct step when using `current` prop + ## [2.5.11] - 2023-06-07 ### Fixed diff --git a/WizardPanels/WizardPanels.js b/WizardPanels/WizardPanels.js index 46582563db..ff2e208e48 100644 --- a/WizardPanels/WizardPanels.js +++ b/WizardPanels/WizardPanels.js @@ -332,10 +332,11 @@ const WizardPanelsBase = kind({ }, computed: { - 'aria-label': ({'aria-label': label, index, noSteps, subtitle, title}) => { + 'aria-label': ({'aria-label': label, current, index, noSteps, subtitle, title}) => { if (label) return label; - const step = noSteps ? '' : new IString($L('step {num}')).format({num: index + 1}) + ' '; + const stepNum = (typeof current === 'number' && current > 0) ? current : (index + 1); + const step = noSteps ? '' : new IString($L('step {num}')).format({num: stepNum}) + ' '; return `${step}${title} ${subtitle}`; }, className: ({noSteps, noSubtitle, styler}) => styler.append( diff --git a/WizardPanels/tests/WizardPanels-specs.js b/WizardPanels/tests/WizardPanels-specs.js index 61c7c0c078..28450993cf 100644 --- a/WizardPanels/tests/WizardPanels-specs.js +++ b/WizardPanels/tests/WizardPanels-specs.js @@ -778,6 +778,27 @@ describe('WizardPanel Specs', () => { } ); + test( + 'should reflect the aria-label when "current" is set', + async () => { + const current = 2; + render( + + + + + + ); + + const header = screen.getByRole('region').children[0].children[0]; + const expected = `step ${current} `; + + await waitFor(() => { + expect(header).toHaveAttribute('aria-label', expected); + }); + } + ); + test( 'should return a ref to the root Panel node', () => { diff --git a/package-lock.json b/package-lock.json index 19ad092079..aaaaf0a376 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@enact/sandstone", - "version": "2.5.10", + "version": "2.5.11", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f5ccd31786..11b3ddcba9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@enact/sandstone", - "version": "2.5.11", + "version": "2.5.12", "description": "Large-screen/TV support library for Enact, containing a variety of UI components.", "repository": { "type": "git", diff --git a/samples/event-logger/package.json b/samples/event-logger/package.json index fe4f03363e..b7c48a129a 100644 --- a/samples/event-logger/package.json +++ b/samples/event-logger/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "@reduxjs/toolkit": "^1.8.1", "ilib": "14.14.0", "prop-types": "^15.8.1", diff --git a/samples/perf-scroller-native/package.json b/samples/perf-scroller-native/package.json index f9183153a3..7be9cfef16 100644 --- a/samples/perf-scroller-native/package.json +++ b/samples/perf-scroller-native/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "classnames": "^2.3.1", "ilib": "14.14.0", "react": "^18.2.0", diff --git a/samples/perf-scroller-translate/package.json b/samples/perf-scroller-translate/package.json index 19c8d9b735..10c1b00b24 100644 --- a/samples/perf-scroller-translate/package.json +++ b/samples/perf-scroller-translate/package.json @@ -23,11 +23,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "classnames": "^2.3.1", "ilib": "14.14.0", "react": "^18.2.0", diff --git a/samples/perf-virtualgridlist-native/package.json b/samples/perf-virtualgridlist-native/package.json index 546f6e17c0..ff8f4d8cb3 100644 --- a/samples/perf-virtualgridlist-native/package.json +++ b/samples/perf-virtualgridlist-native/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "ilib": "14.14.0", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/samples/perf-virtualgridlist-translate/package.json b/samples/perf-virtualgridlist-translate/package.json index 3db8837717..0405f4bdf1 100644 --- a/samples/perf-virtualgridlist-translate/package.json +++ b/samples/perf-virtualgridlist-translate/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "ilib": "14.14.0", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/samples/perf-virtuallist-native-with-different-item-size/package.json b/samples/perf-virtuallist-native-with-different-item-size/package.json index ec947e7d27..3f36250baf 100644 --- a/samples/perf-virtuallist-native-with-different-item-size/package.json +++ b/samples/perf-virtuallist-native-with-different-item-size/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "ilib": "14.14.0", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/samples/perf-virtuallist-native/package.json b/samples/perf-virtuallist-native/package.json index 40bd18711d..d7bf3110b0 100644 --- a/samples/perf-virtuallist-native/package.json +++ b/samples/perf-virtuallist-native/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "ilib": "14.14.0", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/samples/perf-virtuallist-translate/package.json b/samples/perf-virtuallist-translate/package.json index f07445a7a5..2cde95b536 100644 --- a/samples/perf-virtuallist-translate/package.json +++ b/samples/perf-virtuallist-translate/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "ilib": "14.14.0", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/samples/qa-a11y/package.json b/samples/qa-a11y/package.json index 2c86db119b..9da0d7eb5d 100644 --- a/samples/qa-a11y/package.json +++ b/samples/qa-a11y/package.json @@ -22,12 +22,12 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", - "@enact/webos": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", + "@enact/webos": "^4.5.6", "ilib": "14.14.0", "prop-types": "^15.8.1", "react": "^18.2.0", diff --git a/samples/qa-dropdown/package.json b/samples/qa-dropdown/package.json index 5c0e68e1f0..079b10c558 100644 --- a/samples/qa-dropdown/package.json +++ b/samples/qa-dropdown/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "ilib": "14.14.0", "prop-types": "^15.8.1", "react": "^18.2.0", diff --git a/samples/qa-fonts/package.json b/samples/qa-fonts/package.json index 5e411f9e45..73c9c630ad 100644 --- a/samples/qa-fonts/package.json +++ b/samples/qa-fonts/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "ilib": "14.14.0", "prop-types": "^15.8.1", "react": "^18.2.0", diff --git a/samples/qa-i18n-async/package.json b/samples/qa-i18n-async/package.json index b3b3ad176e..91dba136ad 100644 --- a/samples/qa-i18n-async/package.json +++ b/samples/qa-i18n-async/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "ilib": "14.14.0", "prop-types": "^15.8.1", "react": "^18.2.0", diff --git a/samples/qa-i18n/package.json b/samples/qa-i18n/package.json index 4d4474b89a..4778cfd6ca 100644 --- a/samples/qa-i18n/package.json +++ b/samples/qa-i18n/package.json @@ -22,12 +22,12 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", - "@enact/webos": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", + "@enact/webos": "^4.5.6", "ilib": "14.14.0", "prop-types": "^15.8.1", "react": "^18.2.0", diff --git a/samples/qa-scroller/package.json b/samples/qa-scroller/package.json index 4efe95a35b..bacafd5845 100644 --- a/samples/qa-scroller/package.json +++ b/samples/qa-scroller/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "ilib": "14.14.0", "prop-types": "^15.8.1", "react": "^18.2.0", diff --git a/samples/qa-videoplayer/package.json b/samples/qa-videoplayer/package.json index df792fd1f2..f67042b716 100644 --- a/samples/qa-videoplayer/package.json +++ b/samples/qa-videoplayer/package.json @@ -22,11 +22,11 @@ "title": "QA VideoPlayer" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "ilib": "14.14.0", "prop-types": "^15.8.1", "react": "^18.2.0", diff --git a/samples/qa-virtualgridlist/package.json b/samples/qa-virtualgridlist/package.json index df39feef77..1e81a5655f 100644 --- a/samples/qa-virtualgridlist/package.json +++ b/samples/qa-virtualgridlist/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "@reduxjs/toolkit": "^1.8.1", "ilib": "14.14.0", "prop-types": "^15.8.1", diff --git a/samples/qa-virtualgridlistnative-preserve-focus/package.json b/samples/qa-virtualgridlistnative-preserve-focus/package.json index 2a9cfdf935..e897f12ae3 100644 --- a/samples/qa-virtualgridlistnative-preserve-focus/package.json +++ b/samples/qa-virtualgridlistnative-preserve-focus/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "@reduxjs/toolkit": "^1.8.1", "ilib": "14.14.0", "prop-types": "^15.8.1", diff --git a/samples/qa-virtuallist/package.json b/samples/qa-virtuallist/package.json index a1dcc78eb5..601c268719 100644 --- a/samples/qa-virtuallist/package.json +++ b/samples/qa-virtuallist/package.json @@ -22,11 +22,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "@reduxjs/toolkit": "^1.8.1", "ilib": "14.14.0", "prop-types": "^15.8.1", diff --git a/samples/qa-voice-control/package.json b/samples/qa-voice-control/package.json index 4d497e2cdc..2d5b79b454 100644 --- a/samples/qa-voice-control/package.json +++ b/samples/qa-voice-control/package.json @@ -22,12 +22,12 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", - "@enact/webos": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", + "@enact/webos": "^4.5.6", "ilib": "14.14.0", "prop-types": "^15.8.1", "react": "^18.2.0", diff --git a/samples/sampler/package.json b/samples/sampler/package.json index 41fdd75904..fa902a59ab 100644 --- a/samples/sampler/package.json +++ b/samples/sampler/package.json @@ -1,6 +1,6 @@ { "name": "sandstone-sampler", - "version": "2.5.11", + "version": "2.5.12", "description": "Component and QA samples for Sandstone", "private": true, "main": "index.js", @@ -20,11 +20,11 @@ "theme": "sandstone" }, "dependencies": { - "@enact/core": "^4.5.4", - "@enact/i18n": "^4.5.4", + "@enact/core": "^4.5.6", + "@enact/i18n": "^4.5.6", "@enact/sandstone": "../../", - "@enact/spotlight": "^4.5.4", - "@enact/ui": "^4.5.4", + "@enact/spotlight": "^4.5.6", + "@enact/ui": "^4.5.6", "classnames": "^2.3.1", "ilib": "14.14.0", "react": "^18.2.0",