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.

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

fix: draggable Modal should have boundary #28476

Closed
wants to merge 0 commits into from

Conversation

mumiao
Copy link
Contributor

@mumiao mumiao commented Dec 22, 2020

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Performance optimization
  • Enhancement feature
  • Internationalization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

#28438

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English 限制Modal在浏览器窗口内
🇨🇳 Chinese modal draggle be restricted the browerWindow

☑️ 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

View rendered components/modal/demo/modal-render.md

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Dec 22, 2020

@codesandbox-ci
Copy link

codesandbox-ci bot commented Dec 22, 2020

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 fa376f9:

Sandbox Source
antd reproduction template Configuration

@codecov
Copy link

codecov bot commented Dec 22, 2020

Codecov Report

Merging #28476 (4c6bda2) into master (7bef309) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##            master    #28476   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          393       393           
  Lines         7374      7376    +2     
  Branches      2121      2123    +2     
=========================================
+ Hits          7374      7376    +2     
Impacted Files Coverage Δ
components/input/TextArea.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 7bef309...1e3ad37. Read the comment docs.

@github-actions
Copy link
Contributor

github-actions bot commented Dec 22, 2020

Size Change: +23 B (0%)

Total Size: 789 kB

Filename Size Change
./dist/antd.compact.min.css 66.7 kB +5 B (0%)
./dist/antd.dark.min.css 68 kB +10 B (0%)
./dist/antd.min.css 66.7 kB +8 B (0%)
ℹ️ View Unchanged
Filename Size Change
./dist/antd-with-locales.min.js 313 kB 0 B
./dist/antd.min.js 275 kB 0 B

compressed-size-action

@afc163
Copy link
Member

afc163 commented Dec 22, 2020

这样不行,需要限制 Modal 边框在浏览器窗口内。

图片

@mumiao
Copy link
Contributor Author

mumiao commented Dec 22, 2020

需要限制 Modal 边框在浏览器窗口内

了解;限制 Modal 边框在浏览器窗口内以后还需要让draggle作用在body元素么

@afc163
Copy link
Member

afc163 commented Dec 22, 2020

应该没必要了。

@mumiao
Copy link
Contributor Author

mumiao commented Dec 23, 2020

@afc163 辛苦看一下 我本地已经测试过~

@mumiao mumiao mentioned this pull request Dec 23, 2020
19 tasks
@afc163
Copy link
Member

afc163 commented Dec 24, 2020

不要混杂无关的改动。

@afc163
Copy link
Member

afc163 commented Dec 24, 2020

https://preview-28476-ant-design.surge.sh/components/modal-cn/#components-modal-demo-modal-render

图片

还是不行,最好不能在拖拽的时候拖出范围,而不是 drop 的时候再调整。

@yoyo837
Copy link
Contributor

yoyo837 commented Dec 24, 2020

那就合并#28510, 这里rebase

@yoyo837
Copy link
Contributor

yoyo837 commented Dec 24, 2020

rebase下,抵消一些差异

@mumiao
Copy link
Contributor Author

mumiao commented Dec 24, 2020

rebase下,抵消一些差异

我执行了 git rebase upstream/master 就同步了一些master的commits history 没有抵消差异

@mumiao
Copy link
Contributor Author

mumiao commented Dec 24, 2020

https://preview-28476-ant-design.surge.sh/components/modal-cn/#components-modal-demo-modal-render

图片

还是不行,最好不能在拖拽的时候拖出范围,而不是 drop 的时候再调整。

done

@yoyo837
Copy link
Contributor

yoyo837 commented Dec 24, 2020

PR commits 记录里没看到rebase

@mumiao
Copy link
Contributor Author

mumiao commented Dec 24, 2020

因分支被我搞乱了 目前重新提pr :#28527

@afc163 afc163 changed the title fix: add draggled to modal content fix: draggable Modal should have boundary Dec 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants