diff --git a/example/grpc-web/lib/app.dart b/example/grpc-web/lib/app.dart index c28c60eb..4db98d41 100644 --- a/example/grpc-web/lib/app.dart +++ b/example/grpc-web/lib/app.dart @@ -14,8 +14,8 @@ // limitations under the License. import 'dart:async'; -// ignore: deprecated_member_use (#756) -import 'dart:html'; + +import 'package:web/web.dart'; import 'src/generated/echo.pbgrpc.dart'; @@ -57,13 +57,14 @@ class EchoApp { } void _addMessage(String message, String cssClass) { - final classes = cssClass.split(' '); - querySelector('#first')!.after(DivElement() - ..classes.add('row') - ..append(Element.tag('h2') - ..append(SpanElement() - ..classes.add('label') - ..classes.addAll(classes) - ..text = message))); + final span = HTMLSpanElement() + ..classList.add('label') + ..text = message; + for (final classItem in cssClass.split(' ')) { + span.classList.add(classItem); + } + document.querySelector('#first')!.after(HTMLDivElement() + ..classList.add('row') + ..append(HTMLHeadingElement.h2()..append(span))); } } diff --git a/example/grpc-web/pubspec.yaml b/example/grpc-web/pubspec.yaml index 10f80ceb..4719ec17 100644 --- a/example/grpc-web/pubspec.yaml +++ b/example/grpc-web/pubspec.yaml @@ -9,6 +9,7 @@ dependencies: grpc: path: ../../ protobuf: ^3.0.0 + web: ^1.1.0 dev_dependencies: build_runner: ^2.4.13 diff --git a/example/grpc-web/web/main.dart b/example/grpc-web/web/main.dart index bd740ffa..07c3ab4c 100644 --- a/example/grpc-web/web/main.dart +++ b/example/grpc-web/web/main.dart @@ -13,22 +13,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -// ignore: deprecated_member_use (#756) -import 'dart:html'; - import 'package:grpc/grpc_web.dart'; import 'package:grpc_web/app.dart'; import 'package:grpc_web/src/generated/echo.pbgrpc.dart'; +import 'package:web/web.dart'; void main() { final channel = GrpcWebClientChannel.xhr(Uri.parse('http://localhost:8080')); final service = EchoServiceClient(channel); final app = EchoApp(service); - final button = querySelector('#send') as ButtonElement; + final button = document.querySelector('#send') as HTMLButtonElement; button.onClick.listen((e) async { - final msg = querySelector('#msg') as TextInputElement; - final value = msg.value!.trim(); + final msg = document.querySelector('#msg') as HTMLInputElement; + final value = msg.value.trim(); msg.value = ''; if (value.isEmpty) return; diff --git a/lib/src/shared/status.dart b/lib/src/shared/status.dart index cb662326..3d208c70 100644 --- a/lib/src/shared/status.dart +++ b/lib/src/shared/status.dart @@ -13,16 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -// ignore_for_file: prefer_relative_imports - import 'dart:convert'; -import 'package:grpc/src/generated/google/protobuf/any.pb.dart'; -import 'package:grpc/src/generated/google/rpc/error_details.pb.dart'; -import 'package:grpc/src/generated/google/rpc/status.pb.dart'; import 'package:meta/meta.dart'; import 'package:protobuf/protobuf.dart'; +import '../generated/google/protobuf/any.pb.dart'; +import '../generated/google/rpc/error_details.pb.dart'; +import '../generated/google/rpc/status.pb.dart'; import 'io_bits/io_bits.dart' show HttpStatus; class StatusCode {