Skip to content

Commit cd2465d

Browse files
btr-rmconsole-5[bot]btr-rmconsole-5[bot]
authored
Merge pull request #985 from Workiva/batch/no_entrypoint_imports/over_react
no_entrypoint_imports
2 parents 7db04ed + 44ffabc commit cd2465d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+241
-92
lines changed

‎lib/react_dom.dart‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2018 Workiva Inc.
1+
// Copyright 2025 Workiva Inc.
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -25,36 +25,4 @@
2525
/// import 'package:over_react/over_react.dart';
2626
library over_react.react_dom;
2727

28-
import 'dart:html';
29-
30-
import 'package:over_react/over_react.dart';
31-
import 'package:react/react_dom.dart' as react_dom show render, unmountComponentAtNode;
32-
33-
/// Renders the provided [element] into the DOM mounted in the provided [mountNode]
34-
/// and returns a reference to it based on its type:
35-
///
36-
/// 1. Returns an [Element] if [element] is a DOM component _(e.g. [Dom.div])_.
37-
/// 2. Returns a React `Component` if [element] is a composite component.
38-
///
39-
/// > __Throws__ if [element] or [mountNode] are `null`.
40-
///
41-
/// If the [element] was previously rendered into the [mountNode], this will perform an update on it and only
42-
/// mutate the DOM as necessary to reflect the latest React component.
43-
///
44-
/// Use [unmountComponentAtNode] to unmount the instance.
45-
///
46-
/// > Proxies [react_dom.render].
47-
dynamic render(ReactNode element, Element mountNode) {
48-
return react_dom.render(element, mountNode);
49-
}
50-
51-
/// Removes a React `Component` from the DOM that was mounted via [render]
52-
/// and cleans up its event handlers and state.
53-
///
54-
/// * Returns `false` if a `Component` was not mounted in the [mountNode].
55-
/// * Returns `true` if a `Component` was mounted in the [mountNode].
56-
///
57-
/// > Proxies [react_dom.unmountComponentAtNode].
58-
bool unmountComponentAtNode(Element mountNode) {
59-
return react_dom.unmountComponentAtNode(mountNode) as bool;
60-
}
28+
export 'package:over_react/src/react_dom.dart' show render, unmountComponentAtNode;

‎lib/src/component/_deprecated/abstract_transition.dart‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ import 'dart:async';
1919
import 'dart:html';
2020

2121
import 'package:meta/meta.dart';
22-
import 'package:over_react/over_react.dart';
23-
import 'package:over_react/component_base.dart' as component_base;
22+
import 'package:over_react/src/component/_deprecated/abstract_transition.dart';
23+
import 'package:over_react/src/component/_deprecated/abstract_transition_props.dart';
24+
import 'package:over_react/src/component_declaration/builder_helpers.dart';
25+
import 'package:over_react/src/component_declaration/component_base.dart' as component_base;
26+
import 'package:over_react/src/util/validation_util.dart';
2427

2528
export '../abstract_transition.dart' show TransitionPhase;
2629

‎lib/src/component/_deprecated/abstract_transition_props.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ library over_react.deprecated.abstract_transition_props;
1616

1717
import 'dart:collection';
1818

19-
import 'package:over_react/over_react.dart';
19+
import 'package:over_react/src/component/callback_typedefs.dart';
20+
import 'package:over_react/src/component_declaration/builder_helpers.dart';
2021

2122
part 'abstract_transition_props.over_react.g.dart';
2223

‎lib/src/component/_deprecated/error_boundary.dart‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,17 @@
1313
// limitations under the License.
1414

1515
import 'package:logging/logging.dart';
16-
import 'package:over_react/over_react.dart';
1716
import 'package:over_react/src/component/_deprecated/error_boundary_mixins.dart';
1817
import 'package:over_react/src/component/_deprecated/error_boundary_recoverable.dart';
18+
import 'package:over_react/src/component/dom_components.dart';
19+
import 'package:over_react/src/component/error_boundary_api.dart';
20+
import 'package:over_react/src/component_declaration/builder_helpers.dart';
21+
import 'package:over_react/src/component_declaration/component_base_2.dart';
22+
import 'package:over_react/src/util/map_util.dart';
23+
import 'package:over_react/src/util/prop_key_util.dart';
24+
import 'package:react/react_client.dart' show ReactComponentFactoryProxy;
25+
import 'package:react/react_client/js_backed_map.dart';
26+
import 'package:react/react_client/react_interop.dart';
1927

2028
part 'error_boundary.over_react.g.dart';
2129

‎lib/src/component/_deprecated/error_boundary_mixins.dart‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,14 @@ import 'dart:async';
1717

