@@ -162,30 +162,28 @@ export class ResultsApp extends React.Component<
162162
163163 private updateStateWithNewResultsInfo ( resultsInfo : ResultsInfo ) : void {
164164 this . setState ( ( prevState ) => {
165- if ( resultsInfo === null ) {
166- if ( prevState . isExpectingResultsUpdate ) {
167- // Display loading message
168- return {
169- displayedResults : {
170- resultsInfo : null ,
171- results : null ,
172- errorMessage : "Loading results…" ,
173- } ,
174- isExpectingResultsUpdate : prevState . isExpectingResultsUpdate ,
175- nextResultsInfo : resultsInfo ,
176- } ;
177- } else {
178- // No results to display
179- return {
180- displayedResults : {
181- resultsInfo : null ,
182- results : null ,
183- errorMessage : "No results to display" ,
184- } ,
185- isExpectingResultsUpdate : prevState . isExpectingResultsUpdate ,
186- nextResultsInfo : resultsInfo ,
187- } ;
188- }
165+ if ( resultsInfo === null && prevState . isExpectingResultsUpdate ) {
166+ // Display loading message
167+ return {
168+ displayedResults : {
169+ resultsInfo : null ,
170+ results : null ,
171+ errorMessage : "Loading results…" ,
172+ } ,
173+ isExpectingResultsUpdate : prevState . isExpectingResultsUpdate ,
174+ nextResultsInfo : resultsInfo ,
175+ } ;
176+ } else if ( resultsInfo === null ) {
177+ // No results to display
178+ return {
179+ displayedResults : {
180+ resultsInfo : null ,
181+ results : null ,
182+ errorMessage : "No results to display" ,
183+ } ,
184+ isExpectingResultsUpdate : prevState . isExpectingResultsUpdate ,
185+ nextResultsInfo : resultsInfo ,
186+ } ;
189187 }
190188
191189 let results : Results | null = null ;
0 commit comments