@elastic/eui 62.0.2 → 62.0.3

package/optimize/lib/components/portal/portal.js

@@ -7,7 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.insertPositions = exports.INSERT_POSITIONS = exports.EuiPortal = void 0;
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _react = require("react");
 
@@ -15,20 +27,10 @@ var _reactDom = require("react-dom");
 
 var _common = require("../common");
 
-var _services = require("../../services");
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-/**
- * NOTE: We can't test this component because Enzyme doesn't support rendering
- * into portals.
- */
 var insertPositions = {
   after: 'afterend',
   before: 'beforebegin'
@@ -37,47 +39,66 @@ exports.insertPositions = insertPositions;
 var INSERT_POSITIONS = (0, _common.keysOf)(insertPositions);
 exports.INSERT_POSITIONS = INSERT_POSITIONS;
 
-var EuiPortal = function EuiPortal(_ref) {
-  var insert = _ref.insert,
-      portalRef = _ref.portalRef,
-      children = _ref.children;
+var EuiPortal = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(EuiPortal, _Component);
 
-  var _useState = (0, _react.useState)(null),
-      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      portalNode = _useState2[0],
-      setPortalNode = _useState2[1]; // pull `sibling` and `position` out of insert in case their wrapping object is recreated every render
+  var _super = _createSuper(EuiPortal);
 
+  function EuiPortal(props) {
+    var _this;
 
-  var _ref2 = insert || {},
-      sibling = _ref2.sibling,
-      position = _ref2.position;
+    (0, _classCallCheck2.default)(this, EuiPortal);
+    _this = _super.call(this, props);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "portalNode", null);
+    if (typeof window === 'undefined') return (0, _possibleConstructorReturn2.default)(_this); // Prevent SSR errors
 
-  (0, _react.useEffect)(function () {
-    var portalNode = document.createElement('div');
-    portalNode.dataset.euiportal = 'true';
-    setPortalNode(portalNode);
+    var insert = _this.props.insert;
+    _this.portalNode = document.createElement('div');
+    _this.portalNode.dataset.euiportal = 'true';
 
-    if (sibling == null || position == null) {
+    if (insert == null) {
       // no insertion defined, append to body
-      document.body.appendChild(portalNode);
+      document.body.appendChild(_this.portalNode);
     } else {
       // inserting before or after an element
-      sibling.insertAdjacentElement(insertPositions[position], portalNode);
+      var sibling = insert.sibling,
+          position = insert.position;
+      sibling.insertAdjacentElement(insertPositions[position], _this.portalNode);
     }
 
-    return function () {
-      if (portalNode && portalNode.parentNode) {
-        portalNode.parentNode.removeChild(portalNode);
+    return _this;
+  }
+
+  (0, _createClass2.default)(EuiPortal, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.updatePortalRef(this.portalNode);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      var _this$portalNode;
+
+      if ((_this$portalNode = this.portalNode) !== null && _this$portalNode !== void 0 && _this$portalNode.parentNode) {
+        this.portalNode.parentNode.removeChild(this.portalNode);
       }
-    };
-  }, [sibling, position]);
-  (0, _services.useUpdateEffect)(function () {
-    portalRef === null || portalRef === void 0 ? void 0 : portalRef(portalNode);
-    return function () {
-      portalRef === null || portalRef === void 0 ? void 0 : portalRef(null);
-    };
-  }, [portalNode, portalRef]);
-  return portalNode == null ? null : /*#__PURE__*/(0, _reactDom.createPortal)(children, portalNode);
-};
+
+      this.updatePortalRef(null);
+    }
+  }, {
+    key: "updatePortalRef",
+    value: function updatePortalRef(ref) {
+      if (this.props.portalRef) {
+        this.props.portalRef(ref);
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      return this.portalNode ? /*#__PURE__*/(0, _reactDom.createPortal)(this.props.children, this.portalNode) : null;
+    }
+  }]);
+  return EuiPortal;
+}(_react.Component);
 
 exports.EuiPortal = EuiPortal;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elastic/eui",
   "description": "Elastic UI Component Library",
-  "version": "62.0.2",
+  "version": "62.0.3",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "lib",
   "module": "es",

package/test-env/components/popover/wrapping_popover.js

@@ -11,10 +11,22 @@ exports.EuiWrappingPopover = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -31,51 +43,79 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 /**
  * Injects the EuiPopover next to the button via EuiPortal
  * then the button element is moved into the popover dom.
  * On unmount, the button is moved back to its original location.
  */
