if height or width been set ignore 100% width or height

beekai-oss · Feb 9, 2019 · fe1926c · fe1926c
1 parent 8911726
commit fe1926c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/simpleImg.js b/src/simpleImg.js
@@ -173,6 +173,7 @@ export class SimpleImg extends React.PureComponent<Props, State> {
       ...(height ? { height: wrapperStyle.height || height } : null),
       ...(width ? { width: wrapperStyle.width || width } : null),
     };
+    const isHeightOrWidthSet = height || width;
 
     return (
       <span
@@ -197,8 +198,8 @@ export class SimpleImg extends React.PureComponent<Props, State> {
           data-srcset={srcSet}
           style={{
             ...(!isValidImgSrc && !loaded && !isSrcSetFulfilled
-              ? { ...expendWidthHeight, ...heightWidth, ...hiddenStyle }
-              : { ...expendWidthHeight, ...heightWidth }),
+              ? { ...(isHeightOrWidthSet ? null : { expendWidthHeight }), ...heightWidth, ...hiddenStyle }
+              : { ...(isHeightOrWidthSet ? null : { expendWidthHeight }), ...heightWidth }),
           }}
           {...restImgProps}
         />