Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RM-61377 Release over_react 3.1.2 #418

Merged
merged 3 commits into from
Nov 9, 2019
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# OverReact Changelog

## [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.

## [3.1.1](https://github.com/Workiva/over_react/compare/3.1.0...3.1.1)

- Restore the `xmlLang`, `xmlSpace`, `y1`, `y2`, `y` members that were accidentally removed from `SvgProps` in the 3.1.0 release.
Expand Down
1 change: 1 addition & 0 deletions lib/over_react.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export 'src/util/key_constants.dart';
export 'src/util/map_util.dart';
export 'src/util/pretty_print.dart';
export 'src/util/prop_errors.dart';
export 'src/util/prop_key_util.dart';
export 'src/util/react_util.dart';
export 'src/util/react_wrappers.dart';
export 'src/util/rem_util.dart';
Expand Down
9 changes: 8 additions & 1 deletion lib/src/component_declaration/component_base_2.dart
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,13 @@ abstract class UiComponent2<TProps extends UiProps> extends react.Component2
@override
Map<String, react.PropValidator<TProps>> get propTypes => {};

/// Returns the string key of the [factory] prop accessed in [accessProp], including the namespace if one exists.
///
/// __DEPRECATED__: This method had to be deprecated and replaced with [keyForProp] because of the way
/// that shadowing works in Dart when a top-level function name matches the name of an instance method.
@Deprecated('4.0.0')
String getPropKey(void Function(TProps props) accessProp) => keyForProp(accessProp);

/// Returns the string key of the [factory] prop accessed in [accessProp], including the namespace if one exists.
///
/// Intended for use within [propTypes].
Expand All @@ -277,7 +284,7 @@ abstract class UiComponent2<TProps extends UiProps> extends react.Component2
/// }
/// }
/// ```
String getPropKey(void Function(TProps props) accessProp) => prop_key_util.getPropKey(accessProp, typedPropsFactory);
String keyForProp(void Function(TProps props) accessProp) => prop_key_util.getPropKey(accessProp, typedPropsFactory);

// ***************************************************************************
//
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: over_react
version: 3.1.1
version: 3.1.2
description: A library for building statically-typed React UI components using Dart.
homepage: https://github.com/Workiva/over_react/
authors:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ class _$ComponentTestProps extends UiProps {
class ComponentTestComponent extends UiComponent2<ComponentTestProps> {
@override
get propTypes => {
getPropKey((p) => p.requiredAndLengthLimited): (props, info) {
this.getPropKey((p) => p.requiredAndLengthLimited): (props, info) {
final length = props.requiredAndLengthLimited?.length;
if (length != 2) {
return PropError.value(length, info.propName, 'must have a length of 2');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class _$ComponentTestProps extends UiProps {
class ComponentTestComponent extends UiComponent2<ComponentTestProps> {
@override
get propTypes => {
getPropKey((p) => p.requiredAndLengthLimited): (props, info) {
keyForProp((p) => p.requiredAndLengthLimited): (props, info) {
final length = props.requiredAndLengthLimited?.length;
if (length != 2) {
return PropError.value(length, info.propName, 'must have a length of 2');
Expand Down
2 changes: 1 addition & 1 deletion web/component2/src/demo_components/prop_validation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class PropTypesTestComponent extends UiComponent2<PropTypesTestProps> {
// This is closer to what it looks like in JS, but might be confusing syntax.
@override
get propTypes => {
getPropKey((p) => p.twoObjects): (props, info) {
keyForProp((p) => p.twoObjects): (props, info) {
final length = props.twoObjects?.length;
if (length != 2) {
return PropError.value(length, info.propName, 'must have a length of 2');
Expand Down