fix: custom height and iframe SecurityError (#26)

* fix: custom height and iframe SecurityError * update snapshot * fix height judge * fix coverage * reduction ts version
react-component · Sep 7, 2020 · 7bdb272 · 7bdb272 · vercel · Sep 7, 2020
1 parent 060dc9b
commit 7bdb272
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/examples/basic.tsx b/examples/basic.tsx
@@ -34,6 +34,12 @@ export default function Base() {
         src="https://gw.alipayobjects.com/mdn/rms_08e378/afts/img/A*NZuwQp_vcIQAAAAAAAAAAABkARQnAQ"
         width={200}
       />
+
+      <Image
+        src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"
+        width={200}
+        height={100}
+      />
     </div>
   );
 }
diff --git a/src/Image.tsx b/src/Image.tsx
@@ -102,6 +102,7 @@ const ImageInternal: React.FC<ImageProps> = ({
     className: cn(`${prefixCls}-img`, {
       [`${prefixCls}-img-placeholder`]: placeholder === true,
     }),
+    style: height !== undefined ? { height } : undefined,
   };
 
   return (

diff --git a/src/Preview.tsx b/src/Preview.tsx
@@ -8,6 +8,7 @@ import CloseOutlined from '@ant-design/icons/CloseOutlined';
 import classnames from 'classnames';
 import addEventListener from 'rc-util/lib/Dom/addEventListener';
 import { getOffset } from 'rc-util/lib/Dom/css';
+import { warning } from 'rc-util/lib/warning';
 import useFrameSetState from './hooks/useFrameSetState';
 import getFixScaleEleTransPosition from './getFixScaleEleTransPosition';
 
@@ -155,11 +156,16 @@ const Preview: React.FC<PreviewProps> = props => {
     const onMouseUpListener = addEventListener(window, 'mouseup', onMouseUp, false);
     const onMouseMoveListener = addEventListener(window, 'mousemove', onMouseMove, false);
 
-    // Resolve if in iframe lost event
-    /* istanbul ignore next */
-    if (window.top !== window.self) {
-      onTopMouseUpListener = addEventListener(window.top, 'mouseup', onMouseUp, false);
-      onTopMouseMoveListener = addEventListener(window.top, 'mousemove', onMouseMove, false);
+    try {
+      // Resolve if in iframe lost event
+      /* istanbul ignore next */
+      if (window.top !== window.self) {
+        onTopMouseUpListener = addEventListener(window.top, 'mouseup', onMouseUp, false);
+        onTopMouseMoveListener = addEventListener(window.top, 'mousemove', onMouseMove, false);
+      }
+    } catch (error) {
+      /* istanbul ignore next */
+      warning(false, `[rc-image] ${error}`);
     }
 
     return () => {