At this point the laws in several states go far beyond those topics. The people pushing them just figured on had to start with something that would let them mock any opposition as extremist "gender ideology" and the like.
And sadly federal > state law so that means the reasonable states not enacting these awful policies would have to get in line with nationwide, legal discrimination.