Yes, there is no "collapse". Just intentional (in the case of measurement) "narrowing" of the wavefunction (=state in the basis of some operator)or a tighter distribution of eigenvalues, driven by the specific experiment setup (e.g. we set up the experiment to measure momentum or angular momentum along-Z or ...)