@enact/limestone 1.3.0 → 1.10.0

package/Input/InputFieldSpotlightDecorator.js

@@ -7,6 +7,7 @@ exports["default"] = exports.InputSpotlightDecorator = void 0;
 var _handle = require("@enact/core/handle");
 var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
 var _keymap = require("@enact/core/keymap");
+var _util = require("@enact/core/util");
 var _spotlight = require("@enact/spotlight");
 var _Pause = _interopRequireDefault(require("@enact/spotlight/Pause"));
 var _Spottable = _interopRequireDefault(require("@enact/spotlight/Spottable"));
@@ -18,18 +19,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 _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 _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; }
+function _objectDestructuringEmpty(t) { if (null == t) throw new TypeError("Cannot destructure " + t); }
 var isBubbling = function isBubbling(ev) {
   return ev.currentTarget !== ev.target;
 };
@@ -43,7 +41,6 @@ var isSelectionAtLocation = function isSelectionAtLocation(target, location) {
     return true;
   }
 };
-var handleKeyDown = (0, _handle.handle)((0, _handle.forwardWithPrevent)('onKeyDown'), (0, _handle.call)('onKeyDown'));
 
 /**
  * Default config for {@link limestone/Input.InputSpotlightDecorator|InputSpotlightDecorator}
@@ -58,7 +55,7 @@ var defaultConfig = {
    * @type {Boolean}
    * @default false
    * @memberof limestone/Input/InputSpotlightDecorator.InputSpotlightDecorator.defaultConfig
-  */
+   */
   noLockPointer: false
 };
 
