refactored for functional component #1

Closed alexanderywang closed 4 years ago