Skip to content

Commit 2e8c893

Browse files
committed
26-default-background-color-set-to-100c2a
1 parent 8ab7dc7 commit 2e8c893

File tree

5 files changed

+18
-42
lines changed

5 files changed

+18
-42
lines changed

example/web/index.html

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,14 @@
3434

3535
<script>
3636
// The value below is injected by flutter build, do not touch.
37-
const serviceWorkerVersion = null;
37+
var serviceWorkerVersion = '{{flutter_service_worker_version}}';
3838
</script>
3939
<!-- This script adds the flutter initialization JS code -->
4040
<script src="flutter.js" defer></script>
4141
</head>
4242
<body>
4343
<script>
44-
window.addEventListener('load', function(ev) {
45-
// Download main.dart.js
46-
_flutter.loader.loadEntrypoint({
47-
serviceWorker: {
48-
serviceWorkerVersion: serviceWorkerVersion,
49-
},
50-
onEntrypointLoaded: function(engineInitializer) {
51-
engineInitializer.initializeEngine().then(function(appRunner) {
52-
appRunner.runApp();
53-
});
54-
}
55-
});
56-
});
44+
{{flutter_bootstrap_js}}
5745
</script>
5846
</body>
5947
</html>

lib/src/resources/dependencies.js.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,3 @@ const String chartScripts = """
4141
4242
""";
4343

44-
const htmlDependencies = "<script>$dependencies</script>";

lib/src/resources/index.html.dart

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,35 @@
11
// ignore_for_file: leading_newlines_in_multiline_strings
22

3-
import 'package:graphify/src/resources/dependencies.js.dart';
43
import 'package:graphify/src/utils/js_methods.dart';
54

6-
String indexHtml({
7-
required String id,
8-
bool enableDependency = true,
9-
String? backgroundColor,
10-
}) {
5+
String indexHtml({ required String id, String? dependencies}) {
116
return '''<!DOCTYPE html>
127
<html>
138
<head>
149
<meta charset="UTF-8">
1510
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
1611
<style>
1712
html, body {
18-
${backgroundColor != null ? "background-color: $backgroundColor;" : ""}
13+
background-color: transparent;
1914
height: -webkit-fill-available;
2015
box-sizing: content-box;
2116
margin: 0;
2217
overflow: hidden;
18+
width: 100%;
19+
height: 100%;
2320
}
24-
#chart {
25-
height: -webkit-fill-available;
26-
}
21+
#chart { height: -webkit-fill-available; }
2722
</style>
2823
</head>
2924
<body>
3025
<div id="chart"></div>
31-
${enableDependency ? htmlDependencies : ""}
26+
${dependencies ?? ''}
3227
<script>
3328
const dom = document.getElementById('chart');
3429
const context = (window.parent && window.parent.window) || window || {};
3530
const chart = context.echarts.init(dom, 'dark', { renderer: 'canvas', useDirtyRect: false });
36-
3731
context.${JsMethods.initChart}('$id', chart, {});
3832
context.${JsMethods.updateChart}('$id', {});
39-
4033
window.addEventListener('resize', chart.resize);
4134
</script>
4235
</body>

lib/src/view/implements/mobile.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:graphify/src/controller/implements/mobile.dart';
3+
import 'package:graphify/src/resources/dependencies.js.dart';
34
import 'package:graphify/src/resources/index.html.dart';
45
import 'package:graphify/src/view/interface.dart' as g_view;
56
import 'package:webview_flutter/webview_flutter.dart';
@@ -35,25 +36,24 @@ class _GraphifyViewMobile extends g_view.GraphifyViewState<GraphifyView> {
3536

3637
@override
3738
void initView() {
38-
_controller.connector = webViewController = WebViewController();
39-
40-
webViewController
39+
_controller.connector = webViewController = WebViewController()
4140
..setJavaScriptMode(JavaScriptMode.unrestricted)
4241
..setBackgroundColor(Colors.transparent)
43-
..loadHtmlString(indexHtml(
44-
id: _controller.uid,
45-
backgroundColor: widget.initialOptions?['backgroundColor'],
46-
))
42+
..loadHtmlString(
43+
indexHtml(
44+
id: _controller.uid,
45+
dependencies: "<script>$dependencies</script>",
46+
),
47+
)
4748
..setOnConsoleMessage(
48-
(message) => widget.onConsoleMessage?.call(message.message),
49+
(message) => widget.onConsoleMessage?.call(message.message),
4950
)
5051
..setNavigationDelegate(NavigationDelegate(
5152
onPageFinished: (_) async {
5253
widget.onCreated?.call();
5354
await _controller.update(widget.initialOptions);
5455
},
5556
));
56-
5757
}
5858

5959
@override

lib/src/view/implements/web.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ class _GraphifyViewWeb extends g_view.GraphifyViewState<GraphifyView> {
6262
..style.width = '100%'
6363
..style.height = '100%'
6464
..style.border = 'none'
65-
..srcdoc = indexHtml(
66-
id: _uid,
67-
enableDependency: false,
68-
backgroundColor: widget.initialOptions?['backgroundColor'],
69-
).toJS
65+
..srcdoc = indexHtml(id: _uid).toJS
7066
..onLoad.listen((_) => _controller.update(widget.initialOptions))
7167
..onError.listen((event) {
7268
widget.onConsoleMessage?.call(event.toString());

0 commit comments

Comments
 (0)