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: correctly collect elements in absolute container #373

Merged
merged 2 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
22 changes: 20 additions & 2 deletions packages/shared/src/extractor/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,19 @@ export function visibleRect(

// check if the element is hidden by an ancestor
let parent: HTMLElement | Node | null = el;
const parentUntilNonStatic = (currentNode: HTMLElement | Node | null) => {
// find a parent element that is not static
let parent = currentNode?.parentElement;
while (parent) {
const style = currentWindow.getComputedStyle(parent);
if (style.position !== 'static') {
return parent;
}
parent = parent.parentElement;
}
return null;
};

while (parent && parent !== currentDocument.body) {
if (!(parent instanceof currentWindow.HTMLElement)) {
parent = parent.parentElement;
Expand All @@ -354,10 +367,15 @@ export function visibleRect(
}
}
// if the parent is a fixed element, stop the search
if (parentStyle.position === 'fixed') {
if (parentStyle.position === 'fixed' || parentStyle.position === 'sticky') {
break;
}
parent = parent.parentElement;

if (parentStyle.position === 'absolute') {
parent = parentUntilNonStatic(parent);
} else {
parent = parent.parentElement;
}
}

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,20 @@ exports[`extractor > basic 1`] = `
},
"content": "",
},
{
"attributes": {
"htmlTagName": "<div>",
"nodeType": "TEXT Node",
},
"content": "AAA",
},
{
"attributes": {
"htmlTagName": "<div>",
"nodeType": "TEXT Node",
},
"content": "This should be collected",
},
{
"attributes": {
"htmlTagName": "",
Expand Down Expand Up @@ -2938,6 +2952,72 @@ exports[`extractor > basic 2`] = `
"children": [],
"node": null,
},
{
"children": [
{
"children": [],
"node": null,
},
{
"children": [
{
"children": [],
"node": {
"attributes": {
"htmlTagName": "<div>",
"nodeType": "TEXT Node",
},
"content": "AAA",
"indexId": 78,
},
},
],
"node": null,
},
{
"children": [],
"node": null,
},
{
"children": [
{
"children": [],
"node": null,
},
],
"node": null,
},
{
"children": [],
"node": null,
},
{
"children": [
{
"children": [],
"node": {
"attributes": {
"htmlTagName": "<div>",
"nodeType": "TEXT Node",
},
"content": "This should be collected",
"indexId": 79,
},
},
],
"node": null,
},
{
"children": [],
"node": null,
},
],
"node": null,
},
{
"children": [],
"node": null,
},
],
"node": null,
},
Expand All @@ -2957,7 +3037,7 @@ exports[`extractor > basic 2`] = `
"nodeType": "TEXT Node",
},
"content": "Child Page",
"indexId": 79,
"indexId": 81,
},
},
],
Expand All @@ -2977,7 +3057,7 @@ exports[`extractor > basic 2`] = `
"nodeType": "TEXT Node",
},
"content": "This is a child page.",
"indexId": 80,
"indexId": 82,
},
},
],
Expand All @@ -2997,7 +3077,7 @@ exports[`extractor > basic 2`] = `
"nodeType": "TEXT Node",
},
"content": "Click me",
"indexId": 81,
"indexId": 83,
},
},
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,17 @@ <h3>Form</h3>
<iframe src="https://www.bytedance.com" frameborder="0" width="400px" height="200px"></iframe>
</div>
</div>


<div style="overflow: hidden; width: 100px; height: 100px; background-color: #ccc;">
<div style="width: 120px; height: 120px; background-color: #EEE;">AAA</div>
<div style="width: 120px; height: 120px; background-color: #EEE;">BBB</div>
<div style="position: absolute; bottom: 200px; right: 0; width: 120px; height: 120px; background-color: #CCC;">
This should be collected
</div>


</div>
</body>

</html>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading