Merge branch 'develop' into feature/WRR-4833

enactjs · Dec 11, 2024 · 4aac4d7 · 4aac4d7
2 parents b1eadb9 + 5e803d7
commit 4aac4d7
Show file tree

Hide file tree

Showing 10 changed files with 5,326 additions and 7,350 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,11 +6,13 @@ The following is a curated list of changes in the Enact sandstone module, newest
 
 ### Added
 
+- `sandstone/Icon` supported icon list, adding new icon `calibration`
 - `sandstone/Pageviews` `pageIndicatorPosition` prop to provide a way to determine where to place the page indicator
 
 ### Fixed
 
 - `sandstone/Scroller` to focus properly when the spottable node is bigger than the size of viewport by voice control
+- `sandstone/Scroller` to prevent the native scrolling behavior caused by keydown events when a popup is open
 
 ## [3.0.0-alpha.3] - 2024-12-02
 

diff --git a/Icon/Icon.js b/Icon/Icon.js
@@ -395,6 +395,7 @@ const IconBase = kind({
  * ai
  * alert01
  * alert02
+ * calibration
  * ```
  *
  * @name iconList

diff --git a/Icon/IconList.js b/Icon/IconList.js
@@ -254,5 +254,6 @@ export default {
 	sketch            : 0x0F01BA, // sketch
 	ai                : 0x0F01BB, // ai
 	alert01           : 0x0F01BC, // alert.01
-	alert02           : 0x0F01BD // alert.02
+	alert02           : 0x0F01BD, // alert.02
+	calibration       : 0x0F01BE // calibration
 };
diff --git a/fonts/Sandstone_Icons.ttf b/fonts/Sandstone_Icons.ttf