feat: Image support getPopupContainer #26713

rfreling · 2020-09-12T03:26:49Z

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

Add getPreviewContainer to Image Preview

📝 Changelog

Language	Changelog
🇺🇸 English	Add `getContainer` to Image preview property
🇨🇳 Chinese	Image 支持 `preview.getContainer` 属性用于指定预览对话框的容器。

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

Doc is updated/provided or not needed
Demo is updated/provided or not needed
TypeScript definition is updated/provided or not needed
Changelog is provided or not needed

ant-design-bot · 2020-09-12T03:30:14Z

ant-design-bot · 2020-09-12T03:30:32Z

rfreling · 2020-09-12T03:44:28Z

Note: dependent on react-component/image#29

react-component/image@e04ceb6

react-component/image#29

rfreling · 2020-09-22T17:50:17Z

👋 @shaodahong

After this suggestion: react-component/image#29 (comment)

The build fails because of this type conflict:

ant-design/components/config-provider/index.tsx

Line 31 in 5e03522

getPopupContainer?: (triggerNode: HTMLElement) => HTMLElement;

Which do you suggest?

(1) [ant-design] https://share.getcloudapp.com/z8uZN4Nr

or

(2) [react-component/Image] https://share.getcloudapp.com/Blu5rYgv

codecov · 2020-09-23T00:28:31Z

Codecov Report

Merging #26713 into feature will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##           feature    #26713   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          388       388           
  Lines         7396      7396           
  Branches      2072      2072           
=========================================
  Hits          7396      7396

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 2788140...ea9857b. Read the comment docs.

shaodahong · 2020-09-23T02:08:41Z

👋 @shaodahong

After this suggestion: react-component/image#29 (comment)

The build fails because of this type conflict:

ant-design/components/config-provider/index.tsx

Line 31 in 5e03522

getPopupContainer?: (triggerNode: HTMLElement) => HTMLElement;

Which do you suggest?

(1) [ant-design] https://share.getcloudapp.com/z8uZN4Nr

or

(2) [react-component/Image] https://share.getcloudapp.com/Blu5rYgv

https://github.com/react-component/util/blob/69046a6bb2a111cb1909bf5b6a661b27a846e0f5/src/PortalWrapper.js#L30

I don't find triggerNode, @zombieJ getPopupContainer?: (triggerNode: HTMLElement) => HTMLElement; it's same getContainer ?

components/image/index.tsx

zombieJ · 2020-09-23T03:17:59Z

Also need update doc.

(null coalesce)

components/image/index.en-US.md

zombieJ · 2020-09-24T03:29:18Z

/rebase

rfreling · 2020-09-24T03:37:08Z

/rebase

@zombieJ Thanks for reviews. The build is failing because of the type conflict here: #26713 (comment)

Do you have a suggestion for how to handle before rebasing?

zombieJ · 2020-09-24T03:42:49Z

You can ref https://ant.design/components/modal-cn/#header. Preview use rc-dialog internal. It may no need pass triggerNode currently.

rfreling

@zombieJ These suggested changes will fix the type conflict so that the build will pass.

I was following the patterns here which somehow passes the type check:

ant-design/components/modal/Modal.tsx

Line 130 in 006abe5

    
           const { getPopupContainer: getContextPopupContainer, getPrefixCls, direction } = React.useContext(

ant-design/components/modal/Modal.tsx

Line 198 in 006abe5

    
           getContainer={getContainer === undefined ? getContextPopupContainer : getContainer}

components/image/index.tsx

zombieJ · 2020-09-25T08:59:14Z

CI failed

afc163 · 2020-10-10T08:24:16Z

We should move this into preview: { getContainer: () => node } like https://github.com/ant-design/ant-design/pull/26915/files#diff-9c8ad9832b6e737e1c26715f227f1edcR28

components/image/index.en-US.md

Ignore getContextPopupContainer

codesandbox-ci · 2020-10-12T17:01:47Z

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit ea9857b:

Sandbox	Source
antd reproduction template	Configuration

afc163 · 2020-10-13T03:38:05Z

wait for react-component/image#34

hengkx · 2020-10-14T10:13:50Z

react-component/image#34 (comment)

components/image/index.zh-CN.md

afc163 · 2020-10-15T14:24:34Z

You have to upgrade rc-image to 4.0.0

hengkx · 2020-10-15T14:28:55Z

Please check

afc163 · 2020-10-15T14:32:48Z

Please fill changelog part in PR.

rfreling · 2020-10-15T14:43:15Z

Please fill changelog part in PR.

The Chinese is my best guess – will gladly accept edits :)

afc163 · 2020-10-15T14:55:41Z

The Chinese is my best guess – will gladly accept edits :)

You could leave chinese changelog to us. 😹

Image | getPreviewContainer

a6dd4af

pr-triage bot added the PR: unreviewed label Sep 12, 2020

rfreling changed the title ~~Image | getPreviewContainer~~ feat: Image | getPreviewContainer Sep 12, 2020

rfreling added 3 commits September 22, 2020 09:50

getPreviewContainer -> getPopupContainer

d9bd258

react-component/image@e04ceb6

Bump rc-image version

e32a502

react-component/image#29

Merge branch 'feature' into patch-1

3362133

zombieJ changed the title ~~feat: Image | getPreviewContainer~~ feat: Image support getPopupContainer Sep 23, 2020

zombieJ reviewed Sep 23, 2020

View reviewed changes

components/image/index.tsx Outdated Show resolved Hide resolved

