@zohodesk/components 1.4.4 → 1.4.6

package/lib/Modal/Modal.js

@@ -9,12 +9,14 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _reactDom = _interopRequireDefault(require("react-dom"));
-
 var _defaultProps = require("./props/defaultProps");
 
 var _propTypes = require("./props/propTypes");
 
+var _Portal = _interopRequireDefault(require("./Portal/Portal"));
+
+var _Config = require("../Provider/Config");
+
 var _AppContainerModule = _interopRequireDefault(require("../AppContainer/AppContainer.module.css"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -59,10 +61,13 @@ var Modal = /*#__PURE__*/function (_React$Component) {
     _this.handleAddPortalId = _this.handleAddPortalId.bind(_assertThisInitialized(_this));
     _this.handleRemovePortalId = _this.handleRemovePortalId.bind(_assertThisInitialized(_this));
     _this.handleInsertPortalDiv = _this.handleInsertPortalDiv.bind(_assertThisInitialized(_this));
-    _this.getPortalDiv = _this.getPortalDiv.bind(_assertThisInitialized(_this));
+    _this.setPortalDiv = _this.setPortalDiv.bind(_assertThisInitialized(_this));
+    _this.getRootElement = _this.getRootElement.bind(_assertThisInitialized(_this));
+    _this.getPortalPrefix = _this.getPortalPrefix.bind(_assertThisInitialized(_this));
     _this.state = {
       isMounted: false
     };
+    _this.portalPrefix = _this.getPortalPrefix();
     _this.portalId = props.portalId;
     _this.setRef = _this.setRef.bind(_assertThisInitialized(_this));
     _this.ref = null; // this.portalDiv = document.createDocumentFragment();
@@ -81,28 +86,46 @@ var Modal = /*#__PURE__*/function (_React$Component) {
       }
     }
   }, {
-    key: "getPortalDiv",
-    value: function getPortalDiv() {
-      this.modalRoot = this.props.portalId ? document.querySelector("[data-portal=".concat(this.props.portalId, "]")) : '';
+    key: "getRootElement",
+    value: function getRootElement() {
+      var getRootElement = (0, _Config.getLibraryConfig)('getRootElement');
+
+      if (getRootElement && typeof getRootElement === 'function') {
+        var parent = getRootElement();
+
+        if (parent) {
+          return parent;
+        }
+      }
+
+      return null;
+    }
+  }, {
+    key: "getPortalPrefix",
+    value: function getPortalPrefix() {
+      var portalPrefix = (0, _Config.getLibraryConfig)('portalPrefix');
+      return portalPrefix !== '' ? portalPrefix : '';
+    }
+  }, {
+    key: "setPortalDiv",
+    value: function setPortalDiv() {
+      var modalRoot = this.props.portalId ? document.querySelector("[data-portal=".concat(this.portalPrefix).concat(this.props.portalId, "]")) : '';
 
-      if (!this.modalRoot) {
+      if (!modalRoot) {
         this.portalId = this.handleAddPortalId();
         this.newModalRoot = document.createElement('div');
         this.newModalRoot.className = _AppContainerModule["default"].container;
-        this.newModalRoot.setAttribute('data-portal', this.portalId);
+        this.newModalRoot.setAttribute('data-portal', "".concat(this.portalPrefix).concat(this.portalId));
         this.containerDiv && this.containerDiv.appendChild(this.newModalRoot);
-        this.modalRoot = this.newModalRoot;
       }
-
-      return this.modalRoot;
     }
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
       var _this2 = this;
 
-      this.containerDiv = document.getElementsByTagName('desk')[0] ? document.getElementsByTagName('desk')[0] : document.getElementsByTagName('body')[0];
-      this.portalDiv = this.getPortalDiv();
+      this.containerDiv = this.getRootElement() || document.getElementsByTagName('desk')[0] || document.getElementsByTagName('body')[0];
+      this.setPortalDiv();
       this.setState({
         isMounted: true
       }, function () {
@@ -112,7 +135,6 @@ var Modal = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      //this.modalRoot && this.modalRoot.removeChild(this.portalDiv);
       if (this.newModalRoot) {
         this.containerDiv && this.containerDiv.removeChild(this.newModalRoot);
         this.handleRemovePortalId();
@@ -185,9 +207,11 @@ var Modal = /*#__PURE__*/function (_React$Component) {
 
       if (isMounted) {
         if (Element) {
-          return /*#__PURE__*/_reactDom["default"].createPortal( /*#__PURE__*/_react["default"].createElement(Element, _extends({
+          return /*#__PURE__*/_react["default"].createElement(_Portal["default"], {
+            portalId: "".concat(this.portalPrefix).concat(this.portalId)
+          }, /*#__PURE__*/_react["default"].createElement(Element, _extends({
             ref: this.setRef
-          }, elementProps)), this.portalDiv);
+          }, elementProps)));
         }
 
         return null;

package/lib/Modal/Portal/Portal.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = Portal;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _Portal = _interopRequireDefault(require("@zohodesk/dotkit/es/react/components/Portal/Portal"));
+
+var _Config = require("../../Provider/Config");
+
+var _defaultProps = require("./props/defaultProps");
+
+var _propTypes = require("./props/propTypes");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function Portal(_ref) {
+  var children = _ref.children,
+      portalId = _ref.portalId;
+  var portalPrefix = (0, _Config.getLibraryConfig)("portalPrefix");
+
+  var getPortalContainer = function getPortalContainer() {
+    var getPortalContainer = (0, _Config.getLibraryConfig)('getPortalContainer');
+
+    if (getPortalContainer && typeof getPortalContainer === 'function') {
+      var portal = getPortalContainer();
+
+      if (portal) {
+        return portal;
+      }
+    }
+
+    return null;
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_Portal["default"], {
+    portalId: "".concat(portalPrefix ? "".concat(portalPrefix) : '').concat(portalId),
+    getFallbackElement: getPortalContainer
+  }, children);
+}
+
+Portal.propTypes = _propTypes.propTypes;
+Portal.defaultProps = _defaultProps.defaultProps;

package/lib/Modal/Portal/__tests__/Portal.spec.js

@@ -0,0 +1,37 @@
+"use strict";
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _Portal = _interopRequireDefault(require("../Portal"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+beforeEach(function () {
+  (0, _react2.cleanup)();
+});
+describe('Portal', function () {
+  test('rendering the defult props', function () {
+    var customPortalContainer = document.createElement('div');
+    customPortalContainer.setAttribute('data-portal', 'portal1');
+    document.body.appendChild(customPortalContainer);
+
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Portal["default"], null, /*#__PURE__*/_react["default"].createElement("div", null, "Portal Div Check"))),
+        baseElement = _render.baseElement;
+
+    expect(baseElement).toMatchSnapshot();
+  });
+  test('renders with portalId prop', function () {
+    var customPortalContainer = document.createElement('div');
+    customPortalContainer.setAttribute('data-portal', 'customPortal');
+    document.body.appendChild(customPortalContainer);
+
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Portal["default"], {
+      portalId: "customPortal"
+    }, /*#__PURE__*/_react["default"].createElement("div", null, "Portal Content Check"))),
+        baseElement = _render2.baseElement;
+
+    expect(baseElement).toMatchSnapshot();
+  });
+});

package/lib/Modal/Portal/__tests__/__snapshots__/Portal.spec.js.snap

@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Portal rendering the defult props 1`] = `
+<body>
+  <div
+    data-portal="portal1"
+  >
+    <div>
+      Portal Div Check
+    </div>
+  </div>
+  <div />
+</body>
+`;
+
+exports[`Portal renders with portalId prop 1`] = `
+<body>
+  <div
+    data-portal="portal1"
+  />
+  <div
+    data-portal="customPortal"
+  >
+    <div>
+      Portal Content Check
+    </div>
+  </div>
+  <div />
+</body>
+`;

package/lib/Modal/Portal/props/defaultProps.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.defaultProps = void 0;
+var defaultProps = {
+  portalId: 'portal1'
+};
+exports.defaultProps = defaultProps;

package/lib/Modal/Portal/props/propTypes.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.propTypes = void 0;
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var propTypes = {
+  children: _propTypes["default"].node,
+  portalId: _propTypes["default"].string
+};
+exports.propTypes = propTypes;