Skip to content

[FIX] Flutter 3.22 WASM fixes #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2024
Merged

[FIX] Flutter 3.22 WASM fixes #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9db3191
fix(web): migrate to dart:js_interop
prateekmedia May 18, 2024
73ab109
fix(web): use toJS for function eval
prateekmedia May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions example/lib/04.performance/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

// ignore_for_file: avoid_print

import 'dart:js' as js; // ignore: avoid_web_libraries_in_flutter
import 'dart:js_interop' as js;
import 'dart:js_interop_unsafe' as js_util;

import 'package:flutter/material.dart';
import 'package:flutter_code_editor/flutter_code_editor.dart';
import 'package:flutter_highlight/themes/vs2015.dart';
Expand Down Expand Up @@ -56,7 +58,8 @@ final fieldFactories = <String, FieldFactory>{
),
};

final renderer = js.context['flutterCanvasKit'] == null ? 'HTML' : 'CanvasKit';
final renderer =
js.globalContext['flutterCanvasKit'] == null ? 'HTML' : 'CanvasKit';

void main() {
runApp(CodeEditor());
Expand Down
10 changes: 7 additions & 3 deletions lib/src/code_field/js_workarounds/js_workarounds_web.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// ignore: avoid_web_libraries_in_flutter
import 'dart:js' as js;
import 'dart:js_interop' as js;
import 'dart:js_interop_unsafe' as js_util;

//=========================== Disable Spellcheck ===========================

Expand All @@ -21,7 +22,10 @@ bool _isTimerSet = false;

void disableSpellCheck() {
if (!_isTimerSet) {
js.context.callMethod('eval', [_jsSetDisableSpellCheckTimer]);
js.globalContext.callMethod(
'eval'.toJS,
_jsSetDisableSpellCheckTimer.toJS,
);
_isTimerSet = true;
}
}
Expand All @@ -39,5 +43,5 @@ const _jsDisableBuiltinSearch = '''
''';

void disableBuiltInSearch() {
js.context.callMethod('eval', [_jsDisableBuiltinSearch]);
js.globalContext.callMethod('eval'.toJS, _jsDisableBuiltinSearch.toJS);
}