@enact/limestone 1.3.0 → 1.9.4

package/VirtualList/tests/useEvent-specs.js

@@ -27,6 +27,14 @@ var keyDownUp = function keyDownUp(keyCode) {
     });
   };
 };
+var keyDownRepeat = function keyDownRepeat(keyCode) {
+  return function (elm) {
+    return _react.fireEvent.keyDown(elm, {
+      keyCode: keyCode,
+      repeat: true
+    });
+  };
+};
 var pressLeftKey = keyDownUp(37);
 var pressRightKey = keyDownUp(39);
 var pressUpKey = keyDownUp(38);
@@ -148,6 +156,37 @@ describe('VirtualList useEvent', function () {
     expect(spy).toHaveBeenCalled();
     global.Element.prototype.scrollTo = scrollToFn;
   });
+  test('should handle repeat keydown on first VirtualList entry without error', function () {
+    (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_VirtualList["default"], {
+      clientSize: clientSize,
+      dataSize: dataSize,
+      itemRenderer: renderItem,
+      itemSize: itemSize
+    }));
+    var list = _react.screen.getByRole('list');
+    var item0 = list.children.item(0).children.item(0);
+    focus(item0);
+    expect(currentFocusIndex).toBe(0);
+    keyDownRepeat(40)(item0);
+    expect(currentFocusIndex).toBe(0);
+  });
+  test('should handle repeat keydown when data-index jumps unexpectedly without error', function () {
+    (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_VirtualList["default"], {
+      clientSize: clientSize,
+      dataSize: dataSize,
+      itemRenderer: renderItem,
+      itemSize: itemSize
+    }));
+    var list = _react.screen.getByRole('list');
+    var item0 = list.children.item(0).children.item(0);
+    var item1 = list.children.item(1).children.item(0);
+    focus(item0);
+    pressDownKey(item0);
+    expect(currentFocusIndex).toBe(1);
+    item1.dataset.index = '20';
+    keyDownRepeat(40)(item1);
+    expect(currentFocusIndex).toBe(1);
+  });
   test('should scroll by page-down key', function () {
     var spy = jest.fn(function () {});
     var scrollToFn = global.Element.prototype.scrollTo;

package/VirtualList/useEvent.js

@@ -28,13 +28,14 @@ var isDown = (0, _keymap.is)('down'),
     // should return -1 if index is not a number or a negative value
     return number >= 0 ? number : -1;
   };
-var prevKeyDownIndex = -1;
 var useEventKey = exports.useEventKey = function useEventKey(props, instances, context) {
   // Mutable value
 
   var mutableRef = (0, _react.useRef)({
     fn: null
   });
+  var prevKeyDownIndexRef = (0, _react.useRef)(-1);
+  var hasProcessedKeyDownRef = (0, _react.useRef)(false);
 
   // Functions
 
@@ -121,6 +122,7 @@ var useEventKey = exports.useEventKey = function useEventKey(props, instances, c
     var handle5WayKeyUp = context.handle5WayKeyUp,
       handleDirectionKeyDown = context.handleDirectionKeyDown,
       handlePageUpDownKeyDown = context.handlePageUpDownKeyDown,
+      resetAccelerator = context.resetAccelerator,
       spotlightAcceleratorProcessKey = context.spotlightAcceleratorProcessKey;
     function handleKeyDown(ev) {
       var keyCode = ev.keyCode,
@@ -163,15 +165,50 @@ var useEventKey = exports.useEventKey = function useEventKey(props, instances, c
               isRightMovement = _getNextIndex.isRightMovement,
               isWrapped = _getNextIndex.isWrapped,
               nextIndex = _getNextIndex.nextIndex;
+            var _scrollContentHandle$2 = scrollContentHandle.current,
+              dimensionToExtent = _scrollContentHandle$2.dimensionToExtent,
+              isPrimaryDirectionVertical = _scrollContentHandle$2.isPrimaryDirectionVertical;
+
+            // VirtualList recycles DOM nodes during scroll. If a node gets reused for a different index
+            // while browser focus stays on it, target.dataset.index reflects the new (wrong) index.
+            // Detect this by checking if the index jumped unnaturally during key repeat.
+            var isForwardKey = isPrimaryDirectionVertical ? isDownKey : isRightMovement;
+            var isBackwardKey = isPrimaryDirectionVertical ? isUpKey : isLeftMovement;
+            var isOutdatedIndex = repeat && prevKeyDownIndexRef.current !== -1 && (isForwardKey && (prevKeyDownIndexRef.current > index || index > prevKeyDownIndexRef.current + dimensionToExtent) || isBackwardKey && (prevKeyDownIndexRef.current < index || index < prevKeyDownIndexRef.current - dimensionToExtent));
+
+            // Block the first repeat event when entering VirtualList from outside with acceleration.
+            // prevKeyDownIndexRef is -1 only on first entry; a repeat here means key was held before entering.
+            var isFirstEntryRepeat = repeat && !hasProcessedKeyDownRef.current;
+            if (isFirstEntryRepeat) {
+              ev.preventDefault();
+              ev.stopPropagation();
+              resetAccelerator();
+              return;
+            }
+            if (isOutdatedIndex) {
+              ev.preventDefault();
+              ev.stopPropagation();
+              resetAccelerator();
+              var correctedNextIndex = isForwardKey ? prevKeyDownIndexRef.current + dimensionToExtent : prevKeyDownIndexRef.current - dimensionToExtent;
+              if (correctedNextIndex >= 0 && correctedNextIndex < props.dataSize) {
+                var currentItemNode = instances.itemRefs.current[prevKeyDownIndexRef.current % scrollContentHandle.current.state.numOfItems];
+                var correctedTarget = currentItemNode && parseInt(currentItemNode.dataset.index) === prevKeyDownIndexRef.current ? currentItemNode : target;
+                handleDirectionKeyDown(ev, 'acceleratedKeyDown', {
+                  isWrapped: false,
+                  keyCode: keyCode,
+                  nextIndex: correctedNextIndex,
+                  repeat: repeat,
+                  target: correctedTarget
+                });
+                prevKeyDownIndexRef.current = correctedNextIndex;
+              }
+              // At list boundary: keep prevKeyDownIndexRef.current unchanged so next event stays recoverable
+              return;
+            }
             if (nextIndex >= 0) {
               // if the candidate is another item
               ev.preventDefault();
               ev.stopPropagation();
-              if (repeat && prevKeyDownIndex !== -1 && (isDownKey && prevKeyDownIndex > index || isUpKey && prevKeyDownIndex < index)) {
-                // Ignore keyEvent from item with wrong data-index (Workaround for data-index bug)
-                // Sometimes keyDown event occurs before the data-index updated, it causes reverse focus change
-                return;
-              }
               if (props.scrollContainerHandle && props.scrollContainerHandle.current) {
                 props.scrollContainerHandle.current.lastInputType = 'arrowKey';
               }
@@ -188,9 +225,6 @@ var useEventKey = exports.useEventKey = function useEventKey(props, instances, c
                 focusableScrollbar = props.focusableScrollbar,
                 isHorizontalScrollbarVisible = props.isHorizontalScrollbarVisible,
                 isVerticalScrollbarVisible = props.isVerticalScrollbarVisible;
-              var _scrollContentHandle$2 = scrollContentHandle.current,
-                dimensionToExtent = _scrollContentHandle$2.dimensionToExtent,
-                isPrimaryDirectionVertical = _scrollContentHandle$2.isPrimaryDirectionVertical;
               var column = index % dimensionToExtent;
               var row = (index - column) % dataSize / dimensionToExtent;
               var directions = {};
@@ -236,7 +270,8 @@ var useEventKey = exports.useEventKey = function useEventKey(props, instances, c
               }
             }
           }
-          prevKeyDownIndex = index;
+          prevKeyDownIndexRef.current = index;
+          hasProcessedKeyDownRef.current = true;
           if (isLeaving) {
             handleDirectionKeyDown(ev, 'keyLeave');
           }

package/VirtualList/useThemeVirtualList.js

@@ -99,6 +99,9 @@ var useSpottable = function useSpottable(props, instances) {
       handle5WayKeyUp: function handle5WayKeyUp() {
         SpotlightAccelerator.reset();
       },
+      resetAccelerator: function resetAccelerator() {
+        SpotlightAccelerator.reset();
+      },
       spotlightAcceleratorProcessKey: function spotlightAcceleratorProcessKey(ev) {
         return SpotlightAccelerator.processKey(ev, nop);
       }

package/WizardPanels/WizardPanels.module.css

@@ -4,10 +4,10 @@
 .wizardPanels .steps {
   height: 1.25rem;
   line-height: 1.25rem;
-  margin-top: calc( var(--primitive-spacing-84) * -1);
+  margin-top: calc(var(--primitive-spacing-84) * -1);
 }
 .wizardPanels .content {
-  margin: var(--primitive-spacing-60) 4.75rem;
+  margin: var(--primitive-spacing-60) NaNrem - NaNrem - var(--primitive-spacing-36)));
 }
 .wizardPanels .footer {
   text-align: center;

package/WizardPanels/index.d.ts

@@ -6,8 +6,10 @@ import * as React from "react";
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 type Merge<M, N> = Omit<M, Extract<keyof M, keyof N>> & N;
 
-export interface WizardPanelsProps
-  extends Merge<WizardPanelsBaseProps, ui_Changeable_ChangeableProps> {
+export interface WizardPanelsProps extends Merge<
+  WizardPanelsBaseProps,
+  ui_Changeable_ChangeableProps
+> {
   /**
  * Called when the back button is pressed.
  * 

package/internal/$L/$L.js

@@ -15,7 +15,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /* global ILIB_SANDSTONE_PATH */
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /* global ILIB_LIMESTONE_PATH */
 // The ilib.ResBundle for the active locale used by $L
 var resBundle;
 
@@ -37,8 +37,8 @@ function getResBundle() {
  */
 function createResBundle(options) {
   var opts = options;
-  if (typeof ILIB_SANDSTONE_PATH !== 'undefined') {
-    opts.basePath = ILIB_SANDSTONE_PATH;
+  if (typeof ILIB_LIMESTONE_PATH !== 'undefined') {
+    opts.basePath = ILIB_LIMESTONE_PATH;
   }
   if (!opts.onLoad) return;
 

package/internal/DateComponentPicker/DateComponentPicker.module.css

@@ -1,7 +1,7 @@
 .dateComponentPicker {
   display: inline-block;
   text-align: center;
-  margin: 0 0.5rem;
+  margin: 0 var(--primitive-spacing-24);
   vertical-align: inherit;
 }
 .dateComponentPicker .label {
@@ -20,7 +20,7 @@
 :global(.enact-locale-non-latin) .dateComponentPicker .label {
   font-family: "Limestone";
   font-weight: var(--primitive-font-weight-light);
-  font-size: 1.125rem;
+  font-size: var(--primitive-font-size-54);
   font-style: normal;
 }
 :global(.enact-locale-km) .dateComponentPicker .label {

package/internal/DateTime/DateTime.module.css

@@ -2,6 +2,7 @@
   display: inline-block;
 }
 .dateTime .heading {
+  font-size: var(--primitive-font-size-66);
   margin: 0 0 var(--primitive-spacing-132);
   border-bottom: none;
 }

package/internal/Panels/PanelsRouter.js

@@ -13,7 +13,7 @@ var _useAutoFocus = _interopRequireDefault(require("./useAutoFocus"));
 var _useFocusOnTransition2 = _interopRequireDefault(require("./useFocusOnTransition"));
 var _useToggleRole2 = _interopRequireDefault(require("./useToggleRole"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["children", "componentRef", "data-spotlight-id", "index", "onTransition", "onWillTransition", "rtl", "subtitle", "title"],
+var _excluded = ["autoFocus", "children", "componentRef", "data-spotlight-id", "index", "onTransition", "onWillTransition", "rtl", "subtitle", "title"],
   _excluded2 = ["onWillTransition"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -67,7 +67,9 @@ var defaultConfig = {
  */
 var PanelsRouter = exports.PanelsRouter = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
   var PanelsProvider = function PanelsProvider(_ref) {
-    var children = _ref.children,
+    var _ref$autoFocus = _ref.autoFocus,
+      autoFocus = _ref$autoFocus === void 0 ? 'default-element' : _ref$autoFocus,
+      children = _ref.children,
       componentRef = _ref.componentRef,
       spotlightId = _ref['data-spotlight-id'],
       _ref$index = _ref.index,
@@ -87,11 +89,11 @@ var PanelsRouter = exports.PanelsRouter = (0, _hoc["default"])(defaultConfig, fu
     var _useToggleRole = (0, _useToggleRole2["default"])(),
       a11yRef = _useToggleRole.ref,
       a11yOnWillTransition = _useToggleRole.onWillTransition;
-    var autoFocus = (0, _useAutoFocus["default"])({
-      autoFocus: 'default-element',
+    var autoFocusRef = (0, _useAutoFocus["default"])({
+      autoFocus: autoFocus,
       hideChildren: panel == null
     });
-    var ref = (0, _useChainRefs["default"])(autoFocus, a11yRef, componentRef);
+    var ref = (0, _useChainRefs["default"])(autoFocusRef, a11yRef, componentRef);
     var _useReverseTransition = useReverseTransition(index, rtl),
       reverseTransition = _useReverseTransition.reverseTransition,
       prevIndex = _useReverseTransition.prevIndex;
@@ -139,6 +141,15 @@ var PanelsRouter = exports.PanelsRouter = (0, _hoc["default"])(defaultConfig, fu
     });
   };
   PanelsProvider.propTypes = /** @lends limestone/internal/Panels.PanelsRouter.prototype */{
+    /**
+     * Sets the strategy used to automatically focus an element within the Panels upon render.
+     * When set to 'none', focus is not set only on the first render.
+     *
+     * @type {('default-element'|'last-focused'|'none'|String)}
+     * @default 'default-element'
+     * @private
+     */
+    autoFocus: _propTypes2["default"].string,
     /**
      * Obtains a reference to the root node.
      *

package/internal/Picker/Picker.module.css

@@ -2,7 +2,7 @@
   vertical-align: bottom;
   position: relative;
   text-align: center;
-  margin: 0 0.75rem;
+  margin: 0 var(--primitive-spacing-36);
 }
 .picker .sizingPlaceholder,
 .picker .valueWrapper {
@@ -195,7 +195,7 @@
 .picker.joined.horizontal.arrow .decrementer {
   line-height: 2rem;
   height: 2.25rem;
-  margin: 0.1875rem 0.75rem;
+  margin: 0.1875rem var(--primitive-spacing-36);
   padding: 0 0.375rem;
 }
 .picker.joined.vertical .valueWrapper {

package/internal/SharedStateDecorator/SharedStateDecorator.js

@@ -12,19 +12,15 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _objectDestructuringEmpty(t) { if (null == t) throw new TypeError("Cannot destructure " + t); }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
-function _possibleConstructorReturn(t, e) { if (e && ("object" == typeof e || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
-function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
-function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
-function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+function _objectDestructuringEmpty(t) { if (null == t) throw new TypeError("Cannot destructure " + t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 var SharedState = exports.SharedState = /*#__PURE__*/(0, _react.createContext)(null);
 var defaultConfig = {
   idProp: 'id',
@@ -60,100 +56,80 @@ var defaultConfig = {
  * @private
  */
 var SharedStateDecorator = exports.SharedStateDecorator = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
-  var _Class;
   var idProp = config.idProp,
     updateOnMount = config.updateOnMount;
-  return _Class = /*#__PURE__*/function (_Component) {
-    function _Class(props) {
-      var _this;
-      _classCallCheck(this, _Class);
-      _this = _callSuper(this, _Class, [props]);
-      _this.data = {};
-      _this.sharedState = _this.initSharedState();
-      _this.state = {
-        updateOnMount: false
-      };
-      return _this;
-    }
-    _inherits(_Class, _Component);
-    return _createClass(_Class, [{
-      key: "componentDidMount",
-      value: function componentDidMount() {
-        this.loadFromContext();
-      }
-    }, {
-      key: "componentDidUpdate",
-      value: function componentDidUpdate(prevProps) {
-        if (!prevProps.noSharedState && this.props.noSharedState) {
-          this.data = {};
-        } else if (prevProps.noSharedState && !this.props.noSharedState) {
-          this.loadFromContext();
-        }
-      }
-    }, {
-      key: "isUpdateable",
-      value: function isUpdateable() {
-        var _this$props = this.props,
-          id = _this$props[idProp],
-          noSharedState = _this$props.noSharedState;
-        return !noSharedState && (id || id === 0);
-      }
-    }, {
-      key: "initSharedState",
-      value: function initSharedState() {
-        var _this2 = this;
-        return {
-          set: function set(key, value) {
-            var id = _this2.props[idProp];
-            if (_this2.isUpdateable()) {
-              _this2.data[id] = _this2.data[id] || {};
-              _this2.data[id][key] = value;
-            }
-          },
-          get: function get(key) {
-            var id = _this2.props[idProp];
-            return _this2.isUpdateable() && _this2.data[id] ? _this2.data[id][key] : null;
-          },
-          "delete": function _delete(key) {
-            var id = _this2.props[idProp];
-            if (_this2.isUpdateable() && _this2.data[id]) {
-              delete _this2.data[id][key];
-            }
-          }
-        };
-      }
-    }, {
-      key: "loadFromContext",
-      value: function loadFromContext() {
-        var _this$props2 = this.props,
-          id = _this$props2[idProp],
-          noSharedState = _this$props2.noSharedState;
-        if (!noSharedState && this.context && this.context.get) {
-          var data = this.context.get(id);
-          if (data) {
-            this.data = data;
-          } else {
-            this.context.set(id, this.data);
+
+  // eslint-disable-next-line no-shadow
+  var SharedStateDecorator = function SharedStateDecorator(props) {
+    var context = (0, _react.useContext)(SharedState);
+    var data = (0, _react.useRef)({});
+    var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      setUpdateOnMountState = _useState2[1];
+    var isUpdatable = (0, _react.useCallback)(function () {
+      var id = props[idProp],
+        noSharedState = props.noSharedState;
+      return !noSharedState && (id || id === 0);
+    }, [props]);
+    var initSharedState = (0, _react.useCallback)(function () {
+      return {
+        set: function set(key, value) {
+          var id = props[idProp];
+          if (isUpdatable()) {
+            data.current[id] = data.current[id] || {};
+            data.current[id][key] = value;
           }
-          if (updateOnMount) {
-            this.setState({
-              updateOnMount: true
-            });
+        },
+        get: function get(key) {
+          var id = props[idProp];
+          return isUpdatable() && data.current[id] ? data.current[id][key] : null;
+        },
+        "delete": function _delete(key) {
+          var id = props[idProp];
+          if (isUpdatable() && data.current[id]) {
+            delete data.current[id][key];
           }
         }
+      };
+    }, [isUpdatable, props]);
+    var loadFromContext = (0, _react.useCallback)(function () {
+      var id = props[idProp],
+        noSharedState = props.noSharedState;
+      if (!noSharedState && context && context.get) {
+        var contextData = context.get(id);
+        if (contextData) {
+          data.current = contextData;
+        } else {
+          context.set(id, data.current);
+        }
+        if (updateOnMount) {
+          setUpdateOnMountState(true);
+        }
       }
-    }, {
-      key: "render",
-      value: function render() {
-        var props = Object.assign({}, (_objectDestructuringEmpty(this.props), this.props));
-        delete props.noSharedState;
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(SharedState, {
-          value: this.sharedState,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread({}, props))
-        });
+    }, [context, props]);
+    var sharedState = (0, _react.useRef)(initSharedState());
+    var prevProps = (0, _react.useRef)(props);
+    (0, _react.useEffect)(function () {
+      loadFromContext();
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+    (0, _react.useEffect)(function () {
+      if (!prevProps.current.noSharedState && props.noSharedState) {
+        data.current = {};
+      } else if (prevProps.current.noSharedState && !props.noSharedState) {
+        loadFromContext();
       }
-    }]);
-  }(_react.Component), _Class.displayName = 'SharedStateDecorator', _Class.contextType = SharedState, _Class.propTypes = {
+      prevProps.current = props;
+    }, [loadFromContext, props]);
+    var wrappedComponentProps = Object.assign({}, (_objectDestructuringEmpty(props), props));
+    delete wrappedComponentProps.noSharedState;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(SharedState, {
+      value: sharedState.current,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread({}, wrappedComponentProps))
+    });
+  };
+  SharedStateDecorator.displayName = 'SharedStateDecorator';
+  SharedStateDecorator.propTypes = {
     /**
      * Prevents the component from setting or restoring any framework shared state.
      *
@@ -162,6 +138,7 @@ var SharedStateDecorator = exports.SharedStateDecorator = (0, _hoc["default"])(d
      * @public
      */
     noSharedState: _propTypes["default"].bool
-  }, _Class;
+  };
+  return SharedStateDecorator;
 });
 var _default = exports["default"] = SharedStateDecorator;

package/internal/validators/validators.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.warn = exports.validateSteppedOnce = exports.validateStepped = exports.validateRangeOnce = exports.validateRange = void 0;
+exports.warning = exports.warn = exports.validateSteppedOnce = exports.validateStepped = exports.validateRangeOnce = exports.validateRange = void 0;
 /**
  * Exports various utilities for performing dev-time validations
  *
@@ -15,7 +15,7 @@ exports.warn = exports.validateSteppedOnce = exports.validateStepped = exports.v
  * Issues a warning to the console
  *
  * @function
- * @param {String} msg				Event name
+ * @param {String} msg Event name
  *
  * @returns {undefined}
  * @memberof limestone/internal/validators
@@ -27,6 +27,25 @@ var warn = exports.warn = function warn(msg) {
   }
 };
 
+/**
+ * Issues a warning to the console
+ *
+ * @function
+ * @param {Boolean} condition Condition for trigger
+ * @param {String} msg Event name
+ *
+ * @returns {undefined}
+ * @memberof limestone/internal/validators
+ * @private
+ */
+var warning = exports.warning = function warning(condition, msg) {
+  if (process.env.NODE_ENV !== "production") {
+    if (typeof console !== 'undefined' && condition) {
+      console.warn('Warning: ' + msg); // eslint-disable-line no-console
+    }
+  }
+};
+
 /**
  * Issues a warning to the console if `value` is not within the range
  * `min` to `max` or if `min` is less than `max`. In production mode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enact/limestone",
-  "version": "1.3.0",
+  "version": "1.9.4",
   "description": "Large-screen/TV support library for Enact, containing a variety of UI components.",
   "repository": {
     "type": "git",
@@ -39,20 +39,20 @@
     "screenTypes": "ThemeDecorator/screenTypes.json"
   },
   "dependencies": {
-    "@enact/core": "^5.2.0",
-    "@enact/i18n": "^5.2.0",
-    "@enact/spotlight": "^5.2.0",
-    "@enact/ui": "^5.2.0",
-    "@enact/webos": "^5.2.0",
-    "@enovaui/core-tokens": "^0.8.0",
-    "@enovaui/webos-tokens": "^0.8.0",
+    "@enact/core": "^5.4.3",
+    "@enact/i18n": "^5.4.3",
+    "@enact/spotlight": "^5.4.3",
+    "@enact/ui": "^5.4.3",
+    "@enact/webos": "^5.4.3",
+    "@enovaui/core-tokens": "^0.14.0",
+    "@enovaui/webos-tokens": "^0.14.0",
     "classnames": "^2.5.1",
-    "ilib": "^14.21.0 || ^14.21.0-webos1",
+    "ilib": "^14.22.0",
     "invariant": "^2.2.4",
     "prop-types": "^15.8.1",
-    "ramda": "^0.31.3",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0",
+    "ramda": "^0.32.0",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
     "warning": "^4.0.3"
   },
   "peerDependencies": {
@@ -63,7 +63,7 @@
     "vue-template-compiler": "@vue/compiler-sfc@3.4.31"
   },
   "devDependencies": {
-    "@enact/docs-utils": "^0.4.13",
-    "@enact/ui-test-utils": "^3.0.0"
+    "@enact/docs-utils": "^0.4.17",
+    "@enact/ui-test-utils": "^4.0.2"
   }
 }

package/styles/colors-highcontrast.less

@@ -8,7 +8,7 @@
 // UI Conceptual Colors
 // ---------------------------------------
 
-@lime-overlay-outline-color: #7c848b;
+@lime-overlay-outline-color: var(--semantic-color-stroke-main);
 @lime-overlay-outline-style: solid;
 
 // ---------------------------------------
@@ -19,3 +19,11 @@
 // ---------------------------------------
 @lime-popup-bg-color: var(--semantic-color-background-overlay-default); // opaque
 @lime-popup-scrimtransparent-bg-color: var(--semantic-color-background-overlay-default); // opaque
+
+// PopupTanLayout
+// ---------------------------------------
+@lime-popuptablayout-content-background-color: var(--semantic-color-background-overlay-default);
+
+// KeyGuide
+// ---------------------------------------
+@lime-keyguide-outline-color: @lime-overlay-outline-color;