Skip to content

[#1590] Connect PreviewFrame in FullView #1647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2020
Merged

[#1590] Connect PreviewFrame in FullView #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions client/modules/IDE/components/PreviewFrame.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,22 +359,38 @@ PreviewFrame.defaultProps = {
cmController: {}
};

const mapStateToProps = state => ({
files: state.files,
htmlFile: getHTMLFile(state.files),
content:
(state.files.find(file => file.isSelectedFile) ||
state.files.find(file => file.name === 'sketch.js') ||
state.files.find(file => file.name !== 'root')).content,
isPlaying: state.ide.isPlaying,
isAccessibleOutputPlaying: state.ide.isAccessibleOutputPlaying,
previewIsRefreshing: state.ide.previewIsRefreshing,
textOutput: state.preferences.textOutput,
gridOutput: state.preferences.gridOutput,
soundOutput: state.preferences.soundOutput,
language: state.preferences.language,
autorefresh: state.preferences.autorefresh,
});
function mapStateToProps(state, ownProps) {
if (ownProps.fullView) {
return {
files: state.files,
htmlFile: getHTMLFile(state.files),
isPlaying: true,
isAccessibleOutputPlaying: false,
textOutput: false,
gridOutput: false,
soundOutput: false,
language: state.preferences.language,
autorefresh: false,
previewIsRefreshing: false
};
}
return {
files: state.files,
htmlFile: getHTMLFile(state.files),
content:
(state.files.find(file => file.isSelectedFile) ||
state.files.find(file => file.name === 'sketch.js') ||
state.files.find(file => file.name !== 'root')).content,
isPlaying: state.ide.isPlaying,
isAccessibleOutputPlaying: state.ide.isAccessibleOutputPlaying,
previewIsRefreshing: state.ide.previewIsRefreshing,
textOutput: state.preferences.textOutput,
gridOutput: state.preferences.gridOutput,
soundOutput: state.preferences.soundOutput,
language: state.preferences.language,
autorefresh: state.preferences.autorefresh
};
}


const mapDispatchToProps = {
Expand Down
51 changes: 2 additions & 49 deletions client/modules/IDE/pages/FullView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,13 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import PreviewFrame from '../components/PreviewFrame';
import PreviewNav from '../../../components/PreviewNav';
import { getHTMLFile, getJSFiles, getCSSFiles } from '../reducers/files';
import * as ProjectActions from '../actions/project';

class FullView extends React.Component {
componentDidMount() {
this.props.getProject(this.props.params.project_id, this.props.params.username);
}

ident = () => {}

render() {
return (
<div className="fullscreen-preview">
Expand All @@ -27,26 +24,7 @@ class FullView extends React.Component {
/>
<main className="preview-frame-holder">
<PreviewFrame
htmlFile={this.props.htmlFile}
jsFiles={this.props.jsFiles}
cssFiles={this.props.cssFiles}
files={this.props.files}
head={
<link type="text/css" rel="stylesheet" href="/preview-styles.css" />
}
fullView
isPlaying
isAccessibleOutputPlaying={false}
textOutput={false}
gridOutput={false}
soundOutput={false}
dispatchConsoleEvent={this.ident}
endSketchRefresh={this.ident}
previewIsRefreshing={false}
setBlobUrl={this.ident}
stopSketch={this.ident}
expandConsole={this.ident}
clearConsole={this.ident}
/>
</main>
</div>
Expand All @@ -65,37 +43,12 @@ FullView.propTypes = {
username: PropTypes.string
})
}).isRequired,
htmlFile: PropTypes.shape({
id: PropTypes.string.isRequired,
content: PropTypes.string.isRequired,
name: PropTypes.string.isRequired
}).isRequired,
jsFiles: PropTypes.arrayOf(PropTypes.shape({
id: PropTypes.string.isRequired,
content: PropTypes.string.isRequired,
name: PropTypes.string.isRequired
})).isRequired,
cssFiles: PropTypes.arrayOf(PropTypes.shape({
id: PropTypes.string.isRequired,
content: PropTypes.string.isRequired,
name: PropTypes.string.isRequired
})).isRequired,
getProject: PropTypes.func.isRequired,
files: PropTypes.arrayOf(PropTypes.shape({
id: PropTypes.string.isRequired,
content: PropTypes.string.isRequired,
name: PropTypes.string.isRequired
})).isRequired,
getProject: PropTypes.func.isRequired
};

function mapStateToProps(state) {
return {
user: state.user,
htmlFile: getHTMLFile(state.files),
jsFiles: getJSFiles(state.files),
cssFiles: getCSSFiles(state.files),
project: state.project,
files: state.files
project: state.project
};
}

Expand Down