biochemistry - During non-cyclic photophosphorylation, how does NADP+ become NADPH?

I know that NADP+ gets reduced to form NADPH, but what exactly is being donated? Is it two individual electrons (from photolysis or the chlorophyll molecules) and a hydrogen ion (proton)? If this is the case, during the Calvin Cycle, do the NADPH molecules donate the same two individual electrons and hydrogen proton from the light-dependent reactions to become NADP+ again? Thanks.