Skip to content

#1853: Fix direction detection for display:contents lists #2477

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
Yahiro025 wants to merge 1 commit into
base: master
Choose a base branch
from
+203 −4
Open

#1853: Fix direction detection for display:contents lists #2477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions src/Sortable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,24 @@ let dragEl,
})(),

_detectDirection = function(el, options) {
let elCSS = css(el),
elWidth = parseInt(elCSS.width)
let layoutEl = el,
elCSS = css(layoutEl);

// #1853: display:contents generates no box; use the layout-generating ancestor
while (elCSS && elCSS.display === 'contents') {
let parent = layoutEl.assignedSlot || layoutEl.parentElement;
if (!parent && layoutEl.getRootNode) {
const root = layoutEl.getRootNode();
if (root && root.host) parent = root.host;
}
if (!parent || parent === layoutEl || parent.nodeType !== 1) break;
const parentCSS = css(parent);
if (!parentCSS) break;
layoutEl = parent;
elCSS = parentCSS;
}

let elWidth = parseInt(elCSS.width)
- parseInt(elCSS.paddingLeft)
- parseInt(elCSS.paddingRight)
- parseInt(elCSS.borderLeftWidth)
Expand All @@ -174,12 +190,12 @@ let dragEl,
firstChildWidth = firstChildCSS && parseInt(firstChildCSS.marginLeft) + parseInt(firstChildCSS.marginRight) + getRect(child1).width,
secondChildWidth = secondChildCSS && parseInt(secondChildCSS.marginLeft) + parseInt(secondChildCSS.marginRight) + getRect(child2).width;

if (elCSS.display === 'flex') {
if (elCSS.display === 'flex' || elCSS.display === 'inline-flex') {
return elCSS.flexDirection === 'column' || elCSS.flexDirection === 'column-reverse'
? 'vertical' : 'horizontal';
}

if (elCSS.display === 'grid') {
if (elCSS.display === 'grid' || elCSS.display === 'inline-grid') {
return elCSS.gridTemplateColumns.split(' ').length <= 1 ? 'vertical' : 'horizontal';
}

Expand Down
46 changes: 46 additions & 0 deletions tests/Sortable.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,49 @@ test('Do not insert into empty list if outside emptyInsertThreshold', async brow
})
.expect(dragStartPosition.innerText).eql(dragEl.innerText);
});


fixture `Display contents grid`
.page `./display-contents-grid.html`;

const contentsList = Selector('#list-contents');

test('Detect horizontal direction for display:contents inside a multi-column grid', async browser => {
const directions = await browser.eval(() => {
const opts = { draggable: '>*' };
return {
grid: Sortable.utils.detectDirection(document.getElementById('list-contents'), opts),
flexRow: Sortable.utils.detectDirection(document.getElementById('flex-row-inner'), opts),
flexCol: Sortable.utils.detectDirection(document.getElementById('flex-col-inner'), opts),
block: Sortable.utils.detectDirection(document.getElementById('block-inner'), opts),
nested: Sortable.utils.detectDirection(document.getElementById('nested-inner'), opts),
grid1Col: Sortable.utils.detectDirection(document.getElementById('grid-1col-inner'), opts),
inlineGrid: Sortable.utils.detectDirection(document.getElementById('inline-grid-inner'), opts)
};
});

await browser.expect(directions.grid).eql('horizontal');
await browser.expect(directions.flexRow).eql('horizontal');
await browser.expect(directions.flexCol).eql('vertical');
await browser.expect(directions.block).eql('vertical');
await browser.expect(directions.nested).eql('horizontal');
await browser.expect(directions.grid1Col).eql('vertical');
await browser.expect(directions.inlineGrid).eql('horizontal');
});

test('Sort across an incomplete display:contents grid row', async browser => {
const dragStartPosition = contentsList.child(0);
const dragEl = await dragStartPosition();
const targetStartPosition = contentsList.child(2);
const target = await targetStartPosition();

await browser
.expect(dragStartPosition.innerText).eql(dragEl.innerText)
.expect(targetStartPosition.innerText).eql(target.innerText)
.dragToElement(dragEl, target)
.expect(contentsList.child(0).innerText).eql('Item 2')
.expect(contentsList.child(1).innerText).eql('Item 3')
.expect(contentsList.child(2).innerText).eql('Item 1')
.expect(contentsList.child(3).innerText).eql('Item 4')
.expect(contentsList.child(4).innerText).eql('Item 5');
});
137 changes: 137 additions & 0 deletions tests/display-contents-grid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<!DOCTYPE html>
<html>
<head>
<title></title>
<link rel="stylesheet" type="text/css" href="./style.css">
<style>
#grid {
display: grid;
grid-template-columns: 150px 150px 150px;
grid-auto-rows: 54px;
width: 450px;
}
#list-contents {
display: contents;
}
#list-contents > div {
box-sizing: border-box;
width: 80px;
justify-self: center;
}

#flex-row {
display: flex;
flex-direction: row;
}
#flex-row-inner {
display: contents;
}

#flex-col {
display: flex;
flex-direction: column;
}
#flex-col-inner {
display: contents;
}

#block-outer {
display: block;
width: 200px;
}
#block-inner {
display: contents;
}

#nested-grid {
display: grid;
grid-template-columns: 100px 100px;
}
#nested-outer {
display: contents;
}
#nested-inner {
display: contents;
}

#grid-1col {
display: grid;
grid-template-columns: 100px;
}
#grid-1col-inner {
display: contents;
}

#inline-grid {
display: inline-grid;
grid-template-columns: 100px 100px;
}
#inline-grid-inner {
display: contents;
}
</style>
</head>
<body>

<div id="grid">
<div id="list-contents">
<div>Item 1</div>
<div>Item 2</div>
<div>Item 3</div>
<div>Item 4</div>
<div>Item 5</div>
</div>
</div>

<div id="flex-row">
<div id="flex-row-inner">
<div>A</div>
<div>B</div>
</div>
</div>

<div id="flex-col">
<div id="flex-col-inner">
<div>A</div>
<div>B</div>
</div>
</div>

<div id="block-outer">
<div id="block-inner">
<div>A</div>
<div>B</div>
</div>
</div>

<div id="nested-grid">
<div id="nested-outer">
<div id="nested-inner">
<div>A</div>
<div>B</div>
</div>
</div>
</div>

<div id="grid-1col">
<div id="grid-1col-inner">
<div>A</div>
<div>B</div>
</div>
</div>

<div id="inline-grid">
<div id="inline-grid-inner">
<div>A</div>
<div>B</div>
</div>
</div>

<script src="../Sortable.js"></script>

<script type="text/javascript">
new Sortable(document.getElementById('list-contents'));
</script>

</body>
</html>