The preceding revert commit erroneously removed the focus-trap dependency.
#8830
mentioned in issue #318 (closed)