diff --git a/src/components/ContentWrap2.jsx b/src/components/ContentWrap2.jsx index 0cd9216..6bee0d9 100644 --- a/src/components/ContentWrap2.jsx +++ b/src/components/ContentWrap2.jsx @@ -24,6 +24,10 @@ class Sidebar extends Component { type="button" onClick={this.props.onFileSelect.bind(null, file)} > + {file.name} @@ -38,14 +42,12 @@ export default class ContentWrap2 extends Component { super(props); this.state = { isConsoleOpen: false, - isCssSettingsModalOpen: false, - files: [ - { name: 'index.html' }, - { name: 'style.css' }, - { name: 'script.js' } - ] + isCssSettingsModalOpen: false }; - this.state.selectedFile = this.state.files[0]; + this.state.selectedFile = + this.currentItem && this.currentItem.files + ? this.currentItem.files[0] + : null; this.updateTimer = null; this.updateDelay = 500; this.htmlMode = HtmlModes.HTML; @@ -135,10 +137,9 @@ export default class ContentWrap2 extends Component { this.detachedWindow.postMessage({ contents }, '*'); } else { var obj = {}; - this.state.files.forEach(file => { + this.props.currentItem.files.forEach(file => { obj[`/user/${file.name}`] = file.content || ''; }); - // obj[`/user/index.html`] = this.cmCodes.html; navigator.serviceWorker.controller.postMessage(obj); this.frame.src = '/user/index.html'; @@ -474,6 +475,7 @@ export default class ContentWrap2 extends Component { this.updateCssMode('html'); } this.cm.html.setValue(file.content || ''); + this.cm.html.focus(); } render() { @@ -490,7 +492,7 @@ export default class ContentWrap2 extends Component { >
@@ -507,7 +509,7 @@ export default class ContentWrap2 extends Component { title="Double click to toggle code pane" >
this.refreshEditor()); + d.getMinutes() + }; + if (isProject) { + item = { + ...item, + files: [ + { name: 'index.html' }, + { name: 'style.css' }, + { name: 'script.js' } + ] + }; + } else { + item = { + ...item, + html: '', + css: '', + js: '', + externalLibs: { js: '', css: '' }, + layoutMode: this.state.currentLayoutMode + }; + } + this.setCurrentItem(item).then(() => this.refreshEditor()); alertsService.add('New item created'); } openItem(item) { diff --git a/src/index.html b/src/index.html index 2f164a3..e6f22da 100644 --- a/src/index.html +++ b/src/index.html @@ -67,7 +67,7 @@ - + <%= htmlWebpackPlugin.options.ssr({ url: '/' diff --git a/src/style.css b/src/style.css index 697e426..88d5dfe 100644 --- a/src/style.css +++ b/src/style.css @@ -383,6 +383,10 @@ body:not(.light-version).overlay-visible .main-container { width: auto; } +.is-project .content-wrap { + flex-direction: row; +} + /* All vertical layout */ .layout-5 .code-side { @@ -447,6 +451,9 @@ body:not(.light-version).overlay-visible .main-container { height: auto; width: 33%; } +.is-project .code-wrap { + flex-basis: 100%; +} .code-wrap__header { display: flex;