diff --git a/assets/js/src/form_editor/components/form_settings/form_placement_options/below_pages.tsx b/assets/js/src/form_editor/components/form_settings/form_placement_options/below_pages.tsx index 7d4f55ad4e..484de792b7 100644 --- a/assets/js/src/form_editor/components/form_settings/form_placement_options/below_pages.tsx +++ b/assets/js/src/form_editor/components/form_settings/form_placement_options/below_pages.tsx @@ -7,15 +7,13 @@ import Toggle from '../../../../common/toggle'; import Icon from './below_pages_icon'; const BelowPages = () => { - const placeFormBellowAllPages = useSelect( - (select) => select('mailpoet-form-editor').placeFormBellowAllPages(), + const formSettings = useSelect( + (select) => select('mailpoet-form-editor').getFormSettings(), [] ); + const placeFormBellowAllPages = formSettings.placeFormBellowAllPages || false; + const placeFormBellowAllPosts = formSettings.placeFormBellowAllPosts || false; - const placeFormBellowAllPosts = useSelect( - (select) => select('mailpoet-form-editor').placeFormBellowAllPosts(), - [] - ); const { setPlaceFormBellowAllPages, setPlaceFormBellowAllPosts } = useDispatch('mailpoet-form-editor'); const [ diff --git a/assets/js/src/form_editor/components/form_settings/form_placement_options/fixed_bar.tsx b/assets/js/src/form_editor/components/form_settings/form_placement_options/fixed_bar.tsx index 13c7ebd137..0548a4bbfd 100644 --- a/assets/js/src/form_editor/components/form_settings/form_placement_options/fixed_bar.tsx +++ b/assets/js/src/form_editor/components/form_settings/form_placement_options/fixed_bar.tsx @@ -10,24 +10,17 @@ import Icon from './fixed_bar_icon'; const delayValues = [0, 15, 30, 60, 120, 180, 240]; const FixedBar = () => { - const fixedBarFormDelay = useSelect( - (select) => select('mailpoet-form-editor').getFixedBarFormDelay(), - [] - ); - const fixedBarFormPosition = useSelect( - (select) => select('mailpoet-form-editor').getFixedBarFormPosition(), + const formSettings = useSelect( + (select) => select('mailpoet-form-editor').getFormSettings(), [] ); + const fixedBarFormDelay = formSettings.fixedBarFormDelay === undefined + ? 15 + : formSettings.fixedBarFormDelay; + const fixedBarFormPosition = formSettings.fixedBarFormPosition === undefined ? 'top' : formSettings.fixedBarFormPosition; + const placeFixedBarFormOnAllPages = formSettings.placeFixedBarFormOnAllPages || false; + const placeFixedBarFormOnAllPosts = formSettings.placeFixedBarFormOnAllPosts || false; - const placeFixedBarFormOnAllPages = useSelect( - (select) => select('mailpoet-form-editor').placeFixedBarFormOnAllPages(), - [] - ); - - const placeFixedBarFormOnAllPosts = useSelect( - (select) => select('mailpoet-form-editor').placeFixedBarFormOnAllPosts(), - [] - ); const { setPlaceFixedBarFormOnAllPages, setPlaceFixedBarFormOnAllPosts, @@ -46,11 +39,11 @@ const FixedBar = () => { const [ localDelay, setLocalDelay, - ] = useState(fixedBarFormDelay === undefined ? 15 : fixedBarFormDelay); + ] = useState(fixedBarFormDelay); const [ localPosition, setLocalPosition, - ] = useState(fixedBarFormPosition === undefined ? 'top' : fixedBarFormPosition); + ] = useState(fixedBarFormPosition); const save = () => { setPlaceFixedBarFormOnAllPages(localPlaceFixedBarFormOnAllPages); @@ -69,7 +62,7 @@ const FixedBar = () => { >
- {MailPoet.I18n.t('placeFixedBarFormOnPages')} + {MailPoet.I18n.t('placeFormBellowAllPages')}
{ - const popupFormDelay = useSelect( - (select) => select('mailpoet-form-editor').getPopupFormDelay(), + const formSettings = useSelect( + (select) => select('mailpoet-form-editor').getFormSettings(), [] ); + const popupFormDelay = formSettings.popupFormDelay === undefined + ? 15 + : formSettings.fixedBarFormDelay; + const placePopupFormOnAllPages = formSettings.placePopupFormOnAllPages || false; + const placePopupFormOnAllPosts = formSettings.placePopupFormOnAllPosts || false; - const placePopupFormOnAllPages = useSelect( - (select) => select('mailpoet-form-editor').placePopupFormOnAllPages(), - [] - ); - - const placePopupFormOnAllPosts = useSelect( - (select) => select('mailpoet-form-editor').placePopupFormOnAllPosts(), - [] - ); const { setPlacePopupFormOnAllPages, setPlacePopupFormOnAllPosts, @@ -41,7 +37,7 @@ const Popup = () => { const [ localDelay, setLocalDelay, - ] = useState(popupFormDelay === undefined ? 15 : popupFormDelay); + ] = useState(popupFormDelay); const save = () => { setPlacePopupFormOnAllPages(localPlacePopupFormOnAllPages); diff --git a/assets/js/src/form_editor/store/selectors.jsx b/assets/js/src/form_editor/store/selectors.jsx index b452855240..7e19c34d65 100644 --- a/assets/js/src/form_editor/store/selectors.jsx +++ b/assets/js/src/form_editor/store/selectors.jsx @@ -34,33 +34,6 @@ export default { getFormSettings(state) { return state.formData.settings; }, - placeFormBellowAllPages(state) { - return state.formData.settings.placeFormBellowAllPages || false; - }, - placeFormBellowAllPosts(state) { - return state.formData.settings.placeFormBellowAllPosts || false; - }, - placePopupFormOnAllPages(state) { - return state.formData.settings.placePopupFormOnAllPages || false; - }, - placePopupFormOnAllPosts(state) { - return state.formData.settings.placePopupFormOnAllPosts || false; - }, - getPopupFormDelay(state) { - return state.formData.settings.popupFormDelay; - }, - placeFixedBarFormOnAllPages(state) { - return state.formData.settings.placeFixedBarFormOnAllPages || false; - }, - placeFixedBarFormOnAllPosts(state) { - return state.formData.settings.placeFixedBarFormOnAllPosts || false; - }, - getFixedBarFormDelay(state) { - return state.formData.settings.fixedBarFormDelay; - }, - getFixedBarFormPosition(state) { - return state.formData.settings.fixedBarFormPosition; - }, getAllAvailableSegments(state) { return state.segments; },