Question: is rey's lightsaber her staff?
Answer: The small detail within Rey's new lightsaber you may have missed: The hilt of her lightsaber comes from her original staff.