From 66679be2b774d19e116668f3486e60dea0a19f4b Mon Sep 17 00:00:00 2001
From: Anca Ursachi <anca.ursachi@thinslices.com>
Date: Wed, 5 Dec 2018 14:23:45 +0200
Subject: [PATCH] fix(iconButton): Disable icon from password validation.
---
packages/component-faraday-ui/src/IconButton.js | 14 ++++++++++----
.../component-faraday-ui/src/PasswordValidation.js | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/packages/component-faraday-ui/src/IconButton.js b/packages/component-faraday-ui/src/IconButton.js
index 5e4b4acfc..ac1ef02ba 100644
--- a/packages/component-faraday-ui/src/IconButton.js
+++ b/packages/component-faraday-ui/src/IconButton.js
@@ -1,7 +1,6 @@
import React from 'react'
import { Icon } from '@pubsweet/ui'
import styled from 'styled-components'
-
import { positionHelper, marginHelper, paddingHelper } from './styledHelpers'
const IconButton = styled.div`
@@ -10,7 +9,7 @@ const IconButton = styled.div`
display: flex;
justify-content: center;
opacity: ${props => (props.disabled ? 0.7 : 1)};
-
+ pointer-events: ${props => (props.unclickable ? 'none' : 'auto')};
&:hover {
opacity: 0.7;
}
@@ -18,16 +17,23 @@ const IconButton = styled.div`
&[disabled] {
cursor: not-allowed;
}
-
${marginHelper};
${paddingHelper};
${positionHelper};
`
-export default ({ icon, onClick, iconSize = 3, disabled, ...props }) => (
+export default ({
+ icon,
+ onClick,
+ unclickable,
+ iconSize = 3,
+ disabled,
+ ...props
+}) => (
<IconButton
disabled={disabled}
onClick={!disabled ? onClick : null}
+ unclickable={unclickable}
{...props}
>
<Icon size={iconSize} {...props}>
diff --git a/packages/component-faraday-ui/src/PasswordValidation.js b/packages/component-faraday-ui/src/PasswordValidation.js
index 1b27643aa..6dacbd634 100644
--- a/packages/component-faraday-ui/src/PasswordValidation.js
+++ b/packages/component-faraday-ui/src/PasswordValidation.js
@@ -52,7 +52,7 @@ const PasswordValidation = ({
</Row>
<Row alignItems="center" justify="flex-start" mb={-1 / 2}>
- <IconButton icon="info" iconSize={2} ml={-1 / 2} primary />
+ <IconButton icon="info" iconSize={2} ml={-1 / 2} primary unclickable />
<RulesTitle>The password must contain: </RulesTitle>
</Row>
--
GitLab