From 7641397f7f4b702f6f638fbac69a422546194a5f Mon Sep 17 00:00:00 2001
From: Aaron Lademann <aaron.lademann@workiva.com>
Date: Wed, 1 May 2019 06:52:18 -0700
Subject: [PATCH] Update js-interop usage

---
 lib/src/component_declaration/component_type_checking.dart | 3 ++-
 lib/src/util/react_wrappers.dart                           | 2 +-
 test/over_react/util/react_wrappers_test.dart              | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/src/component_declaration/component_type_checking.dart b/lib/src/component_declaration/component_type_checking.dart
index 2c2fa806a..ba1c32169 100644
--- a/lib/src/component_declaration/component_type_checking.dart
+++ b/lib/src/component_declaration/component_type_checking.dart
@@ -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';
 
 // ----------------------------------------------------------------------
diff --git a/lib/src/util/react_wrappers.dart b/lib/src/util/react_wrappers.dart
index 4c428e004..84c5d6649 100644
--- a/lib/src/util/react_wrappers.dart
+++ b/lib/src/util/react_wrappers.dart
@@ -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;
 
diff --git a/test/over_react/util/react_wrappers_test.dart b/test/over_react/util/react_wrappers_test.dart
index 54e5eb121..5fb8e0333 100644
--- a/test/over_react/util/react_wrappers_test.dart
+++ b/test/over_react/util/react_wrappers_test.dart
@@ -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;
@@ -350,7 +350,7 @@ main() {
         });
 
         test('a plain JS object', () {
-          expect(isValidElement(new EmptyObject()), isFalse);
+          expect(isValidElement(newObject()), isFalse);
         });
 
         test('a ReactElement', () {
@@ -987,7 +987,7 @@ main() {
         });
 
         test('an empty JS object', () {
-          expect(() => getProps(new EmptyObject()), throwsArgumentError);
+          expect(() => getProps(newObject()), throwsArgumentError);
         });
 
         test('a String', () {