The first proposal for separate Jewish and Arab states in the territory was made by the British Peel Commission report in 1937.[3] In 1947, the United Nations General Assembly adopted a partition plan for Palestine, leading to the 1948 Palestine war.[4][5] As a result, Israel was established on the area the UN had proposed for the Jewish state, as well as almost 60% of the area proposed for the Arab state. Israel took control of West Jerusalem, which was meant to be part of an international zone. Jordan took control of East Jerusalem and what became known as the West Bank, annexing it the following year. The territory which became the Gaza Strip was occupied by Egypt but never annexed. Since the 1967 Six-Day War, both the West Bank (including East Jerusalem) and Gaza Strip have been militarily occupied by Israel, becoming known as the Palestinian territories.

https://en.m.wikipedia.org/wiki/Two-state_solution

Basically from the beginning until 2014, that has been the basis of every proposal.