Revert "#15: Add the possibility to skip the before and after events …

…with state transitions." This reverts commit ae507a0.
renggli · Aug 2, 2023 · ccf5524 · ccf5524
1 parent ae507a0
commit ccf5524
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 40 deletions.
diff --git a/lib/src/machine.dart b/lib/src/machine.dart
@@ -89,26 +89,7 @@ class Machine<T> {
   /// Errors during the transition phase are collected and included in the
   /// event. Handlers can inspect and clear the errors. If any errors remain,
   /// a single [TransitionError] is rethrown at the end of the state change.
-  set current(/*State<T>|T|Null*/ Object? state) => setCurrent(state);
-
-  /// Sets this machine to the given [state], either specified with a [State]
-  /// object, one of its identifiers, or `null` to remove the active state.
-  ///
-  /// Throws an [ArgumentError], if the state is unknown or from a different
-  /// [Machine].
-  ///
-  /// Triggers a [BeforeTransitionEvent] event before the transition starts,
-  /// unless [skipBeforeEvent] is set to `true`. This gives listeners the
-  /// opportunity to observe the transitions and possibly abort before it
-  /// starts.
-  ///
-  /// Triggers an [AfterTransitionEvent] event after the transition completes,
-  /// unless [skipAfterEvent] is set to `true`. Errors during the transition
-  /// phase are collected and included in the event. Handlers can inspect and
-  /// clear the errors. If any errors remain, a single [TransitionError] is
-  /// rethrown at the end of the state change.
-  void setCurrent(/*State<T>|T|Null*/ Object? state,
-      {bool skipBeforeEvent = false, bool skipAfterEvent = false}) {
+  set current(/*State<T>|T|Null*/ Object? state) {
     // Find and validate the target state.
     final target = state is State<T>
         ? state
@@ -123,7 +104,7 @@ class Machine<T> {
     // Notify listeners about the upcoming transition. Check if any of the
     // listeners wish to abort the transition.
     final source = _current;
-    if (!skipBeforeEvent && _beforeTransitionController.hasListener) {
+    if (_beforeTransitionController.hasListener) {
       final transitionEvent = BeforeTransitionEvent<T>(this, source, target);
       _beforeTransitionController.add(transitionEvent);
       if (transitionEvent.isAborted) {
@@ -154,7 +135,7 @@ class Machine<T> {
       }
     }
     // Notify listeners about the completed transition.
-    if (!skipAfterEvent && _afterTransitionController.hasListener) {
+    if (_afterTransitionController.hasListener) {
       _afterTransitionController
           .add(AfterTransitionEvent<T>(this, source, target, errors));
     }

diff --git a/test/statemachine_test.dart b/test/statemachine_test.dart
@@ -433,23 +433,5 @@ void main() {
       machine.current = other;
       expect(machine.current, exitAbort);
     });
-    test('skip before/after event', () {
-      expectLater(
-          machine.onBeforeTransition,
-          emits(isBeforeTransitionEvent(
-            machine: machine,
-            source: other,
-            target: start,
-          )));
-      expectLater(
-          machine.onAfterTransition,
-          emits(isAfterTransitionEvent(
-            machine: machine,
-            source: start,
-            target: other,
-          )));
-      machine.setCurrent(other, skipBeforeEvent: true);
-      machine.setCurrent(start, skipAfterEvent: true);
-    });
   });
 }