Merge pull request Sub6Resources#1040 from vrtdev/bugfix/1033-video-size-crash

erickok · web-flow · commit 6ae17355347f · 2022-04-14T13:54:15.000+02:00
Don't crash when video ir iframe uses unsupported height/width
diff --git a/packages/flutter_html_iframe/lib/iframe_mobile.dart b/packages/flutter_html_iframe/lib/iframe_mobile.dart
@@ -7,11 +7,11 @@ import 'package:webview_flutter/webview_flutter.dart';
 CustomRender iframeRender({NavigationDelegate? navigationDelegate}) => CustomRender.widget(widget: (context, buildChildren) {
   final sandboxMode = context.tree.element?.attributes["sandbox"];
   final UniqueKey key = UniqueKey();
+  final givenWidth = double.tryParse(context.tree.element?.attributes['width'] ?? "");
+  final givenHeight = double.tryParse(context.tree.element?.attributes['height'] ?? "");
   return Container(
-    width: double.tryParse(context.tree.element?.attributes['width'] ?? "")
-        ?? (double.tryParse(context.tree.element?.attributes['height'] ?? "") ?? 150) * 2,
-    height: double.tryParse(context.tree.element?.attributes['height'] ?? "")
-        ?? (double.tryParse(context.tree.element?.attributes['width'] ?? "") ?? 300) / 2,
+    width: givenWidth ?? (givenHeight ?? 150) * 2,
+    height: givenHeight ?? (givenWidth ?? 300) / 2,
     child: ContainerSpan(
       style: context.style,
       newContext: context,
diff --git a/packages/flutter_html_iframe/lib/iframe_web.dart b/packages/flutter_html_iframe/lib/iframe_web.dart
@@ -10,11 +10,11 @@ import 'dart:html' as html;
 import 'package:webview_flutter/webview_flutter.dart';
 
 CustomRender iframeRender({NavigationDelegate? navigationDelegate}) => CustomRender.widget(widget: (context, buildChildren) {
+  final givenWidth = double.tryParse(context.tree.element?.attributes['width'] ?? "");
+  final givenHeight = double.tryParse(context.tree.element?.attributes['height'] ?? "");
   final html.IFrameElement iframe = html.IFrameElement()
-    ..width = (double.tryParse(context.tree.element?.attributes['width'] ?? "")
-        ?? (double.tryParse(context.tree.element?.attributes['height'] ?? "") ?? 150) * 2).toString()
-    ..height = (double.tryParse(context.tree.element?.attributes['height'] ?? "")
-        ?? (double.tryParse(context.tree.element?.attributes['width'] ?? "") ?? 300) / 2).toString()
+    ..width = (givenWidth ?? (givenHeight ?? 150) * 2).toString()
+    ..height = (givenHeight ?? (givenWidth ?? 300) / 2).toString()
     ..src = context.tree.element?.attributes['src']
     ..style.border = 'none';
   final String createdViewId = getRandString(10);
diff --git a/packages/flutter_html_video/lib/flutter_html_video.dart b/packages/flutter_html_video/lib/flutter_html_video.dart
@@ -30,11 +30,10 @@ class VideoWidget extends StatefulWidget {
 }
 
 class _VideoWidgetState extends State<VideoWidget> {
-  ChewieController? chewieController;
-  VideoPlayerController? videoController;
+  ChewieController? _chewieController;
+  VideoPlayerController? _videoController;
   double? _width;
   double? _height;
-  late final List<String?> sources;
 
   @override
   void initState() {
@@ -44,12 +43,14 @@ class _VideoWidgetState extends State<VideoWidget> {
         attributes['src'],
       ...ReplacedElement.parseMediaSources(widget.context.tree.element!.children),
     ];
+    final givenWidth = double.tryParse(attributes['width'] ?? "");
+    final givenHeight = double.tryParse(attributes['height'] ?? "");
     if (sources.isNotEmpty && sources.first != null) {
-      _width = double.tryParse(attributes['width'] ?? (attributes['height'] ?? 150) * 2);
-      _height = double.tryParse(attributes['height'] ?? (attributes['width'] ?? 300) / 2);
-      videoController = VideoPlayerController.network(sources.first!);
-      chewieController = ChewieController(
-        videoPlayerController: videoController!,
+      _width = givenWidth ?? (givenHeight ?? 150) * 2;
+      _height = givenHeight ?? (givenWidth ?? 300) / 2;
+      _videoController = VideoPlayerController.network(sources.first!);
+      _chewieController = ChewieController(
+        videoPlayerController: _videoController!,
         placeholder: attributes['poster'] != null && attributes['poster']!.isNotEmpty
             ? Image.network(attributes['poster']!)
             : Container(color: Colors.black),
@@ -59,32 +60,29 @@ class _VideoWidgetState extends State<VideoWidget> {
         autoInitialize: true,
         aspectRatio: _width == null || _height == null ? null : _width! / _height!,
       );
-      widget.callback?.call(widget.context.tree.element, chewieController!, videoController!);
+      widget.callback?.call(widget.context.tree.element, _chewieController!, _videoController!);
     }
     super.initState();
   }
 
   @override
   void dispose() {
-    chewieController?.dispose();
-    videoController?.dispose();
+    _chewieController?.dispose();
+    _videoController?.dispose();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext bContext) {
-    if (sources.isEmpty || sources.first == null) {
+    if (_chewieController == null) {
       return Container(height: 0, width: 0);
     }
     final child = Container(
       key: widget.context.key,
       child: Chewie(
-        controller: chewieController!,
+        controller: _chewieController!,
       ),
     );
-    if (_width == null || _height == null) {
-      return child;
-    }
     return AspectRatio(
       aspectRatio: _width! / _height!,
       child: child,
