Feels like this should already be handled by the component