mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-08-03 21:39:38 +00:00
Fix #1325 Squashed commit of the following: commit d8f7de72226855a961051e09b4b78f4dd71baadd Merge: f9bbe86136f3218bAuthor: Andrey Meshkov <am@adguard.com> Date: Mon Jul 6 19:34:53 2020 +0300 Merge branch 'master' into feature/1325 commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f Merge: 99710fef4f8138bdAuthor: Andrey Meshkov <am@adguard.com> Date: Mon Jul 6 19:33:53 2020 +0300 Merge branch 'master' into feature/1325 commit 99710fef0825966b224e4a30a979e4d45f929af1 Merge: 8329326d a5380ead Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 6 18:04:32 2020 +0300 Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325 commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 6 18:03:56 2020 +0300 Update locales, add title for select modal commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a Author: Andrey Meshkov <am@adguard.com> Date: Mon Jul 6 17:26:37 2020 +0300 Update readme commit dfe6e254d909ee6994cacef53d417bb073dfd802 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 6 13:44:19 2020 +0300 Change info icon width commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 6 13:38:58 2020 +0300 Review changes commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd Merge: dd56a3bb73c5d9eaAuthor: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 6 12:01:57 2020 +0300 Merge branch 'master' into feature/1325 commit dd56a3bbb851687823242fa653cc3bb63dedf5e4 Author: Andrey Meshkov <am@adguard.com> Date: Fri Jul 3 15:52:01 2020 +0300 Added blocklists commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e Merge: 854d4f8821dfb5ffAuthor: Andrey Meshkov <am@adguard.com> Date: Fri Jul 3 14:06:19 2020 +0300 Merge branch 'master' into feature/1325 commit 854d4f88017a33dc7f788835dc98591cec9b213f Merge: 239462662c47053cAuthor: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jun 22 14:09:31 2020 +0300 Merge branch 'master' into feature/1325 commit 23946266d4913479bcecfcb7702a096983d20685 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 26 19:00:26 2020 +0300 Math filters by url commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 25 21:07:21 2020 +0300 Change data format commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu May 14 19:52:45 2020 +0300 + client: Add choosing filter lists
248 lines
7.2 KiB
JavaScript
248 lines
7.2 KiB
JavaScript
import React, { Fragment } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { createOnBlurHandler } from './helpers';
|
|
import { R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants';
|
|
|
|
export const renderField = (props, elementType) => {
|
|
const {
|
|
input, id, className, placeholder, type, disabled, normalizeOnBlur,
|
|
autoComplete, meta: { touched, error }, min, max, step,
|
|
} = props;
|
|
|
|
const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur);
|
|
|
|
const element = React.createElement(elementType, {
|
|
...input,
|
|
id,
|
|
className,
|
|
placeholder,
|
|
autoComplete,
|
|
disabled,
|
|
type,
|
|
min,
|
|
max,
|
|
step,
|
|
onBlur,
|
|
});
|
|
return (
|
|
<>
|
|
{element}
|
|
{!disabled && touched && error
|
|
&& <span className="form__message form__message--error">{error}</span>}
|
|
</>
|
|
);
|
|
};
|
|
|
|
renderField.propTypes = {
|
|
id: PropTypes.string.isRequired,
|
|
input: PropTypes.object.isRequired,
|
|
className: PropTypes.string,
|
|
placeholder: PropTypes.string,
|
|
type: PropTypes.string,
|
|
disabled: PropTypes.bool,
|
|
autoComplete: PropTypes.bool,
|
|
normalizeOnBlur: PropTypes.func,
|
|
min: PropTypes.number,
|
|
max: PropTypes.number,
|
|
step: PropTypes.number,
|
|
meta: PropTypes.shape({
|
|
touched: PropTypes.bool,
|
|
error: PropTypes.object,
|
|
}).isRequired,
|
|
};
|
|
|
|
export const renderTextareaField = (props) => renderField(props, 'textarea');
|
|
|
|
export const renderInputField = (props) => renderField(props, 'input');
|
|
|
|
export const renderGroupField = ({
|
|
input,
|
|
id,
|
|
className,
|
|
placeholder,
|
|
type,
|
|
disabled,
|
|
autoComplete,
|
|
isActionAvailable,
|
|
removeField,
|
|
meta: { touched, error },
|
|
normalizeOnBlur,
|
|
}) => {
|
|
const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur);
|
|
|
|
return (
|
|
<Fragment>
|
|
<div className="input-group">
|
|
<input
|
|
{...input}
|
|
id={id}
|
|
placeholder={placeholder}
|
|
type={type}
|
|
className={className}
|
|
disabled={disabled}
|
|
autoComplete={autoComplete}
|
|
onBlur={onBlur}
|
|
/>
|
|
{isActionAvailable
|
|
&& <span className="input-group-append">
|
|
<button
|
|
type="button"
|
|
className="btn btn-secondary btn-icon btn-icon--green"
|
|
onClick={removeField}
|
|
>
|
|
<svg className="icon icon--small">
|
|
<use xlinkHref="#cross" />
|
|
</svg>
|
|
</button>
|
|
</span>
|
|
}
|
|
</div>
|
|
{!disabled && touched && error
|
|
&& <span className="form__message form__message--error">{error}</span>}
|
|
</Fragment>
|
|
);
|
|
};
|
|
|
|
renderGroupField.propTypes = {
|
|
input: PropTypes.object.isRequired,
|
|
id: PropTypes.string,
|
|
className: PropTypes.string,
|
|
placeholder: PropTypes.string,
|
|
type: PropTypes.string,
|
|
disabled: PropTypes.bool,
|
|
autoComplete: PropTypes.bool,
|
|
isActionAvailable: PropTypes.bool,
|
|
removeField: PropTypes.func,
|
|
meta: PropTypes.shape({
|
|
touched: PropTypes.bool,
|
|
error: PropTypes.object,
|
|
}).isRequired,
|
|
normalizeOnBlur: PropTypes.func,
|
|
};
|
|
|
|
export const renderRadioField = ({
|
|
input,
|
|
placeholder,
|
|
subtitle,
|
|
disabled,
|
|
meta: { touched, error },
|
|
}) => <Fragment>
|
|
<label className="custom-control custom-radio">
|
|
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
|
|
<span className="custom-control-label">{placeholder}</span>
|
|
{subtitle && <span
|
|
className="checkbox__label-subtitle"
|
|
dangerouslySetInnerHTML={{ __html: subtitle }}
|
|
/>}
|
|
</label>
|
|
{!disabled
|
|
&& touched
|
|
&& (error && <span className="form__message form__message--error">{error}</span>)}
|
|
</Fragment>;
|
|
|
|
renderRadioField.propTypes = {
|
|
input: PropTypes.object.isRequired,
|
|
placeholder: PropTypes.string,
|
|
subtitle: PropTypes.string,
|
|
disabled: PropTypes.bool,
|
|
meta: PropTypes.shape({
|
|
touched: PropTypes.bool,
|
|
error: PropTypes.object,
|
|
}).isRequired,
|
|
};
|
|
|
|
export const renderSelectField = ({
|
|
input,
|
|
placeholder,
|
|
subtitle,
|
|
disabled,
|
|
onClick,
|
|
modifier = 'checkbox--form',
|
|
checked,
|
|
meta: { touched, error },
|
|
}) => <>
|
|
<label className={`checkbox ${modifier}`} onClick={onClick}>
|
|
<span className="checkbox__marker" />
|
|
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/>
|
|
<span className="checkbox__label">
|
|
<span className="checkbox__label-text checkbox__label-text--long">
|
|
<span className="checkbox__label-title">{placeholder}</span>
|
|
{subtitle
|
|
&& <span
|
|
className="checkbox__label-subtitle"
|
|
dangerouslySetInnerHTML={{ __html: subtitle }}
|
|
|
|
/>}
|
|
</span>
|
|
</span>
|
|
</label>
|
|
{!disabled
|
|
&& touched
|
|
&& error && <span className="form__message form__message--error">{error}</span>}
|
|
</>;
|
|
|
|
renderSelectField.propTypes = {
|
|
input: PropTypes.object.isRequired,
|
|
placeholder: PropTypes.string,
|
|
subtitle: PropTypes.string,
|
|
disabled: PropTypes.bool,
|
|
onClick: PropTypes.func,
|
|
modifier: PropTypes.string,
|
|
checked: PropTypes.bool,
|
|
meta: PropTypes.shape({
|
|
touched: PropTypes.bool,
|
|
error: PropTypes.object,
|
|
}).isRequired,
|
|
};
|
|
|
|
export const renderServiceField = ({
|
|
input,
|
|
placeholder,
|
|
disabled,
|
|
modifier,
|
|
icon,
|
|
meta: { touched, error },
|
|
}) => <Fragment>
|
|
<label className={`service custom-switch ${modifier}`}>
|
|
<input
|
|
{...input}
|
|
type="checkbox"
|
|
className="custom-switch-input"
|
|
value={placeholder.toLowerCase()}
|
|
disabled={disabled}
|
|
/>
|
|
<span className="service__switch custom-switch-indicator"></span>
|
|
<span className="service__text">{placeholder}</span>
|
|
<svg className="service__icon">
|
|
<use xlinkHref={`#${icon}`} />
|
|
</svg>
|
|
</label>
|
|
{!disabled && touched && error
|
|
&& <span className="form__message form__message--error">{error}</span>}
|
|
</Fragment>;
|
|
|
|
renderServiceField.propTypes = {
|
|
input: PropTypes.object.isRequired,
|
|
placeholder: PropTypes.string,
|
|
disabled: PropTypes.bool,
|
|
modifier: PropTypes.string,
|
|
icon: PropTypes.string,
|
|
meta: PropTypes.shape({
|
|
touched: PropTypes.bool,
|
|
error: PropTypes.object,
|
|
}).isRequired,
|
|
};
|
|
|
|
/**
|
|
* @param value {string}
|
|
* @returns {*|number}
|
|
*/
|
|
export const toNumber = (value) => value && parseInt(value, 10);
|
|
|
|
/**
|
|
* @param value {string}
|
|
* @returns {boolean}
|
|
*/
|
|
export const isValidAbsolutePath = (value) => R_WIN_ABSOLUTE_PATH.test(value)
|
|
|| R_UNIX_ABSOLUTE_PATH.test(value);
|