Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: custom height and iframe SecurityError #26

Merged
merged 5 commits into from Sep 7, 2020
Merged

fix: custom height and iframe SecurityError #26

merged 5 commits into from Sep 7, 2020

Conversation

shaodahong
Copy link
Member

@vercel
Copy link

vercel bot commented Sep 5, 2020 •
edited

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/react-component/image/l7y8aq45m
✅ Preview: https://image-git-fix-height-and-iframe.react-component.vercel.app

@codecov
Copy link

codecov bot commented Sep 5, 2020 •
edited

Codecov Report

Merging #26 into master will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##            master       #26   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            4         4           
  Lines          137       139    +2     
  Branches        32        33    +1     
=========================================
+ Hits           137       139    +2
Impacted Files Coverage Δ
src/Image.tsx 100.00% <100.00%> (ø)
src/Preview.tsx 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 230055d...af68421. Read the comment docs.

afc163
afc163 reviewed Sep 5, 2020
View reviewed changes
src/Image.tsx Outdated
@@ -102,6 +102,7 @@ const ImageInternal: React.FC<ImageProps> = ({
className: cn(`${prefixCls}-img`, {
[`${prefixCls}-img-placeholder`]: placeholder === true,
}),
style: { height },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

width 也传进来？

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

width 不用，width 是 100%，只要有一个就能满足了

@vercel vercel bot temporarily deployed to Preview September 5, 2020 04:30 Inactive
afc163
afc163 reviewed Sep 6, 2020
View reviewed changes
package.json Outdated
@@ -63,6 +63,6 @@
"np": "^6.3.2",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"typescript": "^4.0.2"
"typescript": "^3.9.7"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为啥改回来了。

Copy link
Member Author

@shaodahong shaodahong Sep 7, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4.0 配合 eslint 有问题 typescript-eslint/typescript-eslint#1436

发现是 yarn 的问题，改回来了

@shaodahong shaodahong merged commit 7bdb272 into master Sep 7, 2020
@shaodahong shaodahong deleted the fix-height-and-iframe branch September 7, 2020 02:18
@afc163 afc163 mentioned this pull request Sep 10, 2020
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@afc163 afc163 afc163 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Image Component Does Not Work As Expected When Used as Card Cover
2 participants
@shaodahong @afc163