fix nested events conflicting with parent events (#10326) 51f1f66e31 Co-authored-by: hernan <hernan@rive.app>
diff --git a/.rive_head b/.rive_head index a1a68fa..4922057 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -e7ef71b56849da7b093cf7f10c47be71e0b8a754 +51f1f66e318727871563949d737f92488728e460
diff --git a/src/animation/state_machine_instance.cpp b/src/animation/state_machine_instance.cpp index 3382fae..e0f70fc 100644 --- a/src/animation/state_machine_instance.cpp +++ b/src/animation/state_machine_instance.cpp
@@ -2154,12 +2154,15 @@ // sure that a listener must be targetting the // current artboard to disambiguate between external // and internal events. - auto target = sourceArtboard->resolve(listener->targetId()); - if (source == nullptr && - (target != nullptr && target->is<Artboard>() && - target != artboard())) + if (source == nullptr) { - continue; + auto target = + sourceArtboard->resolve(listener->targetId()); + if (target && target != artboard() && + !target->is<Event>()) + { + continue; + } } auto listenerEvent = sourceArtboard->resolve(listener->eventId());
diff --git a/tests/unit_tests/assets/nested_events.riv b/tests/unit_tests/assets/nested_events.riv new file mode 100644 index 0000000..93c78e9 --- /dev/null +++ b/tests/unit_tests/assets/nested_events.riv Binary files differ
diff --git a/tests/unit_tests/runtime/nested_artboard_test.cpp b/tests/unit_tests/runtime/nested_artboard_test.cpp index 92d6021..7f4cb5d 100644 --- a/tests/unit_tests/runtime/nested_artboard_test.cpp +++ b/tests/unit_tests/runtime/nested_artboard_test.cpp
@@ -7,6 +7,7 @@ #include <rive/animation/nested_state_machine.hpp> #include "rive_file_reader.hpp" #include "rive_testing.hpp" +#include "utils/serializing_factory.hpp" #include <catch.hpp> #include <cstdio> #include <iostream> @@ -89,4 +90,61 @@ auto rect = nestedArtboardArtboard->find<rive::Shape>("rect"); REQUIRE(rect != nullptr); REQUIRE(rect->x() == 250.0f); +} + +TEST_CASE("Nested events don't conflict with parent events.", "[silver]") +{ + rive::SerializingFactory silver; + auto file = ReadRiveFile("assets/nested_events.riv", &silver); + + auto artboard = file->artboardDefault(); + + silver.frameSize(artboard->width(), artboard->height()); + + REQUIRE(artboard != nullptr); + auto stateMachine = artboard->stateMachineAt(0); + int viewModelId = artboard.get()->viewModelId(); + + auto vmi = viewModelId == -1 + ? file->createViewModelInstance(artboard.get()) + : file->createViewModelInstance(viewModelId, 0); + + stateMachine->bindViewModelInstance(vmi); + stateMachine->advanceAndApply(0.1f); + + auto renderer = silver.makeRenderer(); + artboard->draw(renderer.get()); + // Pointer down on left top square, triggers child event 1 + silver.addFrame(); + stateMachine->pointerDown(rive::Vec2D(50.0f, 50.0f)); + // Advance and apply twice to take the transition and apply the next state. + stateMachine->advanceAndApply(0.1f); + stateMachine->advanceAndApply(1.0f); + artboard->draw(renderer.get()); + + // Pointer down on right top square, triggers child event 2 + silver.addFrame(); + stateMachine->pointerDown(rive::Vec2D(150.0f, 50.0f)); + // Advance and apply twice to take the transition and apply the next state. + stateMachine->advanceAndApply(0.1f); + stateMachine->advanceAndApply(1.0f); + artboard->draw(renderer.get()); + + // Pointer down on left bottom square, triggers parent event 1 + silver.addFrame(); + stateMachine->pointerDown(rive::Vec2D(50.0f, 150.0f)); + // Advance and apply twice to take the transition and apply the next state. + stateMachine->advanceAndApply(0.1f); + stateMachine->advanceAndApply(1.0f); + artboard->draw(renderer.get()); + + // Pointer down on right bottom square, triggers parent event 1 + silver.addFrame(); + stateMachine->pointerDown(rive::Vec2D(150.0f, 150.0f)); + // Advance and apply twice to take the transition and apply the next state. + stateMachine->advanceAndApply(0.1f); + stateMachine->advanceAndApply(1.0f); + artboard->draw(renderer.get()); + + CHECK(silver.matches("nested_events")); } \ No newline at end of file
diff --git a/tests/unit_tests/silvers/nested_events.sriv b/tests/unit_tests/silvers/nested_events.sriv new file mode 100644 index 0000000..44ebc77 --- /dev/null +++ b/tests/unit_tests/silvers/nested_events.sriv Binary files differ