[draw-state] Add type and use in draw-helper
3 files changed