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

Fix min-width ignored when computing cell measures #1895

Merged
merged 2 commits into from
Aug 19, 2023
Merged

Fix min-width ignored when computing cell measures #1895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f55b823
Create test case for table cell min-width ignored
kygoh Jun 7, 2023
8b17b1c
Fix ignored min-width when computing cell measures
kygoh Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions tests/layout/test_table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2912,3 +2912,64 @@ def test_table_different_display():
</td>
</table>
''')


@assert_no_logs
def test_min_width_with_overflow():
# issue 1383
page, = render_pages('''
<head>
<style>
table td { border: 1px solid black; }
table.key-val tr td:nth-child(1) { min-width: 13em; }
</style>
</head>

<body>
<table class="key-val">
<tbody>
<tr>
<td>Normal Key 1</td>
<td>Normal Value 1</td>
</tr>
<tr>
<td>Normal Key 2</td>
<td>Normal Value 2</td>
</tr>
</tbody>
</table>
<table class="key-val">
<tbody>
<tr>
<td>Short value</td>
<td>Works as expected</td>
</tr>
<tr>
<td>Long Value</td>
<td>Annoyingly breaks my table layout: Sed ut perspiciatis
unde omnis iste natus error sit voluptatem
accusantium doloremque laudantium, totam rem aperiam,
eaque ipsa quae ab illo inventore veritatis et quasi
architecto beatae vitae dicta sunt explicabo.
</td>
</tr>
</tbody>
</table>
</body>
''')
html, = page.children
body, = html.children
table_wrapper_1, table_wrapper_2 = body.children

table1, = table_wrapper_1.children
tbody1, = table1.children
tr1, tr2 = tbody1.children
table1_td1, table1_td2 = tr1.children

table2, = table_wrapper_2.children
tbody2, = table2.children
tr1, tr2 = tbody2.children
table2_td1, table2_td2 = tr1.children

assert table1_td1.min_width == table2_td1.min_width
assert table1_td1.width == table2_td1.width
9 changes: 8 additions & 1 deletion weasyprint/layout/preferred.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,15 @@ def column_group_content_width(context, box):

def table_cell_min_content_width(context, box, outer):
"""Return the min-content width for a ``TableCellBox``."""
# See https://www.w3.org/TR/css-tables-3/#outer-min-content
min_width = box.style['min_width']
if min_width == 'auto':
min_width = 0
else:
min_width = min_width.value
children_widths = [
min_content_width(context, child) for child in box.children
max(min_width, min_content_width(context, child))
for child in box.children
if not child.is_absolutely_positioned()]
children_min_width = margin_width(
box, max(children_widths) if children_widths else 0)
Expand Down