@enact/limestone 1.3.0 → 1.10.0

package/Popup/Popup.js

@@ -4,24 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.PopupBase = exports.Popup = void 0;
-var _keymap = require("@enact/core/keymap");
 var _dispatcher = require("@enact/core/dispatcher");
-var _FloatingLayer = _interopRequireDefault(require("@enact/ui/FloatingLayer"));
+var _handle = require("@enact/core/handle");
+var _keymap = require("@enact/core/keymap");
 var _kind = _interopRequireDefault(require("@enact/core/kind"));
-var _react = require("react");
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _util = require("@enact/core/util");
 var _spotlight = _interopRequireWildcard(require("@enact/spotlight"));
 var _Pause = _interopRequireDefault(require("@enact/spotlight/Pause"));
 var _SpotlightContainerDecorator = _interopRequireDefault(require("@enact/spotlight/SpotlightContainerDecorator"));
 var _container = require("@enact/spotlight/src/container");
+var _FloatingLayer = _interopRequireDefault(require("@enact/ui/FloatingLayer"));
 var _Transition = _interopRequireDefault(require("@enact/ui/Transition"));
-var _handle = require("@enact/core/handle");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = require("react");
 var _warning = _interopRequireDefault(require("warning"));
 var _Skinnable = _interopRequireDefault(require("../Skinnable"));
 var _PopupModule = _interopRequireDefault(require("./Popup.module.css"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["children", "css", "direction", "noAnimation", "onHide", "onShow", "open", "position", "spotlightId", "spotlightRestrict", "transitionContainerClassName"],
-  _excluded2 = ["noAutoDismiss", "scrimType"];
+  _excluded2 = ["noAnimation", "noAutoDismiss", "no5WayClose", "onClose", "open", "position", "scrimType", "spotlightRestrict"];
 /**
  * Modal component that appears at the bottom of the screen and takes up the full screen width.
  *
@@ -34,16 +35,12 @@ var _excluded = ["children", "css", "direction", "noAnimation", "onHide", "onSho
  */
 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 _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 _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 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; }
@@ -304,258 +301,272 @@ var OpenState = {
   OPENING: 1,
   OPEN: 2
 };
+var popupDefaultProps = {
+  noAnimation: false,
+  noAutoDismiss: false,
+  open: false,
+  position: 'bottom',
+  scrimType: 'translucent',
+  spotlightRestrict: 'self-only'
+};
 
 /**
  * A stateful component that renders a popup in a
  * {@link ui/FloatingLayer.FloatingLayer|FloatingLayer}.
  *
- * @class Popup
+ * @function Popup
  * @memberof limestone/Popup
  * @extends limestone/Popup.PopupBase
  * @ui
  * @public
  */
-var Popup = exports.Popup = /*#__PURE__*/function (_Component) {
-  function Popup(props) {
-    var _this;
-    _classCallCheck(this, Popup);
-    _this = _callSuper(this, Popup, [props]);
-    _this.handleFloatingLayerOpen = function () {
-      if (!_this.props.noAnimation && _this.state.popupOpen !== OpenState.OPEN) {
-        _this.setState({
-          popupOpen: OpenState.OPENING
-        });
-      } else if (_this.state.popupOpen === OpenState.OPEN && _this.props.open) {
-        _this.spotPopupContent();
-      }
-    };
-    _this.handleKeyDown = function (ev) {
-      var _this$props = _this.props,
-        onClose = _this$props.onClose,
-        no5WayClose = _this$props.no5WayClose,
-        position = _this$props.position,
-        spotlightRestrict = _this$props.spotlightRestrict;
-      if (no5WayClose) return;
-      var containerId = _this.state.containerId;
-      var keyCode = ev.keyCode;
-      var direction = (0, _spotlight.getDirection)(keyCode);
-      var spottables = _spotlight["default"].getSpottableDescendants(containerId).length;
-      var current = _spotlight["default"].getCurrent();
-      if (direction && (!spottables || current && getContainerNode(containerId).contains(current))) {
-        // explicitly restrict navigation in order to manage focus state when attempting to leave the popup
-        _spotlight["default"].set(containerId, {
-          restrict: 'self-only'
-        });
-        if (onClose) {
-          var focusChanged;
-          if (spottables && current && spotlightRestrict !== 'self-only') {
-            focusChanged = _spotlight["default"].move(direction);
-            if (focusChanged) {
-              // stop propagation to prevent default spotlight behavior
-              ev.stopPropagation();
-            }
+var _Popup = exports.Popup = function Popup(props) {
+  (0, _util.checkPropTypes)(_Popup, props);
+  var componentProps = (0, _util.setDefaultProps)(props, popupDefaultProps);
+  var noAnimation = componentProps.noAnimation,
+    noAutoDismiss = componentProps.noAutoDismiss,
+    no5WayClose = componentProps.no5WayClose,
+    onClose = componentProps.onClose,
+    open = componentProps.open,
+    position = componentProps.position,
+    scrimType = componentProps.scrimType,
+    spotlightRestrict = componentProps.spotlightRestrict,
+    rest = _objectWithoutProperties(componentProps, _excluded2);
+
+  // Assign the needed props to the rest object for the child component
+  Object.assign(rest, {
+    noAnimation: noAnimation,
+    position: position,
+    spotlightRestrict: spotlightRestrict
+  });
+  var _useState = (0, _react.useState)(null),
+    _useState2 = _slicedToArray(_useState, 2),
+    activator = _useState2[0],
+    setActivator = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    addKeyDownListener = _useState4[0],
+    setAddKeyDownListener = _useState4[1];
+  var _useState5 = (0, _react.useState)(open),
+    _useState6 = _slicedToArray(_useState5, 2),
+    floatLayerOpen = _useState6[0],
+    setFloatLayerOpen = _useState6[1];
+  var _useState7 = (0, _react.useState)(open ? OpenState.OPEN : OpenState.CLOSED),
+    _useState8 = _slicedToArray(_useState7, 2),
+    popupOpen = _useState8[0],
+    setPopupOpen = _useState8[1];
+  var _useState9 = (0, _react.useState)(open),
+    _useState0 = _slicedToArray(_useState9, 2),
+    prevOpen = _useState0[0],
+    setPrevOpen = _useState0[1];
+  var containerIdRef = (0, _react.useRef)(null);
+  var pausedRef = (0, _react.useRef)(new _Pause["default"]('Popup'));
+  if (!containerIdRef.current) {
+    containerIdRef.current = _spotlight["default"].add();
+  }
+  var getDerivedStateFromProps = (0, _react.useCallback)(function () {
+    if (open !== prevOpen) {
+      if (open) {
+        setPopupOpen(noAnimation || floatLayerOpen ? OpenState.OPEN : OpenState.CLOSED);
+        setFloatLayerOpen(true);
+        setActivator(_spotlight["default"].getCurrent());
+        setPrevOpen(open);
+      } else {
+        // Disables the spotlight container of popup when `noAnimation` set
+        if (noAnimation) {
+          var node = getContainerNode(containerIdRef.current);
+          if (node) {
+            node.dataset['spotlightContainerDisabled'] = true;
           }
-          if (!spottables || focusChanged === false && (position === 'center' || isUp(keyCode) && position === 'bottom' || isDown(keyCode) && position === 'top' || isRight(keyCode) && position === 'left' || isLeft(keyCode) && position === 'right')) {
-            // prevent default page scrolling
-            ev.preventDefault();
+        }
+        setPopupOpen(OpenState.CLOSED);
+        setFloatLayerOpen(popupOpen === OpenState.OPEN ? !noAnimation : false);
+        setActivator(noAnimation ? null : activator);
+        setPrevOpen(open);
+      }
+    }
+    return null;
+  }, [activator, floatLayerOpen, noAnimation, open, popupOpen, prevOpen]);
+  var handleKeyDown = (0, _react.useCallback)(function (ev) {
+    if (no5WayClose) return;
+    var keyCode = ev.keyCode;
+    var direction = (0, _spotlight.getDirection)(keyCode);
+    var spottables = _spotlight["default"].getSpottableDescendants(containerIdRef.current).length;
+    var current = _spotlight["default"].getCurrent();
+    if (direction && (!spottables || current && getContainerNode(containerIdRef.current).contains(current))) {
+      // explicitly restrict navigation in order to manage focus state when attempting to leave the popup
+      _spotlight["default"].set(containerIdRef.current, {
+        restrict: 'self-only'
+      });
+      if (onClose) {
+        var focusChanged;
+        if (spottables && current && spotlightRestrict !== 'self-only') {
+          focusChanged = _spotlight["default"].move(direction);
+          if (focusChanged) {
             // stop propagation to prevent default spotlight behavior
             ev.stopPropagation();
-            // set the pointer mode to false on keydown
-            _spotlight["default"].setPointerMode(false);
-            (0, _handle.forwardCustom)('onClose')(null, _this.props);
           }
         }
-      }
-    };
-    _this.handleDismiss = function (ev) {
-      (0, _handle.forwardCustom)('onClose', function () {
-        return {
-          detail: ev === null || ev === void 0 ? void 0 : ev.detail
-        };
-      })(null, _this.props);
-    };
-    _this.handlePopupHide = function (ev) {
-      forwardHide(ev, _this.props);
-      _this.setState({
-        floatLayerOpen: false
-      }, function () {
-        if (!ev.currentTarget || ev.currentTarget.getAttribute('data-spotlight-id') === _this.state.containerId) {
-          _this.spotActivator(_this.state.activator);
+        if (!spottables || focusChanged === false && (position === 'center' || isUp(keyCode) && position === 'bottom' || isDown(keyCode) && position === 'top' || isRight(keyCode) && position === 'left' || isLeft(keyCode) && position === 'right')) {
+          // prevent default page scrolling
+          ev.preventDefault();
+          // stop propagation to prevent default spotlight behavior
+          ev.stopPropagation();
+          // set the pointer mode to false on keydown
+          _spotlight["default"].setPointerMode(false);
+          (0, _handle.forwardCustom)('onClose')(null, componentProps);
         }
-        _this.setState({
-          activator: null
-        });
-      });
-    };
-    _this.handlePopupShow = function (ev) {
-      forwardShow(ev, _this.props);
-      _this.setState({
-        popupOpen: OpenState.OPEN
-      });
-      if (!ev.currentTarget || ev.currentTarget.getAttribute('data-spotlight-id') === _this.state.containerId) {
-        _this.spotPopupContent();
       }
-    };
-    _this.spotActivator = function (activator) {
-      _this.paused.resume();
+    }
+  }, [componentProps, no5WayClose, onClose, position, spotlightRestrict]);
+  var spotActivator = (0, _react.useCallback)(function () {
+    pausedRef.current.resume();
 
-      // only spot the activator if the popup is closed
-      if (_this.props.open) return;
-      var current = _spotlight["default"].getCurrent();
-      var containerNode = getContainerNode(_this.state.containerId);
-      var lastContainerId = (0, _container.getLastContainer)();
-      (0, _dispatcher.off)('keydown', _this.handleKeyDown);
+    // only spot the activator if the popup is closed
+    if (open) return;
+    var current = _spotlight["default"].getCurrent();
+    var containerNode = getContainerNode(containerIdRef.current);
+    var lastContainerId = (0, _container.getLastContainer)();
+    setAddKeyDownListener(false);
 
-      // if there is no currently-spotted control, or it is wrapped by the popup's container, we
-      // know it's safe to change focus
-      if (!current || containerNode && containerNode.contains(current)) {
-        // attempt to set focus to the activator, if available
-        if (!_spotlight["default"].isPaused()) {
-          if (activator) {
-            if (!_spotlight["default"].focus(activator)) {
-              _spotlight["default"].focus();
-            }
-          } else {
-            _spotlight["default"].disableSelector(lastContainerId);
+    // if there is no currently-spotted control, or it is wrapped by the popup's container, we
+    // know it's safe to change focus
+    if (!current || containerNode && containerNode.contains(current)) {
+      // attempt to set focus to the activator, if available
+      if (!_spotlight["default"].isPaused() || !pausedRef.current.isPaused()) {
+        if (activator) {
+          if (!_spotlight["default"].focus(activator)) {
             _spotlight["default"].focus();
-            _spotlight["default"].enableSelector(lastContainerId);
           }
+        } else {
+          _spotlight["default"].disableSelector(lastContainerId);
+          _spotlight["default"].focus();
+          _spotlight["default"].enableSelector(lastContainerId);
         }
       }
-    };
-    _this.spotPopupContent = function () {
-      _this.paused.resume();
+    }
+  }, [activator, open]);
+  var spotPopupContent = (0, _react.useCallback)(function () {
+    pausedRef.current.resume();
 
-      // only spot the activator if the popup is open
-      if (!_this.props.open) return;
-      var containerId = _this.state.containerId;
-      (0, _dispatcher.on)('keydown', _this.handleKeyDown);
-      if (!_spotlight["default"].isPaused() && !_spotlight["default"].focus(containerId)) {
-        var current = _spotlight["default"].getCurrent();
+    // only spot the activator if the popup is open
+    if (!open) return;
+    setAddKeyDownListener(true);
+    if (!_spotlight["default"].isPaused() && !_spotlight["default"].focus(containerIdRef.current)) {
+      var current = _spotlight["default"].getCurrent();
 
-        // In cases where the container contains no spottable controls, or we're in pointer-mode, focus
-        // cannot inherently set the active container or blur the active control, so we must do that
-        // here.
-        if (current) {
-          current.blur();
-        }
-        _spotlight["default"].setActiveContainer(containerId);
+      // In cases where the container contains no spottable controls, or we're in pointer-mode, focus
+      // cannot inherently set the active container or blur the active control, so we must do that
+      // here.
+      if (current) {
+        current.blur();
       }
-    };
-    _this.paused = new _Pause["default"]('Popup');
-    _this.state = {
-      floatLayerOpen: _this.props.open,
-      popupOpen: _this.props.open ? OpenState.OPEN : OpenState.CLOSED,
-      prevOpen: _this.props.open,
-      containerId: _spotlight["default"].add(),
-      activator: null
-    };
-    checkScrimNone(_this.props);
-    return _this;
-  }
-
-  // Spot the content after it's mounted.
-  _inherits(Popup, _Component);
-  return _createClass(Popup, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      if (this.props.open) {
-        // If the popup is open on mount, we need to pause spotlight so nothing steals focus
-        // while the popup is rendering.
-        this.paused.pause();
-        if (getContainerNode(this.state.containerId)) {
-          this.spotPopupContent();
-        }
+      _spotlight["default"].setActiveContainer(containerIdRef.current);
+    }
+  }, [open]);
+  var handleFloatingLayerOpen = (0, _react.useCallback)(function () {
+    if (!noAnimation && popupOpen !== OpenState.OPEN) {
+      setPopupOpen(OpenState.OPENING);
+    } else if (popupOpen === OpenState.OPEN && open) {
+      spotPopupContent();
+    }
+  }, [noAnimation, open, popupOpen, spotPopupContent]);
+  var handleDismiss = (0, _react.useCallback)(function (ev) {
+    (0, _handle.forwardCustom)('onClose', function () {
+      return {
+        detail: ev === null || ev === void 0 ? void 0 : ev.detail
+      };
+    })(null, componentProps);
+  }, [componentProps]);
+  var handlePopupHide = (0, _react.useCallback)(function (ev) {
+    forwardHide(ev, componentProps);
+    setFloatLayerOpen(function () {
+      if (!ev.currentTarget || ev.currentTarget.getAttribute('data-spotlight-id') === containerIdRef.current) {
+        spotActivator();
       }
+      setActivator(null);
+      return false;
+    });
+  }, [componentProps, spotActivator]);
+  var handlePopupShow = (0, _react.useCallback)(function (ev) {
+    forwardShow(ev, componentProps);
+    setPopupOpen(OpenState.OPEN);
+    if (!ev.currentTarget || ev.currentTarget.getAttribute('data-spotlight-id') === containerIdRef.current) {
+      spotPopupContent();
     }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps, prevState) {
-      if (this.props.open !== prevProps.open) {
-        if (!this.props.noAnimation) {
-          if (!this.props.open && this.state.popupOpen === OpenState.CLOSED) {
-            // If the popup is supposed to be closed (!this.props.open) and is actually
-            // fully closed (OpenState.CLOSED), we must resume spotlight navigation. This
-            // can occur when quickly toggling a Popup open and closed.
-            this.paused.resume();
-          } else {
-            // Otherwise, we pause spotlight so it is locked until the popup is ready
-            this.paused.pause();
-          }
-        } else if (this.props.open) {
-          forwardShow(null, this.props);
-          this.spotPopupContent();
-        } else if (prevProps.open) {
-          forwardHide(null, this.props);
-          this.spotActivator(prevState.activator);
+  }, [componentProps, spotPopupContent]);
+  (0, _react.useLayoutEffect)(function () {
+    getDerivedStateFromProps();
+  }, [getDerivedStateFromProps]);
+  (0, _react.useEffect)(function () {
+    if (open !== prevOpen) {
+      if (!noAnimation) {
+        if (!open && (popupOpen === OpenState.OPENING || popupOpen === OpenState.OPEN)) {
+          // If the popup is supposed to be closed (!open) and is actually not fully
+          // closed (OpenState.OPENING or OpenState.OPEN), we must resume spotlight navigation. This
+          // can occur when quickly toggling a Popup open and closed.
+          pausedRef.current.resume();
+        } else {
+          // Otherwise, we pause spotlight so it is locked until the popup is ready
+          pausedRef.current.pause();
         }
+      } else if (open) {
+        forwardShow(null, componentProps);
+        spotPopupContent();
+      } else if (prevOpen) {
+        forwardHide(null, componentProps);
+        spotActivator();
       }
-      checkScrimNone(this.props);
     }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      if (this.props.open) {
-        (0, _dispatcher.off)('keydown', this.handleKeyDown);
+    checkScrimNone(componentProps);
+  }, [componentProps, noAnimation, open, popupOpen, prevOpen, spotActivator, spotPopupContent]);
+  (0, _react.useEffect)(function () {
+    checkScrimNone(componentProps);
+
+    // Spot the content after it's mounted.
+    if (open) {
+      // If the popup is open on mount, we need to pause spotlight so nothing steals focus
+      // while the popup is rendering.
+      pausedRef.current.pause();
+      if (getContainerNode(containerIdRef.current)) {
+        spotPopupContent();
       }
-      _spotlight["default"].remove(this.state.containerId);
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props2 = this.props,
-        noAutoDismiss = _this$props2.noAutoDismiss,
-        scrimType = _this$props2.scrimType,
-        rest = _objectWithoutProperties(_this$props2, _excluded2);
-      delete rest.no5WayClose;
-      delete rest.onClose;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FloatingLayer["default"], {
-        noAutoDismiss: noAutoDismiss,
-        open: this.state.floatLayerOpen,
-        onOpen: this.handleFloatingLayerOpen,
-        onDismiss: this.handleDismiss,
-        scrimType: scrimType,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(SkinnedPopupBase, _objectSpread(_objectSpread({}, rest), {}, {
-          "data-webos-voice-exclusive": true,
-          onHide: this.handlePopupHide,
-          onShow: this.handlePopupShow,
-          open: this.state.popupOpen >= OpenState.OPENING,
-          spotlightId: this.state.containerId
-        }))
-      });
     }
-  }], [{
-    key: "getDerivedStateFromProps",
-    value: function getDerivedStateFromProps(props, state) {
-      if (props.open !== state.prevOpen) {
-        if (props.open) {
-          return {
-            popupOpen: props.noAnimation || state.floatLayerOpen ? OpenState.OPEN : OpenState.CLOSED,
-            floatLayerOpen: true,
-            activator: _spotlight["default"].getCurrent(),
-            prevOpen: props.open
-          };
-        } else {
-          // Disables the spotlight conatiner of popup when `noAnimation` set
-          if (props.noAnimation) {
-            var node = getContainerNode(state.containerId);
-            if (node) {
-              node.dataset['spotlightContainerDisabled'] = true;
-            }
-          }
-          return {
-            popupOpen: OpenState.CLOSED,
-            floatLayerOpen: state.popupOpen === OpenState.OPEN ? !props.noAnimation : false,
-            activator: props.noAnimation ? null : state.activator,
-            prevOpen: props.open
-          };
-        }
+    return function () {
+      if (open) {
+        (0, _dispatcher.off)('keydown', handleKeyDown);
       }
-      return null;
+      _spotlight["default"].remove(containerIdRef.current);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  (0, _react.useEffect)(function () {
+    if (addKeyDownListener) {
+      (0, _dispatcher.on)('keydown', handleKeyDown);
+    } else {
+      (0, _dispatcher.off)('keydown', handleKeyDown);
     }
-  }]);
-}(_react.Component);
-Popup.propTypes = /** @lends limestone/Popup.Popup.prototype */{
+    return function () {
+      (0, _dispatcher.off)('keydown', handleKeyDown);
+    };
+  }, [addKeyDownListener, handleKeyDown]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FloatingLayer["default"], {
+    noAutoDismiss: noAutoDismiss,
+    open: floatLayerOpen,
+    onOpen: handleFloatingLayerOpen,
+    onDismiss: handleDismiss,
+    scrimType: scrimType,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(SkinnedPopupBase, _objectSpread(_objectSpread({}, rest), {}, {
+      "data-webos-voice-exclusive": true,
+      onHide: handlePopupHide,
+      onShow: handlePopupShow,
+      open: popupOpen >= OpenState.OPENING,
+      spotlightId: containerIdRef.current
+    }))
+  });
+};
+_Popup.displayName = 'Popup';
+_Popup.propTypes = /** @lends limestone/Popup.Popup.prototype */{
   /**
    * Prevents closing the popup via 5-way navigation out of the content.
    *
@@ -679,12 +690,4 @@ Popup.propTypes = /** @lends limestone/Popup.Popup.prototype */{
    */
   spotlightRestrict: _propTypes["default"].oneOf(['self-first', 'self-only'])
 };
-Popup.defaultProps = {
-  noAnimation: false,
-  noAutoDismiss: false,
-  open: false,
-  position: 'bottom',
-  scrimType: 'translucent',
-  spotlightRestrict: 'self-only'
-};
-var _default = exports["default"] = Popup;
+var _default = exports["default"] = _Popup;