We do have one more Mac desktop and one more Mac laptop expected in the near term based on the filings with the Eurasian Economic Commission.
The most logical desktop to me would be an M2 Mac mini. The most logical laptop to me would be an M2 MacBook Air or M2 MacBook Pro 13.3". Both could launch at WWDC or soon after.
I do expect Apple to announce the Apple Silicon Mac Pro at WWDC, but not give a release date because I could see it slip into 2023.
I do not believe we will see an M1 Pro Mac mini configuration. I'm not sure we'll see an M2 Pro Mac mini configuration, but if we do, my thinking is 2023. Same with an M2 Pro and M2 Max MacBook Pro. And the M2 iMac 24" (with possibly an M2 Pro configuration if Apple does not release an Apple Silicon version of the iMac 5K 27").