Skip to content

Commit

Permalink
Update js-interop usage
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronlademann-wf committed May 1, 2019
1 parent 8bc90b1 commit 7641397
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion lib/src/component_declaration/component_type_checking.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
/// Provides utilities around component type-checking.
library over_react.component_declaration.component_type_checking;

import 'dart:js_util';

import 'package:over_react/src/component_declaration/component_base.dart' show UiFactory;
import 'package:over_react/src/component_declaration/annotations.dart' as annotations show Component2;
import 'package:over_react/src/util/react_wrappers.dart';
import 'package:react/react_client.dart';
import 'package:react/react_client/js_interop_helpers.dart';
import 'package:react/react_client/react_interop.dart';

// ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion lib/src/util/react_wrappers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ library over_react.react_wrappers;

import 'dart:collection';
import 'dart:html';
import 'dart:js_util';

import 'package:js/js.dart';
import 'package:over_react/over_react.dart';
import 'package:over_react/src/component_declaration/component_type_checking.dart';
import 'package:react/react.dart' as react;
import 'package:react/react_client.dart';
import 'package:react/react_client/js_interop_helpers.dart';
import 'package:react/react_client/react_interop.dart';
import 'package:react/react_dom.dart' as react_dom;

Expand Down
6 changes: 3 additions & 3 deletions test/over_react/util/react_wrappers_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
library react_wrappers_test;

import 'dart:html';
import 'dart:js_util';

import 'package:js/js.dart';
import 'package:over_react/over_react.dart';
import 'package:react/react.dart' as react;
import 'package:react/react_client.dart';
import 'package:react/react_client/js_interop_helpers.dart';
import 'package:react/react_client/react_interop.dart';
import 'package:over_react/react_dom.dart' as react_dom;
import 'package:react/react_test_utils.dart' as react_test_utils;
Expand Down Expand Up @@ -350,7 +350,7 @@ main() {
});

test('a plain JS object', () {
expect(isValidElement(new EmptyObject()), isFalse);
expect(isValidElement(newObject()), isFalse);
});

test('a ReactElement', () {
Expand Down Expand Up @@ -987,7 +987,7 @@ main() {
});

test('an empty JS object', () {
expect(() => getProps(new EmptyObject()), throwsArgumentError);
expect(() => getProps(newObject()), throwsArgumentError);
});

test('a String', () {
Expand Down

0 comments on commit 7641397

Please sign in to comment.