2.7.12 release

.travis.yml

@@ -2,7 +2,7 @@ dist: focal
 language: node_js
 node_js:
     - lts/*
-    - node
+    - "20"
 sudo: false
 before_install:
     - sudo apt-get update

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.7.12] - 2023-10-23
+
+### Fixed
+
+- `sandstone/Scroller` to read out the announcement of completion properly when `editable` is given
+
 ## [2.7.11] - 2023-10-13
 
 ### Fixed

Scroller/EditableWrapper.js

@@ -572,12 +572,15 @@ const EditableWrapper = (props) => {
 						focusItem(target);
 					}
 					mutableRef.current.needToPreventEvent = true;
-
+					selectedItem.children[1].ariaLabel = '';
 					setTimeout(() => {
 						announceRef.current.announce(
 							selectedItemLabel + $L('Movement completed'),
 							true
 						);
+						setTimeout(() => {
+							selectedItem.children[1].ariaLabel = `${selectedItem.ariaLabel} ${$L('Press the OK button to move or press the up button to select other options.')}`;
+						}, completeAnnounceDelay);
 					}, completeAnnounceDelay);
 				} else if (selectItemBy === 'press') {
 					startEditing(targetItemNode);
@@ -639,12 +642,15 @@ const EditableWrapper = (props) => {
 				if (selectItemBy === 'press') {
 					focusItem(target);
 				}
-
+				selectedItem.children[1].ariaLabel = '';
 				setTimeout(() => {
 					announceRef?.current?.announce(
 						selectedItemLabel + $L('Movement completed'),
 						true
 					);
+					setTimeout(() => {
+						selectedItem.children[1].ariaLabel = `${selectedItem.ariaLabel} ${$L('Press the OK button to move or press the up button to select other options.')}`;
+					}, completeAnnounceDelay);
 				}, completeAnnounceDelay);
 
 				ev.stopPropagation(); // To prevent onCancel by CancelDecorator

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enact/sandstone",
-  "version": "2.7.11",
+  "version": "2.7.12",
   "description": "Large-screen/TV support library for Enact, containing a variety of UI components.",
   "repository": {
     "type": "git",

samples/sampler/.storybook/preview.js

@@ -2,6 +2,7 @@ import {configureActions} from '@enact/storybook-utils/addons/actions';
 import {getBooleanType, getObjectType} from '@enact/storybook-utils/addons/controls';
 import {DocsContainer, Primary, Title} from '@enact/storybook-utils/addons/docs';
 import ri from '@enact/ui/resolution';
+import ReactGA4 from "react-ga4";
 import {themes} from '@storybook/theming';
 
 import ThemeEnvironment from '../src/ThemeEnvironment';
@@ -49,6 +50,21 @@ const skins = {
 
 configureActions();
 
+const GA_MEASUREMENT_ID  = "G-ZNPW7ST2D8";
+const options = {
+	gtagOptions: {
+		content_group: 'storybook',
+	},
+};
+
+ReactGA4.initialize(GA_MEASUREMENT_ID, options);
+
+const script = document.createElement("script");
+script.src = `//cdn.cookie-script.com/s/3a846584c6b545a3d1ac4dcfc8ac15a2.js`;
+script.type = "text/javascript";
+
+document.body.appendChild(script);
+
 export const parameters = {
 	docs: {
 		container: DocsContainer,