@enact/limestone 1.10.0 → 1.10.2

package/useScroll/ScrollbarPlaceholder.js

@@ -30,9 +30,14 @@ var ScrollbarPlaceholder = exports.ScrollbarPlaceholder = function ScrollbarPlac
     _useState2 = _slicedToArray(_useState, 2),
     showPlaceholder = _useState2[0],
     setShowPlaceholder = _useState2[1];
-  if (showPlaceholder) {
-    setShowPlaceholder(false);
-  }
+
+  // The placeholder needs to mount and then unmount so its `onSpotlightDisappear` fires and
+  // hands focus over to the real scrollbar once it is ready.
+  (0, _react.useEffect)(function () {
+    if (showPlaceholder) {
+      setShowPlaceholder(false); // eslint-disable-line react-hooks/set-state-in-effect
+    }
+  }, [showPlaceholder]);
   var resetFocus = (0, _react.useCallback)(function () {
     setTimeout(function () {
       if (!_spotlight["default"].getPointerMode() && !_spotlight["default"].getCurrent()) {

package/useScroll/useScroll.js

@@ -23,7 +23,7 @@ var _useOverscrollEffect2 = _interopRequireDefault(require("./useOverscrollEffec
 var _useSpotlight = require("./useSpotlight");
 var _OverscrollEffectModule = _interopRequireDefault(require("./OverscrollEffect.module.css"));
 var _useScrollModule = _interopRequireDefault(require("./useScroll.module.css"));
-var _excluded = ["className", "data-spotlight-container", "data-spotlight-container-disabled", "data-spotlight-id", "data-webos-voice-disabled", "data-webos-voice-focused", "data-webos-voice-group-label", "editable", "focusableScrollbar", "fadeOut", "horizontalScrollThumbAriaLabel", "noAffordance", "scrollMode", "snapToCenter", "style", "verticalScrollThumbAriaLabel"];
+var _excluded = ["className", "data-spotlight-container", "data-spotlight-container-disabled", "data-spotlight-id", "data-webos-voice-disabled", "data-webos-voice-focused", "data-webos-voice-group-label", "editable", "focusableScrollbar", "fadeOut", "horizontalScrollThumbAriaLabel", "noAffordance", "scrollMode", "snapToCenter", "stickTo", "style", "verticalScrollThumbAriaLabel"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
@@ -347,6 +347,7 @@ var useScroll = exports.useScroll = function useScroll(props) {
     noAffordance = props.noAffordance,
     scrollMode = props.scrollMode,
     snapToCenter = props.snapToCenter,
+    stickTo = props.stickTo,
     style = props.style,
     verticalScrollThumbAriaLabel = props.verticalScrollThumbAriaLabel,
     rest = _objectWithoutProperties(props, _excluded);
@@ -501,6 +502,7 @@ var useScroll = exports.useScroll = function useScroll(props) {
     scrollContainerRef: scrollContainerRef,
     setThemeScrollContentHandle: setThemeScrollContentHandle,
     spotlightId: spotlightId,
+    stickTo: stickTo,
     scrollContainerHandle: scrollContainerHandle,
     scrollContentHandle: scrollContentHandle,
     scrollContentRef: scrollContentRef