diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a1df1def5..5c85e75d34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,9 +2,9 @@ name: Test flutter_html on: pull_request: - branches: [ main ] + branches: [ master ] push: - branches: [ main ] + branches: [ master ] jobs: test: @@ -16,7 +16,7 @@ jobs: - name: Setup Melos run: flutter pub global activate melos - name: Bootstrap Project - run: flutter pub global run melos bootstrap + run: melos bootstrap - name: Run Test Suite run: flutter pub global run melos run test - name: Compile Test Coverage Report @@ -30,4 +30,4 @@ jobs: - name: Run Dart Analysis run: flutter pub global run melos analyze --fatal-infos - name: Check that `dart format` has been run on every file - run: dart format -o none --set-exit-if-changed + run: dart format -o none --set-exit-if-changed . diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 308b3a2825..91a6cee4cc 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -7,10 +7,8 @@ environment: sdk: '>=3.2.0 <4.0.0' dependencies: - flutter_html: - path: .. - flutter_html_all: - path: ../packages/flutter_html_all + flutter_html: ^3.0.0-beta.2 + flutter_html_all: ^3.0.0-beta.2 flutter: sdk: flutter diff --git a/packages/flutter_html_iframe/lib/iframe_web.dart b/packages/flutter_html_iframe/lib/iframe_web.dart index 99ab6d4ad2..f2f4d33805 100644 --- a/packages/flutter_html_iframe/lib/iframe_web.dart +++ b/packages/flutter_html_iframe/lib/iframe_web.dart @@ -4,8 +4,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_html_iframe/shims/dart_ui.dart' as ui; -// ignore: avoid_web_libraries_in_flutter -import 'dart:html' as html; +import 'package:web/web.dart' show HTMLIFrameElement; import 'package:webview_flutter/webview_flutter.dart'; @@ -25,10 +24,10 @@ class IframeWidget extends StatelessWidget { double.tryParse(extensionContext.attributes['width'] ?? ""); final givenHeight = double.tryParse(extensionContext.attributes['height'] ?? ""); - final html.IFrameElement iframe = html.IFrameElement() + final HTMLIFrameElement iframe = HTMLIFrameElement() ..width = (givenWidth ?? (givenHeight ?? 150) * 2).toString() ..height = (givenHeight ?? (givenWidth ?? 300) / 2).toString() - ..src = extensionContext.attributes['src'] + ..src = extensionContext.attributes['src'] ?? "" ..style.border = 'none'; final String createdViewId = _getRandString(10); ui.platformViewRegistry diff --git a/packages/flutter_html_iframe/pubspec.yaml b/packages/flutter_html_iframe/pubspec.yaml index cbb09e5bb7..772b184291 100644 --- a/packages/flutter_html_iframe/pubspec.yaml +++ b/packages/flutter_html_iframe/pubspec.yaml @@ -12,6 +12,7 @@ dependencies: sdk: flutter html: '>=0.15.0 <1.0.0' flutter_html: ^3.0.0-beta.2 + web: '>=1.1.1 < 2.0.0' webview_flutter: '>=4.0.0 <5.0.0' dev_dependencies: