I've named changed because this could be possibly outing.
Sorry for the essay 
Last week some who I work with caused me to have a panic attack.
He basically blocked my only exit & placed a lot of heavy cages (in warehouse) around me & locked them together so I was unable to get out/move them. I thought he was just joking but then he actually left me there & didn't come back so I was stuck! I ended up quite upset (as claustrophobic) someone managed to get me out afterwards.
His manager had a word & although I didn't make a formal complaint he told him he could have been in serious trouble if I had.
He apologised & said he was mortified that he made me cry but it was actually really funny.
We made amends & it was a joke that went too far.
Yesterday the 1st thing he said to me was "I thought about buying you a rape alarm, but forgot" then laughed.
I told him that it was a pretty insensitive thing to say & it wasn't funny.
He KICKED OFF! Swearing, saying I was being dramatic & I was just too delicate, didn't know how to take a joke. Then he told me to fuck off.
Bear in mind this all happened where customers are present. So someone could have over heard everything.
I feel like quitting my job, I'm dreading going to work tonight because he'll be there. 
Was I right to have called him out on what he said? He's literally making me doubt myself.