diff --git a/packages/components/package.json b/packages/components/package.json index abfa1df3d20..9f7139696ed 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -26,24 +26,26 @@ "watch": "BABEL_ENV=production rollup -c -w -o dist/index.js -f cjs" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-beta.23", - "@freesewing/css-theme": "^2.0.0-beta.23", - "@freesewing/examples": "^2.0.0-beta.23", - "@freesewing/i18n": "^2.0.0-beta.23", - "@freesewing/mui-theme": "^2.0.0-beta.23", - "@freesewing/pattern-info": "^2.0.0-beta.23", - "@freesewing/rendertest": "^2.0.0-beta.23", - "@freesewing/tutorial": "^2.0.0-beta.23", - "@freesewing/utils": "^2.0.0-beta.23", + "react": "^16.8", + "prop-types": "15.7.2", + "@freesewing/pattern-info": "^2.0.0-beta.24", + "@freesewing/mui-theme": "^2.0.0-beta.24", + "@freesewing/css-theme": "^2.0.0-beta.24", + "@freesewing/core": "^2.0.0-beta.24", + "@freesewing/examples": "^2.0.0-beta.24", + "@freesewing/rendertest": "^2.0.0-beta.24", + "@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/icons": "^4.0.1", "@material-ui/lab": "^v4.0.0-alpha.14", - "prismjs": "1.16.0", - "prop-types": "15.7.2", - "react": "^16.8", - "react-intl": "^2.8.0", - "typeface-roboto-condensed": "latest" + "prismjs": "1.16.0" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "Blockquote/*", "Draft/*", diff --git a/packages/components/src/DraftConfigurator/PatternOptionPctDegCount/index.js b/packages/components/src/DraftConfigurator/PatternOptionPctDegCount/index.js index 933414d2e37..63e3ab357b9 100644 --- a/packages/components/src/DraftConfigurator/PatternOptionPctDegCount/index.js +++ b/packages/components/src/DraftConfigurator/PatternOptionPctDegCount/index.js @@ -30,7 +30,9 @@ const PatternOptionPctDegCount = props => { const reset = () => { 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); diff --git a/packages/components/src/Workbench/index.js b/packages/components/src/Workbench/index.js index f6a15ebfd44..780182fb6e1 100644 --- a/packages/components/src/Workbench/index.js +++ b/packages/components/src/Workbench/index.js @@ -27,13 +27,19 @@ const Workbench = props => { setDisplay(getDisplay()); props.setLanguage(props.userLanguage || "en"); }, []); - useEffect(() => { - if (props.from) props.importGist(props.from); - }, [props.from]); - useEffect(() => { - if (props.language !== props.gist.settings.locale) - props.updateGist(props.language, "settings", "locale"); - }, [props.language]); + useEffect( + () => { + if (props.from) props.importGist(props.from); + }, + [props.from] + ); + 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 saveDisplay = d => { @@ -176,7 +182,6 @@ const Workbench = props => { } const themes = { dark, light }; - console.log("With navbar"); return (