Added onClick and move Subview to the regular dependencies