@hig/input
Advanced tools
Comparing version 1.2.1 to 1.2.2
@@ -268,18 +268,4 @@ import React from 'react'; | ||
} | ||
if (hasFocus) { | ||
return _extends$2({}, defaults, { | ||
borderBottomColor: themeData["input.line.focus.borderBottomColor"] | ||
}); | ||
} | ||
if (hasHover) { | ||
return _extends$2({}, defaults, { | ||
borderBottomColor: themeData["input.box.hover.borderBottomColor"] | ||
}); | ||
} | ||
if (error) { | ||
return _extends$2({}, defaults, { | ||
borderBottomColor: themeData["input.error.borderBottomColor"] | ||
}); | ||
} | ||
return defaults; | ||
return _extends$2({}, defaults, error ? { borderBottomColor: themeData["input.error.borderBottomColor"] } : {}, hasFocus ? { borderBottomColor: themeData["input.line.focus.borderBottomColor"] } : {}, hasHover ? { borderBottomColor: themeData["input.box.hover.borderBottomColor"] } : {}); | ||
} | ||
@@ -294,6 +280,15 @@ | ||
height: 0, | ||
backgroundColor: themeData["input.hover.haloColor"], | ||
transitionProperty: "height, color", | ||
transitionDuration: "0.3s, 0.3s" | ||
}; | ||
var focusStyles = { | ||
height: themeData["input.haloWidth"], | ||
backgroundColor: themeData["input.focus.haloColor"], | ||
transitionDuration: "0.1s, 0.1s" | ||
}; | ||
var hoverStyles = { | ||
backgroundColor: themeData["input.hover.haloColor"], | ||
height: themeData["input.haloWidth"], | ||
transitionDuration: "0.1s, 0.1s" | ||
}; | ||
@@ -303,16 +298,4 @@ if (isDisabled) { | ||
} | ||
if (hasFocus) { | ||
return { | ||
height: themeData["input.haloWidth"], | ||
backgroundColor: themeData["input.focus.haloColor"], | ||
transitionDuration: "0.1s, 0.1s" | ||
}; | ||
} | ||
if (hasHover) { | ||
return _extends$2({}, defaults, { | ||
height: themeData["input.haloWidth"], | ||
transitionDuration: "0.1s, 0.1s" | ||
}); | ||
} | ||
return defaults; | ||
return _extends$2({}, defaults, hasFocus ? focusStyles : {}, hasHover ? hoverStyles : {}); | ||
} | ||
@@ -319,0 +302,0 @@ |
@@ -274,18 +274,4 @@ 'use strict'; | ||
} | ||
if (hasFocus) { | ||
return _extends$2({}, defaults, { | ||
borderBottomColor: themeData["input.line.focus.borderBottomColor"] | ||
}); | ||
} | ||
if (hasHover) { | ||
return _extends$2({}, defaults, { | ||
borderBottomColor: themeData["input.box.hover.borderBottomColor"] | ||
}); | ||
} | ||
if (error) { | ||
return _extends$2({}, defaults, { | ||
borderBottomColor: themeData["input.error.borderBottomColor"] | ||
}); | ||
} | ||
return defaults; | ||
return _extends$2({}, defaults, error ? { borderBottomColor: themeData["input.error.borderBottomColor"] } : {}, hasFocus ? { borderBottomColor: themeData["input.line.focus.borderBottomColor"] } : {}, hasHover ? { borderBottomColor: themeData["input.box.hover.borderBottomColor"] } : {}); | ||
} | ||
@@ -300,6 +286,15 @@ | ||
height: 0, | ||
backgroundColor: themeData["input.hover.haloColor"], | ||
transitionProperty: "height, color", | ||
transitionDuration: "0.3s, 0.3s" | ||
}; | ||
var focusStyles = { | ||
height: themeData["input.haloWidth"], | ||
backgroundColor: themeData["input.focus.haloColor"], | ||
transitionDuration: "0.1s, 0.1s" | ||
}; | ||
var hoverStyles = { | ||
backgroundColor: themeData["input.hover.haloColor"], | ||
height: themeData["input.haloWidth"], | ||
transitionDuration: "0.1s, 0.1s" | ||
}; | ||
@@ -309,16 +304,4 @@ if (isDisabled) { | ||
} | ||
if (hasFocus) { | ||
return { | ||
height: themeData["input.haloWidth"], | ||
backgroundColor: themeData["input.focus.haloColor"], | ||
transitionDuration: "0.1s, 0.1s" | ||
}; | ||
} | ||
if (hasHover) { | ||
return _extends$2({}, defaults, { | ||
height: themeData["input.haloWidth"], | ||
transitionDuration: "0.1s, 0.1s" | ||
}); | ||
} | ||
return defaults; | ||
return _extends$2({}, defaults, hasFocus ? focusStyles : {}, hasHover ? hoverStyles : {}); | ||
} | ||
@@ -325,0 +308,0 @@ |
@@ -0,1 +1,8 @@ | ||
# [@hig/input-v1.2.2](https://github.com/Autodesk/hig/compare/@hig/input@1.2.1...@hig/input@1.2.2) (2020-07-28) | ||
### Bug Fixes | ||
* hover styles take precedent over focus ([16e15a4](https://github.com/Autodesk/hig/commit/16e15a4)) | ||
# [@hig/input-v1.2.1](https://github.com/Autodesk/hig/compare/@hig/input@1.2.0...@hig/input@1.2.1) (2020-05-12) | ||
@@ -2,0 +9,0 @@ |
{ | ||
"name": "@hig/input", | ||
"version": "1.2.1", | ||
"version": "1.2.2", | ||
"description": "HIG Input", | ||
@@ -33,3 +33,3 @@ "author": "Autodesk Inc.", | ||
"@hig/theme-context": "^3.0.0", | ||
"@hig/theme-data": "^2.16.0", | ||
"@hig/theme-data": "^2.17.0", | ||
"react": "^15.4.1 || ^16.3.2" | ||
@@ -36,0 +36,0 @@ }, |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
43784
6
1202