IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

Browse Source
This commit is contained in:
Tatiana Lopaeva 2024-08-27 17:54:26 +03:00
commit d0806a346b
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/LdapFieldComponent.js
View File

@ -39,7 +39,7 @@ const LdapFieldComponent = (props) => {
name,
onChange,
isPassword,
...prop
...rest
} = props;
const onChangeFn = (e) => {
@ -54,12 +54,12 @@ const LdapFieldComponent = (props) => {
onChange && onChange(e);
};
const onFocus = (e) => {
const name = e.target.name;
if (errors[name]) {
removeErrorField(name);
}
};
// const onFocus = (e) => {
// const name = e.target.name;
// if (errors[name]) {
// removeErrorField(name);
// }
// };
const onBlur = (e) => {
if (e.target.value.trim() === "") {
@ -68,16 +68,16 @@ const LdapFieldComponent = (props) => {
};
if (isTextArea)
return <Textarea name={name} onChange={onChangeFn} {...prop} />;
return <Textarea name={name} onChange={onChangeFn} {...rest} />;
if (isPassword)
return (
<PasswordInput
name={name}
inputName={name}
onBlur={onBlur}
onFocus={onFocus}
//onFocus={onFocus}
onChange={onChangeFn}
{...prop}
{...rest}
/>
);
@ -85,9 +85,9 @@ const LdapFieldComponent = (props) => {
<TextInput
name={name}
onBlur={onBlur}
onFocus={onFocus}
//onFocus={onFocus}
onChange={onChangeFn}
{...prop}
{...rest}
/>
);
};

36
packages/shared/components/input-block/InputBlock.tsx
View File

@ -160,23 +160,25 @@ const InputBlock = ({
forwardedRef={forwardedRef}
/>
<div className="append">
<StyledIconBlock
className={`input-block-icon ${iconButtonClassName}`}
onClick={onIconClickAction}
isClickable={!!onIconClick}
>
<IconButton
size={iconButtonSize}
iconNode={iconNode}
iconName={iconName || ""}
isFill={isIconFill}
isClickable={typeof onIconClick === "function"}
color={iconColor}
hoverColor={hoverColor}
/>
</StyledIconBlock>
</div>
{!isDisabled && (
<div className="append">
<StyledIconBlock
className={`input-block-icon ${iconButtonClassName}`}
onClick={onIconClickAction}
isClickable={!!onIconClick}
>
<IconButton
size={iconButtonSize}
iconNode={iconNode}
iconName={iconName || ""}
isFill={isIconFill}
isClickable={typeof onIconClick === "function"}
color={iconColor}
hoverColor={hoverColor}
/>
</StyledIconBlock>
</div>
)}
</StyledInputGroup>
);
};