fix(angular): emit  events at the correct time