Merge branch 'develop'

invoiceninja · Jul 28, 2021 · ec83d23 · ec83d23
2 parents 54dfad3 + 2103e29
commit ec83d23
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lib/ui/app/app_webview.dart b/lib/ui/app/app_webview.dart
@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/utils/web_stub.dart'
@@ -52,8 +54,9 @@ class _MobileWebViewState extends State<_MobileWebView>
     super.didUpdateWidget(oldWidget);
 
     if (widget.html != oldWidget.html) {
-      _webViewController.loadUrl(
-          Uri.dataFromString(widget.html, mimeType: 'text/html').toString());
+      _webViewController.loadUrl(Uri.dataFromString(widget.html,
+              mimeType: 'text/html', encoding: Encoding.getByName('utf-8'))
+          .toString());
     }
   }
 
@@ -62,8 +65,9 @@ class _MobileWebViewState extends State<_MobileWebView>
     super.build(context);
 
     return WebView(
-      initialUrl:
-          Uri.dataFromString(widget.html, mimeType: 'text/html').toString(),
+      initialUrl: Uri.dataFromString(widget.html,
+              mimeType: 'text/html', encoding: Encoding.getByName('utf-8'))
+          .toString(),
       onWebViewCreated: (WebViewController webViewController) {
         _webViewController = webViewController;
       },

diff --git a/lib/ui/invoice/edit/invoice_edit_desktop.dart b/lib/ui/invoice/edit/invoice_edit_desktop.dart
@@ -40,6 +40,7 @@ import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
 import 'package:invoiceninja_flutter/utils/icons.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
+import 'package:pointer_interceptor/pointer_interceptor.dart';
 
 class InvoiceEditDesktop extends StatefulWidget {
   const InvoiceEditDesktop({
@@ -965,7 +966,9 @@ class __PdfPreviewState extends State<_PdfPreview> {
           kIsWeb
               ? Padding(
                   padding: const EdgeInsets.only(right: 11),
-                  child: HtmlElementView(viewType: _pdfString),
+                  child: PointerInterceptor(
+                    child: HtmlElementView(viewType: _pdfString),
+                  ),
                 )
               : Padding(
                   padding: const EdgeInsets.all(8),