Adapt prop type validation method to first check for enum field

Adapt prop type validation method to first check for enum field #15544