Fix typechecking of wrapped components

[wdimmit]

Currently, components wrapped with withModal cannot be type checked properly because the declaration for the WithModalComponent class incorrectly omits all Props. Additionally the incoming component class is mistyped as already containing the modal props.

With these two minor fixes, wrapped components can be successfully type checked and the @ts-ignore overrides can be removed

[CharlesMangwa]

Thanks for the fix @wdimmit! ✨