1
0
mirror of https://github.com/chinchang/web-maker.git synced 2025-05-07 02:55:19 +02:00

Refactor settings. Add switches and tabs. fixes #339

This commit is contained in:
Kushagra Gour 2018-11-07 01:39:24 +05:30
parent ec4ce2be29
commit f2a96b3ec2
4 changed files with 409 additions and 294 deletions

View File

@ -1,6 +1,7 @@
import { h, Component } from 'preact'; import { h, Component } from 'preact';
import { editorThemes } from '../editorThemes'; import { editorThemes } from '../editorThemes';
import Switch from './Switch'; import Switch from './Switch';
import Tabs, { TabPanel } from './Tabs';
function CheckboxSetting({ function CheckboxSetting({
title, title,
@ -40,304 +41,301 @@ export default class Settings extends Component {
<div> <div>
<h1>Settings</h1> <h1>Settings</h1>
<h3>Indentation</h3> <Tabs>
<div <TabPanel label="Indentation">
class="line" <div
title="I know this is tough, but you have to decide one!" class="line"
> title="I know this is tough, but you have to decide one!"
<label> >
<input <label>
type="radio"
name="indentation"
value="spaces"
checked={prefs.indentWith === 'spaces'}
onChange={this.updateSetting.bind(this)}
data-setting="indentWith"
/>{' '}
Spaces
</label>
<label class="ml-1">
<input
type="radio"
name="indentation"
value="tabs"
checked={prefs.indentWith === 'tabs'}
onChange={this.updateSetting.bind(this)}
data-setting="indentWith"
/>{' '}
Tabs
</label>
</div>
<label class="line" title="">
Indentation Size{' '}
<input
type="range"
class="va-m ml-1"
value={prefs.indentSize}
min="1"
max="7"
list="indentationSizeList"
data-setting="indentSize"
onChange={this.updateSetting.bind(this)}
/>
<span id="indentationSizeValueEl">{prefs.indentSize}</span>
<datalist id="indentationSizeList">
<option>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
<option>5</option>
<option>6</option>
<option>7</option>
</datalist>
</label>
<hr />
<h3>Editor</h3>
<div class="flex block--mobile">
<div>
<label class="line">Default Preprocessors</label>
<div class="flex line">
<select
style="flex:1;margin-left:20px"
data-setting="htmlMode"
value={prefs.htmlMode}
onChange={this.updateSetting.bind(this)}
>
<option value="html">HTML</option>
<option value="markdown">Markdown</option>
<option value="jade">Pug</option>
</select>
<select
style="flex:1;margin-left:20px"
data-setting="cssMode"
value={prefs.cssMode}
onChange={this.updateSetting.bind(this)}
>
<option value="css">CSS</option>
<option value="scss">SCSS</option>
<option value="sass">SASS</option>
<option value="less">LESS</option>
<option value="stylus">Stylus</option>
<option value="acss">Atomic CSS</option>
</select>
<select
style="flex:1;margin-left:20px"
data-setting="jsMode"
value={prefs.jsMode}
onChange={this.updateSetting.bind(this)}
>
<option value="js">JS</option>
<option value="coffee">CoffeeScript</option>
<option value="es6">ES6 (Babel)</option>
<option value="typescript">TypeScript</option>
</select>
</div>
<label class="line">
Theme
<select
style="flex:1;margin:0 20px"
data-setting="editorTheme"
value={prefs.editorTheme}
onChange={this.updateSetting.bind(this)}
>
{editorThemes.map(theme => (
<option value={theme}>{theme}</option>
))}
</select>
</label>
<label class="line">
Font
<select
style="flex:1;margin:0 20px"
data-setting="editorFont"
value={prefs.editorFont}
onChange={this.updateSetting.bind(this)}
>
<option value="FiraCode">Fira Code</option>
<option value="Inconsolata">Inconsolata</option>
<option value="Monoid">Monoid</option>
<option value="FixedSys">FixedSys</option>
<option disabled="disabled">----</option>
<option value="other">Other font from system</option>
</select>
{prefs.editorFont === 'other' && (
<input <input
id="customEditorFontInput" type="radio"
type="text" name="indentation"
value={prefs.editorCustomFont} value="spaces"
placeholder="Custom font name here" checked={prefs.indentWith === 'spaces'}
data-setting="editorCustomFont" onChange={this.updateSetting.bind(this)}
data-setting="indentWith"
/>{' '}
Spaces
</label>
<label class="ml-1">
<input
type="radio"
name="indentation"
value="tabs"
checked={prefs.indentWith === 'tabs'}
onChange={this.updateSetting.bind(this)}
data-setting="indentWith"
/>{' '}
Tabs
</label>
</div>
<label class="line" title="">
Indentation Size{' '}
<input
type="range"
class="va-m ml-1"
value={prefs.indentSize}
min="1"
max="7"
list="indentationSizeList"
data-setting="indentSize"
onChange={this.updateSetting.bind(this)}
/>
<span id="indentationSizeValueEl">{prefs.indentSize}</span>
<datalist id="indentationSizeList">
<option>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
<option>5</option>
<option>6</option>
<option>7</option>
</datalist>
</label>
</TabPanel>
<TabPanel label="Editor">
<div class="fle block--mobile">
<div>
<label class="line">Default Preprocessors</label>
<div class="flex line">
<select
style="flex:1;margin-left:20px"
data-setting="htmlMode"
value={prefs.htmlMode}
onChange={this.updateSetting.bind(this)}
>
<option value="html">HTML</option>
<option value="markdown">Markdown</option>
<option value="jade">Pug</option>
</select>
<select
style="flex:1;margin-left:20px"
data-setting="cssMode"
value={prefs.cssMode}
onChange={this.updateSetting.bind(this)}
>
<option value="css">CSS</option>
<option value="scss">SCSS</option>
<option value="sass">SASS</option>
<option value="less">LESS</option>
<option value="stylus">Stylus</option>
<option value="acss">Atomic CSS</option>
</select>
<select
style="flex:1;margin-left:20px"
data-setting="jsMode"
value={prefs.jsMode}
onChange={this.updateSetting.bind(this)}
>
<option value="js">JS</option>
<option value="coffee">CoffeeScript</option>
<option value="es6">ES6 (Babel)</option>
<option value="typescript">TypeScript</option>
</select>
</div>
<label class="line">
Theme
<select
style="flex:1;margin:0 20px"
data-setting="editorTheme"
value={prefs.editorTheme}
onChange={this.updateSetting.bind(this)}
>
{editorThemes.map(theme => (
<option value={theme}>{theme}</option>
))}
</select>
</label>
<label class="line">
Font
<select
style="flex:1;margin:0 20px"
data-setting="editorFont"
value={prefs.editorFont}
onChange={this.updateSetting.bind(this)}
>
<option value="FiraCode">Fira Code</option>
<option value="Inconsolata">Inconsolata</option>
<option value="Monoid">Monoid</option>
<option value="FixedSys">FixedSys</option>
<option disabled="disabled">----</option>
<option value="other">Other font from system</option>
</select>
{prefs.editorFont === 'other' && (
<input
id="customEditorFontInput"
type="text"
value={prefs.editorCustomFont}
placeholder="Custom font name here"
data-setting="editorCustomFont"
onChange={this.updateSetting.bind(this)}
/>
)}
</label>
<label class="line">
Font Size{' '}
<input
style="width:70px"
type="number"
value={prefs.fontSize}
data-setting="fontSize"
onChange={this.updateSetting.bind(this)}
/>{' '}
px
</label>
<div class="line">
Key bindings
<label class="ml-1">
<input
type="radio"
name="keymap"
value="sublime"
checked={prefs.keymap === 'sublime'}
data-setting="keymap"
onChange={this.updateSetting.bind(this)}
/>{' '}
Sublime
</label>
<label class="ml-1">
<input
type="radio"
name="keymap"
value="vim"
checked={prefs.keymap === 'vim'}
data-setting="keymap"
onChange={this.updateSetting.bind(this)}
/>{' '}
Vim
</label>
</div>
</div>
<div class="flex-grow">
<CheckboxSetting
name="lineWrap"
title="Toggle wrapping of long sentences onto new line"
label="Line wrap"
pref={prefs.lineWrap}
onChange={this.updateSetting.bind(this)} onChange={this.updateSetting.bind(this)}
/> />
)} <CheckboxSetting
</label> name="refreshOnResize"
<label class="line"> title="Your Preview will refresh when you resize the preview split"
Font Size{' '} label="Refresh preview on resize"
<input pref={prefs.refreshOnResize}
style="width:70px"
type="number"
value={prefs.fontSize}
data-setting="fontSize"
onChange={this.updateSetting.bind(this)}
/>{' '}
px
</label>
<div class="line">
Key bindings
<label class="ml-1">
<input
type="radio"
name="keymap"
value="sublime"
checked={prefs.keymap === 'sublime'}
data-setting="keymap"
onChange={this.updateSetting.bind(this)} onChange={this.updateSetting.bind(this)}
/>{' '} />
Sublime <CheckboxSetting
</label> name="autoComplete"
<label class="ml-1"> title="Turns on the auto-completion suggestions as you type"
<input label="Auto-complete suggestions"
type="radio" pref={prefs.autoComplete}
name="keymap"
value="vim"
checked={prefs.keymap === 'vim'}
data-setting="keymap"
onChange={this.updateSetting.bind(this)} onChange={this.updateSetting.bind(this)}
/>{' '} />
Vim <CheckboxSetting
</label> name="autoPreview"
title="Refreshes the preview as you code. Otherwise use the Run button"
label="Auto-preview"
pref={prefs.autoPreview}
onChange={this.updateSetting.bind(this)}
/>
<CheckboxSetting
name="autoSave"
title="Auto-save keeps saving your code at regular intervals after you hit the first save manually"
label="Auto-save"
pref={prefs.autoSave}
onChange={this.updateSetting.bind(this)}
/>
<CheckboxSetting
name="preserveLastCode"
title="Loads the last open creation when app starts"
label="Preserve last written code"
pref={prefs.preserveLastCode}
onChange={this.updateSetting.bind(this)}
/>
<CheckboxSetting
name="replaceNewTab"
title="Turning this on will start showing Web Maker in every new tab you open"
label="Replace new tab page"
pref={prefs.replaceNewTab}
onChange={this.updateSetting.bind(this)}
showWhenExtension
/>
<CheckboxSetting
name="preserveConsoleLogs"
title="Preserves the console logs across your preview refreshes"
label="Preserve console logs"
pref={prefs.preserveConsoleLogs}
onChange={this.updateSetting.bind(this)}
/>
<CheckboxSetting
name="lightVersion"
title="Switch to lighter version for better performance. Removes things like blur etc."
label="Fast/light version"
pref={prefs.lightVersion}
onChange={this.updateSetting.bind(this)}
/>
</div>
</div> </div>
</div> </TabPanel>
<div class="flex-grow ml-2 ml-0--mobile"> <TabPanel label="Fun">
<CheckboxSetting <p>
name="lineWrap" <CheckboxSetting
title="Toggle wrapping of long sentences onto new line" title="Enjoy wonderful particle blasts while you type"
label="Line wrap" label="Code blast!"
pref={prefs.lineWrap} name="isCodeBlastOn"
onChange={this.updateSetting.bind(this)} pref={prefs.isCodeBlastOn}
/> onChange={this.updateSetting.bind(this)}
<CheckboxSetting />
name="refreshOnResize"
title="Your Preview will refresh when you resize the preview split"
label="Refresh preview on resize"
pref={prefs.refreshOnResize}
onChange={this.updateSetting.bind(this)}
/>
<CheckboxSetting
name="autoComplete"
title="Turns on the auto-completion suggestions as you type"
label="Auto-complete suggestions"
pref={prefs.autoComplete}
onChange={this.updateSetting.bind(this)}
/>
<CheckboxSetting
name="autoPreview"
title="Refreshes the preview as you code. Otherwise use the Run button"
label="Auto-preview"
pref={prefs.autoPreview}
onChange={this.updateSetting.bind(this)}
/>
<CheckboxSetting
name="autoSave"
title="Auto-save keeps saving your code at regular intervals after you hit the first save manually"
label="Auto-save"
pref={prefs.autoSave}
onChange={this.updateSetting.bind(this)}
/>
<CheckboxSetting
name="preserveLastCode"
title="Loads the last open creation when app starts"
label="Preserve last written code"
pref={prefs.preserveLastCode}
onChange={this.updateSetting.bind(this)}
/>
<CheckboxSetting
name="replaceNewTab"
title="Turning this on will start showing Web Maker in every new tab you open"
label="Replace new tab page"
pref={prefs.replaceNewTab}
onChange={this.updateSetting.bind(this)}
showWhenExtension
/>
<CheckboxSetting
name="preserveConsoleLogs"
title="Preserves the console logs across your preview refreshes"
label="Preserve console logs"
pref={prefs.preserveConsoleLogs}
onChange={this.updateSetting.bind(this)}
/>
<CheckboxSetting
name="lightVersion"
title="Switch to lighter version for better performance. Removes things like blur etc."
label="Fast/light version"
pref={prefs.lightVersion}
onChange={this.updateSetting.bind(this)}
/>
</div>
</div>
<hr /> <CheckboxSetting
title="Get ready to build some games at JS13KGames"
label="Js13kGames Mode"
name="isJs13kModeOn"
pref={prefs.isJs13kModeOn}
onChange={this.updateSetting.bind(this)}
/>
</p>
</TabPanel>
<TabPanel label="Advanced">
<p>
<label
class="line"
title="This timeout is used to indentify a possible infinite loop and prevent it."
>
Maximum time allowed in a loop iteration{' '}
<input
type="number"
value={prefs.infiniteLoopTimeout}
data-setting="infiniteLoopTimeout"
onChange={this.updateSetting.bind(this)}
/>{' '}
ms
</label>
<div class="help-text">
If any loop iteration takes more than the defined time, it is
detected as a potential infinite loop and further iterations are
stopped.
</div>
</p>
<h3>Fun</h3> <p>
<p> <label class="line">
<CheckboxSetting Language
title="Enjoy wonderful particle blasts while you type" <select
label="Code blast!" data-setting="lang"
name="isCodeBlastOn" value={prefs.lang}
pref={prefs.isCodeBlastOn} onChange={this.updateSetting.bind(this)}
onChange={this.updateSetting.bind(this)} >
/> <option value="en">English</option>
<option value="hi">Hindi</option>
<CheckboxSetting <option value="ja">Japanese</option>
title="Get ready to build some games at JS13KGames" <option value="sa">Sanskrit</option>
label="Js13kGames Mode" </select>
name="isJs13kModeOn" </label>
pref={prefs.isJs13kModeOn} </p>
onChange={this.updateSetting.bind(this)} </TabPanel>
/> </Tabs>
</p>
<hr />
<h3>Advanced</h3>
<p>
<label
class="line"
title="This timeout is used to indentify a possible infinite loop and prevent it."
>
Maximum time allowed in a loop iteration{' '}
<input
type="number"
value={prefs.infiniteLoopTimeout}
data-setting="infiniteLoopTimeout"
onChange={this.updateSetting.bind(this)}
/>{' '}
ms
</label>
<div class="help-text">
If any loop iteration takes more than the defined time, it is
detected as a potential infinite loop and further iterations are
stopped.
</div>
</p>
<p>
<label class="line">
Language
<select
data-setting="lang"
value={prefs.lang}
onChange={this.updateSetting.bind(this)}
>
<option value="en">English</option>
<option value="hi">Hindi</option>
<option value="ja">Japanese</option>
<option value="sa">Sanskrit</option>
</select>
</label>
</p>
</div> </div>
); );
} }

16
src/components/Switch.jsx Normal file
View File

@ -0,0 +1,16 @@
import { h, Component } from 'preact';
export default class Switch extends Component {
render() {
return (
<label class="check-switch">
{this.props.children}
<input role="switch" type="checkbox" checked={this.props.checked} />
<span aria-hidden="true" class="check-switch__toggle" />
<span aria-hidden="true" class="check-switch__status">
{this.props.checked ? 'on' : 'off'}
</span>
</label>
);
}
}

79
src/components/Tabs.jsx Normal file
View File

@ -0,0 +1,79 @@
import { h, Component } from 'preact';
function hyphenate(text) {
return text.replace(/\s/g, '-');
}
const ID_PREFIX = 'tab-panel-';
export function TabPanel({ label }) {
return (
<div
class="tabs__tabpanel"
role="tabpanel"
id={`${ID_PREFIX}${hyphenate(label)}`}
>
{this.props.children}
</div>
);
}
function Tab({ label, isSelected, onKeyUp, onClick }) {
return (
<button
class={`tabs__tab ${isSelected ? 'tabs__tab--selected' : ''}`}
role="tab"
tabindex={isSelected ? null : -1}
aria-selected={isSelected}
aria-controls={`${ID_PREFIX}${hyphenate(label)}`}
onKeyUp={onKeyUp}
onClick={onClick}
>
{label}
</button>
);
}
export default class Tabs extends Component {
constructor(props) {
super(props);
this.state = {
selectedTab: 0
};
}
isSelected(index) {
return this.state.selectedTab === index;
}
keyUpHandler(e) {
let { selectedTab } = this.state;
if (e.key === 'ArrowLeft' || e.key === 'ArrowUp') {
selectedTab--;
selectedTab = selectedTab < 0 ? this.props.length - 1 : selectedTab;
this.setState({ selectedTab: selectedTab });
e.preventDefault();
} else if (e.key === 'ArrowRight' || e.key === 'ArrowDown') {
selectedTab++;
selectedTab %= this.props.children.length;
this.setState({ selectedTab: selectedTab });
e.preventDefault();
}
}
render() {
const tabs = this.props.children;
return (
<div class="tabs">
<div class="tabs__tablist" role="tablist">
{tabs.map((child, index) => (
<Tab
isSelected={this.isSelected(index)}
label={child.props.label}
onKeyUp={this.keyUpHandler.bind(this)}
onClick={() => this.setState({ selectedTab: index })}
/>
))}
</div>
<div class="tabs__tabpanel-wrap">
{tabs.map(
(child, index) => (this.state.selectedTab === index ? child : null)
)}
</div>
</div>
);
}
}

View File

@ -976,10 +976,9 @@ body > #demo-frame {
/* Make settings modal smaller */ /* Make settings modal smaller */
@media screen and (min-width: 600px) { @media screen and (min-width: 850px) {
.modal--settings { .modal--settings > .modal__content {
/* width: 600px; */ width: 850px;
/* margin-lef.t: -300px; */
} }
} }
@ -1891,6 +1890,29 @@ while the theme CSS file is loading */
padding: 5px; padding: 5px;
z-index: 1; z-index: 1;
} }
.tabs {
display: flex;
}
.tabs__tablist {
margin-right: 40px;
flex-shrink: 0;
}
.tabs__tab {
display: block;
margin-bottom: 10px;
background: transparent;
border: 0;
text-align: left;
width: 100%;
color: inherit;
}
.tabs__tab--selected {
background-color: rgba(0, 0, 0, 0.3);
}
.tabs__tabpanel-wrap {
flex: 1;
}
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
body { body {
font-size: 70%; font-size: 70%;