-var EuiWrappingPopover = function EuiWrappingPopover(_ref) {
-  var button = _ref.button,
-      rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-
-  var _useState = (0, _react.useState)(null),
-      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      anchor = _useState2[0],
-      setAnchor = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(null),
-      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      portal = _useState4[0],
-      setPortal = _useState4[1];
-
-  (0, _react.useEffect)(function () {
-    if (anchor) {
-      // move the button into the popover DOM
-      anchor.insertAdjacentElement('beforebegin', button);
+var EuiWrappingPopover = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(EuiWrappingPopover, _Component);
+
+  var _super = _createSuper(EuiWrappingPopover);
+
+  function EuiWrappingPopover() {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, EuiWrappingPopover);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
 
-    return function () {
-      if (portal) {
-        // move the button back out of the popover DOM
-        portal.insertAdjacentElement('beforebegin', button);
+    _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "portal", null);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "anchor", null);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setPortalRef", function (node) {
+      _this.portal = node;
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setAnchorRef", function (node) {
+      _this.anchor = node;
+    });
+    return _this;
+  }
+
+  (0, _createClass2.default)(EuiWrappingPopover, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      if (this.anchor) {
+        this.anchor.insertAdjacentElement('beforebegin', this.props.button);
+      }
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if (this.props.button.parentNode) {
+        if (this.portal) {
+          this.portal.insertAdjacentElement('beforebegin', this.props.button);
+        }
       }
-    };
-  }, [anchor, button, portal]);
-  return (0, _react2.jsx)(_portal.EuiPortal, {
-    portalRef: setPortal,
-    insert: {
-      sibling: button,
-      position: 'after'
     }
-  }, (0, _react2.jsx)(_popover.EuiPopover, (0, _extends2.default)({}, rest, {
-    button: (0, _react2.jsx)("div", {
-      ref: setAnchor,
-      className: "euiWrappingPopover__anchor"
-    })
-  })));
-};
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props = this.props,
+          button = _this$props.button,
+          rest = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
+      return (0, _react2.jsx)(_portal.EuiPortal, {
+        portalRef: this.setPortalRef,
+        insert: {
+          sibling: this.props.button,
+          position: 'after'
+        }
+      }, (0, _react2.jsx)(_popover.EuiPopover, (0, _extends2.default)({}, rest, {
+        button: (0, _react2.jsx)("div", {
+          ref: this.setAnchorRef,
+          className: "euiWrappingPopover__anchor"
+        })
+      })));
+    }
+  }]);
+  return EuiWrappingPopover;
+}(_react.Component);
 
 exports.EuiWrappingPopover = EuiWrappingPopover;
 EuiWrappingPopover.propTypes = {

package/test-env/components/portal/portal.js

@@ -7,28 +7,32 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.insertPositions = exports.INSERT_POSITIONS = exports.EuiPortal = void 0;
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _react = require("react");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _reactDom = require("react-dom");
 
 var _common = require("../common");
 
-var _services = require("../../services");
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-/**
- * NOTE: We can't test this component because Enzyme doesn't support rendering
- * into portals.
- */
 var insertPositions = {
   after: 'afterend',
   before: 'beforebegin'
@@ -37,47 +41,77 @@ exports.insertPositions = insertPositions;
 var INSERT_POSITIONS = (0, _common.keysOf)(insertPositions);
 exports.INSERT_POSITIONS = INSERT_POSITIONS;
 
-var EuiPortal = function EuiPortal(_ref) {
-  var insert = _ref.insert,
-      portalRef = _ref.portalRef,
-      children = _ref.children;
+var EuiPortal = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(EuiPortal, _Component);
 
-  var _useState = (0, _react.useState)(null),
-      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      portalNode = _useState2[0],
-      setPortalNode = _useState2[1]; // pull `sibling` and `position` out of insert in case their wrapping object is recreated every render
+  var _super = _createSuper(EuiPortal);
 
+  function EuiPortal(props) {
+    var _this;
 
-  var _ref2 = insert || {},
-      sibling = _ref2.sibling,
-      position = _ref2.position;
+    (0, _classCallCheck2.default)(this, EuiPortal);
+    _this = _super.call(this, props);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "portalNode", null);
+    if (typeof window === 'undefined') return (0, _possibleConstructorReturn2.default)(_this); // Prevent SSR errors
 
-  (0, _react.useEffect)(function () {
-    var portalNode = document.createElement('div');
-    portalNode.dataset.euiportal = 'true';
-    setPortalNode(portalNode);
+    var insert = _this.props.insert;
+    _this.portalNode = document.createElement('div');
+    _this.portalNode.dataset.euiportal = 'true';
 
-    if (sibling == null || position == null) {
+    if (insert == null) {
       // no insertion defined, append to body
-      document.body.appendChild(portalNode);
+      document.body.appendChild(_this.portalNode);
     } else {
       // inserting before or after an element
-      sibling.insertAdjacentElement(insertPositions[position], portalNode);
+      var sibling = insert.sibling,
+          position = insert.position;
+      sibling.insertAdjacentElement(insertPositions[position], _this.portalNode);
     }
 
-    return function () {
-      if (portalNode && portalNode.parentNode) {
-        portalNode.parentNode.removeChild(portalNode);
+    return _this;
+  }
+
+  (0, _createClass2.default)(EuiPortal, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.updatePortalRef(this.portalNode);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      var _this$portalNode;
+
+      if ((_this$portalNode = this.portalNode) !== null && _this$portalNode !== void 0 && _this$portalNode.parentNode) {
+        this.portalNode.parentNode.removeChild(this.portalNode);
       }
-    };
-  }, [sibling, position]);
-  (0, _services.useUpdateEffect)(function () {
-    portalRef === null || portalRef === void 0 ? void 0 : portalRef(portalNode);
-    return function () {
-      portalRef === null || portalRef === void 0 ? void 0 : portalRef(null);
-    };
-  }, [portalNode, portalRef]);
-  return portalNode == null ? null : /*#__PURE__*/(0, _reactDom.createPortal)(children, portalNode);
-};
 
-exports.EuiPortal = EuiPortal;
+      this.updatePortalRef(null);
+    }
+  }, {
+    key: "updatePortalRef",
+    value: function updatePortalRef(ref) {
+      if (this.props.portalRef) {
+        this.props.portalRef(ref);
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      return this.portalNode ? /*#__PURE__*/(0, _reactDom.createPortal)(this.props.children, this.portalNode) : null;
+    }
+  }]);
+  return EuiPortal;
+}(_react.Component);
+
+exports.EuiPortal = EuiPortal;
+EuiPortal.propTypes = {
+  /**
+     * ReactNode to render as this component's content
+     */
+  children: _propTypes.default.node.isRequired,
+  insert: _propTypes.default.shape({
+    sibling: _propTypes.default.any.isRequired,
+    position: _propTypes.default.oneOf(["before", "after"]).isRequired
+  }),
+  portalRef: _propTypes.default.func
+};