Skip to content

Commit f78250d

Browse files
authored
Merge pull request #18 from vant3ch/main
Migrate to web packages
2 parents cbfaf0e + 166df01 commit f78250d

File tree

5 files changed

+110
-87
lines changed

5 files changed

+110
-87
lines changed

example/pubspec.lock

Lines changed: 46 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,42 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
8+
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "2.11.0"
11+
version: "2.12.0"
1212
boolean_selector:
1313
dependency: transitive
1414
description:
1515
name: boolean_selector
16-
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
16+
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "2.1.1"
19+
version: "2.1.2"
2020
characters:
2121
dependency: transitive
2222
description:
2323
name: characters
24-
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
24+
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
2525
url: "https://pub.dev"
2626
source: hosted
27-
version: "1.3.0"
27+
version: "1.4.0"
2828
clock:
2929
dependency: transitive
3030
description:
3131
name: clock
32-
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
32+
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
3333
url: "https://pub.dev"
3434
source: hosted
35-
version: "1.1.1"
35+
version: "1.1.2"
3636
collection:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
40+
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.18.0"
43+
version: "1.19.1"
4444
cupertino_icons:
4545
dependency: "direct main"
4646
description:
@@ -53,10 +53,10 @@ packages:
5353
dependency: transitive
5454
description:
5555
name: fake_async
56-
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
56+
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
5757
url: "https://pub.dev"
5858
source: hosted
59-
version: "1.3.1"
59+
version: "1.3.2"
6060
flutter:
6161
dependency: "direct main"
6262
description: flutter
@@ -99,18 +99,18 @@ packages:
9999
dependency: transitive
100100
description:
101101
name: leak_tracker
102-
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
102+
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
103103
url: "https://pub.dev"
104104
source: hosted
105-
version: "10.0.5"
105+
version: "10.0.8"
106106
leak_tracker_flutter_testing:
107107
dependency: transitive
108108
description:
109109
name: leak_tracker_flutter_testing
110-
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
110+
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
111111
url: "https://pub.dev"
112112
source: hosted
113-
version: "3.0.5"
113+
version: "3.0.9"
114114
leak_tracker_testing:
115115
dependency: transitive
116116
description:
@@ -131,10 +131,10 @@ packages:
131131
dependency: transitive
132132
description:
133133
name: matcher
134-
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
134+
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
135135
url: "https://pub.dev"
136136
source: hosted
137-
version: "0.12.16+1"
137+
version: "0.12.17"
138138
material_color_utilities:
139139
dependency: transitive
140140
description:
@@ -147,71 +147,71 @@ packages:
147147
dependency: transitive
148148
description:
149149
name: meta
150-
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
150+
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
151151
url: "https://pub.dev"
152152
source: hosted
153-
version: "1.15.0"
153+
version: "1.16.0"
154154
path:
155155
dependency: transitive
156156
description:
157157
name: path
158-
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
158+
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
159159
url: "https://pub.dev"
160160
source: hosted
161-
version: "1.9.0"
161+
version: "1.9.1"
162162
sky_engine:
163163
dependency: transitive
164164
description: flutter
165165
source: sdk
166-
version: "0.0.99"
166+
version: "0.0.0"
167167
source_span:
168168
dependency: transitive
169169
description:
170170
name: source_span
171-
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
171+
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
172172
url: "https://pub.dev"
173173
source: hosted
174-
version: "1.10.0"
174+
version: "1.10.1"
175175
stack_trace:
176176
dependency: transitive
177177
description:
178178
name: stack_trace
179-
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
179+
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
180180
url: "https://pub.dev"
181181
source: hosted
182-
version: "1.11.1"
182+
version: "1.12.1"
183183
stream_channel:
184184
dependency: transitive
185185
description:
186186
name: stream_channel
187-
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
187+
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
188188
url: "https://pub.dev"
189189
source: hosted
190-
version: "2.1.2"
190+
version: "2.1.4"
191191
string_scanner:
192192
dependency: transitive
193193
description:
194194
name: string_scanner
195-
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
195+
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
196196
url: "https://pub.dev"
197197
source: hosted
198-
version: "1.2.0"
198+
version: "1.4.1"
199199
term_glyph:
200200
dependency: transitive
201201
description:
202202
name: term_glyph
203-
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
203+
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
204204
url: "https://pub.dev"
205205
source: hosted
206-
version: "1.2.1"
206+
version: "1.2.2"
207207
test_api:
208208
dependency: transitive
209209
description:
210210
name: test_api
211-
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
211+
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
212212
url: "https://pub.dev"
213213
source: hosted
214-
version: "0.7.2"
214+
version: "0.7.4"
215215
vector_math:
216216
dependency: transitive
217217
description:
@@ -224,10 +224,18 @@ packages:
224224
dependency: transitive
225225
description:
226226
name: vm_service
227-
sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
227+
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
228228
url: "https://pub.dev"
229229
source: hosted
230-
version: "14.2.4"
230+
version: "14.3.1"
231+
web:
232+
dependency: transitive
233+
description:
234+
name: web
235+
sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
236+
url: "https://pub.dev"
237+
source: hosted
238+
version: "1.1.1"
231239
sdks:
232-
dart: ">=3.3.0 <4.0.0"
240+
dart: ">=3.7.0-0 <4.0.0"
233241
flutter: ">=3.18.0-18.0.pre.54"

example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: flutter_window_close_example
22
description: Demonstrates how to use the flutter_window_close plugin.
3-
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
3+
publish_to: "none" # Remove this line if you wish to publish to pub.dev
44

55
environment:
6-
sdk: ">=2.17.0 <4.0.0"
6+
sdk: ">=3.4.0 <4.0.0"
77

88
dependencies:
99
flutter:

lib/flutter_window_close_web.dart

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import 'dart:async';
33
// In order to *not* need this ignore, consider extracting the "web" version
44
// of your plugin as a separate package, instead of inlining it in the same
55
// package as the core of your plugin.
6-
// ignore: avoid_web_libraries_in_flutter
7-
import 'dart:html' as html;
6+
import 'dart:js_interop';
7+
import 'package:web/web.dart';
88

99
import 'package:flutter/services.dart';
1010
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
@@ -23,13 +23,18 @@ class FlutterWindowClosePluginWeb {
2323
}
2424

2525
FlutterWindowClosePluginWeb() {
26-
html.window.onBeforeUnload.listen((event) {
27-
if (event is html.BeforeUnloadEvent) {
28-
if (_returnValue != null) {
29-
event.returnValue = _returnValue;
26+
window.addEventListener(
27+
'beforeunload',
28+
(JSAny event) {
29+
if (event.isA<BeforeUnloadEvent>()) {
30+
final unloadEvent = event as BeforeUnloadEvent;
31+
unloadEvent.preventDefault();
32+
if (_returnValue != null) {
33+
unloadEvent.returnValue = _returnValue!;
34+
}
3035
}
31-
}
32-
});
36+
}.toJS,
37+
);
3338
}
3439

3540
String? _returnValue;

0 commit comments

Comments
 (0)