rfreling added 3 commits September 23, 2020 09:23

Syntax update

6b945f9

(null coalesce)

Update en docs (image)

edfc59d

Update zh docs (image)

6bb0c05

zombieJ reviewed Sep 24, 2020

View reviewed changes

components/image/index.en-US.md Outdated Show resolved Hide resolved

rfreling added 2 commits September 23, 2020 19:08

Update index.en-US.md

7076020

Update index.zh-CN.md

5988f2b

zombieJ approved these changes Sep 24, 2020

View reviewed changes

pr-triage bot added PR: reviewed-approved and removed PR: unreviewed labels Sep 24, 2020

zombieJ self-requested a review September 24, 2020 03:29

pr-triage bot added PR: unreviewed and removed PR: reviewed-approved labels Sep 24, 2020

Merge remote-tracking branch 'upstream/feature' into patch-1

0aeeff3

pr-triage bot added PR: unreviewed and removed PR: partially-approved labels Sep 24, 2020

rfreling commented Sep 24, 2020

View reviewed changes

components/image/index.tsx Outdated Show resolved Hide resolved

components/image/index.tsx Outdated Show resolved Hide resolved

hengkx reviewed Oct 10, 2020

View reviewed changes

components/image/index.en-US.md Outdated Show resolved Hide resolved

rfreling added 3 commits October 12, 2020 11:43

Update components/image/index.tsx

012b25c

Ignore getContextPopupContainer

Update components/image/index.tsx

f8970a7

Ignore getContextPopupContainer

Update index.en-US.md

d390192

rfreling added 2 commits October 12, 2020 13:44

Merge branch 'feature' into patch-1

d2da552

Lint error (multiline jsx parens)

8120cf6

hengkx mentioned this pull request Oct 13, 2020

improve: preview props react-component/image#34

Merged

rfreling and others added 2 commits October 15, 2020 09:18

rc-image preview props react-component/image#34

26b0ee7

Merge branch 'feature' into patch-1

924ac8c

afc163 reviewed Oct 15, 2020

View reviewed changes

components/image/index.zh-CN.md Outdated Show resolved Hide resolved

ant-design deleted a comment from rfreling Oct 15, 2020

bump rc-image to 4.0.0

ea9857b

afc163 merged commit 7d59890 into ant-design:feature Oct 15, 2020

pr-triage bot added PR: merged and removed PR: unreviewed labels Oct 15, 2020

xrkffgg mentioned this pull request Nov 2, 2020

release: 4.8.0 changelog #27490

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Image support getPopupContainer #26713

feat: Image support getPopupContainer #26713

rfreling commented Sep 12, 2020 •

edited by afc163

Loading

ant-design-bot commented Sep 12, 2020 •

edited

Loading

ant-design-bot commented Sep 12, 2020 •

edited

Loading

rfreling commented Sep 12, 2020

rfreling commented Sep 22, 2020 •

edited

Loading

codecov bot commented Sep 23, 2020 •

edited

Loading

shaodahong commented Sep 23, 2020

zombieJ commented Sep 23, 2020

zombieJ commented Sep 24, 2020

rfreling commented Sep 24, 2020 •

edited

Loading

zombieJ commented Sep 24, 2020

rfreling left a comment

zombieJ commented Sep 25, 2020

afc163 commented Oct 10, 2020 •

edited

Loading

codesandbox-ci bot commented Oct 12, 2020 •

edited

Loading

afc163 commented Oct 13, 2020

hengkx commented Oct 14, 2020

afc163 commented Oct 15, 2020

hengkx commented Oct 15, 2020

afc163 commented Oct 15, 2020

rfreling commented Oct 15, 2020

afc163 commented Oct 15, 2020

feat: Image support getPopupContainer #26713

feat: Image support getPopupContainer #26713

Conversation

rfreling commented Sep 12, 2020 • edited by afc163 Loading

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self Check before Merge

ant-design-bot commented Sep 12, 2020 • edited Loading

ant-design-bot commented Sep 12, 2020 • edited Loading

rfreling commented Sep 12, 2020

rfreling commented Sep 22, 2020 • edited Loading

codecov bot commented Sep 23, 2020 • edited Loading

Codecov Report

shaodahong commented Sep 23, 2020

zombieJ commented Sep 23, 2020

zombieJ commented Sep 24, 2020

rfreling commented Sep 24, 2020 • edited Loading

zombieJ commented Sep 24, 2020

rfreling left a comment

Choose a reason for hiding this comment

zombieJ commented Sep 25, 2020

afc163 commented Oct 10, 2020 • edited Loading

codesandbox-ci bot commented Oct 12, 2020 • edited Loading

afc163 commented Oct 13, 2020

hengkx commented Oct 14, 2020

afc163 commented Oct 15, 2020

hengkx commented Oct 15, 2020

afc163 commented Oct 15, 2020

rfreling commented Oct 15, 2020

afc163 commented Oct 15, 2020

rfreling commented Sep 12, 2020 •

edited by afc163

Loading

ant-design-bot commented Sep 12, 2020 •

edited

Loading

ant-design-bot commented Sep 12, 2020 •

edited

Loading

rfreling commented Sep 22, 2020 •

edited

Loading

codecov bot commented Sep 23, 2020 •

edited

Loading

rfreling commented Sep 24, 2020 •

edited

Loading

afc163 commented Oct 10, 2020 •

edited

Loading

codesandbox-ci bot commented Oct 12, 2020 •

edited

Loading