fix issue were auto-animate could interfere with inherited line-height
parent
a0e48602d3
commit
b23d15c430
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -399,8 +399,15 @@ export default class AutoAnimate {
|
||||||
value = { value: style.to, explicitValue: true };
|
value = { value: style.to, explicitValue: true };
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
// Use a unitless value for line-height so that it inherits properly
|
||||||
|
if( style.property === 'line-height' ) {
|
||||||
|
value = parseFloat( computedStyles['line-height'] ) / parseFloat( computedStyles['font-size'] );
|
||||||
|
}
|
||||||
|
|
||||||
|
if( isNaN(value) ) {
|
||||||
value = computedStyles[style.property];
|
value = computedStyles[style.property];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if( value !== '' ) {
|
if( value !== '' ) {
|
||||||
properties.styles[style.property] = value;
|
properties.styles[style.property] = value;
|
||||||
|
@ -475,7 +482,6 @@ export default class AutoAnimate {
|
||||||
} );
|
} );
|
||||||
|
|
||||||
pairs.forEach( pair => {
|
pairs.forEach( pair => {
|
||||||
|
|
||||||
// Disable scale transformations on text nodes, we transition
|
// Disable scale transformations on text nodes, we transition
|
||||||
// each individual text property instead
|
// each individual text property instead
|
||||||
if( matches( pair.from, textNodes ) ) {
|
if( matches( pair.from, textNodes ) ) {
|
||||||
|
|
Loading…
Reference in New Issue