2018-02-07 18:06:07 +00:00
|
|
|
import PropTypes from 'prop-types';
|
|
|
|
import React from 'react';
|
2017-02-22 19:29:35 +00:00
|
|
|
import { bindActionCreators } from 'redux';
|
|
|
|
import { connect } from 'react-redux';
|
|
|
|
import { withRouter } from 'react-router';
|
2020-07-06 09:36:45 +00:00
|
|
|
import { withTranslation } from 'react-i18next';
|
2017-06-06 02:37:41 +00:00
|
|
|
import { Helmet } from 'react-helmet';
|
2017-02-22 19:29:35 +00:00
|
|
|
import SplitPane from 'react-split-pane';
|
2016-06-23 22:29:55 +00:00
|
|
|
import Editor from '../components/Editor';
|
2016-07-06 19:09:05 +00:00
|
|
|
import Sidebar from '../components/Sidebar';
|
2016-06-23 22:29:55 +00:00
|
|
|
import PreviewFrame from '../components/PreviewFrame';
|
|
|
|
import Toolbar from '../components/Toolbar';
|
2020-07-21 21:18:19 +00:00
|
|
|
import Preferences from '../components/Preferences/index';
|
2016-07-13 20:13:28 +00:00
|
|
|
import NewFileModal from '../components/NewFileModal';
|
2016-08-30 03:23:10 +00:00
|
|
|
import NewFolderModal from '../components/NewFolderModal';
|
2019-08-12 15:21:42 +00:00
|
|
|
import UploadFileModal from '../components/UploadFileModal';
|
2016-09-07 02:37:29 +00:00
|
|
|
import ShareModal from '../components/ShareModal';
|
2016-09-07 21:47:22 +00:00
|
|
|
import KeyboardShortcutModal from '../components/KeyboardShortcutModal';
|
2017-01-24 20:29:25 +00:00
|
|
|
import ErrorModal from '../components/ErrorModal';
|
2016-06-23 22:29:55 +00:00
|
|
|
import Nav from '../../../components/Nav';
|
2016-07-17 23:06:43 +00:00
|
|
|
import Console from '../components/Console';
|
2016-09-07 23:00:52 +00:00
|
|
|
import Toast from '../components/Toast';
|
2016-06-23 22:29:55 +00:00
|
|
|
import * as FileActions from '../actions/files';
|
|
|
|
import * as IDEActions from '../actions/ide';
|
|
|
|
import * as ProjectActions from '../actions/project';
|
2016-08-11 17:29:30 +00:00
|
|
|
import * as EditorAccessibilityActions from '../actions/editorAccessibility';
|
2016-08-05 01:43:13 +00:00
|
|
|
import * as PreferencesActions from '../actions/preferences';
|
2016-08-28 00:46:20 +00:00
|
|
|
import * as UserActions from '../../User/actions';
|
2016-09-07 23:00:52 +00:00
|
|
|
import * as ToastActions from '../actions/toast';
|
2017-01-09 23:09:23 +00:00
|
|
|
import * as ConsoleActions from '../actions/console';
|
2016-11-16 18:12:36 +00:00
|
|
|
import { getHTMLFile } from '../reducers/files';
|
2016-08-15 21:06:12 +00:00
|
|
|
import Overlay from '../../App/components/Overlay';
|
2016-08-22 16:35:59 +00:00
|
|
|
import About from '../components/About';
|
2019-11-25 20:19:22 +00:00
|
|
|
import AddToCollectionList from '../components/AddToCollectionList';
|
2018-02-09 21:32:06 +00:00
|
|
|
import Feedback from '../components/Feedback';
|
2019-11-10 20:39:22 +00:00
|
|
|
import { CollectionSearchbar } from '../components/Searchbar';
|
2016-06-23 22:29:55 +00:00
|
|
|
|
2020-06-29 20:27:31 +00:00
|
|
|
function getTitle(props) {
|
2020-06-20 14:31:15 +00:00
|
|
|
const { id } = props.project;
|
|
|
|
return id ? `p5.js Web Editor | ${props.project.name}` : 'p5.js Web Editor';
|
2020-06-29 20:27:31 +00:00
|
|
|
}
|
2020-06-20 14:31:15 +00:00
|
|
|
|
2020-06-29 20:27:31 +00:00
|
|
|
function isUserOwner(props) {
|
|
|
|
return props.project.owner && props.project.owner.id === props.user.id;
|
|
|
|
}
|
2020-06-20 14:31:15 +00:00
|
|
|
|
2020-07-24 21:11:10 +00:00
|
|
|
function warnIfUnsavedChanges(props) {
|
|
|
|
// eslint-disable-line
|
2020-07-02 12:28:45 +00:00
|
|
|
const { route } = props.route;
|
2020-07-24 21:11:10 +00:00
|
|
|
if (
|
|
|
|
route &&
|
|
|
|
route.action === 'PUSH' &&
|
|
|
|
(route.pathname === '/login' || route.pathname === '/signup')
|
|
|
|
) {
|
2020-07-02 12:28:45 +00:00
|
|
|
// don't warn
|
|
|
|
props.persistState();
|
|
|
|
window.onbeforeunload = null;
|
2020-07-24 21:11:10 +00:00
|
|
|
} else if (
|
|
|
|
route &&
|
|
|
|
(props.location.pathname === '/login' ||
|
|
|
|
props.location.pathname === '/signup')
|
|
|
|
) {
|
2020-07-02 12:28:45 +00:00
|
|
|
// don't warn
|
|
|
|
props.persistState();
|
|
|
|
window.onbeforeunload = null;
|
|
|
|
} else if (props.ide.unsavedChanges) {
|
2020-07-31 13:20:42 +00:00
|
|
|
if (!window.confirm(props.t('Nav.WarningUnsavedChanges'))) {
|
2020-07-02 12:28:45 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
props.setUnsavedChanges(false);
|
|
|
|
return true;
|
|
|
|
}
|
2020-08-03 17:35:28 +00:00
|
|
|
return true;
|
2020-07-02 12:28:45 +00:00
|
|
|
}
|
|
|
|
|
2016-06-23 22:29:55 +00:00
|
|
|
class IDEView extends React.Component {
|
2016-08-11 20:50:31 +00:00
|
|
|
constructor(props) {
|
|
|
|
super(props);
|
2016-09-08 01:48:45 +00:00
|
|
|
this.handleGlobalKeydown = this.handleGlobalKeydown.bind(this);
|
2019-03-05 21:25:34 +00:00
|
|
|
|
|
|
|
this.state = {
|
|
|
|
consoleSize: props.ide.consoleIsExpanded ? 150 : 29,
|
2020-07-24 21:11:10 +00:00
|
|
|
sidebarSize: props.ide.sidebarIsExpanded ? 160 : 20,
|
2019-03-05 21:25:34 +00:00
|
|
|
};
|
2016-08-11 20:50:31 +00:00
|
|
|
}
|
|
|
|
|
2016-06-23 22:29:55 +00:00
|
|
|
componentDidMount() {
|
2017-04-20 18:05:15 +00:00
|
|
|
// If page doesn't reload after Sign In then we need
|
|
|
|
// to force cleared state to be cleared
|
|
|
|
this.props.clearPersistedState();
|
|
|
|
|
2016-08-28 01:52:00 +00:00
|
|
|
this.props.stopSketch();
|
2016-06-23 22:29:55 +00:00
|
|
|
if (this.props.params.project_id) {
|
2020-05-26 21:35:13 +00:00
|
|
|
const { project_id: id, username } = this.props.params;
|
2016-11-10 23:49:42 +00:00
|
|
|
if (id !== this.props.project.id) {
|
2020-05-26 21:35:13 +00:00
|
|
|
this.props.getProject(id, username);
|
2016-11-10 23:49:42 +00:00
|
|
|
}
|
2016-06-23 22:29:55 +00:00
|
|
|
}
|
2016-08-11 20:50:31 +00:00
|
|
|
|
2016-09-08 01:48:45 +00:00
|
|
|
this.isMac = navigator.userAgent.toLowerCase().indexOf('mac') !== -1;
|
|
|
|
document.addEventListener('keydown', this.handleGlobalKeydown, false);
|
2016-09-20 22:27:10 +00:00
|
|
|
|
2020-07-24 21:11:10 +00:00
|
|
|
this.props.router.setRouteLeaveHook(
|
|
|
|
this.props.route,
|
|
|
|
this.handleUnsavedChanges
|
|
|
|
);
|
2016-09-20 22:27:10 +00:00
|
|
|
|
2020-07-09 16:50:46 +00:00
|
|
|
window.onbeforeunload = this.handleUnsavedChanges;
|
2016-09-21 22:52:44 +00:00
|
|
|
|
2017-01-24 18:04:51 +00:00
|
|
|
this.autosaveInterval = null;
|
2016-08-11 20:50:31 +00:00
|
|
|
}
|
|
|
|
|
2016-11-10 21:13:00 +00:00
|
|
|
componentWillReceiveProps(nextProps) {
|
|
|
|
if (nextProps.location !== this.props.location) {
|
|
|
|
this.props.setPreviousPath(this.props.location.pathname);
|
|
|
|
}
|
|
|
|
|
2016-08-11 20:50:31 +00:00
|
|
|
if (this.props.ide.consoleIsExpanded !== nextProps.ide.consoleIsExpanded) {
|
2020-07-24 21:11:10 +00:00
|
|
|
this.setState({
|
|
|
|
consoleSize: nextProps.ide.consoleIsExpanded ? 150 : 29,
|
|
|
|
});
|
2016-08-11 20:50:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (this.props.ide.sidebarIsExpanded !== nextProps.ide.sidebarIsExpanded) {
|
2020-07-24 21:11:10 +00:00
|
|
|
this.setState({
|
|
|
|
sidebarSize: nextProps.ide.sidebarIsExpanded ? 160 : 20,
|
|
|
|
});
|
2016-08-11 20:50:31 +00:00
|
|
|
}
|
2019-03-05 21:25:34 +00:00
|
|
|
}
|
2016-08-15 21:06:12 +00:00
|
|
|
|
2019-03-05 21:25:34 +00:00
|
|
|
componentWillUpdate(nextProps) {
|
2016-08-15 21:06:12 +00:00
|
|
|
if (nextProps.params.project_id && !this.props.params.project_id) {
|
2016-11-10 23:49:42 +00:00
|
|
|
if (nextProps.params.project_id !== nextProps.project.id) {
|
|
|
|
this.props.getProject(nextProps.params.project_id);
|
|
|
|
}
|
|
|
|
}
|
2016-06-23 22:29:55 +00:00
|
|
|
}
|
|
|
|
|
2016-08-04 01:47:24 +00:00
|
|
|
componentDidUpdate(prevProps) {
|
2020-06-20 14:31:15 +00:00
|
|
|
if (isUserOwner(this.props) && this.props.project.id) {
|
2020-07-24 21:11:10 +00:00
|
|
|
if (
|
|
|
|
this.props.preferences.autosave &&
|
|
|
|
this.props.ide.unsavedChanges &&
|
|
|
|
!this.props.ide.justOpenedProject
|
|
|
|
) {
|
2017-06-06 02:33:32 +00:00
|
|
|
if (
|
|
|
|
this.props.selectedFile.name === prevProps.selectedFile.name &&
|
2020-07-24 21:11:10 +00:00
|
|
|
this.props.selectedFile.content !== prevProps.selectedFile.content
|
|
|
|
) {
|
2017-05-14 00:47:41 +00:00
|
|
|
if (this.autosaveInterval) {
|
|
|
|
clearTimeout(this.autosaveInterval);
|
|
|
|
}
|
|
|
|
console.log('will save project in 20 seconds');
|
|
|
|
this.autosaveInterval = setTimeout(this.props.autosaveProject, 20000);
|
|
|
|
}
|
2017-01-24 18:04:51 +00:00
|
|
|
} else if (this.autosaveInterval && !this.props.preferences.autosave) {
|
2017-01-18 21:43:41 +00:00
|
|
|
clearTimeout(this.autosaveInterval);
|
2016-08-09 22:45:59 +00:00
|
|
|
this.autosaveInterval = null;
|
|
|
|
}
|
2017-01-18 21:43:41 +00:00
|
|
|
} else if (this.autosaveInterval) {
|
|
|
|
clearTimeout(this.autosaveInterval);
|
2016-08-12 16:45:26 +00:00
|
|
|
this.autosaveInterval = null;
|
|
|
|
}
|
2016-09-20 22:27:10 +00:00
|
|
|
|
|
|
|
if (this.props.route.path !== prevProps.route.path) {
|
2020-07-24 21:11:10 +00:00
|
|
|
this.props.router.setRouteLeaveHook(this.props.route, () =>
|
|
|
|
warnIfUnsavedChanges(this.props));
|
2016-09-20 22:27:10 +00:00
|
|
|
}
|
2016-06-23 22:29:55 +00:00
|
|
|
}
|
|
|
|
|
2016-08-03 23:03:01 +00:00
|
|
|
componentWillUnmount() {
|
2018-03-02 17:26:20 +00:00
|
|
|
document.removeEventListener('keydown', this.handleGlobalKeydown, false);
|
2017-01-18 21:43:41 +00:00
|
|
|
clearTimeout(this.autosaveInterval);
|
2016-08-03 23:03:01 +00:00
|
|
|
this.autosaveInterval = null;
|
|
|
|
}
|
|
|
|
|
2016-09-08 01:48:45 +00:00
|
|
|
handleGlobalKeydown(e) {
|
2016-10-19 22:35:59 +00:00
|
|
|
// 83 === s
|
2020-07-24 21:11:10 +00:00
|
|
|
if (
|
|
|
|
e.keyCode === 83 &&
|
|
|
|
((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac))
|
|
|
|
) {
|
2016-09-08 01:48:45 +00:00
|
|
|
e.preventDefault();
|
|
|
|
e.stopPropagation();
|
2020-07-24 21:11:10 +00:00
|
|
|
if (
|
|
|
|
isUserOwner(this.props) ||
|
|
|
|
(this.props.user.authenticated && !this.props.project.owner)
|
|
|
|
) {
|
2019-02-25 21:45:20 +00:00
|
|
|
this.props.saveProject(this.cmController.getContent());
|
2018-02-23 16:55:14 +00:00
|
|
|
} else if (this.props.user.authenticated) {
|
|
|
|
this.props.cloneProject();
|
|
|
|
} else {
|
|
|
|
this.props.showErrorModal('forceAuthentication');
|
2016-11-03 02:19:05 +00:00
|
|
|
}
|
2016-10-19 22:35:59 +00:00
|
|
|
// 13 === enter
|
2020-07-24 21:11:10 +00:00
|
|
|
} else if (
|
|
|
|
e.keyCode === 13 &&
|
|
|
|
e.shiftKey &&
|
|
|
|
((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac))
|
|
|
|
) {
|
2016-09-14 04:10:01 +00:00
|
|
|
e.preventDefault();
|
|
|
|
e.stopPropagation();
|
|
|
|
this.props.stopSketch();
|
2020-07-24 21:11:10 +00:00
|
|
|
} else if (
|
|
|
|
e.keyCode === 13 &&
|
|
|
|
((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac))
|
|
|
|
) {
|
2016-09-14 04:10:01 +00:00
|
|
|
e.preventDefault();
|
|
|
|
e.stopPropagation();
|
2017-09-14 21:57:09 +00:00
|
|
|
this.props.startSketch();
|
2017-09-15 16:10:25 +00:00
|
|
|
// 50 === 2
|
2020-07-24 21:11:10 +00:00
|
|
|
} else if (
|
|
|
|
e.keyCode === 50 &&
|
|
|
|
((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac)) &&
|
|
|
|
e.shiftKey
|
|
|
|
) {
|
2016-11-08 17:39:46 +00:00
|
|
|
e.preventDefault();
|
2017-09-15 16:10:25 +00:00
|
|
|
this.props.setAllAccessibleOutput(false);
|
|
|
|
// 49 === 1
|
2020-07-24 21:11:10 +00:00
|
|
|
} else if (
|
|
|
|
e.keyCode === 49 &&
|
|
|
|
((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac)) &&
|
|
|
|
e.shiftKey
|
|
|
|
) {
|
2016-11-08 17:39:46 +00:00
|
|
|
e.preventDefault();
|
2017-09-15 16:10:25 +00:00
|
|
|
this.props.setAllAccessibleOutput(true);
|
2020-07-24 21:11:10 +00:00
|
|
|
} else if (
|
|
|
|
e.keyCode === 66 &&
|
|
|
|
((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac))
|
|
|
|
) {
|
2020-02-23 18:48:16 +00:00
|
|
|
e.preventDefault();
|
|
|
|
if (!this.props.ide.sidebarIsExpanded) {
|
|
|
|
this.props.expandSidebar();
|
|
|
|
} else {
|
|
|
|
this.props.collapseSidebar();
|
|
|
|
}
|
2020-04-05 08:16:07 +00:00
|
|
|
} else if (e.keyCode === 192 && e.ctrlKey) {
|
2020-02-24 19:43:57 +00:00
|
|
|
e.preventDefault();
|
|
|
|
if (this.props.ide.consoleIsExpanded) {
|
|
|
|
this.props.collapseConsole();
|
|
|
|
} else {
|
|
|
|
this.props.expandConsole();
|
|
|
|
}
|
2020-04-23 18:59:33 +00:00
|
|
|
} else if (e.keyCode === 27) {
|
|
|
|
if (this.props.ide.newFolderModalVisible) {
|
|
|
|
this.props.closeNewFolderModal();
|
|
|
|
} else if (this.props.ide.uploadFileModalVisible) {
|
|
|
|
this.props.closeUploadFileModal();
|
|
|
|
} else if (this.props.ide.modalIsVisible) {
|
|
|
|
this.props.closeNewFileModal();
|
|
|
|
}
|
2016-09-08 01:48:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-09 16:50:46 +00:00
|
|
|
handleUnsavedChanges = () => warnIfUnsavedChanges(this.props);
|
2020-07-06 19:01:56 +00:00
|
|
|
|
2016-06-23 22:29:55 +00:00
|
|
|
render() {
|
|
|
|
return (
|
|
|
|
<div className="ide">
|
2017-06-06 02:37:41 +00:00
|
|
|
<Helmet>
|
2020-06-20 14:31:15 +00:00
|
|
|
<title>{getTitle(this.props)}</title>
|
2017-06-06 02:37:41 +00:00
|
|
|
</Helmet>
|
2016-09-07 23:00:52 +00:00
|
|
|
{this.props.toast.isVisible && <Toast />}
|
2016-06-23 22:29:55 +00:00
|
|
|
<Nav
|
2020-07-09 16:50:46 +00:00
|
|
|
warnIfUnsavedChanges={this.handleUnsavedChanges}
|
2017-09-01 16:40:15 +00:00
|
|
|
cmController={this.cmController}
|
2016-06-23 22:29:55 +00:00
|
|
|
/>
|
2020-06-28 13:05:33 +00:00
|
|
|
<Toolbar key={this.props.project.id} />
|
2020-07-24 21:11:10 +00:00
|
|
|
{this.props.ide.preferencesIsVisible && (
|
2017-11-14 00:09:08 +00:00
|
|
|
<Overlay
|
2020-07-31 13:20:42 +00:00
|
|
|
title={this.props.t('Preferences.Settings')}
|
|
|
|
ariaLabel={this.props.t('Preferences.Settings')}
|
2017-11-14 00:09:08 +00:00
|
|
|
closeOverlay={this.props.closePreferences}
|
|
|
|
>
|
|
|
|
<Preferences
|
|
|
|
fontSize={this.props.preferences.fontSize}
|
|
|
|
setFontSize={this.props.setFontSize}
|
|
|
|
autosave={this.props.preferences.autosave}
|
2019-03-26 19:37:44 +00:00
|
|
|
linewrap={this.props.preferences.linewrap}
|
2019-08-30 16:36:34 +00:00
|
|
|
lineNumbers={this.props.preferences.lineNumbers}
|
|
|
|
setLineNumbers={this.props.setLineNumbers}
|
2017-11-14 00:09:08 +00:00
|
|
|
setAutosave={this.props.setAutosave}
|
2019-03-26 19:37:44 +00:00
|
|
|
setLinewrap={this.props.setLinewrap}
|
2017-11-14 00:09:08 +00:00
|
|
|
lintWarning={this.props.preferences.lintWarning}
|
|
|
|
setLintWarning={this.props.setLintWarning}
|
|
|
|
textOutput={this.props.preferences.textOutput}
|
|
|
|
gridOutput={this.props.preferences.gridOutput}
|
|
|
|
soundOutput={this.props.preferences.soundOutput}
|
|
|
|
setTextOutput={this.props.setTextOutput}
|
|
|
|
setGridOutput={this.props.setGridOutput}
|
|
|
|
setSoundOutput={this.props.setSoundOutput}
|
|
|
|
theme={this.props.preferences.theme}
|
|
|
|
setTheme={this.props.setTheme}
|
|
|
|
/>
|
|
|
|
</Overlay>
|
2020-07-24 21:11:10 +00:00
|
|
|
)}
|
2020-05-19 19:34:00 +00:00
|
|
|
<main className="editor-preview-container">
|
2016-08-11 20:50:31 +00:00
|
|
|
<SplitPane
|
|
|
|
split="vertical"
|
2019-03-05 21:25:34 +00:00
|
|
|
size={this.state.sidebarSize}
|
|
|
|
onChange={size => this.setState({ sidebarSize: size })}
|
2016-08-11 20:50:31 +00:00
|
|
|
onDragFinished={this._handleSidebarPaneOnDragFinished}
|
|
|
|
allowResize={this.props.ide.sidebarIsExpanded}
|
2020-07-30 22:59:12 +00:00
|
|
|
minSize={125}
|
2016-08-11 20:50:31 +00:00
|
|
|
>
|
2016-08-11 19:41:13 +00:00
|
|
|
<Sidebar
|
2016-07-21 04:05:47 +00:00
|
|
|
files={this.props.files}
|
2016-08-11 19:41:13 +00:00
|
|
|
setSelectedFile={this.props.setSelectedFile}
|
|
|
|
newFile={this.props.newFile}
|
|
|
|
isExpanded={this.props.ide.sidebarIsExpanded}
|
|
|
|
deleteFile={this.props.deleteFile}
|
|
|
|
updateFileName={this.props.updateFileName}
|
2016-08-30 03:23:10 +00:00
|
|
|
projectOptionsVisible={this.props.ide.projectOptionsVisible}
|
|
|
|
openProjectOptions={this.props.openProjectOptions}
|
|
|
|
closeProjectOptions={this.props.closeProjectOptions}
|
|
|
|
newFolder={this.props.newFolder}
|
2017-04-12 00:06:04 +00:00
|
|
|
user={this.props.user}
|
|
|
|
owner={this.props.project.owner}
|
2019-09-10 22:42:23 +00:00
|
|
|
openUploadFileModal={this.props.openUploadFileModal}
|
|
|
|
closeUploadFileModal={this.props.closeUploadFileModal}
|
2016-07-21 04:05:47 +00:00
|
|
|
/>
|
2016-08-11 19:41:13 +00:00
|
|
|
<SplitPane
|
|
|
|
split="vertical"
|
2018-05-05 00:22:39 +00:00
|
|
|
defaultSize="50%"
|
2020-07-24 21:11:10 +00:00
|
|
|
onChange={() => {
|
|
|
|
this.overlay.style.display = 'block';
|
|
|
|
}}
|
|
|
|
onDragFinished={() => {
|
|
|
|
this.overlay.style.display = 'none';
|
|
|
|
}}
|
2019-03-20 18:28:15 +00:00
|
|
|
resizerStyle={{
|
2020-07-24 21:11:10 +00:00
|
|
|
borderLeftWidth: '2px',
|
|
|
|
borderRightWidth: '2px',
|
|
|
|
width: '2px',
|
|
|
|
margin: '0px 0px',
|
2019-03-20 18:28:15 +00:00
|
|
|
}}
|
2016-08-11 19:41:13 +00:00
|
|
|
>
|
2016-08-11 20:50:31 +00:00
|
|
|
<SplitPane
|
|
|
|
split="horizontal"
|
|
|
|
primary="second"
|
2019-03-05 21:25:34 +00:00
|
|
|
size={this.state.consoleSize}
|
2016-08-11 20:50:31 +00:00
|
|
|
minSize={29}
|
2019-03-05 21:25:34 +00:00
|
|
|
onChange={size => this.setState({ consoleSize: size })}
|
2016-08-11 20:50:31 +00:00
|
|
|
allowResize={this.props.ide.consoleIsExpanded}
|
2016-12-19 22:07:04 +00:00
|
|
|
className="editor-preview-subpanel"
|
2016-08-11 20:50:31 +00:00
|
|
|
>
|
2020-08-12 14:41:53 +00:00
|
|
|
<Editor provideController={(ctl) => { this.cmController = ctl; }} />
|
2020-07-16 21:20:52 +00:00
|
|
|
<Console />
|
2016-08-11 19:41:13 +00:00
|
|
|
</SplitPane>
|
2020-05-19 19:34:00 +00:00
|
|
|
<section className="preview-frame-holder">
|
2017-03-02 20:01:33 +00:00
|
|
|
<header className="preview-frame__header">
|
2020-07-31 13:20:42 +00:00
|
|
|
<h2 className="preview-frame__title">{this.props.t('Toolbar.Preview')}</h2>
|
2017-03-02 20:01:33 +00:00
|
|
|
</header>
|
2018-09-08 18:50:39 +00:00
|
|
|
<div className="preview-frame__content">
|
2020-07-24 21:11:10 +00:00
|
|
|
<div
|
|
|
|
className="preview-frame-overlay"
|
|
|
|
ref={(element) => {
|
|
|
|
this.overlay = element;
|
|
|
|
}}
|
|
|
|
>
|
2018-09-08 18:50:39 +00:00
|
|
|
</div>
|
|
|
|
<div>
|
2020-07-24 21:11:10 +00:00
|
|
|
{((this.props.preferences.textOutput ||
|
|
|
|
this.props.preferences.gridOutput ||
|
|
|
|
this.props.preferences.soundOutput) &&
|
|
|
|
this.props.ide.isPlaying) ||
|
|
|
|
this.props.ide.isAccessibleOutputPlaying}
|
2018-09-08 18:50:39 +00:00
|
|
|
</div>
|
|
|
|
<PreviewFrame
|
|
|
|
htmlFile={this.props.htmlFile}
|
|
|
|
files={this.props.files}
|
|
|
|
content={this.props.selectedFile.content}
|
|
|
|
isPlaying={this.props.ide.isPlaying}
|
2020-07-24 21:11:10 +00:00
|
|
|
isAccessibleOutputPlaying={
|
|
|
|
this.props.ide.isAccessibleOutputPlaying
|
|
|
|
}
|
2018-09-08 18:50:39 +00:00
|
|
|
textOutput={this.props.preferences.textOutput}
|
|
|
|
gridOutput={this.props.preferences.gridOutput}
|
|
|
|
soundOutput={this.props.preferences.soundOutput}
|
|
|
|
setTextOutput={this.props.setTextOutput}
|
|
|
|
setGridOutput={this.props.setGridOutput}
|
|
|
|
setSoundOutput={this.props.setSoundOutput}
|
|
|
|
dispatchConsoleEvent={this.props.dispatchConsoleEvent}
|
|
|
|
autorefresh={this.props.preferences.autorefresh}
|
|
|
|
previewIsRefreshing={this.props.ide.previewIsRefreshing}
|
|
|
|
endSketchRefresh={this.props.endSketchRefresh}
|
|
|
|
stopSketch={this.props.stopSketch}
|
|
|
|
setBlobUrl={this.props.setBlobUrl}
|
|
|
|
expandConsole={this.props.expandConsole}
|
2019-04-30 21:44:41 +00:00
|
|
|
clearConsole={this.props.clearConsole}
|
2019-05-02 19:30:56 +00:00
|
|
|
cmController={this.cmController}
|
2018-09-08 18:50:39 +00:00
|
|
|
/>
|
2016-08-11 19:41:13 +00:00
|
|
|
</div>
|
2020-05-19 19:34:00 +00:00
|
|
|
</section>
|
2016-08-11 19:41:13 +00:00
|
|
|
</SplitPane>
|
|
|
|
</SplitPane>
|
2020-05-19 19:34:00 +00:00
|
|
|
</main>
|
2020-07-24 21:11:10 +00:00
|
|
|
{this.props.ide.modalIsVisible && <NewFileModal />}
|
|
|
|
{this.props.ide.newFolderModalVisible && (
|
2017-11-13 19:44:23 +00:00
|
|
|
<NewFolderModal
|
|
|
|
closeModal={this.props.closeNewFolderModal}
|
|
|
|
createFolder={this.props.createFolder}
|
|
|
|
/>
|
2020-07-24 21:11:10 +00:00
|
|
|
)}
|
|
|
|
{this.props.ide.uploadFileModalVisible && (
|
|
|
|
<UploadFileModal closeModal={this.props.closeUploadFileModal} />
|
|
|
|
)}
|
|
|
|
{this.props.location.pathname === '/about' && (
|
2017-11-13 19:44:23 +00:00
|
|
|
<Overlay
|
2020-07-31 13:20:42 +00:00
|
|
|
title={this.props.t('About.Title')}
|
2017-11-13 19:44:23 +00:00
|
|
|
previousPath={this.props.ide.previousPath}
|
2020-07-31 13:20:42 +00:00
|
|
|
ariaLabel={this.props.t('About.Title')}
|
2017-11-13 19:44:23 +00:00
|
|
|
>
|
|
|
|
<About previousPath={this.props.ide.previousPath} />
|
|
|
|
</Overlay>
|
2020-07-24 21:11:10 +00:00
|
|
|
)}
|
|
|
|
{this.props.location.pathname === '/feedback' && (
|
2018-02-09 21:32:06 +00:00
|
|
|
<Overlay
|
2020-07-31 13:20:42 +00:00
|
|
|
title={this.props.t('IDEView.SubmitFeedback')}
|
2018-02-09 21:32:06 +00:00
|
|
|
previousPath={this.props.ide.previousPath}
|
|
|
|
ariaLabel="submit-feedback"
|
|
|
|
>
|
|
|
|
<Feedback previousPath={this.props.ide.previousPath} />
|
|
|
|
</Overlay>
|
2020-07-24 21:11:10 +00:00
|
|
|
)}
|
|
|
|
{this.props.location.pathname.match(/add-to-collection$/) && (
|
2019-09-09 16:52:54 +00:00
|
|
|
<Overlay
|
|
|
|
ariaLabel="add to collection"
|
2020-01-15 09:50:17 +00:00
|
|
|
title="Add to collection"
|
2019-09-09 16:52:54 +00:00
|
|
|
previousPath={this.props.ide.previousPath}
|
2019-11-10 20:39:22 +00:00
|
|
|
actions={<CollectionSearchbar />}
|
2019-12-11 14:12:00 +00:00
|
|
|
isFixedHeight
|
2019-09-09 16:52:54 +00:00
|
|
|
>
|
2019-11-25 20:19:22 +00:00
|
|
|
<AddToCollectionList
|
2019-09-09 16:52:54 +00:00
|
|
|
projectId={this.props.params.project_id}
|
|
|
|
username={this.props.params.username}
|
|
|
|
user={this.props.user}
|
|
|
|
/>
|
|
|
|
</Overlay>
|
2020-07-24 21:11:10 +00:00
|
|
|
)}
|
|
|
|
{this.props.ide.shareModalVisible && (
|
2017-11-13 19:44:23 +00:00
|
|
|
<Overlay
|
2019-12-29 23:43:06 +00:00
|
|
|
title="Share"
|
2017-11-13 19:44:23 +00:00
|
|
|
ariaLabel="share"
|
|
|
|
closeOverlay={this.props.closeShareModal}
|
|
|
|
>
|
|
|
|
<ShareModal
|
2019-06-19 20:21:25 +00:00
|
|
|
projectId={this.props.ide.shareModalProjectId}
|
|
|
|
projectName={this.props.ide.shareModalProjectName}
|
|
|
|
ownerUsername={this.props.ide.shareModalProjectUsername}
|
2017-11-13 19:44:23 +00:00
|
|
|
/>
|
|
|
|
</Overlay>
|
2020-07-24 21:11:10 +00:00
|
|
|
)}
|
|
|
|
{this.props.ide.keyboardShortcutVisible && (
|
2017-11-13 19:44:23 +00:00
|
|
|
<Overlay
|
2020-07-31 13:20:42 +00:00
|
|
|
title={this.props.t('KeyboardShortcuts.Title')}
|
|
|
|
ariaLabel={this.props.t('KeyboardShortcuts.Title')}
|
2017-11-13 19:44:23 +00:00
|
|
|
closeOverlay={this.props.closeKeyboardShortcutModal}
|
|
|
|
>
|
|
|
|
<KeyboardShortcutModal />
|
|
|
|
</Overlay>
|
2020-07-24 21:11:10 +00:00
|
|
|
)}
|
|
|
|
{this.props.ide.errorType && (
|
2017-11-13 19:44:23 +00:00
|
|
|
<Overlay
|
2019-12-29 23:43:06 +00:00
|
|
|
title="Error"
|
2020-07-31 13:20:42 +00:00
|
|
|
ariaLabel={this.props.t('Common.Error')}
|
2018-03-02 17:26:20 +00:00
|
|
|
closeOverlay={this.props.hideErrorModal}
|
2017-11-13 19:44:23 +00:00
|
|
|
>
|
|
|
|
<ErrorModal
|
|
|
|
type={this.props.ide.errorType}
|
2018-02-23 16:55:14 +00:00
|
|
|
closeModal={this.props.hideErrorModal}
|
2017-11-13 19:44:23 +00:00
|
|
|
/>
|
|
|
|
</Overlay>
|
2020-07-24 21:11:10 +00:00
|
|
|
)}
|
2016-06-23 22:29:55 +00:00
|
|
|
</div>
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-27 19:34:58 +00:00
|
|
|
IDEView.propTypes = {
|
|
|
|
params: PropTypes.shape({
|
2016-08-17 19:53:25 +00:00
|
|
|
project_id: PropTypes.string,
|
2016-10-18 20:07:25 +00:00
|
|
|
username: PropTypes.string,
|
|
|
|
reset_password_token: PropTypes.string,
|
2017-02-22 19:29:35 +00:00
|
|
|
}).isRequired,
|
2016-08-15 21:06:12 +00:00
|
|
|
location: PropTypes.shape({
|
2020-07-24 21:11:10 +00:00
|
|
|
pathname: PropTypes.string,
|
2017-02-22 19:29:35 +00:00
|
|
|
}).isRequired,
|
2016-06-27 19:34:58 +00:00
|
|
|
getProject: PropTypes.func.isRequired,
|
2016-07-21 02:18:20 +00:00
|
|
|
user: PropTypes.shape({
|
2016-08-09 22:45:59 +00:00
|
|
|
authenticated: PropTypes.bool.isRequired,
|
2016-11-04 22:54:14 +00:00
|
|
|
id: PropTypes.string,
|
2020-07-24 21:11:10 +00:00
|
|
|
username: PropTypes.string,
|
2016-07-21 02:18:20 +00:00
|
|
|
}).isRequired,
|
2016-06-27 19:34:58 +00:00
|
|
|
saveProject: PropTypes.func.isRequired,
|
|
|
|
ide: PropTypes.shape({
|
2020-08-12 14:41:53 +00:00
|
|
|
errorType: PropTypes.string,
|
|
|
|
keyboardShortcutVisible: PropTypes.bool.isRequired,
|
2016-09-07 20:33:01 +00:00
|
|
|
shareModalVisible: PropTypes.bool.isRequired,
|
2019-06-19 20:21:25 +00:00
|
|
|
shareModalProjectId: PropTypes.string.isRequired,
|
|
|
|
shareModalProjectName: PropTypes.string.isRequired,
|
|
|
|
shareModalProjectUsername: PropTypes.string.isRequired,
|
2016-11-29 20:51:16 +00:00
|
|
|
previousPath: PropTypes.string.isRequired,
|
2020-08-12 14:41:53 +00:00
|
|
|
previewIsRefreshing: PropTypes.bool.isRequired,
|
|
|
|
isPlaying: PropTypes.bool.isRequired,
|
|
|
|
isAccessibleOutputPlaying: PropTypes.bool.isRequired,
|
|
|
|
projectOptionsVisible: PropTypes.bool.isRequired,
|
|
|
|
preferencesIsVisible: PropTypes.bool.isRequired,
|
|
|
|
modalIsVisible: PropTypes.bool.isRequired,
|
2020-07-24 21:11:10 +00:00
|
|
|
uploadFileModalVisible: PropTypes.bool.isRequired,
|
2020-08-12 14:41:53 +00:00
|
|
|
newFolderModalVisible: PropTypes.bool.isRequired,
|
|
|
|
justOpenedProject: PropTypes.bool.isRequired,
|
|
|
|
sidebarIsExpanded: PropTypes.bool.isRequired,
|
|
|
|
consoleIsExpanded: PropTypes.bool.isRequired,
|
|
|
|
unsavedChanges: PropTypes.bool.isRequired,
|
2016-06-27 19:34:58 +00:00
|
|
|
}).isRequired,
|
|
|
|
stopSketch: PropTypes.func.isRequired,
|
|
|
|
project: PropTypes.shape({
|
2016-08-04 01:47:24 +00:00
|
|
|
id: PropTypes.string,
|
2016-07-15 15:54:47 +00:00
|
|
|
name: PropTypes.string.isRequired,
|
|
|
|
owner: PropTypes.shape({
|
2016-08-09 22:45:59 +00:00
|
|
|
username: PropTypes.string,
|
2020-07-24 21:11:10 +00:00
|
|
|
id: PropTypes.string,
|
2017-03-02 19:38:29 +00:00
|
|
|
}),
|
2020-07-24 21:11:10 +00:00
|
|
|
updatedAt: PropTypes.string,
|
2016-06-27 19:34:58 +00:00
|
|
|
}).isRequired,
|
2016-08-11 17:29:30 +00:00
|
|
|
editorAccessibility: PropTypes.shape({
|
2020-07-24 21:11:10 +00:00
|
|
|
lintMessages: PropTypes.array.isRequired, // eslint-disable-line
|
2016-08-10 15:13:17 +00:00
|
|
|
}).isRequired,
|
2016-06-27 19:34:58 +00:00
|
|
|
preferences: PropTypes.shape({
|
2016-08-11 18:09:59 +00:00
|
|
|
autosave: PropTypes.bool.isRequired,
|
2020-08-12 14:41:53 +00:00
|
|
|
fontSize: PropTypes.number.isRequired,
|
2019-03-26 19:37:44 +00:00
|
|
|
linewrap: PropTypes.bool.isRequired,
|
2019-08-30 16:36:34 +00:00
|
|
|
lineNumbers: PropTypes.bool.isRequired,
|
2016-08-12 19:50:33 +00:00
|
|
|
lintWarning: PropTypes.bool.isRequired,
|
2017-05-31 19:23:30 +00:00
|
|
|
textOutput: PropTypes.bool.isRequired,
|
|
|
|
gridOutput: PropTypes.bool.isRequired,
|
|
|
|
soundOutput: PropTypes.bool.isRequired,
|
2016-09-28 18:12:01 +00:00
|
|
|
theme: PropTypes.string.isRequired,
|
2020-07-24 21:11:10 +00:00
|
|
|
autorefresh: PropTypes.bool.isRequired,
|
2020-08-12 14:41:53 +00:00
|
|
|
|
2016-06-27 19:34:58 +00:00
|
|
|
}).isRequired,
|
|
|
|
closePreferences: PropTypes.func.isRequired,
|
2016-08-05 01:43:13 +00:00
|
|
|
setFontSize: PropTypes.func.isRequired,
|
2016-08-09 20:15:28 +00:00
|
|
|
setAutosave: PropTypes.func.isRequired,
|
2019-08-30 16:36:34 +00:00
|
|
|
setLineNumbers: PropTypes.func.isRequired,
|
2019-03-26 19:37:44 +00:00
|
|
|
setLinewrap: PropTypes.func.isRequired,
|
2016-08-11 18:09:59 +00:00
|
|
|
setLintWarning: PropTypes.func.isRequired,
|
2016-08-12 19:50:33 +00:00
|
|
|
setTextOutput: PropTypes.func.isRequired,
|
2017-05-31 19:23:30 +00:00
|
|
|
setGridOutput: PropTypes.func.isRequired,
|
|
|
|
setSoundOutput: PropTypes.func.isRequired,
|
2017-09-15 16:10:25 +00:00
|
|
|
setAllAccessibleOutput: PropTypes.func.isRequired,
|
2017-02-22 19:29:35 +00:00
|
|
|
files: PropTypes.arrayOf(PropTypes.shape({
|
|
|
|
id: PropTypes.string.isRequired,
|
|
|
|
name: PropTypes.string.isRequired,
|
2020-07-24 21:11:10 +00:00
|
|
|
content: PropTypes.string.isRequired,
|
2017-02-22 19:29:35 +00:00
|
|
|
})).isRequired,
|
2016-07-08 18:57:22 +00:00
|
|
|
selectedFile: PropTypes.shape({
|
2016-07-08 19:58:49 +00:00
|
|
|
id: PropTypes.string.isRequired,
|
2017-05-14 00:47:41 +00:00
|
|
|
content: PropTypes.string.isRequired,
|
2020-07-24 21:11:10 +00:00
|
|
|
name: PropTypes.string.isRequired,
|
2017-02-22 19:29:35 +00:00
|
|
|
}).isRequired,
|
2016-07-11 19:22:29 +00:00
|
|
|
setSelectedFile: PropTypes.func.isRequired,
|
2017-02-22 19:29:35 +00:00
|
|
|
htmlFile: PropTypes.shape({
|
|
|
|
id: PropTypes.string.isRequired,
|
|
|
|
name: PropTypes.string.isRequired,
|
2020-07-24 21:11:10 +00:00
|
|
|
content: PropTypes.string.isRequired,
|
2017-02-22 19:29:35 +00:00
|
|
|
}).isRequired,
|
2016-07-17 23:15:13 +00:00
|
|
|
dispatchConsoleEvent: PropTypes.func.isRequired,
|
2016-07-13 20:13:28 +00:00
|
|
|
newFile: PropTypes.func.isRequired,
|
2016-07-14 16:47:54 +00:00
|
|
|
expandSidebar: PropTypes.func.isRequired,
|
2016-07-15 17:11:50 +00:00
|
|
|
collapseSidebar: PropTypes.func.isRequired,
|
2016-07-21 04:33:41 +00:00
|
|
|
cloneProject: PropTypes.func.isRequired,
|
|
|
|
expandConsole: PropTypes.func.isRequired,
|
|
|
|
collapseConsole: PropTypes.func.isRequired,
|
2016-08-03 21:10:03 +00:00
|
|
|
deleteFile: PropTypes.func.isRequired,
|
2016-08-15 16:42:13 +00:00
|
|
|
updateFileName: PropTypes.func.isRequired,
|
2016-08-30 03:23:10 +00:00
|
|
|
openProjectOptions: PropTypes.func.isRequired,
|
|
|
|
closeProjectOptions: PropTypes.func.isRequired,
|
|
|
|
newFolder: PropTypes.func.isRequired,
|
|
|
|
closeNewFolderModal: PropTypes.func.isRequired,
|
2020-04-23 18:59:33 +00:00
|
|
|
closeNewFileModal: PropTypes.func.isRequired,
|
2016-08-30 18:39:37 +00:00
|
|
|
createFolder: PropTypes.func.isRequired,
|
2016-09-07 20:33:01 +00:00
|
|
|
closeShareModal: PropTypes.func.isRequired,
|
2016-09-07 23:00:52 +00:00
|
|
|
closeKeyboardShortcutModal: PropTypes.func.isRequired,
|
|
|
|
toast: PropTypes.shape({
|
2020-07-24 21:11:10 +00:00
|
|
|
isVisible: PropTypes.bool.isRequired,
|
2016-09-07 23:00:52 +00:00
|
|
|
}).isRequired,
|
2016-09-20 22:27:10 +00:00
|
|
|
autosaveProject: PropTypes.func.isRequired,
|
|
|
|
router: PropTypes.shape({
|
2020-07-24 21:11:10 +00:00
|
|
|
setRouteLeaveHook: PropTypes.func,
|
2016-09-20 22:27:10 +00:00
|
|
|
}).isRequired,
|
2017-02-22 19:29:35 +00:00
|
|
|
route: PropTypes.oneOfType([PropTypes.object, PropTypes.element]).isRequired,
|
2016-09-13 18:15:46 +00:00
|
|
|
setTheme: PropTypes.func.isRequired,
|
2016-09-28 22:05:14 +00:00
|
|
|
endSketchRefresh: PropTypes.func.isRequired,
|
2016-11-10 21:13:00 +00:00
|
|
|
setBlobUrl: PropTypes.func.isRequired,
|
2016-11-10 23:49:42 +00:00
|
|
|
setPreviousPath: PropTypes.func.isRequired,
|
2017-01-13 22:17:31 +00:00
|
|
|
clearConsole: PropTypes.func.isRequired,
|
2017-01-24 20:29:25 +00:00
|
|
|
showErrorModal: PropTypes.func.isRequired,
|
2017-04-20 18:05:15 +00:00
|
|
|
hideErrorModal: PropTypes.func.isRequired,
|
|
|
|
clearPersistedState: PropTypes.func.isRequired,
|
2017-09-14 21:57:09 +00:00
|
|
|
startSketch: PropTypes.func.isRequired,
|
2019-09-10 22:42:23 +00:00
|
|
|
openUploadFileModal: PropTypes.func.isRequired,
|
2020-07-06 09:36:45 +00:00
|
|
|
closeUploadFileModal: PropTypes.func.isRequired,
|
2020-07-24 21:11:10 +00:00
|
|
|
t: PropTypes.func.isRequired,
|
2016-06-27 19:34:58 +00:00
|
|
|
};
|
|
|
|
|
2016-06-23 22:29:55 +00:00
|
|
|
function mapStateToProps(state) {
|
|
|
|
return {
|
2016-08-24 17:09:48 +00:00
|
|
|
files: state.files,
|
2020-07-24 21:11:10 +00:00
|
|
|
selectedFile:
|
|
|
|
state.files.find(file => file.isSelectedFile) ||
|
2019-05-06 18:50:28 +00:00
|
|
|
state.files.find(file => file.name === 'sketch.js') ||
|
|
|
|
state.files.find(file => file.name !== 'root'),
|
2016-07-11 19:22:29 +00:00
|
|
|
htmlFile: getHTMLFile(state.files),
|
2016-08-24 17:09:48 +00:00
|
|
|
ide: state.ide,
|
2016-06-23 22:29:55 +00:00
|
|
|
preferences: state.preferences,
|
2016-08-11 17:29:30 +00:00
|
|
|
editorAccessibility: state.editorAccessibility,
|
2016-06-23 22:29:55 +00:00
|
|
|
user: state.user,
|
2016-09-07 23:00:52 +00:00
|
|
|
project: state.project,
|
2017-01-09 23:09:23 +00:00
|
|
|
toast: state.toast,
|
2020-07-24 21:11:10 +00:00
|
|
|
console: state.console,
|
2016-06-23 22:29:55 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
function mapDispatchToProps(dispatch) {
|
2018-05-05 00:22:39 +00:00
|
|
|
return bindActionCreators(
|
|
|
|
Object.assign(
|
|
|
|
{},
|
|
|
|
EditorAccessibilityActions,
|
|
|
|
FileActions,
|
|
|
|
ProjectActions,
|
|
|
|
IDEActions,
|
|
|
|
PreferencesActions,
|
|
|
|
UserActions,
|
|
|
|
ToastActions,
|
|
|
|
ConsoleActions
|
|
|
|
),
|
|
|
|
dispatch
|
|
|
|
);
|
2016-06-23 22:29:55 +00:00
|
|
|
}
|
|
|
|
|
2020-07-31 13:20:42 +00:00
|
|
|
|
|
|
|
export default withTranslation()(withRouter(connect(mapStateToProps, mapDispatchToProps)(IDEView)));
|