2018-02-07 19:06:07 +01:00
|
|
|
import PropTypes from 'prop-types';
|
|
|
|
import React from 'react';
|
2017-02-22 20:29:35 +01:00
|
|
|
import { bindActionCreators } from 'redux';
|
|
|
|
import { connect } from 'react-redux';
|
|
|
|
import { withRouter } from 'react-router';
|
2017-06-06 04:37:41 +02:00
|
|
|
import { Helmet } from 'react-helmet';
|
2017-02-22 20:29:35 +01:00
|
|
|
import SplitPane from 'react-split-pane';
|
2016-06-24 00:29:55 +02:00
|
|
|
import Editor from '../components/Editor';
|
2016-07-06 21:09:05 +02:00
|
|
|
import Sidebar from '../components/Sidebar';
|
2016-06-24 00:29:55 +02:00
|
|
|
import PreviewFrame from '../components/PreviewFrame';
|
|
|
|
import Toolbar from '../components/Toolbar';
|
|
|
|
import Preferences from '../components/Preferences';
|
2016-07-13 22:13:28 +02:00
|
|
|
import NewFileModal from '../components/NewFileModal';
|
2016-08-30 05:23:10 +02:00
|
|
|
import NewFolderModal from '../components/NewFolderModal';
|
2016-09-07 04:37:29 +02:00
|
|
|
import ShareModal from '../components/ShareModal';
|
2016-09-07 23:47:22 +02:00
|
|
|
import KeyboardShortcutModal from '../components/KeyboardShortcutModal';
|
2017-01-24 21:29:25 +01:00
|
|
|
import ErrorModal from '../components/ErrorModal';
|
2017-09-14 20:51:36 +02:00
|
|
|
import HTTPSModal from '../components/HTTPSModal';
|
2016-06-24 00:29:55 +02:00
|
|
|
import Nav from '../../../components/Nav';
|
2016-07-18 01:06:43 +02:00
|
|
|
import Console from '../components/Console';
|
2016-09-08 01:00:52 +02:00
|
|
|
import Toast from '../components/Toast';
|
2016-06-24 00:29:55 +02:00
|
|
|
import * as FileActions from '../actions/files';
|
|
|
|
import * as IDEActions from '../actions/ide';
|
|
|
|
import * as ProjectActions from '../actions/project';
|
2016-08-11 19:29:30 +02:00
|
|
|
import * as EditorAccessibilityActions from '../actions/editorAccessibility';
|
2016-08-05 03:43:13 +02:00
|
|
|
import * as PreferencesActions from '../actions/preferences';
|
2016-08-28 02:46:20 +02:00
|
|
|
import * as UserActions from '../../User/actions';
|
2016-09-08 01:00:52 +02:00
|
|
|
import * as ToastActions from '../actions/toast';
|
2017-01-10 00:09:23 +01:00
|
|
|
import * as ConsoleActions from '../actions/console';
|
2016-11-16 19:12:36 +01:00
|
|
|
import { getHTMLFile } from '../reducers/files';
|
2016-08-15 23:06:12 +02:00
|
|
|
import Overlay from '../../App/components/Overlay';
|
|
|
|
import SketchList from '../components/SketchList';
|
2019-08-21 20:08:08 +02:00
|
|
|
import Searchbar from '../components/Searchbar';
|
2017-07-11 17:37:43 +02:00
|
|
|
import AssetList from '../components/AssetList';
|
2016-08-22 18:35:59 +02:00
|
|
|
import About from '../components/About';
|
2018-02-09 22:32:06 +01:00
|
|
|
import Feedback from '../components/Feedback';
|
2016-06-24 00:29:55 +02:00
|
|
|
|
|
|
|
class IDEView extends React.Component {
|
2016-08-11 22:50:31 +02:00
|
|
|
constructor(props) {
|
|
|
|
super(props);
|
2016-09-08 03:48:45 +02:00
|
|
|
this.handleGlobalKeydown = this.handleGlobalKeydown.bind(this);
|
2016-09-21 00:27:10 +02:00
|
|
|
this.warnIfUnsavedChanges = this.warnIfUnsavedChanges.bind(this);
|
2019-03-05 22:25:34 +01:00
|
|
|
|
|
|
|
this.state = {
|
|
|
|
consoleSize: props.ide.consoleIsExpanded ? 150 : 29,
|
|
|
|
sidebarSize: props.ide.sidebarIsExpanded ? 160 : 20
|
|
|
|
};
|
2016-08-11 22:50:31 +02:00
|
|
|
}
|
|
|
|
|
2016-06-24 00:29:55 +02:00
|
|
|
componentDidMount() {
|
2017-04-20 20:05:15 +02: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 03:52:00 +02:00
|
|
|
this.props.stopSketch();
|
2016-06-24 00:29:55 +02:00
|
|
|
if (this.props.params.project_id) {
|
|
|
|
const id = this.props.params.project_id;
|
2016-11-11 00:49:42 +01:00
|
|
|
if (id !== this.props.project.id) {
|
|
|
|
this.props.getProject(id);
|
|
|
|
}
|
2016-06-24 00:29:55 +02:00
|
|
|
}
|
2016-08-11 22:50:31 +02:00
|
|
|
|
2016-09-08 03:48:45 +02:00
|
|
|
this.isMac = navigator.userAgent.toLowerCase().indexOf('mac') !== -1;
|
|
|
|
document.addEventListener('keydown', this.handleGlobalKeydown, false);
|
2016-09-21 00:27:10 +02:00
|
|
|
|
2017-02-22 20:29:35 +01:00
|
|
|
this.props.router.setRouteLeaveHook(this.props.route, route => this.warnIfUnsavedChanges(route));
|
2016-09-21 00:27:10 +02:00
|
|
|
|
|
|
|
window.onbeforeunload = () => this.warnIfUnsavedChanges();
|
2016-09-22 00:52:44 +02:00
|
|
|
|
|
|
|
document.body.className = this.props.preferences.theme;
|
2017-01-24 19:04:51 +01:00
|
|
|
this.autosaveInterval = null;
|
2016-08-11 22:50:31 +02:00
|
|
|
}
|
|
|
|
|
2016-11-10 22:13:00 +01:00
|
|
|
componentWillReceiveProps(nextProps) {
|
|
|
|
if (nextProps.location !== this.props.location) {
|
|
|
|
this.props.setPreviousPath(this.props.location.pathname);
|
|
|
|
}
|
|
|
|
|
2016-08-11 22:50:31 +02:00
|
|
|
if (this.props.ide.consoleIsExpanded !== nextProps.ide.consoleIsExpanded) {
|
2019-03-05 22:25:34 +01:00
|
|
|
this.setState({ consoleSize: nextProps.ide.consoleIsExpanded ? 150 : 29 });
|
2016-08-11 22:50:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (this.props.ide.sidebarIsExpanded !== nextProps.ide.sidebarIsExpanded) {
|
2019-03-05 22:25:34 +01:00
|
|
|
this.setState({ sidebarSize: nextProps.ide.sidebarIsExpanded ? 160 : 20 });
|
2016-08-11 22:50:31 +02:00
|
|
|
}
|
2019-03-05 22:25:34 +01:00
|
|
|
}
|
2016-08-15 23:06:12 +02:00
|
|
|
|
2019-03-05 22:25:34 +01:00
|
|
|
componentWillUpdate(nextProps) {
|
2016-08-15 23:06:12 +02:00
|
|
|
if (nextProps.params.project_id && !this.props.params.project_id) {
|
2016-11-11 00:49:42 +01:00
|
|
|
if (nextProps.params.project_id !== nextProps.project.id) {
|
|
|
|
this.props.getProject(nextProps.params.project_id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-09-22 00:52:44 +02:00
|
|
|
if (nextProps.preferences.theme !== this.props.preferences.theme) {
|
|
|
|
document.body.className = nextProps.preferences.theme;
|
|
|
|
}
|
2016-06-24 00:29:55 +02:00
|
|
|
}
|
|
|
|
|
2016-08-04 03:47:24 +02:00
|
|
|
componentDidUpdate(prevProps) {
|
2017-01-18 22:43:41 +01:00
|
|
|
if (this.isUserOwner() && this.props.project.id) {
|
2017-05-14 02:47:41 +02:00
|
|
|
if (this.props.preferences.autosave && this.props.ide.unsavedChanges && !this.props.ide.justOpenedProject) {
|
2017-06-06 04:33:32 +02:00
|
|
|
if (
|
|
|
|
this.props.selectedFile.name === prevProps.selectedFile.name &&
|
|
|
|
this.props.selectedFile.content !== prevProps.selectedFile.content) {
|
2017-05-14 02:47:41 +02: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 19:04:51 +01:00
|
|
|
} else if (this.autosaveInterval && !this.props.preferences.autosave) {
|
2017-01-18 22:43:41 +01:00
|
|
|
clearTimeout(this.autosaveInterval);
|
2016-08-10 00:45:59 +02:00
|
|
|
this.autosaveInterval = null;
|
|
|
|
}
|
2017-01-18 22:43:41 +01:00
|
|
|
} else if (this.autosaveInterval) {
|
|
|
|
clearTimeout(this.autosaveInterval);
|
2016-08-12 18:45:26 +02:00
|
|
|
this.autosaveInterval = null;
|
|
|
|
}
|
2016-09-21 00:27:10 +02:00
|
|
|
|
|
|
|
if (this.props.route.path !== prevProps.route.path) {
|
2017-02-22 20:29:35 +01:00
|
|
|
this.props.router.setRouteLeaveHook(this.props.route, route => this.warnIfUnsavedChanges(route));
|
2016-09-21 00:27:10 +02:00
|
|
|
}
|
2016-06-24 00:29:55 +02:00
|
|
|
}
|
|
|
|
|
2016-08-04 01:03:01 +02:00
|
|
|
componentWillUnmount() {
|
2018-03-02 18:26:20 +01:00
|
|
|
document.removeEventListener('keydown', this.handleGlobalKeydown, false);
|
2017-01-18 22:43:41 +01:00
|
|
|
clearTimeout(this.autosaveInterval);
|
2016-08-04 01:03:01 +02:00
|
|
|
this.autosaveInterval = null;
|
|
|
|
}
|
|
|
|
|
2016-12-09 20:33:21 +01:00
|
|
|
isUserOwner() {
|
|
|
|
return this.props.project.owner && this.props.project.owner.id === this.props.user.id;
|
|
|
|
}
|
|
|
|
|
2016-09-08 03:48:45 +02:00
|
|
|
handleGlobalKeydown(e) {
|
2016-10-20 00:35:59 +02:00
|
|
|
// 83 === s
|
|
|
|
if (e.keyCode === 83 && ((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac))) {
|
2016-09-08 03:48:45 +02:00
|
|
|
e.preventDefault();
|
|
|
|
e.stopPropagation();
|
2017-02-22 20:29:35 +01:00
|
|
|
if (this.isUserOwner() || (this.props.user.authenticated && !this.props.project.owner)) {
|
2019-02-25 22:45:20 +01:00
|
|
|
this.props.saveProject(this.cmController.getContent());
|
2018-02-23 17:55:14 +01:00
|
|
|
} else if (this.props.user.authenticated) {
|
|
|
|
this.props.cloneProject();
|
|
|
|
} else {
|
|
|
|
this.props.showErrorModal('forceAuthentication');
|
2016-11-03 03:19:05 +01:00
|
|
|
}
|
2016-10-20 00:35:59 +02:00
|
|
|
// 13 === enter
|
|
|
|
} else if (e.keyCode === 13 && e.shiftKey && ((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac))) {
|
2016-09-14 06:10:01 +02:00
|
|
|
e.preventDefault();
|
|
|
|
e.stopPropagation();
|
|
|
|
this.props.stopSketch();
|
2016-10-20 00:35:59 +02:00
|
|
|
} else if (e.keyCode === 13 && ((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac))) {
|
2016-09-14 06:10:01 +02:00
|
|
|
e.preventDefault();
|
|
|
|
e.stopPropagation();
|
2017-09-14 23:57:09 +02:00
|
|
|
this.props.startSketch();
|
2017-09-15 18:10:25 +02:00
|
|
|
// 50 === 2
|
2016-11-08 18:39:46 +01:00
|
|
|
} else if (e.keyCode === 50 && ((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac)) && e.shiftKey) {
|
|
|
|
e.preventDefault();
|
2017-09-15 18:10:25 +02:00
|
|
|
this.props.setAllAccessibleOutput(false);
|
|
|
|
// 49 === 1
|
2016-11-08 18:39:46 +01:00
|
|
|
} else if (e.keyCode === 49 && ((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac)) && e.shiftKey) {
|
|
|
|
e.preventDefault();
|
2017-09-15 18:10:25 +02:00
|
|
|
this.props.setAllAccessibleOutput(true);
|
2016-09-08 03:48:45 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-11 00:49:42 +01:00
|
|
|
warnIfUnsavedChanges(route) { // eslint-disable-line
|
|
|
|
if (route && (route.action === 'PUSH' && (route.pathname === '/login' || route.pathname === '/signup'))) {
|
|
|
|
// don't warn
|
2017-04-20 20:05:15 +02:00
|
|
|
this.props.persistState();
|
|
|
|
window.onbeforeunload = null;
|
2017-02-22 20:29:35 +01:00
|
|
|
} else if (route && (this.props.location.pathname === '/login' || this.props.location.pathname === '/signup')) {
|
2016-11-11 00:49:42 +01:00
|
|
|
// don't warn
|
2017-04-20 20:05:15 +02:00
|
|
|
this.props.persistState();
|
|
|
|
window.onbeforeunload = null;
|
2016-11-11 00:49:42 +01:00
|
|
|
} else if (this.props.ide.unsavedChanges) {
|
2016-09-21 00:27:10 +02:00
|
|
|
if (!window.confirm('Are you sure you want to leave this page? You have unsaved changes.')) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
this.props.setUnsavedChanges(false);
|
2017-01-05 21:27:57 +01:00
|
|
|
return true;
|
2016-09-21 00:27:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-24 00:29:55 +02:00
|
|
|
render() {
|
|
|
|
return (
|
|
|
|
<div className="ide">
|
2017-06-06 04:37:41 +02:00
|
|
|
<Helmet>
|
2018-02-23 17:31:41 +01:00
|
|
|
<title>p5.js Web Editor | {this.props.project.name}</title>
|
2017-06-06 04:37:41 +02:00
|
|
|
</Helmet>
|
2016-09-08 01:00:52 +02:00
|
|
|
{this.props.toast.isVisible && <Toast />}
|
2016-06-24 00:29:55 +02:00
|
|
|
<Nav
|
2017-01-05 21:27:57 +01:00
|
|
|
warnIfUnsavedChanges={this.warnIfUnsavedChanges}
|
2017-09-01 18:40:15 +02:00
|
|
|
cmController={this.cmController}
|
2016-06-24 00:29:55 +02:00
|
|
|
/>
|
2019-03-01 22:21:00 +01:00
|
|
|
<Toolbar />
|
2017-11-14 01:09:08 +01:00
|
|
|
{this.props.ide.preferencesIsVisible &&
|
|
|
|
<Overlay
|
|
|
|
title="Settings"
|
|
|
|
ariaLabel="settings"
|
|
|
|
closeOverlay={this.props.closePreferences}
|
|
|
|
>
|
|
|
|
<Preferences
|
|
|
|
fontSize={this.props.preferences.fontSize}
|
|
|
|
setFontSize={this.props.setFontSize}
|
|
|
|
autosave={this.props.preferences.autosave}
|
2019-03-26 20:37:44 +01:00
|
|
|
linewrap={this.props.preferences.linewrap}
|
2017-11-14 01:09:08 +01:00
|
|
|
setAutosave={this.props.setAutosave}
|
2019-03-26 20:37:44 +01:00
|
|
|
setLinewrap={this.props.setLinewrap}
|
2017-11-14 01:09:08 +01: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>
|
|
|
|
}
|
2016-07-21 06:05:47 +02:00
|
|
|
<div className="editor-preview-container">
|
2016-08-11 22:50:31 +02:00
|
|
|
<SplitPane
|
|
|
|
split="vertical"
|
2019-03-05 22:25:34 +01:00
|
|
|
size={this.state.sidebarSize}
|
|
|
|
onChange={size => this.setState({ sidebarSize: size })}
|
2016-08-11 22:50:31 +02:00
|
|
|
onDragFinished={this._handleSidebarPaneOnDragFinished}
|
|
|
|
allowResize={this.props.ide.sidebarIsExpanded}
|
2016-08-12 18:45:26 +02:00
|
|
|
minSize={20}
|
2016-08-11 22:50:31 +02:00
|
|
|
>
|
2016-08-11 21:41:13 +02:00
|
|
|
<Sidebar
|
2016-07-21 06:05:47 +02:00
|
|
|
files={this.props.files}
|
2016-08-11 21:41:13 +02: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 05:23:10 +02:00
|
|
|
projectOptionsVisible={this.props.ide.projectOptionsVisible}
|
|
|
|
openProjectOptions={this.props.openProjectOptions}
|
|
|
|
closeProjectOptions={this.props.closeProjectOptions}
|
|
|
|
newFolder={this.props.newFolder}
|
2017-04-12 02:06:04 +02:00
|
|
|
user={this.props.user}
|
|
|
|
owner={this.props.project.owner}
|
2016-07-21 06:05:47 +02:00
|
|
|
/>
|
2016-08-11 21:41:13 +02:00
|
|
|
<SplitPane
|
|
|
|
split="vertical"
|
2018-05-05 02:22:39 +02:00
|
|
|
defaultSize="50%"
|
2017-09-05 23:54:41 +02:00
|
|
|
onChange={() => { this.overlay.style.display = 'block'; }}
|
|
|
|
onDragFinished={() => { this.overlay.style.display = 'none'; }}
|
2019-03-20 19:28:15 +01:00
|
|
|
resizerStyle={{
|
|
|
|
borderLeftWidth: '2px', borderRightWidth: '2px', width: '2px', margin: '0px 0px'
|
|
|
|
}}
|
2016-08-11 21:41:13 +02:00
|
|
|
>
|
2016-08-11 22:50:31 +02:00
|
|
|
<SplitPane
|
|
|
|
split="horizontal"
|
|
|
|
primary="second"
|
2019-03-05 22:25:34 +01:00
|
|
|
size={this.state.consoleSize}
|
2016-08-11 22:50:31 +02:00
|
|
|
minSize={29}
|
2019-03-05 22:25:34 +01:00
|
|
|
onChange={size => this.setState({ consoleSize: size })}
|
2016-08-11 22:50:31 +02:00
|
|
|
allowResize={this.props.ide.consoleIsExpanded}
|
2016-12-19 23:07:04 +01:00
|
|
|
className="editor-preview-subpanel"
|
2016-08-11 22:50:31 +02:00
|
|
|
>
|
2016-08-11 21:41:13 +02:00
|
|
|
<Editor
|
2016-08-12 02:59:01 +02:00
|
|
|
lintWarning={this.props.preferences.lintWarning}
|
2019-03-26 20:37:44 +01:00
|
|
|
linewrap={this.props.preferences.linewrap}
|
2016-08-12 02:59:01 +02:00
|
|
|
lintMessages={this.props.editorAccessibility.lintMessages}
|
|
|
|
updateLintMessage={this.props.updateLintMessage}
|
|
|
|
clearLintMessage={this.props.clearLintMessage}
|
2016-08-11 21:41:13 +02:00
|
|
|
file={this.props.selectedFile}
|
|
|
|
updateFileContent={this.props.updateFileContent}
|
|
|
|
fontSize={this.props.preferences.fontSize}
|
2016-08-12 03:29:43 +02:00
|
|
|
files={this.props.files}
|
2016-09-07 22:33:01 +02:00
|
|
|
editorOptionsVisible={this.props.ide.editorOptionsVisible}
|
|
|
|
showEditorOptions={this.props.showEditorOptions}
|
|
|
|
closeEditorOptions={this.props.closeEditorOptions}
|
2016-09-07 23:47:22 +02:00
|
|
|
showKeyboardShortcutModal={this.props.showKeyboardShortcutModal}
|
2016-09-21 00:27:10 +02:00
|
|
|
setUnsavedChanges={this.props.setUnsavedChanges}
|
2016-09-12 07:31:30 +02:00
|
|
|
isPlaying={this.props.ide.isPlaying}
|
2016-09-22 00:52:44 +02:00
|
|
|
theme={this.props.preferences.theme}
|
2016-09-29 06:54:35 +02:00
|
|
|
startRefreshSketch={this.props.startRefreshSketch}
|
|
|
|
stopSketch={this.props.stopSketch}
|
|
|
|
autorefresh={this.props.preferences.autorefresh}
|
2016-11-08 19:30:41 +01:00
|
|
|
unsavedChanges={this.props.ide.unsavedChanges}
|
2017-03-02 20:38:29 +01:00
|
|
|
projectSavedTime={this.props.project.updatedAt}
|
2016-12-19 23:07:04 +01:00
|
|
|
isExpanded={this.props.ide.sidebarIsExpanded}
|
|
|
|
expandSidebar={this.props.expandSidebar}
|
|
|
|
collapseSidebar={this.props.collapseSidebar}
|
2017-01-13 17:55:13 +01:00
|
|
|
isUserOwner={this.isUserOwner()}
|
2017-02-17 22:04:47 +01:00
|
|
|
clearConsole={this.props.clearConsole}
|
2017-07-17 23:27:21 +02:00
|
|
|
consoleEvents={this.props.console}
|
2017-07-26 20:46:59 +02:00
|
|
|
showRuntimeErrorWarning={this.props.showRuntimeErrorWarning}
|
|
|
|
hideRuntimeErrorWarning={this.props.hideRuntimeErrorWarning}
|
|
|
|
runtimeErrorWarningVisible={this.props.ide.runtimeErrorWarningVisible}
|
2017-09-01 18:40:15 +02:00
|
|
|
provideController={(ctl) => { this.cmController = ctl; }}
|
2016-08-11 21:41:13 +02:00
|
|
|
/>
|
|
|
|
<Console
|
2018-09-13 04:00:19 +02:00
|
|
|
fontSize={this.props.preferences.fontSize}
|
2017-01-11 20:13:49 +01:00
|
|
|
consoleEvents={this.props.console}
|
2016-08-11 21:41:13 +02:00
|
|
|
isExpanded={this.props.ide.consoleIsExpanded}
|
|
|
|
expandConsole={this.props.expandConsole}
|
|
|
|
collapseConsole={this.props.collapseConsole}
|
2017-01-11 20:13:49 +01:00
|
|
|
clearConsole={this.props.clearConsole}
|
2018-07-30 18:20:57 +02:00
|
|
|
dispatchConsoleEvent={this.props.dispatchConsoleEvent}
|
|
|
|
theme={this.props.preferences.theme}
|
2016-08-11 21:41:13 +02:00
|
|
|
/>
|
|
|
|
</SplitPane>
|
2016-12-19 23:07:04 +01:00
|
|
|
<div className="preview-frame-holder">
|
2017-03-02 21:01:33 +01:00
|
|
|
<header className="preview-frame__header">
|
|
|
|
<h2 className="preview-frame__title">Preview</h2>
|
|
|
|
</header>
|
2018-09-08 20:50:39 +02:00
|
|
|
<div className="preview-frame__content">
|
|
|
|
<div className="preview-frame-overlay" ref={(element) => { this.overlay = element; }}>
|
|
|
|
</div>
|
|
|
|
<div>
|
|
|
|
{(
|
|
|
|
(
|
|
|
|
(this.props.preferences.textOutput ||
|
|
|
|
this.props.preferences.gridOutput ||
|
|
|
|
this.props.preferences.soundOutput
|
|
|
|
) &&
|
|
|
|
this.props.ide.isPlaying
|
|
|
|
) ||
|
|
|
|
this.props.ide.isAccessibleOutputPlaying
|
|
|
|
)
|
|
|
|
}
|
|
|
|
</div>
|
|
|
|
<PreviewFrame
|
|
|
|
htmlFile={this.props.htmlFile}
|
|
|
|
files={this.props.files}
|
|
|
|
content={this.props.selectedFile.content}
|
|
|
|
isPlaying={this.props.ide.isPlaying}
|
|
|
|
isAccessibleOutputPlaying={this.props.ide.isAccessibleOutputPlaying}
|
|
|
|
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 23:44:41 +02:00
|
|
|
clearConsole={this.props.clearConsole}
|
2019-05-02 21:30:56 +02:00
|
|
|
cmController={this.cmController}
|
2018-09-08 20:50:39 +02:00
|
|
|
/>
|
2016-08-11 21:41:13 +02:00
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</SplitPane>
|
|
|
|
</SplitPane>
|
2016-07-21 06:05:47 +02:00
|
|
|
</div>
|
2017-11-13 20:44:23 +01:00
|
|
|
{ this.props.ide.modalIsVisible &&
|
|
|
|
<NewFileModal
|
|
|
|
canUploadMedia={this.props.user.authenticated}
|
|
|
|
closeModal={this.props.closeNewFileModal}
|
|
|
|
createFile={this.props.createFile}
|
|
|
|
/>
|
|
|
|
}
|
|
|
|
{ this.props.ide.newFolderModalVisible &&
|
|
|
|
<NewFolderModal
|
|
|
|
closeModal={this.props.closeNewFolderModal}
|
|
|
|
createFolder={this.props.createFolder}
|
|
|
|
/>
|
|
|
|
}
|
|
|
|
{ this.props.location.pathname.match(/sketches$/) &&
|
|
|
|
<Overlay
|
|
|
|
ariaLabel="project list"
|
|
|
|
title="Open a Sketch"
|
|
|
|
previousPath={this.props.ide.previousPath}
|
|
|
|
>
|
2019-08-21 20:08:08 +02:00
|
|
|
<Searchbar />
|
2017-11-13 20:44:23 +01:00
|
|
|
<SketchList
|
|
|
|
username={this.props.params.username}
|
|
|
|
user={this.props.user}
|
|
|
|
/>
|
|
|
|
</Overlay>
|
|
|
|
}
|
|
|
|
{ this.props.location.pathname.match(/assets$/) &&
|
|
|
|
<Overlay
|
|
|
|
title="Assets"
|
|
|
|
ariaLabel="asset list"
|
|
|
|
previousPath={this.props.ide.previousPath}
|
|
|
|
>
|
|
|
|
<AssetList
|
|
|
|
username={this.props.params.username}
|
|
|
|
user={this.props.user}
|
|
|
|
/>
|
|
|
|
</Overlay>
|
|
|
|
}
|
|
|
|
{ this.props.location.pathname === '/about' &&
|
|
|
|
<Overlay
|
|
|
|
previousPath={this.props.ide.previousPath}
|
|
|
|
title="Welcome"
|
|
|
|
ariaLabel="about"
|
|
|
|
>
|
|
|
|
<About previousPath={this.props.ide.previousPath} />
|
|
|
|
</Overlay>
|
|
|
|
}
|
2018-02-09 22:32:06 +01:00
|
|
|
{ this.props.location.pathname === '/feedback' &&
|
|
|
|
<Overlay
|
|
|
|
previousPath={this.props.ide.previousPath}
|
|
|
|
title="Submit Feedback"
|
|
|
|
ariaLabel="submit-feedback"
|
|
|
|
>
|
|
|
|
<Feedback previousPath={this.props.ide.previousPath} />
|
|
|
|
</Overlay>
|
|
|
|
}
|
2017-11-13 20:44:23 +01:00
|
|
|
{ this.props.ide.shareModalVisible &&
|
|
|
|
<Overlay
|
|
|
|
title="Share This Sketch"
|
|
|
|
ariaLabel="share"
|
|
|
|
closeOverlay={this.props.closeShareModal}
|
|
|
|
>
|
|
|
|
<ShareModal
|
2019-06-19 22:21:25 +02:00
|
|
|
projectId={this.props.ide.shareModalProjectId}
|
|
|
|
projectName={this.props.ide.shareModalProjectName}
|
|
|
|
ownerUsername={this.props.ide.shareModalProjectUsername}
|
2017-11-13 20:44:23 +01:00
|
|
|
/>
|
|
|
|
</Overlay>
|
|
|
|
}
|
|
|
|
{ this.props.ide.keyboardShortcutVisible &&
|
|
|
|
<Overlay
|
|
|
|
title="Keyboard Shortcuts"
|
|
|
|
ariaLabel="keyboard shortcuts"
|
|
|
|
closeOverlay={this.props.closeKeyboardShortcutModal}
|
|
|
|
>
|
|
|
|
<KeyboardShortcutModal />
|
|
|
|
</Overlay>
|
|
|
|
}
|
|
|
|
{ this.props.ide.errorType &&
|
|
|
|
<Overlay
|
|
|
|
title="Error"
|
|
|
|
ariaLabel="error"
|
2018-03-02 18:26:20 +01:00
|
|
|
closeOverlay={this.props.hideErrorModal}
|
2017-11-13 20:44:23 +01:00
|
|
|
>
|
|
|
|
<ErrorModal
|
|
|
|
type={this.props.ide.errorType}
|
2018-02-23 17:55:14 +01:00
|
|
|
closeModal={this.props.hideErrorModal}
|
2017-11-13 20:44:23 +01:00
|
|
|
/>
|
|
|
|
</Overlay>
|
|
|
|
}
|
|
|
|
{ this.props.ide.helpType &&
|
|
|
|
<Overlay
|
|
|
|
title="Serve over HTTPS"
|
|
|
|
closeOverlay={this.props.hideHelpModal}
|
|
|
|
>
|
|
|
|
<HTTPSModal />
|
|
|
|
</Overlay>
|
|
|
|
}
|
2016-06-24 00:29:55 +02:00
|
|
|
</div>
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-27 21:34:58 +02:00
|
|
|
IDEView.propTypes = {
|
|
|
|
params: PropTypes.shape({
|
2016-08-17 21:53:25 +02:00
|
|
|
project_id: PropTypes.string,
|
2016-10-18 22:07:25 +02:00
|
|
|
username: PropTypes.string,
|
|
|
|
reset_password_token: PropTypes.string,
|
2017-02-22 20:29:35 +01:00
|
|
|
}).isRequired,
|
2016-08-15 23:06:12 +02:00
|
|
|
location: PropTypes.shape({
|
|
|
|
pathname: PropTypes.string
|
2017-02-22 20:29:35 +01:00
|
|
|
}).isRequired,
|
2016-06-27 21:34:58 +02:00
|
|
|
getProject: PropTypes.func.isRequired,
|
2016-07-21 04:18:20 +02:00
|
|
|
user: PropTypes.shape({
|
2016-08-10 00:45:59 +02:00
|
|
|
authenticated: PropTypes.bool.isRequired,
|
2016-11-04 23:54:14 +01:00
|
|
|
id: PropTypes.string,
|
|
|
|
username: PropTypes.string
|
2016-07-21 04:18:20 +02:00
|
|
|
}).isRequired,
|
2016-06-27 21:34:58 +02:00
|
|
|
saveProject: PropTypes.func.isRequired,
|
|
|
|
ide: PropTypes.shape({
|
2016-07-13 22:13:28 +02:00
|
|
|
isPlaying: PropTypes.bool.isRequired,
|
2017-05-31 21:23:30 +02:00
|
|
|
isAccessibleOutputPlaying: PropTypes.bool.isRequired,
|
2016-10-06 22:58:14 +02:00
|
|
|
consoleEvent: PropTypes.array,
|
2016-07-14 18:47:54 +02:00
|
|
|
modalIsVisible: PropTypes.bool.isRequired,
|
2016-07-21 06:33:41 +02:00
|
|
|
sidebarIsExpanded: PropTypes.bool.isRequired,
|
2016-08-01 19:55:49 +02:00
|
|
|
consoleIsExpanded: PropTypes.bool.isRequired,
|
2016-08-30 05:23:10 +02:00
|
|
|
preferencesIsVisible: PropTypes.bool.isRequired,
|
|
|
|
projectOptionsVisible: PropTypes.bool.isRequired,
|
2016-09-07 04:37:29 +02:00
|
|
|
newFolderModalVisible: PropTypes.bool.isRequired,
|
2016-09-07 22:33:01 +02:00
|
|
|
shareModalVisible: PropTypes.bool.isRequired,
|
2019-06-19 22:21:25 +02:00
|
|
|
shareModalProjectId: PropTypes.string.isRequired,
|
|
|
|
shareModalProjectName: PropTypes.string.isRequired,
|
|
|
|
shareModalProjectUsername: PropTypes.string.isRequired,
|
2016-09-07 23:47:22 +02:00
|
|
|
editorOptionsVisible: PropTypes.bool.isRequired,
|
2016-09-21 00:27:10 +02:00
|
|
|
keyboardShortcutVisible: PropTypes.bool.isRequired,
|
2016-09-21 00:32:26 +02:00
|
|
|
unsavedChanges: PropTypes.bool.isRequired,
|
|
|
|
infiniteLoop: PropTypes.bool.isRequired,
|
2016-10-06 21:45:26 +02:00
|
|
|
previewIsRefreshing: PropTypes.bool.isRequired,
|
2016-11-09 18:52:14 +01:00
|
|
|
infiniteLoopMessage: PropTypes.string.isRequired,
|
2017-07-17 23:34:11 +02:00
|
|
|
projectSavedTime: PropTypes.string,
|
2016-11-29 21:51:16 +01:00
|
|
|
previousPath: PropTypes.string.isRequired,
|
2017-01-24 21:29:25 +01:00
|
|
|
justOpenedProject: PropTypes.bool.isRequired,
|
2017-05-03 17:46:12 +02:00
|
|
|
errorType: PropTypes.string,
|
2017-07-26 20:46:59 +02:00
|
|
|
helpType: PropTypes.string,
|
|
|
|
runtimeErrorWarningVisible: PropTypes.bool.isRequired,
|
2016-06-27 21:34:58 +02:00
|
|
|
}).isRequired,
|
|
|
|
stopSketch: PropTypes.func.isRequired,
|
|
|
|
project: PropTypes.shape({
|
2016-08-04 03:47:24 +02:00
|
|
|
id: PropTypes.string,
|
2016-07-15 17:54:47 +02:00
|
|
|
name: PropTypes.string.isRequired,
|
|
|
|
owner: PropTypes.shape({
|
2016-08-10 00:45:59 +02:00
|
|
|
username: PropTypes.string,
|
|
|
|
id: PropTypes.string
|
2017-03-02 20:38:29 +01:00
|
|
|
}),
|
|
|
|
updatedAt: PropTypes.string
|
2016-06-27 21:34:58 +02:00
|
|
|
}).isRequired,
|
2016-08-11 19:29:30 +02:00
|
|
|
editorAccessibility: PropTypes.shape({
|
2016-08-11 19:24:02 +02:00
|
|
|
lintMessages: PropTypes.array.isRequired,
|
2016-08-10 17:13:17 +02:00
|
|
|
}).isRequired,
|
2016-08-11 19:24:02 +02:00
|
|
|
updateLintMessage: PropTypes.func.isRequired,
|
|
|
|
clearLintMessage: PropTypes.func.isRequired,
|
2016-06-27 21:34:58 +02:00
|
|
|
preferences: PropTypes.shape({
|
2016-07-06 17:27:39 +02:00
|
|
|
fontSize: PropTypes.number.isRequired,
|
2016-08-11 20:09:59 +02:00
|
|
|
autosave: PropTypes.bool.isRequired,
|
2019-03-26 20:37:44 +01:00
|
|
|
linewrap: PropTypes.bool.isRequired,
|
2016-08-12 21:50:33 +02:00
|
|
|
lintWarning: PropTypes.bool.isRequired,
|
2017-05-31 21:23:30 +02:00
|
|
|
textOutput: PropTypes.bool.isRequired,
|
|
|
|
gridOutput: PropTypes.bool.isRequired,
|
|
|
|
soundOutput: PropTypes.bool.isRequired,
|
2016-09-28 20:12:01 +02:00
|
|
|
theme: PropTypes.string.isRequired,
|
|
|
|
autorefresh: PropTypes.bool.isRequired
|
2016-06-27 21:34:58 +02:00
|
|
|
}).isRequired,
|
|
|
|
closePreferences: PropTypes.func.isRequired,
|
2016-08-05 03:43:13 +02:00
|
|
|
setFontSize: PropTypes.func.isRequired,
|
2016-08-09 22:15:28 +02:00
|
|
|
setAutosave: PropTypes.func.isRequired,
|
2019-03-26 20:37:44 +01:00
|
|
|
setLinewrap: PropTypes.func.isRequired,
|
2016-08-11 20:09:59 +02:00
|
|
|
setLintWarning: PropTypes.func.isRequired,
|
2016-08-12 21:50:33 +02:00
|
|
|
setTextOutput: PropTypes.func.isRequired,
|
2017-05-31 21:23:30 +02:00
|
|
|
setGridOutput: PropTypes.func.isRequired,
|
|
|
|
setSoundOutput: PropTypes.func.isRequired,
|
2017-09-15 18:10:25 +02:00
|
|
|
setAllAccessibleOutput: PropTypes.func.isRequired,
|
2017-02-22 20:29:35 +01:00
|
|
|
files: PropTypes.arrayOf(PropTypes.shape({
|
|
|
|
id: PropTypes.string.isRequired,
|
|
|
|
name: PropTypes.string.isRequired,
|
|
|
|
content: PropTypes.string.isRequired
|
|
|
|
})).isRequired,
|
2016-07-08 20:57:22 +02:00
|
|
|
updateFileContent: PropTypes.func.isRequired,
|
|
|
|
selectedFile: PropTypes.shape({
|
2016-07-08 21:58:49 +02:00
|
|
|
id: PropTypes.string.isRequired,
|
2017-05-14 02:47:41 +02:00
|
|
|
content: PropTypes.string.isRequired,
|
|
|
|
name: PropTypes.string.isRequired
|
2017-02-22 20:29:35 +01:00
|
|
|
}).isRequired,
|
2016-07-11 21:22:29 +02:00
|
|
|
setSelectedFile: PropTypes.func.isRequired,
|
2017-02-22 20:29:35 +01:00
|
|
|
htmlFile: PropTypes.shape({
|
|
|
|
id: PropTypes.string.isRequired,
|
|
|
|
name: PropTypes.string.isRequired,
|
|
|
|
content: PropTypes.string.isRequired
|
|
|
|
}).isRequired,
|
2016-07-18 01:15:13 +02:00
|
|
|
dispatchConsoleEvent: PropTypes.func.isRequired,
|
2016-07-13 22:13:28 +02:00
|
|
|
newFile: PropTypes.func.isRequired,
|
2016-07-14 18:47:54 +02:00
|
|
|
closeNewFileModal: PropTypes.func.isRequired,
|
|
|
|
expandSidebar: PropTypes.func.isRequired,
|
2016-07-15 19:11:50 +02:00
|
|
|
collapseSidebar: PropTypes.func.isRequired,
|
2016-07-21 06:33:41 +02:00
|
|
|
cloneProject: PropTypes.func.isRequired,
|
|
|
|
expandConsole: PropTypes.func.isRequired,
|
|
|
|
collapseConsole: PropTypes.func.isRequired,
|
2016-08-03 23:10:03 +02:00
|
|
|
deleteFile: PropTypes.func.isRequired,
|
2016-08-15 18:42:13 +02:00
|
|
|
updateFileName: PropTypes.func.isRequired,
|
2016-08-30 05:23:10 +02:00
|
|
|
openProjectOptions: PropTypes.func.isRequired,
|
|
|
|
closeProjectOptions: PropTypes.func.isRequired,
|
|
|
|
newFolder: PropTypes.func.isRequired,
|
|
|
|
closeNewFolderModal: PropTypes.func.isRequired,
|
2016-08-30 20:39:37 +02:00
|
|
|
createFolder: PropTypes.func.isRequired,
|
|
|
|
createFile: PropTypes.func.isRequired,
|
2016-09-07 22:33:01 +02:00
|
|
|
closeShareModal: PropTypes.func.isRequired,
|
|
|
|
showEditorOptions: PropTypes.func.isRequired,
|
2016-09-07 23:47:22 +02:00
|
|
|
closeEditorOptions: PropTypes.func.isRequired,
|
|
|
|
showKeyboardShortcutModal: PropTypes.func.isRequired,
|
2016-09-08 01:00:52 +02:00
|
|
|
closeKeyboardShortcutModal: PropTypes.func.isRequired,
|
|
|
|
toast: PropTypes.shape({
|
|
|
|
isVisible: PropTypes.bool.isRequired
|
|
|
|
}).isRequired,
|
2016-09-21 00:27:10 +02:00
|
|
|
autosaveProject: PropTypes.func.isRequired,
|
|
|
|
router: PropTypes.shape({
|
|
|
|
setRouteLeaveHook: PropTypes.func
|
|
|
|
}).isRequired,
|
2017-02-22 20:29:35 +01:00
|
|
|
route: PropTypes.oneOfType([PropTypes.object, PropTypes.element]).isRequired,
|
2016-09-13 20:15:46 +02:00
|
|
|
setUnsavedChanges: PropTypes.func.isRequired,
|
|
|
|
setTheme: PropTypes.func.isRequired,
|
2016-09-29 00:05:14 +02:00
|
|
|
endSketchRefresh: PropTypes.func.isRequired,
|
2016-10-22 22:42:43 +02:00
|
|
|
startRefreshSketch: PropTypes.func.isRequired,
|
2016-11-10 22:13:00 +01:00
|
|
|
setBlobUrl: PropTypes.func.isRequired,
|
2016-11-11 00:49:42 +01:00
|
|
|
setPreviousPath: PropTypes.func.isRequired,
|
2017-02-22 20:29:35 +01:00
|
|
|
console: PropTypes.arrayOf(PropTypes.shape({
|
|
|
|
method: PropTypes.string.isRequired,
|
|
|
|
args: PropTypes.arrayOf(PropTypes.string)
|
|
|
|
})).isRequired,
|
2017-01-13 23:17:31 +01:00
|
|
|
clearConsole: PropTypes.func.isRequired,
|
2017-01-24 21:29:25 +01:00
|
|
|
showErrorModal: PropTypes.func.isRequired,
|
2017-04-20 20:05:15 +02:00
|
|
|
hideErrorModal: PropTypes.func.isRequired,
|
|
|
|
clearPersistedState: PropTypes.func.isRequired,
|
2017-05-03 17:46:12 +02:00
|
|
|
persistState: PropTypes.func.isRequired,
|
2017-07-26 20:46:59 +02:00
|
|
|
hideHelpModal: PropTypes.func.isRequired,
|
|
|
|
showRuntimeErrorWarning: PropTypes.func.isRequired,
|
2017-10-12 21:38:02 +02:00
|
|
|
hideRuntimeErrorWarning: PropTypes.func.isRequired,
|
2017-09-14 23:57:09 +02:00
|
|
|
startSketch: PropTypes.func.isRequired,
|
2016-06-27 21:34:58 +02:00
|
|
|
};
|
|
|
|
|
2016-06-24 00:29:55 +02:00
|
|
|
function mapStateToProps(state) {
|
|
|
|
return {
|
2016-08-24 19:09:48 +02:00
|
|
|
files: state.files,
|
2018-11-27 00:08:24 +01:00
|
|
|
selectedFile: state.files.find(file => file.isSelectedFile) ||
|
2019-05-06 20:50:28 +02:00
|
|
|
state.files.find(file => file.name === 'sketch.js') ||
|
|
|
|
state.files.find(file => file.name !== 'root'),
|
2016-07-11 21:22:29 +02:00
|
|
|
htmlFile: getHTMLFile(state.files),
|
2016-08-24 19:09:48 +02:00
|
|
|
ide: state.ide,
|
2016-06-24 00:29:55 +02:00
|
|
|
preferences: state.preferences,
|
2016-08-11 19:29:30 +02:00
|
|
|
editorAccessibility: state.editorAccessibility,
|
2016-06-24 00:29:55 +02:00
|
|
|
user: state.user,
|
2016-09-08 01:00:52 +02:00
|
|
|
project: state.project,
|
2017-01-10 00:09:23 +01:00
|
|
|
toast: state.toast,
|
|
|
|
console: state.console
|
2016-06-24 00:29:55 +02:00
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
function mapDispatchToProps(dispatch) {
|
2018-05-05 02:22:39 +02:00
|
|
|
return bindActionCreators(
|
|
|
|
Object.assign(
|
|
|
|
{},
|
|
|
|
EditorAccessibilityActions,
|
|
|
|
FileActions,
|
|
|
|
ProjectActions,
|
|
|
|
IDEActions,
|
|
|
|
PreferencesActions,
|
|
|
|
UserActions,
|
|
|
|
ToastActions,
|
|
|
|
ConsoleActions
|
|
|
|
),
|
|
|
|
dispatch
|
|
|
|
);
|
2016-06-24 00:29:55 +02:00
|
|
|
}
|
|
|
|
|
2016-09-21 00:27:10 +02:00
|
|
|
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(IDEView));
|