Skip to content

Commit 2814407

Browse files
Merge pull request #1466 from Sub6Resources/gh-actions
Fix CI including code coverage
2 parents 3bdb550 + 7c6d460 commit 2814407

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Test flutter_html
22

33
on:
44
pull_request:
5-
branches: [ main ]
5+
branches: [ master ]
66
push:
7-
branches: [ main ]
7+
branches: [ master ]
88

99
jobs:
1010
test:
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Melos
1717
run: flutter pub global activate melos
1818
- name: Bootstrap Project
19-
run: flutter pub global run melos bootstrap
19+
run: melos bootstrap
2020
- name: Run Test Suite
2121
run: flutter pub global run melos run test
2222
- name: Compile Test Coverage Report
@@ -30,4 +30,4 @@ jobs:
3030
- name: Run Dart Analysis
3131
run: flutter pub global run melos analyze --fatal-infos
3232
- name: Check that `dart format` has been run on every file
33-
run: dart format -o none --set-exit-if-changed
33+
run: dart format -o none --set-exit-if-changed .

example/pubspec.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ environment:
77
sdk: '>=3.2.0 <4.0.0'
88

99
dependencies:
10-
flutter_html:
11-
path: ..
12-
flutter_html_all:
13-
path: ../packages/flutter_html_all
10+
flutter_html: ^3.0.0-beta.2
11+
flutter_html_all: ^3.0.0-beta.2
1412
flutter:
1513
sdk: flutter
1614

packages/flutter_html_iframe/lib/iframe_web.dart

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import 'dart:math';
44
import 'package:flutter/material.dart';
55
import 'package:flutter_html/flutter_html.dart';
66
import 'package:flutter_html_iframe/shims/dart_ui.dart' as ui;
7-
// ignore: avoid_web_libraries_in_flutter
8-
import 'dart:html' as html;
7+
import 'package:web/web.dart' show HTMLIFrameElement;
98

109
import 'package:webview_flutter/webview_flutter.dart';
1110

@@ -25,10 +24,10 @@ class IframeWidget extends StatelessWidget {
2524
double.tryParse(extensionContext.attributes['width'] ?? "");
2625
final givenHeight =
2726
double.tryParse(extensionContext.attributes['height'] ?? "");
28-
final html.IFrameElement iframe = html.IFrameElement()
27+
final HTMLIFrameElement iframe = HTMLIFrameElement()
2928
..width = (givenWidth ?? (givenHeight ?? 150) * 2).toString()
3029
..height = (givenHeight ?? (givenWidth ?? 300) / 2).toString()
31-
..src = extensionContext.attributes['src']
30+
..src = extensionContext.attributes['src'] ?? ""
3231
..style.border = 'none';
3332
final String createdViewId = _getRandString(10);
3433
ui.platformViewRegistry

packages/flutter_html_iframe/pubspec.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies:
1212
sdk: flutter
1313
html: '>=0.15.0 <1.0.0'
1414
flutter_html: ^3.0.0-beta.2
15+
web: '>=1.1.1 < 2.0.0'
1516
webview_flutter: '>=4.0.0 <5.0.0'
1617

1718
dev_dependencies:

0 commit comments

Comments
 (0)