VSinerva/freesewing
1
0
Fork 0
Code Activity

🚧 Fixed handling of default reset in pct options

Browse source
This commit is contained in:
Joost De Cock 2019-06-28 17:51:07 +02:00
parent 97afac7693
commit 3a6d7c5680
3 changed files with 32 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
packages/components/package.json
View file

@ -26,24 +26,26 @@
"watch": "BABEL_ENV=production rollup -c -w -o dist/index.js -f cjs" "watch": "BABEL_ENV=production rollup -c -w -o dist/index.js -f cjs"
}, },
"peerDependencies": { "peerDependencies": {
"@freesewing/core": "^2.0.0-beta.23", "react": "^16.8",
"@freesewing/css-theme": "^2.0.0-beta.23", "prop-types": "15.7.2",
"@freesewing/examples": "^2.0.0-beta.23", "@freesewing/pattern-info": "^2.0.0-beta.24",
"@freesewing/i18n": "^2.0.0-beta.23", "@freesewing/mui-theme": "^2.0.0-beta.24",
"@freesewing/mui-theme": "^2.0.0-beta.23", "@freesewing/css-theme": "^2.0.0-beta.24",
"@freesewing/pattern-info": "^2.0.0-beta.23", "@freesewing/core": "^2.0.0-beta.24",
"@freesewing/rendertest": "^2.0.0-beta.23", "@freesewing/examples": "^2.0.0-beta.24",
"@freesewing/tutorial": "^2.0.0-beta.23", "@freesewing/rendertest": "^2.0.0-beta.24",
"@freesewing/utils": "^2.0.0-beta.23", "@freesewing/tutorial": "^2.0.0-beta.24",
"typeface-roboto-condensed": "latest",
"@freesewing/i18n": "^2.0.0-beta.24",
"@freesewing/utils": "^2.0.0-beta.24",
"react-intl": "^2.8.0",
"@material-ui/core": "^4.0.1", "@material-ui/core": "^4.0.1",
"@material-ui/icons": "^4.0.1", "@material-ui/icons": "^4.0.1",
"@material-ui/lab": "^v4.0.0-alpha.14", "@material-ui/lab": "^v4.0.0-alpha.14",
"prismjs": "1.16.0", "prismjs": "1.16.0"
"prop-types": "15.7.2",
"react": "^16.8",
"react-intl": "^2.8.0",
"typeface-roboto-condensed": "latest"
}, },
"dependencies": {},
"devDependencies": {},
"files": [ "files": [
"Blockquote/*", "Blockquote/*",
"Draft/*", "Draft/*",

4
packages/components/src/DraftConfigurator/PatternOptionPctDegCount/index.js
View file

@ -30,7 +30,9 @@ const PatternOptionPctDegCount = props => {
const reset = () => { const reset = () => {
setValue(props.dflt); setValue(props.dflt);
props.updateValue(props.name, props.dflt); let factor = 1;
if (props.type === "pct") factor = 100;
props.updateValue(props.name, props.dflt / factor);
}; };
const toggleExpanded = () => setExpanded(!expanded); const toggleExpanded = () => setExpanded(!expanded);

21
packages/components/src/Workbench/index.js
View file

@ -27,13 +27,19 @@ const Workbench = props => {
setDisplay(getDisplay()); setDisplay(getDisplay());
props.setLanguage(props.userLanguage || "en"); props.setLanguage(props.userLanguage || "en");
}, []); }, []);
useEffect(() => { useEffect(
if (props.from) props.importGist(props.from); () => {
}, [props.from]); if (props.from) props.importGist(props.from);
useEffect(() => { },
if (props.language !== props.gist.settings.locale) [props.from]
props.updateGist(props.language, "settings", "locale"); );
}, [props.language]); useEffect(
() => {
if (props.language !== props.gist.settings.locale)
props.updateGist(props.language, "settings", "locale");
},
[props.language]
);
const getDisplay = () => storage.get(props.config.name + "-display"); const getDisplay = () => storage.get(props.config.name + "-display");
const saveDisplay = d => { const saveDisplay = d => {
@ -176,7 +182,6 @@ const Workbench = props => {
} }
const themes = { dark, light }; const themes = { dark, light };
console.log("With navbar");
return ( return (
<MuiThemeProvider theme={createMuiTheme(themes[theme])}> <MuiThemeProvider theme={createMuiTheme(themes[theme])}>
<div <div