From 371a27f3fd59f66a105fa591443b07272e45e47e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Jul 2019 15:50:33 +0200 Subject: [PATCH] :bug: Fixed handling of language/margin draft settings across renders --- .../src/DraftConfigurator/DraftSettingLanguage/index.js | 4 +++- .../src/DraftConfigurator/DraftSettingMargin/index.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js b/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js index 64f04f7fa46..7383ae30d93 100644 --- a/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js +++ b/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js @@ -6,7 +6,9 @@ import { injectIntl } from "react-intl"; import { languages } from "@freesewing/i18n"; const DraftSettingLanguage = props => { - const [value, setValue] = useState(props.intl.locale); + const [value, setValue] = useState( + props.value === null ? props.intl.locale : props.value + ); const [expanded, setExpanded] = useState(false); const update = (name, newValue, evt) => { diff --git a/packages/components/src/DraftConfigurator/DraftSettingMargin/index.js b/packages/components/src/DraftConfigurator/DraftSettingMargin/index.js index 088583cdfb9..3fa443ccb15 100644 --- a/packages/components/src/DraftConfigurator/DraftSettingMargin/index.js +++ b/packages/components/src/DraftConfigurator/DraftSettingMargin/index.js @@ -5,7 +5,9 @@ import { formatMm, roundMm, sliderStep } from "@freesewing/utils"; import OptionPreamble from "../OptionPreamble"; const DraftSettingMargin = props => { - const [value, setValue] = useState(props.dflt); + const [value, setValue] = useState( + props.value === null ? props.dflt : props.value + ); const [expanded, setExpanded] = useState(false); const update = (name, newValue, evt) => {