Add draw interaction events
Add tests for draw interaction events