filecoin-project/slate
1
1
Fork 0
mirror of https://github.com/filecoin-project/slate.git synced 2024-11-09 20:28:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

history: fixes history

Browse Source
This commit is contained in:
@wwwjim 2020-09-11 22:54:54 -07:00
parent 4c713fdb6d
commit 8249b29c97
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/window.js
View File

@ -39,6 +39,16 @@ export const getViewportSize = () => {
};
};
export const getQueryParameterByName = (name) => {
let url = window.location.href;
name = name.replace(/[\[\]]/g, "\\$&");
var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
results = regex.exec(url);
if (!results) return null;
if (!results[2]) return "";
return decodeURIComponent(results[2].replace(/\+/g, " "));
};
export const isDescendant = (parent, child) => {
let node = child.parentNode;
while (node != null) {

22
components/core/Application.js
View File

@ -6,6 +6,7 @@ import * as Credentials from "~/common/credentials";
import * as Validations from "~/common/validations";
import * as FileUtilities from "~/common/file-utilities";
import * as System from "~/components/system";
import * as Window from "~/common/window";
// NOTE(jim):
// Scenes each have an ID and can be navigated to with _handleAction
@ -105,6 +106,12 @@ export default class ApplicationPage extends React.Component {
window.addEventListener("drop", this._handleDrop);
window.addEventListener("online", this._handleOnlineStatus);
window.addEventListener("offline", this._handleOnlineStatus);
const id = Window.getQueryParameterByName("scene");
if (this.state.viewer) {
return this._handleNavigateTo({ id });
}
}
componentWillUnmount() {
@ -437,10 +444,11 @@ export default class ApplicationPage extends React.Component {
};
_handleNavigateTo = (next, data = null) => {
window.history.replaceState({ ...next }, "Slate", `?scene=${next.id}`);
let body = document.documentElement || document.body;
console.log(body.scrollTop);
this.state.history[this.state.currentIndex].scrollTop = body.scrollTop; //window.scrollY => body.scrollTop (where body is the body of the ApplicationLayout)
this.state.history[this.state.currentIndex].data = this.state.data; //BUG FIX: was originally = data. So it was setting it equal to the data for the next one rather than the current one
this.state.history[this.state.currentIndex].scrollTop = body.scrollTop;
this.state.history[this.state.currentIndex].data = this.state.data;
if (this.state.currentIndex !== this.state.history.length - 1) {
const adjustedArray = [...this.state.history];
@ -470,11 +478,11 @@ export default class ApplicationPage extends React.Component {
_handleBack = () => {
let body = document.documentElement || document.body;
console.log(body.scrollTop);
this.state.history[this.state.currentIndex].scrollTop = body.scrollTop;
this.state.history[this.state.currentIndex].data = this.state.data; //BUG FIX: if you go back, it doesn't save the data for that page. so if you go forward to it again, it breaks. changed data => this.state.data
this.state.history[this.state.currentIndex].data = this.state.data;
const next = this.state.history[this.state.currentIndex - 1];
window.history.replaceState({ ...next }, "Slate", `?scene=${next.id}`);
this.setState(
{
@ -491,11 +499,11 @@ export default class ApplicationPage extends React.Component {
_handleForward = () => {
let body = document.documentElement || document.body;
console.log(body.scrollTop);
this.state.history[this.state.currentIndex].scrollTop = body.scrollTop;
const next = this.state.history[this.state.currentIndex + 1];
window.history.replaceState({ ...next }, "Slate", `?scene=${next.id}`);
this.setState(
{
currentIndex: this.state.currentIndex + 1,