Fix call order created init + detached on dispose

juicycleff · Dec 19, 2022 · ac66ba0 · ac66ba0
1 parent d8ede98
commit ac66ba0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/lib/src/io/mobile_unity_widget_controller.dart b/lib/src/io/mobile_unity_widget_controller.dart
@@ -36,7 +36,6 @@ class MobileUnityWidgetController extends UnityWidgetController {
       unityWidgetState,
       unityId: id,
     );
-    await UnityWidgetPlatform.instance.init(id);
     return controller;
   }
 

diff --git a/lib/src/io/unity_widget.dart b/lib/src/io/unity_widget.dart
@@ -155,6 +155,7 @@ class _UnityWidgetState extends State<UnityWidget> {
 
   @override
   Future<void> dispose() async {
+    widget.onUnityDetached?.call();
     if (!kIsWeb) {
       if (_nextUnityCreationId > 0) --_nextUnityCreationId;
     }
@@ -199,6 +200,8 @@ class _UnityWidgetState extends State<UnityWidget> {
     final controller = await MobileUnityWidgetController.init(id, this);
     _controller = controller;
     widget.onUnityCreated(controller);
+    await UnityWidgetPlatform.instance.init(id); // init is called here so onCreated called before onAttached
+
 
     // if (widget.onUnityAttached != null)
     //   widget.onUnityAttached!();

diff --git a/lib/src/web/web_unity_widget_controller.dart b/lib/src/web/web_unity_widget_controller.dart
@@ -35,6 +35,9 @@ class WebUnityWidgetController extends UnityWidgetController {
 
   MethodChannel? _channel;
 
+  @override
+  int get id => throw UnimplementedError("Platform does not support id");
+
   /// used for cancel the subscription
   StreamSubscription? _onUnityMessageSub,
       _onUnitySceneLoadedSub,