@@ -72,7 +69,6 @@ var defaultConfig = {
  * @private
  */
 var InputSpotlightDecorator = exports.InputSpotlightDecorator = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
-  var _Class;
   var noLockPointer = config.noLockPointer;
   var Component = (0, _Spottable["default"])({
     emulateMouse: false
@@ -80,245 +76,269 @@ var InputSpotlightDecorator = exports.InputSpotlightDecorator = (0, _hoc["defaul
   var forwardBlur = (0, _handle.forward)('onBlur');
   var forwardMouseDown = (0, _handle.forward)('onMouseDown');
   var forwardFocus = (0, _handle.forward)('onFocus');
+  var forwardKeyDown = (0, _handle.forwardWithPrevent)('onKeyDown');
   var forwardKeyUp = (0, _handle.forward)('onKeyUp');
-  return _Class = /*#__PURE__*/function (_ReactComponent) {
-    function _Class(props) {
-      var _this;
-      _classCallCheck(this, _Class);
-      _this = _callSuper(this, _Class, [props]);
-      _this.updateFocus = function () {
-        // focus node if `InputSpotlightDecorator` is pausing Spotlight or if Spotlight is paused
-        if (_this.node && _spotlight.Spotlight.getCurrent() !== _this.node && (_this.paused.isPaused() || !_spotlight.Spotlight.isPaused())) {
-          if (_this.fromMouse) {
-            _this.node.focus({
-              preventScroll: true
-            });
-          } else {
-            _this.node.focus();
-          }
+
+  // eslint-disable-next-line no-shadow
+  var _InputSpotlightDecorator = function InputSpotlightDecorator(_ref) {
+    var props = Object.assign({}, (_objectDestructuringEmpty(_ref), _ref));
+    (0, _util.checkPropTypes)(_InputSpotlightDecorator, props);
+    var _props$caretToEndOnFo = props.caretToEndOnFocus,
+      caretToEndOnFocus = _props$caretToEndOnFo === void 0 ? false : _props$caretToEndOnFo;
+    var downTarget = (0, _react.useRef)(null);
+    var focused = (0, _react.useRef)(null);
+    var node = (0, _react.useRef)(null);
+    var fromMouse = (0, _react.useRef)(false);
+    var prevStatus = (0, _react.useRef)({
+      focused: null,
+      node: null
+    });
+    var paused = (0, _react.useMemo)(function () {
+      return new _Pause["default"]('InputSpotlightDecorator');
+    }, []);
+    var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      active = _useState2[0],
+      setActive = _useState2[1];
+    var setDownTarget = (0, _react.useCallback)(function (ev) {
+      var repeat = ev.repeat,
+        target = ev.target;
+      if (!repeat) {
+        downTarget.current = target;
+      }
+    }, []);
+    var moveCaretToEnd = (0, _react.useCallback)(function (inputNode) {
+      if (caretToEndOnFocus && inputNode && SELECTABLE_TYPES.test(inputNode.type)) {
+        var length = inputNode.value.length;
+        inputNode.setSelectionRange(length, length);
+        inputNode.scrollLeft = inputNode.dir === 'rtl' ? 0 : inputNode.scrollWidth;
+      }
+    }, [caretToEndOnFocus]);
+    var updateFocus = (0, _react.useCallback)(function () {
+      // focus node if `InputSpotlightDecorator` is pausing Spotlight or if Spotlight is paused
+      if (node.current && _spotlight.Spotlight.getCurrent() !== node.current && (paused.isPaused() || !_spotlight.Spotlight.isPaused())) {
+        if (fromMouse.current) {
+          node.current.focus({
+            preventScroll: true
+          });
+        } else {
+          node.current.focus();
         }
-        var focusChanged = _this.focused !== _this.prevStatus.focused;
-        if (focusChanged) {
-          if (_this.focused === 'input') {
-            (0, _handle.forwardCustom)('onActivate')(null, _this.props);
-            if (!noLockPointer) {
-              (0, _pointer.lockPointer)(_this.node);
-            }
-            _this.paused.pause();
-          } else if (_this.prevStatus.focused === 'input') {
-            (0, _handle.forwardCustom)('onDeactivate')(null, _this.props);
-            if (!noLockPointer) {
-              (0, _pointer.releasePointer)(_this.prevStatus.node);
-            }
-            _this.paused.resume();
+
+        // Move caret to end if caretToEndOnFocus is enabled and we're focusing an input
+        if (focused.current === 'input') {
+          if (fromMouse.current) {
+            setTimeout(function () {
+              moveCaretToEnd(node.current);
+            }, 0);
+          } else {
+            moveCaretToEnd(node.current);
           }
         }
-        _this.prevStatus.focused = _this.focused;
-        _this.prevStatus.node = _this.node;
-      };
-      _this.focus = function (focused, node, fromMouse) {
-        _this.focused = focused;
-        _this.node = node;
-        _this.fromMouse = fromMouse;
-        _this.updateFocus();
-      };
-      _this.blur = function () {
-        if (_this.focused || _this.node) {
-          _this.focused = null;
-          _this.node = null;
-          _this.updateFocus();
-        }
-      };
-      _this.focusDecorator = function (decorator) {
-        _this.focus('decorator', decorator, false);
-      };
-      _this.focusInput = function (decorator, fromMouse) {
-        _this.focus('input', decorator.querySelector('input'), fromMouse);
-      };
-      _this.onBlur = function (ev) {
-        if (!_this.props.autoFocus) {
-          if (isBubbling(ev)) {
-            if (_spotlight.Spotlight.getPointerMode()) {
-              _this.blur();
-              forwardBlur(ev, _this.props);
-            } else {
-              _this.focused = 'decorator';
-              _this.node = ev.currentTarget;
-              _this.fromMouse = false;
-              ev.stopPropagation();
-            }
-          } else if (!ev.currentTarget.contains(ev.relatedTarget)) {
-            // Blurring decorator but not focusing input
-            forwardBlur(ev, _this.props);
-            _this.blur();
+      }
+      var focusChanged = focused.current !== prevStatus.current.focused;
+      if (focusChanged) {
+        if (focused.current === 'input') {
+          setActive(true);
+          (0, _handle.forwardCustom)('onActivate')(null, props);
+          if (!noLockPointer) {
+            (0, _pointer.lockPointer)(node.current);
           }
-        } else if (isBubbling(ev)) {
-          if (_this.focused === 'input' && _this.node === ev.target && ev.currentTarget !== ev.relatedTarget) {
-            _this.blur();
-            forwardBlur(ev, _this.props);
-          } else {
-            _this.focusDecorator(ev.currentTarget);
-            ev.stopPropagation();
-            _this.blur();
+          paused.pause();
+        } else if (prevStatus.current.focused === 'input') {
+          setActive(false);
+          (0, _handle.forwardCustom)('onDeactivate')(null, props);
+          if (!noLockPointer) {
+            (0, _pointer.releasePointer)(prevStatus.current.node);
           }
+          paused.resume();
         }
+      }
+      prevStatus.current = {
+        focused: focused.current,
+        node: node.current
       };
-      _this.onMouseDown = function (ev) {
-        var _this$props = _this.props,
-          disabled = _this$props.disabled,
-          spotlightDisabled = _this$props.spotlightDisabled;
-        _this.setDownTarget(ev);
-        // focus the <input> whenever clicking on any part of the component to ensure both that
-        // the <input> has focus and Spotlight is paused.
-        if (!disabled && !spotlightDisabled) {
-          _this.focusInput(ev.currentTarget, true);
-        }
-        forwardMouseDown(ev, _this.props);
-      };
-      _this.onFocus = function (ev) {
-        forwardFocus(ev, _this.props);
+    }, [moveCaretToEnd, paused, props]);
+    var blur = (0, _react.useCallback)(function () {
+      if (focused.current || node.current) {
+        focused.current = null;
+        node.current = null;
+        updateFocus();
+      }
+    }, [updateFocus]);
+    var focus = (0, _react.useCallback)(function (focusedProp, nodeProp, fromMouseProp) {
+      focused.current = focusedProp;
+      node.current = nodeProp;
+      fromMouse.current = fromMouseProp;
+      updateFocus();
+    }, [updateFocus]);
+    var focusDecorator = (0, _react.useCallback)(function (decorator) {
+      focus('decorator', decorator, false);
+    }, [focus]);
+    var onKeyDown = (0, _react.useCallback)(function (ev) {
+      forwardKeyDown(ev, props);
+      var currentTarget = ev.currentTarget,
+        keyCode = ev.keyCode,
+        target = ev.target;
 
-        // when in autoFocus mode, focusing the decorator directly will cause it to
-        // forward the focus onto the <input>
-        if (!isBubbling(ev) && _this.props.autoFocus && _this.focused === null && !_spotlight.Spotlight.getPointerMode()) {
-          _this.focusInput(ev.currentTarget, false);
-          ev.stopPropagation();
+      // cache the target if this is the first keyDown event to ensure the component had focus
+      // when the key interaction started
+      setDownTarget(ev);
+      if (focused.current === 'input') {
+        var isDown = (0, _keymap.is)('down', keyCode);
+        var isLeft = (0, _keymap.is)('left', keyCode);
+        var isRight = (0, _keymap.is)('right', keyCode);
+        var isUp = (0, _keymap.is)('up', keyCode);
+
+        // move spotlight
+        var shouldSpotlightMove =
+        // No value exists! (Can happen when disabled)
+        target.value == null ||
+        // on left + at beginning of selection
+        isLeft && isSelectionAtLocation(target, 0) ||
+        // on right + at end of selection (note: fails on non-selectable types usually)
+        isRight && isSelectionAtLocation(target, target.value.length) ||
+        // on up
+        isUp ||
+        // on down
+        isDown;
+
+        // prevent modifying the value via 5-way for numeric fields
+        if ((isUp || isDown) && target.type === 'number') {
+          ev.preventDefault();
         }
-      };
-      _this.onKeyUp = function (ev) {
-        var dismissOnEnter = _this.props.dismissOnEnter;
-        var currentTarget = ev.currentTarget,
-          keyCode = ev.keyCode,
-          target = ev.target;
+        if (shouldSpotlightMove) {
+          var direction = (0, _spotlight.getDirection)(keyCode);
+          var getPointerMode = _spotlight.Spotlight.getPointerMode,
+            move = _spotlight.Spotlight.move,
+            resetKeyHoldState = _spotlight.Spotlight.resetKeyHoldState,
+            setPointerMode = _spotlight.Spotlight.setPointerMode;
+          if (getPointerMode()) {
+            setPointerMode(false);
+          }
+          (0, _handle.stopImmediate)(ev);
+          paused.resume();
 
-        // verify that we have a matching pair of key down/up events to avoid adjusting focus
-        // when the component received focus mid-press
-        if (target === _this.downTarget) {
-          _this.downTarget = null;
-          if (!_this.props.disabled) {
-            if (_this.focused === 'input' && dismissOnEnter && (0, _keymap.is)('enter', keyCode)) {
-              _this.focusDecorator(currentTarget);
-              // prevent Enter onKeyPress which triggers an onMouseDown via Spotlight
-              ev.preventDefault();
-            } else if (_this.focused !== 'input' && (0, _keymap.is)('enter', keyCode)) {
-              _this.focusInput(currentTarget, false);
-            }
+          // Move spotlight in the keypress direction
+          if (move(direction)) {
+            // if successful, reset the internal state
+            blur();
+            resetKeyHoldState();
+          } else {
+            // if there is no other spottable elements, focus `InputDecorator` instead
+            focusDecorator(currentTarget);
           }
+        } else if (isLeft || isRight) {
+          // prevent 5-way nav for left/right keys within the <input>
+          (0, _handle.stopImmediate)(ev);
         }
-        forwardKeyUp(ev, _this.props);
-      };
-      _this.focused = null;
-      _this.node = null;
-      _this.fromMouse = false;
-      _this.paused = new _Pause["default"]('InputSpotlightDecorator');
-      _this.handleKeyDown = handleKeyDown.bind(_this);
-      _this.prevStatus = {
-        focused: null,
-        node: null
-      };
-      return _this;
-    }
-    _inherits(_Class, _ReactComponent);
-    return _createClass(_Class, [{
-      key: "componentWillUnmount",
-      value: function componentWillUnmount() {
-        this.paused.resume();
-        if (this.focused === 'input') {
-          var onSpotlightDisappear = this.props.onSpotlightDisappear;
+      }
+    }, [blur, focusDecorator, paused, props, setDownTarget]);
+    (0, _react.useEffect)(function () {
+      return function () {
+        paused.resume();
+        if (focused.current === 'input') {
+          var onSpotlightDisappear = props.onSpotlightDisappear;
           if (onSpotlightDisappear) {
             onSpotlightDisappear();
           }
           if (!noLockPointer) {
-            (0, _pointer.releasePointer)(this.node);
+            (0, _pointer.releasePointer)(node.current);
           }
         }
-      }
-    }, {
-      key: "onKeyDown",
-      value: function onKeyDown(ev) {
-        var currentTarget = ev.currentTarget,
-          keyCode = ev.keyCode,
-          target = ev.target;
-
-        // cache the target if this is the first keyDown event to ensure the component had focus
-        // when the key interaction started
-        this.setDownTarget(ev);
-        if (this.focused === 'input') {
-          var isDown = (0, _keymap.is)('down', keyCode);
-          var isLeft = (0, _keymap.is)('left', keyCode);
-          var isRight = (0, _keymap.is)('right', keyCode);
-          var isUp = (0, _keymap.is)('up', keyCode);
-
-          // move spotlight
-          var shouldSpotlightMove =
-          // No value exists! (Can happen when disabled)
-          target.value == null ||
-          // on left + at beginning of selection
-          isLeft && isSelectionAtLocation(target, 0) ||
-          // on right + at end of selection (note: fails on non-selectable types usually)
-          isRight && isSelectionAtLocation(target, target.value.length) ||
-          // on up
-          isUp ||
-          // on down
-          isDown;
-
-          // prevent modifying the value via 5-way for numeric fields
-          if ((isUp || isDown) && target.type === 'number') {
-            ev.preventDefault();
-          }
-          if (shouldSpotlightMove) {
-            var direction = (0, _spotlight.getDirection)(keyCode);
-            var getPointerMode = _spotlight.Spotlight.getPointerMode,
-              move = _spotlight.Spotlight.move,
-              resetKeyHoldState = _spotlight.Spotlight.resetKeyHoldState,
-              setPointerMode = _spotlight.Spotlight.setPointerMode;
-            if (getPointerMode()) {
-              setPointerMode(false);
-            }
-            (0, _handle.stopImmediate)(ev);
-            this.paused.resume();
+      };
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
-            // Move spotlight in the keypress direction
-            if (move(direction)) {
-              // if successful, reset the internal state
-              this.blur();
-              resetKeyHoldState();
-            } else {
-              // if there is no other spottable elements, focus `InputDecorator` instead
-              this.focusDecorator(currentTarget);
-            }
-          } else if (isLeft || isRight) {
-            // prevent 5-way nav for left/right keys within the <input>
-            (0, _handle.stopImmediate)(ev);
+    var focusInput = (0, _react.useCallback)(function (decorator, fromMouseProp) {
+      focus('input', decorator.querySelector('input'), fromMouseProp);
+    }, [focus]);
+    var onBlur = (0, _react.useCallback)(function (ev) {
+      if (!props.autoFocus) {
+        if (isBubbling(ev)) {
+          if (_spotlight.Spotlight.getPointerMode()) {
+            blur();
+            forwardBlur(ev, props);
+          } else {
+            focused.current = 'decorator';
+            node.current = ev.currentTarget;
+            fromMouse.current = false;
+            ev.stopPropagation();
           }
+        } else if (!ev.currentTarget.contains(ev.relatedTarget)) {
+          // Blurring decorator but not focusing input
+          forwardBlur(ev, props);
+          blur();
         }
-      }
-    }, {
-      key: "setDownTarget",
-      value: function setDownTarget(ev) {
-        var repeat = ev.repeat,
-          target = ev.target;
-        if (!repeat) {
-          this.downTarget = target;
+      } else if (isBubbling(ev)) {
+        if (focused.current === 'input' && node.current === ev.target && ev.currentTarget !== ev.relatedTarget) {
+          blur();
+          forwardBlur(ev, props);
+        } else {
+          focusDecorator(ev.currentTarget);
+          ev.stopPropagation();
+          blur();
         }
       }
-    }, {
-      key: "render",
-      value: function render() {
-        var props = Object.assign({}, this.props);
-        delete props.autoFocus;
-        delete props.onActivate;
-        delete props.onDeactivate;
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread(_objectSpread({}, props), {}, {
-          onBlur: this.onBlur,
-          onMouseDown: this.onMouseDown,
-          onFocus: this.onFocus,
-          onKeyDown: this.handleKeyDown,
-          onKeyUp: this.onKeyUp
-        }));
+    }, [blur, focusDecorator, props]);
+    var onMouseDown = (0, _react.useCallback)(function (ev) {
+      var disabled = props.disabled,
+        spotlightDisabled = props.spotlightDisabled;
+      setDownTarget(ev);
+      // focus the <input> whenever clicking on any part of the component to ensure both that
+      // the <input> has focus and Spotlight is paused. Skip when the target is a decorative
+      // icon so it doesn't activate the input.
+      if (!disabled && !spotlightDisabled && !ev.target.closest('[data-input-icon]')) {
+        focusInput(ev.currentTarget, true);
+      }
+      forwardMouseDown(ev, props);
+    }, [focusInput, props, setDownTarget]);
+    var onFocus = (0, _react.useCallback)(function (ev) {
+      forwardFocus(ev, props);
+      // when in autoFocus mode, focusing the decorator directly will cause it to
+      // forward the focus onto the <input>
+      if (!isBubbling(ev) && props.autoFocus && focused.current === null && !_spotlight.Spotlight.getPointerMode()) {
+        focusInput(ev.currentTarget, false);
+        ev.stopPropagation();
+      }
+    }, [focusInput, props]);
+    var onKeyUp = (0, _react.useCallback)(function (ev) {
+      var dismissOnEnter = props.dismissOnEnter;
+      var currentTarget = ev.currentTarget,
+        keyCode = ev.keyCode,
+        target = ev.target;
+
+      // verify that we have a matching pair of key down/up events to avoid adjusting focus
+      // when the component received focus mid-press
+      if (target === downTarget.current) {
+        downTarget.current = null;
+        if (!props.disabled) {
+          if (focused.current === 'input' && dismissOnEnter && (0, _keymap.is)('enter', keyCode)) {
+            focusDecorator(currentTarget);
+            // prevent Enter onKeyPress which triggers an onMouseDown via Spotlight
+            ev.preventDefault();
+          } else if (focused.current !== 'input' && (0, _keymap.is)('enter', keyCode)) {
+            focusInput(currentTarget, false);
+          }
+        }
       }
-    }]);
-  }(_react.Component), _Class.displayName = 'InputSpotlightDecorator', _Class.propTypes = /** @lends limestone/Input/InputSpotlightDecorator.InputSpotlightDecorator.prototype */{
+      forwardKeyUp(ev, props);
+    }, [focusDecorator, focusInput, props]);
+    var componentProps = Object.assign({}, props);
+    delete componentProps.autoFocus;
+    delete componentProps.caretToEndOnFocus;
+    delete componentProps.onActivate;
+    delete componentProps.onDeactivate;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread(_objectSpread({}, componentProps), {}, {
+      active: active,
+      onBlur: onBlur,
+      onFocus: onFocus,
+      onKeyDown: onKeyDown,
+      onKeyUp: onKeyUp,
+      onMouseDown: onMouseDown
+    }));
+  };
+  _InputSpotlightDecorator.displayName = 'InputSpotlightDecorator';
+  _InputSpotlightDecorator.propTypes = /** @lends limestone/Input/InputSpotlightDecorator.InputSpotlightDecorator.prototype */{
     /**
      * Focuses the <input> when the decorator is focused via 5-way.
      *
@@ -327,6 +347,14 @@ var InputSpotlightDecorator = exports.InputSpotlightDecorator = (0, _hoc["defaul
      * @public
      */
     autoFocus: _propTypes["default"].bool,
+    /**
+     * Moves the caret to the end of the text when the input receives focus.
+     *
+     * @type {Boolean}
+     * @default false
+     * @public
+     */
+    caretToEndOnFocus: _propTypes["default"].bool,
     /**
      * Applies a disabled style and the control becomes non-interactive.
      *
@@ -375,6 +403,7 @@ var InputSpotlightDecorator = exports.InputSpotlightDecorator = (0, _hoc["defaul
      * @public
      */
     spotlightDisabled: _propTypes["default"].bool
-  }, _Class;
+  };
+  return _InputSpotlightDecorator;
 });
 var _default = exports["default"] = InputSpotlightDecorator;