@dnb/eufemia 9.15.2 → 9.16.3

package/cjs/components/pagination/PaginationProvider.js

@@ -10,8 +10,6 @@ require("core-js/modules/es.symbol.js");
 
 require("core-js/modules/es.symbol.description.js");
 
-require("core-js/modules/es.object.to-string.js");
-
 require("core-js/modules/es.symbol.iterator.js");
 
 require("core-js/modules/es.array.iterator.js");
@@ -26,6 +24,8 @@ require("core-js/modules/es.array.slice.js");
 
 require("core-js/modules/es.function.name.js");
 
+require("core-js/modules/es.regexp.exec.js");
+
 require("core-js/modules/es.object.keys.js");
 
 require("core-js/modules/es.array.filter.js");
@@ -43,6 +43,10 @@ require("core-js/modules/es.parse-float.js");
 
 require("core-js/modules/es.array.find.js");
 
+require("core-js/modules/es.object.to-string.js");
+
+require("core-js/modules/es.array.find-index.js");
+
 require("core-js/modules/es.array.concat.js");
 
 require("core-js/modules/web.dom-collections.for-each.js");
@@ -119,7 +123,7 @@ var PaginationProvider = function (_React$PureComponent) {
         newContent = [newContent, content];
       }
 
-      var pageNumber = parseFloat(newContent[0]);
+      var pageNumber = parseFloat(newContent[0]) || 1;
       newContent = newContent[1];
 
       if (typeof newContent === 'function') {
@@ -138,8 +142,7 @@ var PaginationProvider = function (_React$PureComponent) {
 
         if (!itemToPrepare) {
           items = _this.prefillItems(pageNumber, {
-            position: position,
-            skipObserver: true
+            position: position
           });
           itemToPrepare = items.find(function (_ref2) {
             var p = _ref2.pageNumber;
@@ -155,8 +158,7 @@ var PaginationProvider = function (_React$PureComponent) {
 
         _this.setState({
           items: _toConsumableArray(items || _this.state.items),
-          currentPage: pageNumber,
-          _listenForPropChanges: false
+          currentPage: pageNumber
         }, _this.callOnPageUpdate);
       }
     });
@@ -165,8 +167,7 @@ var PaginationProvider = function (_React$PureComponent) {
       clearTimeout(_this.resetContentTimeout);
       _this.resetContentTimeout = setTimeout(function () {
         _this.setState({
-          items: [],
-          _listenForPropChanges: false
+          items: []
         });
       }, 10);
     });
@@ -174,39 +175,29 @@ var PaginationProvider = function (_React$PureComponent) {
     _defineProperty(_assertThisInitialized(_this), "resetInfinity", function () {
       var pageNumber = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _this.state.startupPage;
       var lowerPage = pageNumber;
-      var upperPage = pageNumber;
+      var upperPage = pageNumber + parseFloat(_this.props.startup_count) - 1;
       var currentPage = pageNumber;
-      _this._hasEndedInfinity = true;
 
       _this.setState({
+        items: [],
         hasEndedInfinity: true,
         lowerPage: lowerPage,
         upperPage: upperPage,
-        currentPage: currentPage,
-        _listenForPropChanges: false
+        currentPage: currentPage
       });
 
-      clearTimeout(_this.resetInfinityTimeout);
-      _this.resetInfinityTimeout = setTimeout(function () {
-        _this.startInfinity();
-      }, _this.state.minTime);
+      _this.startInfinity();
     });
 
     _defineProperty(_assertThisInitialized(_this), "startInfinity", function () {
-      _this._hasEndedInfinity = false;
-
       _this.setState({
-        hasEndedInfinity: false,
-        _listenForPropChanges: false
+        hasEndedInfinity: false
       });
     });
 
     _defineProperty(_assertThisInitialized(_this), "endInfinity", function () {
-      _this._hasEndedInfinity = true;
-
       _this.setState({
-        hasEndedInfinity: true,
-        _listenForPropChanges: false
+        hasEndedInfinity: true
       }, function () {
         var pageNumber = _this.state.currentPage + 1;
         (0, _componentHelper.dispatchCustomElementEvent)(_assertThisInitialized(_this), 'on_end', _objectSpread({
@@ -219,8 +210,7 @@ var PaginationProvider = function (_React$PureComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "setItems", function (items, cb) {
       _this.setState({
-        items: items,
-        _listenForPropChanges: false
+        items: items
       }, cb);
     });
 
@@ -229,6 +219,19 @@ var PaginationProvider = function (_React$PureComponent) {
       var items = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _this.state.items;
       var position = props.position || (pageNumber < _this.state.currentPage ? 'before' : 'after');
 
+      if (isNaN(pageNumber)) {
+        pageNumber = 1;
+      }
+
+      var exists = items.findIndex(function (_ref3) {
+        var p = _ref3.pageNumber;
+        return p === pageNumber;
+      }) > -1;
+
+      if (exists) {
+        return items;
+      }
+
       var obj = _objectSpread({
         pageNumber: pageNumber,
         position: position,
@@ -245,9 +248,7 @@ var PaginationProvider = function (_React$PureComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "setStateHandler", function (state, cb) {
-      _this.setState(_objectSpread(_objectSpread({}, state), {}, {
-        _listenForPropChanges: false
-      }), cb);
+      _this.setState(_objectSpread({}, state), cb);
     });
 
     _defineProperty(_assertThisInitialized(_this), "callOnPageUpdate", function () {
@@ -286,13 +287,12 @@ var PaginationProvider = function (_React$PureComponent) {
 
     _this.state = {
       items: [],
-      isLoading: false,
-      _listenForPropChanges: true
+      isLoading: false
     };
 
     if (_props.rerender) {
-      _this.rerender = function (_ref3) {
-        var store = _ref3.current;
+      _this.rerender = function (_ref4) {
+        var store = _ref4.current;
 
         if (store && store.pageNumber > 0) {
           clearTimeout(_this.rerenderTimeout);
@@ -352,9 +352,9 @@ var PaginationProvider = function (_React$PureComponent) {
     }
   }, {
     key: "componentDidUpdate",
-    value: function componentDidUpdate(_ref4) {
-      var current = _ref4.current_page,
-          content = _ref4.internalContent;
+    value: function componentDidUpdate(_ref5) {
+      var current = _ref5.current_page,
+          content = _ref5.internalContent;
       var _this$props2 = this.props,
           internalContent = _this$props2.internalContent,
           current_page = _this$props2.current_page;
@@ -391,8 +391,7 @@ var PaginationProvider = function (_React$PureComponent) {
             setItems: this.setItems,
             prefillItems: this.prefillItems,
             setState: this.setStateHandler,
-            onPageUpdate: this.onPageUpdate,
-            _hasEndedInfinity: this._hasEndedInfinity
+            onPageUpdate: this.onPageUpdate
           }, this.props), this.state)
         })
       }, children);
@@ -400,48 +399,48 @@ var PaginationProvider = function (_React$PureComponent) {
   }], [{
     key: "getDerivedStateFromProps",
     value: function getDerivedStateFromProps(props, state) {
-      if (state._listenForPropChanges) {
-        if (props.page_count !== null) {
-          state.pageCount = parseFloat(props.page_count) || 1;
-        }
+      if (props.page_count !== null) {
+        state.pageCount = parseFloat(props.page_count) || 1;
+      }
 
-        if (props.current_page !== null && typeof state.currentPage === 'undefined') {
-          state.currentPage = parseFloat(props.current_page) || 1;
-        }
+      if (props.current_page !== null && typeof state.currentPage === 'undefined') {
+        state.currentPage = parseFloat(props.current_page) || 1;
+      }
 
-        if (typeof state.startupPage === 'undefined') {
-          state.startupPage = parseFloat(props.startup_page) || parseFloat(props.current_page) || 1;
-        }
+      if (typeof state.startupPage !== 'number') {
+        state.startupPage = parseFloat(props.startup_page) || parseFloat(props.current_page) || state.currentPage;
+      }
 
-        state.parallelLoadCount = parseFloat(props.parallel_load_count) || 1;
-        state.minTime = parseFloat(props.min_wait_time) || 0;
-        state.placeMakerBeforeContent = (0, _componentHelper.isTrue)(props.place_maker_before_content);
+      state.parallelLoadCount = parseFloat(props.parallel_load_count) || 1;
+      state.minTime = parseFloat(props.min_wait_time) || 0;
+      state.placeMakerBeforeContent = (0, _componentHelper.isTrue)(props.place_maker_before_content);
 
-        if (props.useMarkerOnly) {
-          if (!state.lowerPage) {
-            state.lowerPage = state.upperPage = state.startupPage;
-          }
-        }
+      if (props.useMarkerOnly && props.reset_pagination_handler !== null && (0, _componentHelper.isTrue)(props.reset_pagination_handler)) {
+        state.lowerPage = undefined;
+        state.upperPage = undefined;
+      }
 
-        if (props.reset_pagination_handler !== null && (0, _componentHelper.isTrue)(props.reset_pagination_handler)) {
-          if (props.useMarkerOnly) {
-            state.lowerPage = state.upperPage = state.startupPage;
-          }
+      if (props.useMarkerOnly) {
+        if (typeof state.lowerPage === 'undefined' && parseFloat(props.current_page) > 0) {
+          state.lowerPage = state.startupPage;
         }
 
-        if (props.reset_content_handler !== null && (0, _componentHelper.isTrue)(props.reset_content_handler)) {
-          state.items = [];
-          state.pageCount = parseFloat(props.page_count) || 1;
+        if (typeof state.upperPage === 'undefined') {
+          state.upperPage = state.startupPage + parseFloat(props.startup_count) - 1;
         }
+      }
 
-        if (typeof props.items === 'string' && props.items[0] === '[') {
-          state.items = JSON.parse(props.items);
-        } else if (Array.isArray(props.items)) {
-          state.items = props.items;
-        }
+      if (props.reset_content_handler !== null && (0, _componentHelper.isTrue)(props.reset_content_handler)) {
+        state.items = [];
+        state.pageCount = parseFloat(props.page_count) || 1;
+      }
+
+      if (typeof props.items === 'string' && props.items[0] === '[') {
+        state.items = JSON.parse(props.items);
+      } else if (Array.isArray(props.items)) {
+        state.items = props.items;
       }
 
-      state._listenForPropChanges = true;
       return state;
     }
   }]);