[dartpad_ui] Use the new cross origin window support for pkg:web (#3068)

dart-lang · Oct 1, 2024 · 26580f5 · 26580f5
1 parent 1878439
commit 26580f5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 38 deletions.
diff --git a/pkgs/dartpad_ui/lib/embed.dart b/pkgs/dartpad_ui/lib/embed.dart
@@ -11,7 +11,7 @@ import 'model.dart';
 /// Listen to frame messages if embedded as an iFrame
 /// to accept injected snippets.
 void handleEmbedMessage(AppServices services, {bool runOnInject = false}) {
-  final parent = web.window.parent;
+  final parent = web.window.parentCrossOrigin;
   if (parent == null) return;
 
   web.window.addEventListener(

diff --git a/pkgs/dartpad_ui/lib/execution/frame.dart b/pkgs/dartpad_ui/lib/execution/frame.dart
@@ -9,7 +9,6 @@ import 'dart:js_interop';
 import 'package:web/web.dart' as web;
 
 import '../model.dart';
-import 'frame_utils.dart';
 
 class ExecutionServiceImpl implements ExecutionService {
   final StreamController<String> _stdoutController =
@@ -134,12 +133,14 @@ require(["dartpad_main", "dart_sdk"], function(dartpad_main, dart_sdk) {
   }
 
   Future<void> _send(String command, Map<String, Object?> params) {
-    final message = {
-      'command': command,
-      ...params,
-    }.jsify();
     // TODO: Use dartpad.dev instead of '*'?
-    _frame.safelyPostMessage(message, '*');
+    _frame.contentWindowCrossOrigin?.postMessage(
+      {
+        'command': command,
+        ...params,
+      }.jsify(),
+      '*'.toJS,
+    );
     return Future.value();
   }
 

diff --git a/pkgs/dartpad_ui/lib/execution/frame_utils.dart b/pkgs/dartpad_ui/lib/execution/frame_utils.dart
diff --git a/pkgs/dartpad_ui/pubspec.yaml b/pkgs/dartpad_ui/pubspec.yaml
@@ -22,7 +22,7 @@ dependencies:
   split_view: ^3.2.1
   url_launcher: ^6.3.0
   vtable: ^0.4.0
-  web: ^1.0.0
+  web: ^1.1.0
 
 dev_dependencies:
   flutter_test: