@dnb/eufemia 9.17.1 → 9.17.2

package/esm/components/modal/ModalContent.js

@@ -22,8 +22,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import "core-js/modules/es.array.filter.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/web.dom-collections.for-each.js";
-import "core-js/modules/es.regexp.exec.js";
 import "core-js/modules/es.parse-float.js";
+import "core-js/modules/es.regexp.exec.js";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -57,6 +57,31 @@ var ModalContent = function (_React$PureComponent) {
       triggeredByEvent: null
     });
 
+    _defineProperty(_assertThisInitialized(_this), "lockBody", function () {
+      var modalRoots = getListOfModalRoots();
+      var firstLevel = modalRoots[0];
+
+      if (firstLevel === _assertThisInitialized(_this)) {
+        _this._ii = new InteractionInvalidation();
+
+        _this._ii.setBypassSelector(['.dnb-modal__content *', "#dnb-modal-".concat(_this.props.root_id || 'root', " *")].filter(Boolean));
+
+        _this._ii.activate();
+      } else {
+        modalRoots.forEach(function (modal) {
+          if (modal !== _assertThisInitialized(_this) && typeof modal._iiLocal === 'undefined' && typeof modal._contentRef !== 'undefined') {
+            modal._iiLocal = new InteractionInvalidation();
+
+            modal._iiLocal.activate(modal._contentRef.current);
+          }
+        });
+      }
+
+      if (typeof document !== 'undefined') {
+        document.addEventListener('keydown', _this.onKeyDownHandler);
+      }
+    });
+
     _defineProperty(_assertThisInitialized(_this), "_androidFocusHelper", function () {
       clearTimeout(_this._androidFocusTimeout);
       _this._androidFocusTimeout = setTimeout(function () {
@@ -67,7 +92,7 @@ var ModalContent = function (_React$PureComponent) {
             document.activeElement.scrollIntoView();
           }
         } catch (e) {}
-      }, 100);
+      }, parseFloat(_this.props.animation_duration) / 2);
     });
 
     _defineProperty(_assertThisInitialized(_this), "preventClick", function (e) {
@@ -122,8 +147,6 @@ var ModalContent = function (_React$PureComponent) {
   _createClass(ModalContent, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this2 = this;
-
       this.addToIndex();
       this.removeScrollPossibility();
       this.setFocus();
@@ -136,9 +159,7 @@ var ModalContent = function (_React$PureComponent) {
       if (isTrue(this.props.no_animation) || process.env.NODE_ENV === 'test') {
         this.lockBody();
       } else {
-        this._lockTimeout = setTimeout(function () {
-          _this2.lockBody();
-        }, 500);
+        this._lockTimeout = setTimeout(this.lockBody, parseFloat(this.props.animation_duration) * 1.2);
       }
     }
   }, {
@@ -148,34 +169,6 @@ var ModalContent = function (_React$PureComponent) {
       clearTimeout(this._lockTimeout);
       this.removeLocks();
     }
-  }, {
-    key: "lockBody",
-    value: function lockBody() {
-      var _this3 = this;
-
-      var modalRoots = getListOfModalRoots();
-      var firstLevel = modalRoots[0];
-
-      if (firstLevel === this) {
-        this._ii = new InteractionInvalidation();
-
-        this._ii.setBypassSelector(['.dnb-modal__content *', "#dnb-modal-".concat(this.props.root_id || 'root', " *")].filter(Boolean));
-
-        this._ii.activate();
-      } else {
-        modalRoots.forEach(function (modal) {
-          if (modal !== _this3 && typeof modal._iiLocal === 'undefined' && typeof modal._contentRef !== 'undefined') {
-            modal._iiLocal = new InteractionInvalidation();
-
-            modal._iiLocal.activate(modal._contentRef.current);
-          }
-        });
-      }
-
-      if (typeof document !== 'undefined') {
-        document.addEventListener('keydown', this.onKeyDownHandler);
-      }
-    }
   }, {
     key: "removeLocks",
     value: function removeLocks() {
@@ -248,7 +241,7 @@ var ModalContent = function (_React$PureComponent) {
   }, {
     key: "removeFromIndex",
     value: function removeFromIndex() {
-      var _this4 = this;
+      var _this2 = this;
 
       if (typeof window !== 'undefined') {
         try {
@@ -257,7 +250,7 @@ var ModalContent = function (_React$PureComponent) {
           }
 
           window.__modalStack = window.__modalStack.filter(function (cur) {
-            return cur !== _this4;
+            return cur !== _this2;
           });
         } catch (e) {
           warn(e);
@@ -312,7 +305,7 @@ var ModalContent = function (_React$PureComponent) {
     key: "closeModal",
     value: function closeModal(event, _ref) {
       var _event$persist,
-          _this5 = this;
+          _this3 = this;
 
       var triggeredBy = _ref.triggeredBy,
           params = _objectWithoutProperties(_ref, _excluded);
@@ -322,7 +315,7 @@ var ModalContent = function (_React$PureComponent) {
         triggeredBy: triggeredBy,
         triggeredByEvent: event
       }, function () {
-        _this5.props.closeModal(event, _objectSpread({
+        _this3.props.closeModal(event, _objectSpread({
           triggeredBy: triggeredBy
         }, params));
       });