Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/src/react_client/chain_refs.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import 'package:js/js_util.dart';
import 'package:react/react.dart' as react;
import 'package:react/react_client/react_interop.dart';
import 'package:react/src/react_client/factory_util.dart';

import '../../react.dart' as react;

/// Returns a ref that updates both [ref1] and [ref2], effectively
/// allowing you to set multiple refs.
///
Expand Down
2 changes: 1 addition & 1 deletion lib/src/react_client/component_registration.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'dart:html';

import 'package:react/react.dart';
import 'package:react/react_client/bridge.dart';
import 'package:react/react_client/js_backed_map.dart';
import 'package:react/react_client/react_interop.dart';
Expand All @@ -9,6 +8,7 @@ import 'package:react/react_client/component_factory.dart';
import 'package:react/src/react_client/dart_interop_statics.dart';
import 'package:react/src/react_client/internal_react_interop.dart';

import '../../react.dart';
import '../js_interop_util.dart';

/// Util used with `registerComponent2` to ensure no important lifecycle
Expand Down
3 changes: 2 additions & 1 deletion lib/src/react_client/dart_interop_statics.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'dart:js_util';

import 'package:js/js.dart';
import 'package:meta/meta.dart';
import 'package:react/react.dart';
import 'package:react/react_client/bridge.dart';
import 'package:react/react_client/js_backed_map.dart';
import 'package:react/react_client/js_interop_helpers.dart';
Expand All @@ -17,6 +16,8 @@ import 'package:react/src/react_client/internal_react_interop.dart';
import 'package:react/src/react_client/private_utils.dart';
import 'package:react/src/typedefs.dart';

import '../../react.dart';

/// The static methods that proxy JS component lifecycle methods to Dart components.
@internal
@Deprecated('Only used with the deprecated Component base class and not Component2.')
Expand Down
4 changes: 3 additions & 1 deletion lib/src/react_client/internal_react_interop.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ library react.src.react_client.internal_react_interop;

import 'package:js/js.dart';
import 'package:meta/meta.dart';
import 'package:react/react.dart' show Component, Component2, ComponentFactory;

import 'package:react/react_client/bridge.dart';
import 'package:react/react_client/js_backed_map.dart';
import 'package:react/react_client/react_interop.dart'
show React, ReactClass, ReactComponent, ReactDartComponentInternal;
import 'package:react/src/typedefs.dart';

import '../../react.dart' show Component, Component2, ComponentFactory;

/// A JavaScript interop class representing a value in a React JS `context` object.
///
/// Used for storing/accessing Dart [ReactDartContextInternal] objects in `context`
Expand Down
3 changes: 2 additions & 1 deletion lib/src/react_client/lazy.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import 'dart:js';
import 'dart:js_util';

import 'package:react/react.dart';
import 'package:react/react_client/component_factory.dart';
import 'package:react/react_client/react_interop.dart';
import 'package:react/src/js_interop_util.dart';

import '../../react.dart';

/// Defer loading a component's code until it is rendered for the first time.
///
/// The `lazy` function is used to create lazy components in react-dart. Lazy components are able to run asynchronous code only when they are trying to be rendered for the first time, allowing for deferred loading of the component's code.
Expand Down
3 changes: 2 additions & 1 deletion lib/src/react_client/private_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ library react_client_private_utils;
import 'dart:js_util';

import 'package:js/js.dart';
import 'package:react/react.dart' show Component2;
import 'package:react/react_client/react_interop.dart';
import 'package:react/src/js_interop_util.dart';
import 'package:react/src/react_client/component_registration.dart' show registerComponent2;
import 'package:react/src/react_client/internal_react_interop.dart';

import '../../react.dart' show Component2;

/// A flag used to cache whether React is accessible.
///
/// This is used when setting environment variables to ensure they can be set properly.
Expand Down
3 changes: 2 additions & 1 deletion lib/src/typedefs.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
library react.typedefs;

import 'package:react/react.dart';
import 'package:react/react_client/js_backed_map.dart';

import '../../react.dart';

/// The type of `Component.ref` specified as a callback.
///
/// See: <https://reactjs.org/docs/refs-and-the-dom.html#the-ref-callback-attribute>
Expand Down