diff --git a/lib/src/observables/states/states.dart b/lib/src/observables/states/states.dart index ee3289a..c179e62 100644 --- a/lib/src/observables/states/states.dart +++ b/lib/src/observables/states/states.dart @@ -15,34 +15,34 @@ class States { ): this.from(Observable(observe)); static States combine({ - required List> children, + required List> states, required R Function(List items) combiner, }) => Observable.combine( - observables: children + observables: states .map((states) => states.observable) .toList(), combiner: combiner, ).asStates(); static States combine2({ - required States child1, - required States child2, + required States states1, + required States states2, required R Function(T1, T2) combiner, }) => Observable.combine2( - observable1: child1.observable, - observable2: child2.observable, + observable1: states1.observable, + observable2: states2.observable, combiner: combiner, ).asStates(); static States combine3({ - required States child1, - required States child2, - required States child3, + required States states1, + required States states2, + required States states3, required R Function(T1, T2, T3) combiner, }) => Observable.combine3( - observable1: child1.observable, - observable2: child2.observable, - observable3: child3.observable, + observable1: states1.observable, + observable2: states2.observable, + observable3: states3.observable, combiner: combiner, ).asStates(); @@ -109,7 +109,7 @@ extension StatesX on States { StatesActivated activated() { return StatesActivated( - child: this + states: this ); } } diff --git a/lib/src/observables/states/states_activated.dart b/lib/src/observables/states/states_activated.dart index 3303a90..5ed9fe5 100644 --- a/lib/src/observables/states/states_activated.dart +++ b/lib/src/observables/states/states_activated.dart @@ -13,19 +13,19 @@ abstract class HasStates { abstract class StatesActivated implements HasStates, Disposable { @internal factory StatesActivated({ - required States child + required States states }) = _StatesActivated; } class _StatesActivated implements StatesActivated { _StatesActivated({ - required States child - }): _child = child { + required States states + }): _states = states { _startObserve(); } - final States _child; + final States _states; final _subject = ReplaySubject(bufferSize: 1); @override @@ -34,7 +34,7 @@ class _StatesActivated implements StatesActivated { late final Disposable _observation; void _startObserve() { - _observation = _child.observe(_subject.onData); + _observation = _states.observe(_subject.onData); } void _stopObserve() { diff --git a/test/observables/states/states_combine_test.g.dart b/test/observables/states/states_combine_test.g.dart index 85f7fbc..59fb304 100644 --- a/test/observables/states/states_combine_test.g.dart +++ b/test/observables/states/states_combine_test.g.dart @@ -19,7 +19,7 @@ void _main() { }); final combine = States.combine( - children: [ + states: [ states1, states2, ], @@ -51,8 +51,8 @@ void _main() { }); final combine = States.combine2( - child1: states1, - child2: states2, + states1: states1, + states2: states2, combiner: (it1, it2) => '$it1|$it2', ); @@ -86,9 +86,9 @@ void _main() { }); final combine = States.combine3( - child1: states1, - child2: states2, - child3: states3, + states1: states1, + states2: states2, + states3: states3, combiner: (it1, it2, it3) => '$it1|$it2|$it3', ); @@ -119,7 +119,7 @@ void _main() { }); final combine = States.combine( - children: [ + states: [ states1, states2, ], @@ -155,8 +155,8 @@ void _main() { }); final combine = States.combine2( - child1: states1, - child2: states2, + states1: states1, + states2: states2, combiner: (it1, it2) => '$it1|$it2', ); @@ -194,9 +194,9 @@ void _main() { }); final combine = States.combine3( - child1: states1, - child2: states2, - child3: states3, + states1: states1, + states2: states2, + states3: states3, combiner: (it1, it2, it3) => '$it1|$it2|$it3', ); @@ -233,7 +233,7 @@ void _main() { }); final combine = States.combine( - children: [ + states: [ states1, states2, ], @@ -267,8 +267,8 @@ void _main() { }); final combine = States.combine2( - child1: states1, - child2: states2, + states1: states1, + states2: states2, combiner: (it1, it2) => '$it1|$it2', ); @@ -305,9 +305,9 @@ void _main() { }); final combine = States.combine3( - child1: states1, - child2: states2, - child3: states3, + states1: states1, + states2: states2, + states3: states3, combiner: (it1, it2, it3) => '$it1|$it2|$it3', ); @@ -334,7 +334,7 @@ void _main() { }); final combine = States.combine( - children: [ + states: [ states1, states2, ], @@ -370,8 +370,8 @@ void _main() { }); final combine = States.combine2( - child1: states1, - child2: states2, + states1: states1, + states2: states2, combiner: (it1, it2) => '$it1|$it2', ); @@ -409,9 +409,9 @@ void _main() { }); final combine = States.combine3( - child1: states1, - child2: states2, - child3: states3, + states1: states1, + states2: states2, + states3: states3, combiner: (it1, it2, it3) => '$it1|$it2|$it3', ); diff --git a/test/test_gen/combine_test/shared/codes.dart b/test/test_gen/combine_test/shared/codes.dart index f99c164..4cb8bad 100644 --- a/test/test_gen/combine_test/shared/codes.dart +++ b/test/test_gen/combine_test/shared/codes.dart @@ -64,8 +64,8 @@ String statesCombine(int? number) { String _combine(bool isObservable, int? number) { final type = isObservable ? 'Observable' : 'States'; final name = isObservable ? 'observable' : 'states'; - final sources = isObservable ? 'observables' : 'children'; - final source = isObservable ? 'observable' : 'child'; + final sources = isObservable ? 'observables' : 'states'; + final source = isObservable ? 'observable' : 'states'; if (number == null) { return ''' final combine = $type.combine(