Merge pull request Sub6Resources#915 from tneotia/bugfix/image-reload

erickok · web-flow · commit c8681252f6a9 · 2021-12-08T14:46:58.000+01:00
Image Fixes
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -61,6 +61,8 @@ class HtmlParser extends StatelessWidget {
   final TextSelectionControls? selectionControls;
   final ScrollPhysics? scrollPhysics;
 
+  final Map<String, Size> cachedImageSizes = {};
+
   HtmlParser({
     required this.key,
     required this.htmlData,
diff --git a/lib/image_render.dart b/lib/image_render.dart
@@ -109,48 +109,44 @@ ImageRender networkImageRender({
 }) =>
     (context, attributes, element) {
       final src = mapUrl?.call(_src(attributes)) ?? _src(attributes)!;
-      precacheImage(
-        NetworkImage(
-          src,
-          headers: headers,
-        ),
-        context.buildContext,
-        onError: (exception, StackTrace? stackTrace) {
-          context.parser.onImageError?.call(exception, stackTrace);
-        },
-      );
       Completer<Size> completer = Completer();
-      Image image = Image.network(src, frameBuilder: (ctx, child, frame, _) {
-        if (frame == null) {
+      if (context.parser.cachedImageSizes[src] != null) {
+        completer.complete(context.parser.cachedImageSizes[src]);
+      } else {
+        Image image = Image.network(src, frameBuilder: (ctx, child, frame, _) {
+          if (frame == null) {
+            if (!completer.isCompleted) {
+              completer.completeError("error");
+            }
+            return child;
+          } else {
+            return child;
+          }
+        });
+
+        ImageStreamListener? listener;
+        listener = ImageStreamListener((ImageInfo imageInfo, bool synchronousCall) {
+          var myImage = imageInfo.image;
+          Size size = Size(myImage.width.toDouble(), myImage.height.toDouble());
           if (!completer.isCompleted) {
-            completer.completeError("error");
+            context.parser.cachedImageSizes[src] = size;
+            completer.complete(size);
+            image.image.resolve(ImageConfiguration()).removeListener(listener!);
           }
-          return child;
-        } else {
-          return child;
-        }
-      });
-
-      var listener =
-          ImageStreamListener((ImageInfo image, bool synchronousCall) {
-        var myImage = image.image;
-        Size size = Size(myImage.width.toDouble(), myImage.height.toDouble());
-        if (!completer.isCompleted) {
-          completer.complete(size);
-        }
-      }, onError: (object, stacktrace) {
-        if (!completer.isCompleted) {
-          completer.completeError(object);
-        }
-      });
-
-      image.image.resolve(ImageConfiguration()).addListener(listener);
+        }, onError: (object, stacktrace) {
+          if (!completer.isCompleted) {
+            completer.completeError(object);
+            image.image.resolve(ImageConfiguration()).removeListener(listener!);
+          }
+        });
+
+        image.image.resolve(ImageConfiguration()).addListener(listener);
+      }
+
       return FutureBuilder<Size>(
         future: completer.future,
+        initialData: context.parser.cachedImageSizes[src],
         builder: (BuildContext buildContext, AsyncSnapshot<Size> snapshot) {
-          if (completer.isCompleted) {
-            image.image.resolve(ImageConfiguration()).removeListener(listener);
-          }
           if (snapshot.hasData) {
             return Container(
               constraints: BoxConstraints(
