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

integrate fix for live mode #923 #77

Merged
merged 5 commits into from
Jun 30, 2022
Merged

integrate fix for live mode #923 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86a6134
Revert "improve error handling in rrdom (#76)"
Vadman97 Jun 30, 2022
b93b582
Remove children of Document even if doc not in mirror
Juice10 Jun 29, 2022
5f886cd
fix flaky test
Juice10 Jun 29, 2022
ce29729
Update packages/rrdom/test/diff.test.ts
Juice10 Jun 29, 2022
216c4f7
bump versions
Vadman97 Jun 30, 2022
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
2 changes: 1 addition & 1 deletion packages/rrdom/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@highlight-run/rrdom",
"version": "0.1.9",
"version": "0.1.10",
"scripts": {
"dev": "rollup -c -w",
"bundle": "rollup --config",
Expand Down
18 changes: 9 additions & 9 deletions packages/rrdom/src/diff.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,22 +283,22 @@ function diffChildren(
) {
try {
parentNode.insertBefore(oldStartNode, oldEndNode.nextSibling);
} catch (e) {
console.error(e, parentNode, oldStartNode, oldEndNode);
diff(oldStartNode, newEndNode, replayer, rrnodeMirror);
oldStartNode = oldChildren[++oldStartIndex];
newEndNode = newChildren[--newEndIndex];
} catch (e) {
console.error(e, parentNode, oldStartNode, oldEndNode);
}
} else if (
replayer.mirror.getId(oldEndNode) === rrnodeMirror.getId(newStartNode)
) {
try {
parentNode.insertBefore(oldEndNode, oldStartNode);
} catch (e) {
console.error(e, parentNode, oldEndNode, oldStartNode);
diff(oldEndNode, newStartNode, replayer, rrnodeMirror);
oldEndNode = oldChildren[--oldEndIndex];
newStartNode = newChildren[++newStartIndex];
} catch (e) {
console.error(e, parentNode, oldEndNode, oldStartNode);
}
} else {
if (!oldIdToIndex) {
Expand All @@ -314,10 +314,10 @@ function diffChildren(
const nodeToMove = oldChildren[indexInOld]!;
try {
parentNode.insertBefore(nodeToMove, oldStartNode);
} catch (e) {
console.error(e, parentNode, nodeToMove, oldStartNode);
diff(nodeToMove, newStartNode, replayer, rrnodeMirror);
oldChildren[indexInOld] = undefined;
} catch (e) {
console.error(e, parentNode, nodeToMove, oldStartNode);
}
} else {
const newNode = createOrGetNode(
Expand All @@ -331,7 +331,7 @@ function diffChildren(
* We should delete it before insert a serialized one. Otherwise, an error 'Only one element on document allowed' will be thrown.
*/
if (
replayer.mirror.getMeta(parentNode)?.type === RRNodeType.Document &&
parentNode.nodeName === '#document' &&
replayer.mirror.getMeta(newNode)?.type === RRNodeType.Element &&
(parentNode as Document).documentElement
) {
Expand All @@ -341,9 +341,9 @@ function diffChildren(
}
try {
parentNode.insertBefore(newNode, oldStartNode || null);
diff(newNode, newStartNode, replayer, rrnodeMirror);
} catch (e) {
console.error(e, parentNode, newNode, oldStartNode || null);
diff(newNode, newStartNode, replayer, rrnodeMirror);
}
}
newStartNode = newChildren[++newStartIndex];
Expand All @@ -367,9 +367,9 @@ function diffChildren(
);
try {
parentNode.insertBefore(newNode, referenceNode);
diff(newNode, newChildren[newStartIndex], replayer, rrnodeMirror);
} catch (e) {
console.error(e, parentNode, newNode, referenceNode);
diff(newNode, newChildren[newStartIndex], replayer, rrnodeMirror);
}
}
} else if (newStartIndex > newEndIndex) {
Expand Down
18 changes: 18 additions & 0 deletions packages/rrdom/test/diff.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,24 @@ describe('diff algorithm for rrdom', () => {
expect(element.tagName).toBe('DIV');
expect(mirror.getId(element)).toEqual(2);
});

it('should remove children from document before adding new nodes', () => {
document.write('<style></style>'); // old document with elements that need removing

const rrDocument = new RRDocument();
const docType = rrDocument.createDocumentType('html', '', '');
rrDocument.mirror.add(docType, getDefaultSN(docType, 1));
rrDocument.appendChild(docType);
const htmlEl = rrDocument.createElement('html');
rrDocument.mirror.add(htmlEl, getDefaultSN(htmlEl, 2));
rrDocument.appendChild(htmlEl);

diff(document, rrDocument, replayer);
expect(document.childNodes.length).toBe(2);
const element = document.childNodes[0] as HTMLElement;
expect(element.nodeType).toBe(element.DOCUMENT_TYPE_NODE);
expect(mirror.getId(element)).toEqual(1);
});
});

describe('create or get a Node', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/rrweb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@highlight-run/rrweb",
"version": "2.0.10",
"version": "2.0.11",
"description": "record and replay the web",
"scripts": {
"prepare": "npm run prepack",
Expand Down
3 changes: 1 addition & 2 deletions packages/rrweb/test/integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,7 @@ describe('record integration tests', function (this: ISuite) {
);
});
});
await page.waitForTimeout(20); // 20ms of sleep time
await waitForRAF(page); // wait for events to get created
await waitForRAF(page);

const snapshots = await page.evaluate('window.snapshots');
assertSnapshot(snapshots);
Expand Down