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: Grid should support ssr for flex gap #29586

Merged
merged 3 commits into from
Mar 2, 2021
Merged

fix: Grid should support ssr for flex gap #29586

merged 3 commits into from
Mar 2, 2021

Conversation

zombieJ
Copy link
Member

@zombieJ zombieJ commented Mar 2, 2021

[中文版模板 / 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

resolve #29327

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English Fix Grid throw error when client support flexGap but ssr not support.
🇨🇳 Chinese 修复 Grid 在使用 ssr 时,游览器支持 flexGap 会报内容不一致的问题。

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

@github-actions
Copy link
Contributor

github-actions bot commented Mar 2, 2021

Prepare preview

@codecov
Copy link

codecov bot commented Mar 2, 2021

Codecov Report

Merging #29586 (082de07) into master (992b99c) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##            master    #29586   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          393       394    +1     
  Lines         7504      7511    +7     
  Branches      2111      2111           
=========================================
+ Hits          7504      7511    +7     
Impacted Files Coverage Δ
components/grid/RowContext.tsx 100.00% <ø> (ø)
components/grid/col.tsx 100.00% <100.00%> (ø)
components/grid/hooks/useFlexGapSupport.tsx 100.00% <100.00%> (ø)
components/grid/row.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 992b99c...082de07. Read the comment docs.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 2, 2021

Size Change: +54 B (0%)

Total Size: 836 kB

Filename Size Change
./dist/antd-with-locales.min.js 337 kB +16 B (0%)
./dist/antd.min.js 297 kB +38 B (0%)
ℹ️ View Unchanged
Filename Size Change
./dist/antd.compact.min.css 67.1 kB 0 B
./dist/antd.dark.min.css 68.4 kB 0 B
./dist/antd.min.css 67.1 kB 0 B

compressed-size-action

@zombieJ zombieJ merged commit 6aaa7be into master Mar 2, 2021
@zombieJ zombieJ deleted the fix-ssr branch March 2, 2021 12:29
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.

flex gap feature detection causes style prop mismatch warning with server-side rendering
1 participant