diff --git a/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx b/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx index 863caaa8a6..216d541c32 100644 --- a/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx +++ b/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx @@ -107,21 +107,21 @@ const CustomTextAreaEdit = ({ attributes, setAttributes, clientId }) => { ); - const labelStyles = { + const labelStyles = !attributes.styles.inheritFromTheme ? { fontWeight: attributes.styles.bold ? 'bold' : 'inherit', - }; + } : {}; - const inputStyles = { + const inputStyles = !attributes.styles.inheritFromTheme ? { borderRadius: attributes.styles.borderRadius ? `${attributes.styles.borderRadius}px` : 0, borderWidth: attributes.styles.borderSize ? `${attributes.styles.borderSize}px` : '1px', borderColor: attributes.styles.borderColor || 'initial', - }; + } : {}; if (attributes.styles.fullWidth) { inputStyles.width = '100%'; } - if (attributes.styles.backgroundColor) { + if (attributes.styles.backgroundColor && !attributes.styles.inheritFromTheme) { inputStyles.backgroundColor = attributes.styles.backgroundColor; } diff --git a/assets/js/src/form_editor/blocks/text_input_edit.jsx b/assets/js/src/form_editor/blocks/text_input_edit.jsx index 05862d802d..f784879baf 100644 --- a/assets/js/src/form_editor/blocks/text_input_edit.jsx +++ b/assets/js/src/form_editor/blocks/text_input_edit.jsx @@ -14,21 +14,21 @@ const TextInputEdit = ({ const input = useRef(null); const id = `${name}_${Math.random().toString(36).substring(2, 15)}`; - const labelStyles = { + const labelStyles = !styles.inheritFromTheme ? { fontWeight: styles.bold ? 'bold' : 'inherit', - }; + } : {}; - const inputStyles = { + const inputStyles = !styles.inheritFromTheme ? { borderRadius: styles.borderRadius ? `${styles.borderRadius}px` : 0, borderWidth: styles.borderSize ? `${styles.borderSize}px` : '1px', borderColor: styles.borderColor || 'initial', - }; + } : {}; if (styles.fullWidth) { inputStyles.width = '100%'; } - if (styles.backgroundColor) { + if (styles.backgroundColor && !styles.inheritFromTheme) { inputStyles.backgroundColor = styles.backgroundColor; }