1818
import 'package:logging/logging.dart';
1919
import 'package:meta/meta.dart';
20-
import 'package:over_react/over_react.dart';
20+
import 'package:over_react/src/component/dom_components.dart';
21+
import 'package:over_react/src/component/error_boundary_api.dart';
22+
import 'package:over_react/src/component_declaration/builder_helpers.dart';
23+
import 'package:over_react/src/component_declaration/component_base_2.dart';
24+
import 'package:over_react/src/util/react_util.dart';
25+
import 'package:over_react/src/util/react_wrappers.dart';
26+
import 'package:react/react_client.dart' show ReactNode;
27+
import 'package:react/react_client/react_interop.dart' show ReactErrorInfo;
2128

2229
part 'error_boundary_mixins.over_react.g.dart';
2330

‎lib/src/component/_deprecated/error_boundary_recoverable.dart‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import 'package:over_react/over_react.dart';
1615
import 'package:over_react/src/component/_deprecated/error_boundary_mixins.dart';
16+
import 'package:over_react/src/component_declaration/builder_helpers.dart';
17+
import 'package:over_react/src/component_declaration/component_base_2.dart';
18+
import 'package:over_react/src/util/map_util.dart';
19+
import 'package:over_react/src/util/prop_key_util.dart';
20+
import 'package:react/react_client.dart' show ReactComponentFactoryProxy;
21+
import 'package:react/react_client/js_backed_map.dart';
1722

1823
part 'error_boundary_recoverable.over_react.g.dart';
1924

‎lib/src/component/_deprecated/resize_sensor.dart‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,20 @@ import 'dart:collection';
2020
import 'dart:html';
2121

2222
import 'package:meta/meta.dart';
23-
import 'package:over_react/over_react.dart';
23+
import 'package:over_react/src/util/map_util.dart';
24+
import 'package:over_react/src/util/prop_key_util.dart';
25+
import 'package:over_react/src/util/react_wrappers.dart';
26+
import 'package:over_react/src/util/string_util.dart';
27+
import 'package:react/react.dart' show ReactComponentFactoryProxy, SyntheticEvent;
28+
import 'package:over_react/src/component/callback_typedefs.dart';
29+
import 'package:over_react/src/component/dom_components.dart';
30+
import 'package:over_react/src/component/ref_util.dart';
2431
import 'package:over_react/src/component/resize_sensor.dart' show ResizeSensorEvent, SafeAnimationFrameMixin;
2532
import 'package:over_react/src/component/resize_sensor_constants.dart';
33+
import 'package:over_react/src/component_declaration/builder_helpers.dart';
34+
import 'package:over_react/src/component_declaration/component_base_2.dart';
35+
import 'package:over_react/src/util/validation_util.dart';
36+
import 'package:react/react_client/js_backed_map.dart';
2637

2738
export 'package:over_react/src/component/resize_sensor.dart' show ResizeSensorEvent;
2839

‎lib/src/component/abstract_transition.dart‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ import 'dart:async';
1818
import 'dart:html';
1919

2020
import 'package:meta/meta.dart';
21-
import 'package:over_react/over_react.dart' hide TransitionPropsMixin;
22-
import 'package:over_react/components.dart' show TransitionPropsMixin;
23-
import 'package:over_react/component_base.dart' as component_base;
21+
import 'package:over_react/src/component/abstract_transition_props.dart';
22+
import 'package:over_react/src/component_declaration/builder_helpers.dart';
23+
import 'package:over_react/src/component_declaration/component_base.dart' as component_base;
24+
import 'package:over_react/src/component_declaration/component_base_2.dart';
25+
import 'package:over_react/src/util/validation_util.dart';
2426

2527
part 'abstract_transition.over_react.g.dart';
2628

‎lib/src/component/abstract_transition_props.dart‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414

1515
library over_react.abstract_transition_props;
1616

17-
import 'package:over_react/over_react.dart' hide AbstractTransitionComponent, AbstractTransitionProps;
18-
import 'package:over_react/components.dart' show AbstractTransitionComponent, AbstractTransitionProps;
17+
import 'package:over_react/src/component/callback_typedefs.dart';
18+
import 'package:over_react/src/component_declaration/builder_helpers.dart';
19+
import 'package:over_react/src/component/abstract_transition.dart';
20+
import 'package:over_react/src/util/cast_ui_factory.dart';
21+
import 'package:over_react/src/util/prop_key_util.dart';
22+
import 'package:react/react_client/js_backed_map.dart';
1923

2024
part 'abstract_transition_props.over_react.g.dart';
2125

‎lib/src/component/aria_mixin.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ library over_react.aria_mixin;
1616

1717
import 'dart:collection';
1818

19+
import 'package:over_react/src/component_declaration/annotations.dart';
1920
// Must import these consts because they are used in the transformed code.
2021
// ignore: unused_shown_name
21-
import 'package:over_react/over_react.dart'
22-
show PropDescriptor, PropsMeta;
23-
import 'package:over_react/src/component_declaration/annotations.dart';
22+
import 'package:over_react/src/component_declaration/component_base.dart' show PropDescriptor, PropsMeta;
2423

2524
part 'aria_mixin.over_react.g.dart';
2625

0 commit comments

Comments
 (0)