Merge pull request #17071 from qmonmert/react/17064

[React] Replace react-infinite-scroller by react-infinite-scroll-comp…
jhipster · Nov 22, 2021 · ea9ac6a · ea9ac6a
2 parents c324bb7 + 9d174ff
commit ea9ac6a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/generators/client/files-react.js b/generators/client/files-react.js
@@ -31,7 +31,6 @@ const files = {
   common: [
     {
       templates: [
-        '.npmrc',
         'package.json',
         '.eslintrc.json',
         'tsconfig.json',
@@ -347,6 +346,9 @@ function cleanup() {
   if (this.isJhipsterVersionLessThan('7.4.0') && this.enableI18nRTL) {
     this.removeFile(`${CLIENT_MAIN_SRC_DIR}content/scss/rtl.scss`);
   }
+  if (this.isJhipsterVersionLessThan('7.4.1')) {
+    this.removeFile('.npmrc');
+  }
 }
 
 function writeFiles() {

diff --git a/generators/client/templates/react/.npmrc.ejs b/generators/client/templates/react/.npmrc.ejs
diff --git a/generators/client/templates/react/package.json b/generators/client/templates/react/package.json
@@ -63,7 +63,7 @@
     "mini-css-extract-plugin": "2.4.5",
     "postcss-loader": "6.2.0",
     "postcss-rtlcss": "3.5.0",
-    "react-infinite-scroller": "1.2.4",
+    "react-infinite-scroll-component": "6.1.0",
     "redux-mock-store": "1.5.4",
     "rimraf": "3.0.2",
     "sass": "1.43.4",

diff --git a/generators/client/templates/react/package.json.ejs b/generators/client/templates/react/package.json.ejs
@@ -134,7 +134,7 @@
 <%_ if (protractorTests) { _%>
     "protractor": "7.0.0",
 <%_ } _%>
-    "react-infinite-scroller": "<%= dependabotPackageJson.devDependencies['react-infinite-scroller'] %>",
+    "react-infinite-scroll-component": "<%= dependabotPackageJson.devDependencies['react-infinite-scroll-component'] %>",
     "redux-mock-store": "<%= dependabotPackageJson.devDependencies['redux-mock-store'] %>",
     "rimraf": "<%= dependabotPackageJson.devDependencies['rimraf'] %>",
     "sass": "<%= dependabotPackageJson.devDependencies['sass'] %>",

diff --git a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs
@@ -18,7 +18,7 @@
 -%>
 import React, { useState, useEffect } from 'react';
 <%_ if (paginationInfiniteScroll) { _%>
-import InfiniteScroll from 'react-infinite-scroller';
+import InfiniteScroll from 'react-infinite-scroll-component';
 <%_ } _%>
 import { Link, RouteComponentProps } from 'react-router-dom';
 import { Button, <% if (searchEngine) { %>Input, InputGroup, FormGroup, Form, Row, Col, <% } %>Table } from 'reactstrap';
@@ -324,12 +324,10 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
 <%_ } _%>
       <div className="table-responsive">
 <%_ if (paginationInfiniteScroll) { _%>
-        <InfiniteScroll pageStart={paginationState.activePage}
-                        loadMore={handleLoadMore}
+        <InfiniteScroll dataLength={<%= entityInstance %>List ? <%= entityInstance %>List.length : 0} 
+                        next={handleLoadMore}
                         hasMore={paginationState.activePage - 1 < links.next}
-                        loader={<div className="loader">Loading ...</div>}
-                        threshold={0}
-                        initialLoad={false}>
+                        loader={<div className="loader">Loading ...</div>}>
 <%_ } _%>
         {
           <%= entityInstance %>List && <%= entityInstance %>List.length > 0 ?(

diff --git a/test/__snapshots__/app.spec.js.snap b/test/__snapshots__/app.spec.js.snap
@@ -9875,9 +9875,6 @@ Object {
   ".mvn/wrapper/maven-wrapper.properties": Object {
     "stateCleared": "modified",
   },
-  ".npmrc": Object {
-    "stateCleared": "modified",
-  },
   ".prettierignore": Object {
     "stateCleared": "modified",
   },