Skip to content

bugfix: fix table cell vertical-align table export styles #5994

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

Open
wants to merge 4 commits into
base: development
Choose a base branch
from
Open

bugfix: fix table cell vertical-align table export styles #5994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bea422
bugfix: dont add empty cell to footnotes or sub or sup
shun2wang Aug 17, 2025
fd3918b
adjust table style
shun2wang Aug 17, 2025
c644ecc
fix value vertical-align
shun2wang Aug 17, 2025
f6610ba
fix bottom border width
shun2wang Aug 28, 2025
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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,7 @@ QMLComponents/utilities/appdirs.h

# Bundle related
Tools/ModuleBundleBuildDir
Modules/local
Modules/local

# User configurations
.qmlls.ini
29 changes: 12 additions & 17 deletions Desktop/html/css/jasp.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,13 @@ th[colspan="2"] {
padding-right: 1em ;
}

td.value {
padding-left : 1em ;
padding-right: 0 ;
}

td.symbol {
text-align: left ;
padding-right: 1em ;
padding-left: 0 ;
}

td {
text-align: right ;
vertical-align: top ;
text-align: right;
vertical-align: bottom;
padding-left: 1em;
padding-right: 1em;
/* padding-top: .25em; because algin to buttom then seems visual balanced */
padding-bottom: .25em;
}

