Display inputs with padding

[MAILPOET-2809]
This commit is contained in:
Pavel Dohnal
2020-04-20 14:54:53 +02:00
committed by Veljko V
parent f5a7f3af11
commit deba1e438f
4 changed files with 38 additions and 1 deletions

View File

@@ -16,6 +16,10 @@ import CustomFieldSettings from '../custom_radio/custom_field_settings.jsx';
import mapCustomFieldFormData from '../map_custom_field_form_data.jsx'; import mapCustomFieldFormData from '../map_custom_field_form_data.jsx';
const CustomSelectEdit = ({ attributes, setAttributes, clientId }) => { const CustomSelectEdit = ({ attributes, setAttributes, clientId }) => {
const settings = useSelect(
(select) => select('mailpoet-form-editor').getFormSettings(),
[]
);
const isSaving = useSelect( const isSaving = useSelect(
(sel) => sel('mailpoet-form-editor').getIsCustomFieldSaving(), (sel) => sel('mailpoet-form-editor').getIsCustomFieldSaving(),
[] []
@@ -92,8 +96,14 @@ const CustomSelectEdit = ({ attributes, setAttributes, clientId }) => {
}); });
} }
const inputStyles = {};
if (settings.inputPadding !== undefined) {
inputStyles.padding = settings.inputPadding;
}
return ( return (
<select className="mailpoet_select" id={clientId} value={defaultValue} readOnly> <select style={inputStyles} className="mailpoet_select" id={clientId} value={defaultValue} readOnly>
{ {
options.map((option, index) => ( options.map((option, index) => (
<option key={option.label} value={option.label} disabled={index === 0}> <option key={option.label} value={option.label} disabled={index === 0}>

View File

@@ -17,6 +17,10 @@ import mapCustomFieldFormData from '../map_custom_field_form_data.jsx';
import { InputStylesSettings, inputStylesPropTypes } from '../input_styles_settings.jsx'; import { InputStylesSettings, inputStylesPropTypes } from '../input_styles_settings.jsx';
const CustomTextAreaEdit = ({ attributes, setAttributes, clientId }) => { const CustomTextAreaEdit = ({ attributes, setAttributes, clientId }) => {
const settings = useSelect(
(select) => select('mailpoet-form-editor').getFormSettings(),
[]
);
const isSaving = useSelect( const isSaving = useSelect(
(sel) => sel('mailpoet-form-editor').getIsCustomFieldSaving(), (sel) => sel('mailpoet-form-editor').getIsCustomFieldSaving(),
[] []
@@ -126,6 +130,10 @@ const CustomTextAreaEdit = ({ attributes, setAttributes, clientId }) => {
inputStyles.backgroundColor = attributes.styles.backgroundColor; inputStyles.backgroundColor = attributes.styles.backgroundColor;
} }
if (settings.inputPadding !== undefined) {
inputStyles.padding = settings.inputPadding;
}
inputStyles.resize = 'none'; inputStyles.resize = 'none';
const textarea = useRef(null); const textarea = useRef(null);

View File

@@ -8,11 +8,17 @@ import { InspectorControls } from '@wordpress/block-editor';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import MailPoet from 'mailpoet'; import MailPoet from 'mailpoet';
import classnames from 'classnames'; import classnames from 'classnames';
import { useSelect } from '@wordpress/data';
import ParagraphEdit from '../paragraph_edit.jsx'; import ParagraphEdit from '../paragraph_edit.jsx';
import StylesSettings from './styles_settings'; import StylesSettings from './styles_settings';
const SubmitEdit = ({ attributes, setAttributes }) => { const SubmitEdit = ({ attributes, setAttributes }) => {
const settings = useSelect(
(select) => select('mailpoet-form-editor').getFormSettings(),
[]
);
const inspectorControls = ( const inspectorControls = (
<InspectorControls> <InspectorControls>
<Panel> <Panel>
@@ -43,6 +49,10 @@ const SubmitEdit = ({ attributes, setAttributes }) => {
styles.width = '100%'; styles.width = '100%';
} }
if (settings.inputPadding !== undefined) {
styles.padding = settings.inputPadding;
}
if (attributes.styles.backgroundColor && !attributes.styles.inheritFromTheme) { if (attributes.styles.backgroundColor && !attributes.styles.inheritFromTheme) {
styles.backgroundColor = attributes.styles.backgroundColor; styles.backgroundColor = attributes.styles.backgroundColor;
} }

View File

@@ -1,5 +1,6 @@
import React, { useRef } from 'react'; import React, { useRef } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { useSelect } from '@wordpress/data';
import ParagraphEdit from './paragraph_edit.jsx'; import ParagraphEdit from './paragraph_edit.jsx';
import formatLabel from './label_formatter.jsx'; import formatLabel from './label_formatter.jsx';
import { inputStylesPropTypes } from './input_styles_settings.jsx'; import { inputStylesPropTypes } from './input_styles_settings.jsx';
@@ -12,6 +13,10 @@ const TextInputEdit = ({
styles, styles,
className, className,
}) => { }) => {
const settings = useSelect(
(select) => select('mailpoet-form-editor').getFormSettings(),
[]
);
const input = useRef(null); const input = useRef(null);
const id = `${name}_${Math.random().toString(36).substring(2, 15)}`; const id = `${name}_${Math.random().toString(36).substring(2, 15)}`;
@@ -26,6 +31,10 @@ const TextInputEdit = ({
borderStyle: 'solid', borderStyle: 'solid',
} : {}; } : {};
if (settings.inputPadding !== undefined) {
inputStyles.padding = settings.inputPadding;
}
if (styles.fullWidth) { if (styles.fullWidth) {
inputStyles.width = '100%'; inputStyles.width = '100%';
} }