Merge pull request #420 from Workiva/release-over-react-3.1.3

RM-61380 Release over_react 3.1.3 (Allow UiComponent2 to subtype UiComponent)

Author: rmconsole4-wk

CHANGELOG.md

@@ -1,5 +1,10 @@
 # OverReact Changelog
 
+## [3.1.3](https://github.com/Workiva/over_react/compare/3.1.2...3.1.3)
+
+- Fixes an issue that prevents `UiComponent` instances from being declared as sub-types of `UiComponent2` instances
+  via the `subtypeOf` argument in a `Component2()` annotation.
+
 ## [3.1.2](https://github.com/Workiva/over_react/compare/3.1.1...3.1.2)
 
 - Restore the public `getPropKey` function that was accidentally made private in the 3.1.0 release.

lib/src/component_declaration/component_base_2.dart

@@ -54,7 +54,8 @@ ReactDartComponentFactoryProxy2 registerAbstractComponent2(Type abstractComponen
 /// * [displayName]: the name of the component for use when debugging.
 ReactDartComponentFactoryProxy2 registerComponent2(react.Component2 Function() dartComponentFactory, {
     bool isWrapper = false,
-    ReactDartComponentFactoryProxy2 parentType,
+    // This must remain typed in a way that both UiComponent and UiComponent2 classes can be passed as the `subtypeOf` value.
+    ReactDartComponentFactoryProxy parentType,
     UiFactory builderFactory,
     Type componentClass,
     String displayName,

pubspec.yaml

@@ -1,5 +1,5 @@
 name: over_react
-version: 3.1.2
+version: 3.1.3
 description: A library for building statically-typed React UI components using Dart.
 homepage: https://github.com/Workiva/over_react/
 authors:

test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subsubtype_of_component1.dart

@@ -0,0 +1,30 @@
+// Copyright 2019 Workiva Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import 'package:over_react/over_react.dart';
+import './subtype_of_component1.dart';
+
+part 'subsubtype_of_component1.over_react.g.dart';
+
+@Factory()
+UiFactory<TestSubsubtypeOfComponent1Props> TestSubsubtypeOfComponent1 = _$TestSubsubtypeOfComponent1;
+
+@Props()
+class _$TestSubsubtypeOfComponent1Props extends UiProps {}
+
+@Component2(subtypeOf: TestSubtypeOfComponent1Component)
+class TestSubsubtypeOfComponent1Component extends UiComponent2<TestSubsubtypeOfComponent1Props> {
+  @override
+  render() => Dom.div()();
+}

test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subsubtype_of_component1.over_react.g.dart

@@ -0,0 +1,31 @@
+// Copyright 2019 Workiva Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import 'package:over_react/over_react.dart';
+
+import '../../component_type_checking_test/type_inheritance/parent.dart';
+
+part 'subtype_of_component1.over_react.g.dart';
+
+@Factory()
+UiFactory<TestSubtypeOfComponent1Props> TestSubtypeOfComponent1 = _$TestSubtypeOfComponent1;
+
+@Props()
+class _$TestSubtypeOfComponent1Props extends UiProps {}
+
+@Component2(subtypeOf: TestParentComponent)
+class TestSubtypeOfComponent1Component extends UiComponent2<TestSubtypeOfComponent1Props> {
+  @override
+  render() => Dom.div()();
+}