thead tr:nth-child(2) th:not(.separator) {
Expand All @@ -138,6 +131,8 @@ thead th {
white-space: nowrap;
padding-top: .25em ;
padding-bottom: .25em ;
padding-left: 1em;
padding-right: 1em;
}

tbody th {
Expand Down Expand Up @@ -188,7 +183,7 @@ div.over-title-space:empty {
tbody tr:last-child th,
tbody tr:last-child td {

border-bottom: 2px solid ;
border-bottom: thin solid ;
}

tbody tr td.new-sub-group-row {
Expand All @@ -198,7 +193,7 @@ tbody tr td.new-sub-group-row {

tbody tr td.new-group-row,
tbody tr:first-child td {

vertical-align: top; /* align to top for first group rows */
padding-top: .9em ;
}

Expand All @@ -215,7 +210,7 @@ td.text {
}

tfoot td {

padding-left: 0em ;
text-align: left;
}

Expand Down Expand Up @@ -654,4 +649,4 @@ iframe.ql-video {
100% {
transform: translateX(0);
}
}
}
2 changes: 1 addition & 1 deletion Desktop/html/js/jaspwidgets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ JASPWidgets.Exporter = {
},

getTableContentStyles: function (element, exportParams) {
return JASPWidgets.Exporter.getStyles(element, ["border-collapse", "border-top-width", "border-bottom-width", "border-left-width", "border-right-width", "border-color", "border-style", "padding", "text-align", "margin", "display", "float", "font-size", "font-weight", "font", "color"]);
return JASPWidgets.Exporter.getStyles(element, ["border-collapse", "border-top-width", "border-bottom-width", "border-left-width", "border-right-width", "border-color", "border-style", "padding", "text-align", "margin", "display", "float", "font-size", "font-weight", "font", "color", "background", "background-color"]);
},

getErrorStyles: function (element, component) {
Expand Down
47 changes: 17 additions & 30 deletions Desktop/html/js/table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,18 +548,15 @@ JASPWidgets.tablePrimitive = JASPWidgets.View.extend({
var chunks = []

if (optError) {

chunks.push('<table class="error-state jasp-no-select">')
}
else {

chunks.push('<table class="jasp-no-select">')
}


chunks.push('<thead>')
chunks.push('<tr>')
chunks.push('<th colspan="' + 2 * columnCount + '"><div class="toolbar"></div></div>')
chunks.push('<th colspan="' + columnCount + '"><div class="toolbar"></div>')

if (optError && optError.errorMessage) {

Expand All @@ -576,7 +573,7 @@ JASPWidgets.tablePrimitive = JASPWidgets.View.extend({

if (optSubtitle) {
chunks.push('<tr>')
chunks.push('<th colspan="' + 2 * columnCount + '"></th>')
chunks.push('<th colspan="' + columnCount + '"></th>')
chunks.push('</tr>')
}

Expand Down Expand Up @@ -606,11 +603,10 @@ JASPWidgets.tablePrimitive = JASPWidgets.View.extend({

if (hasOvertitles) {

if (hasAdjacentOvertitles) {
if (hasAdjacentOvertitles)
chunks.push('<tr class="over-title-space">')
} else {
else
chunks.push('<tr class="over-title">')
}


var span = 1;
Expand All @@ -627,26 +623,24 @@ JASPWidgets.tablePrimitive = JASPWidgets.View.extend({
newTitle = ""

if (newTitle == oldTitle) {

span++
}
else {
if (hasAdjacentOvertitles) {
chunks.push('<th colspan="' + (2 * span) + '"><div class="over-title-space">' + oldTitle + '</div></th>');
} else {
chunks.push('<th colspan="' + (2 * span) + '">' + oldTitle + '</th>');
}
if (hasAdjacentOvertitles)
chunks.push('<th colspan="' + span + '"><div class="over-title-space">' + oldTitle + '</div></th>');
else
chunks.push('<th colspan="' + span + '">' + oldTitle + '</th>');

oldTitle = newTitle
span = 1
}
}

if (newTitle == oldTitle) {
if (hasAdjacentOvertitles) {
chunks.push('<th colspan="' + (2 * span) + '"><div class="over-title-space">' + newTitle + '</div></th>')
} else {
chunks.push('<th colspan="' + (2 * span) + '">' + newTitle + '</th>')
}
if (hasAdjacentOvertitles)
chunks.push('<th colspan="' + span + '"><div class="over-title-space">' + newTitle + '</div></th>')
else
chunks.push('<th colspan="' + span + '">' + newTitle + '</th>')
}


Expand All @@ -669,9 +663,6 @@ JASPWidgets.tablePrimitive = JASPWidgets.View.extend({
span = 1

if (span) {

span *= 2 // times 2, because of footnote markers

chunks.push('<th colspan="' + span + '" class="' + cell.type + '">' + cell.content)
if (cell.footnotes)
chunks.push(cell.footnotes.join(' '))
Expand Down Expand Up @@ -709,18 +700,14 @@ JASPWidgets.tablePrimitive = JASPWidgets.View.extend({
cellClass += (cell.span > 1 ? " row-span" : "")

cellHtml += (cell.header ? '<th' : '<td')
cellHtml += ' class="value ' + cellClass + '"'
cellHtml += ' class="' + cellClass + '"'
cellHtml += (cell.span ? ' rowspan="' + cell.span + '"' : '')
cellHtml += '>'
cellHtml += (typeof cell.content != "undefined" ? cell.content : '')
cellHtml += (cell.header ? '</th>' : '</td>')

cellHtml += (cell.header ? '<th' : '<td')
cellHtml += ' class="symbol ' + cellClass + '"'
cellHtml += (cell.span ? ' rowspan="' + cell.span + '"' : '')
cellHtml += '>'
if (typeof cell.footnotes != "undefined")
cellHtml += cell.footnotes.join(' ')

cellHtml += (cell.header ? '</th>' : '</td>')

tableProgress[colNo].from += 1
Expand All @@ -746,7 +733,7 @@ JASPWidgets.tablePrimitive = JASPWidgets.View.extend({
chunks.push('</tr>')
}

chunks.push('<tr><td colspan="' + 2 * columnCount + '"></td></tr>')
chunks.push('<tr><td colspan="' + columnCount + '"></td></tr>')

chunks.push('</tbody>')

Expand All @@ -758,7 +745,7 @@ JASPWidgets.tablePrimitive = JASPWidgets.View.extend({
if(optFootnotes[i].text !== "")
{

chunks.push('<tr><td colspan="' + 2 * columnCount + '">')
chunks.push('<tr><td colspan="' + columnCount + '">')

var footnote = optFootnotes[i]

Expand Down