Ensure we don't call setState on PromiseCancelledException error

Fixes wojtekmaj#328
alfieqashwa · Jan 5, 2019 · 996f135 · 996f135
1 parent 527820d
commit 996f135
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/Document.jsx b/src/Document.jsx
@@ -120,7 +120,6 @@ export default class Document extends PureComponent {
         return { pdf };
       }, this.onLoadSuccess);
     } catch (error) {
-      this.setState({ pdf: false });
       this.onLoadError(error);
     }
   }
@@ -212,6 +211,8 @@ export default class Document extends PureComponent {
       return;
     }
 
+    this.setState({ pdf: false });
+
     errorOnDev(error);
 
     const { onLoadError } = this.props;

diff --git a/src/Outline.jsx b/src/Outline.jsx
@@ -61,7 +61,6 @@ export class OutlineInternal extends PureComponent {
       const outline = await cancellable.promise;
       this.setState({ outline }, this.onLoadSuccess);
     } catch (error) {
-      this.setState({ outline: false });
       this.onLoadError(error);
     }
   }
@@ -98,6 +97,8 @@ export class OutlineInternal extends PureComponent {
       return;
     }
 
+    this.setState({ outline: false });
+
     errorOnDev(error);
 
     const { onLoadError } = this.props;

diff --git a/src/Page/AnnotationLayer.jsx b/src/Page/AnnotationLayer.jsx
@@ -54,7 +54,6 @@ export class AnnotationLayerInternal extends PureComponent {
       const annotations = await cancellable.promise;
       this.setState({ annotations }, this.onLoadSuccess);
     } catch (error) {
-      this.setState({ annotations: false });
       this.onLoadError(error);
     }
   }
@@ -74,6 +73,8 @@ export class AnnotationLayerInternal extends PureComponent {
       return;
     }
 
+    this.setState({ annotations: false });
+
     errorOnDev(error);
 
     const { onGetAnnotationsError } = this.props;

diff --git a/src/Page/TextLayer.jsx b/src/Page/TextLayer.jsx
@@ -51,7 +51,6 @@ export class TextLayerInternal extends PureComponent {
       const { items: textItems } = await cancellable.promise;
       this.setState({ textItems }, this.onLoadSuccess);
     } catch (error) {
-      this.setState({ textItems: false });
       this.onLoadError(error);
     }
   }
@@ -71,6 +70,8 @@ export class TextLayerInternal extends PureComponent {
       return;
     }
 
+    this.setState({ textItems: false });
+
     errorOnDev(error);
 
     const { onGetTextError } = this.props;