Skip to content

john/hig-1014-2nd-attempt-at-stitches-fix-in-rrweb #47

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

Merged
merged 2 commits into from
Aug 16, 2021
Merged

john/hig-1014-2nd-attempt-at-stitches-fix-in-rrweb #47

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
4bc9491
Revert "Record and replay nested stylesheet rules (#46)"
Aug 16, 2021
e1698ac
Update rrweb to fix stitches bug
Aug 16, 2021
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 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": "0.12.5",
"version": "0.12.6",
"description": "record and replay the web",
"scripts": {
"test": "npm run bundle:browser && cross-env TS_NODE_CACHE=false TS_NODE_FILES=true mocha -r ts-node/register -r ignore-styles -r jsdom-global/register test/**.test.ts",
Expand Down
83 changes: 43 additions & 40 deletions src/replay/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import getInjectStyleRules from './styles/inject-style';
import './styles/style.css';
import {
applyVirtualStyleRulesToNode,
getNestedRule,
storeCSSRules,
StyleRuleType,
VirtualStyleRules,
Expand Down Expand Up @@ -387,10 +388,9 @@ export class Replayer {

public getMetaData(): playerMetaData {
const firstEvent = this.service.state.context.events[0];
const lastEvent =
this.service.state.context.events[
this.service.state.context.events.length - 1
];
const lastEvent = this.service.state.context.events[
this.service.state.context.events.length - 1
];
return {
startTime: firstEvent.timestamp,
endTime: lastEvent.timestamp,
Expand Down Expand Up @@ -956,13 +956,13 @@ export class Replayer {
const { triggerFocus } = this.config;
switch (d.type) {
case MouseInteractions.Blur:
if ('blur' in (target as Node as HTMLElement)) {
(target as Node as HTMLElement).blur();
if ('blur' in ((target as Node) as HTMLElement)) {
((target as Node) as HTMLElement).blur();
}
break;
case MouseInteractions.Focus:
if (triggerFocus && (target as Node as HTMLElement).focus) {
(target as Node as HTMLElement).focus({
if (triggerFocus && ((target as Node) as HTMLElement).focus) {
((target as Node) as HTMLElement).focus({
preventScroll: true,
});
}
Expand Down Expand Up @@ -1032,7 +1032,7 @@ export class Replayer {
if (!target) {
return this.debugNodeNotFound(d, d.id);
}
const mediaEl = target as Node as HTMLMediaElement;
const mediaEl = (target as Node) as HTMLMediaElement;
try {
if (d.currentTime) {
mediaEl.currentTime = d.currentTime;
Expand Down Expand Up @@ -1062,8 +1062,8 @@ export class Replayer {
return this.debugNodeNotFound(d, d.id);
}

const styleEl = target as Node as HTMLStyleElement;
const parent = target.parentNode as unknown as INode;
const styleEl = (target as Node) as HTMLStyleElement;
const parent = (target.parentNode as unknown) as INode;
const usingVirtualParent = this.fragmentParentMap.has(parent);

/**
Expand Down Expand Up @@ -1093,25 +1093,26 @@ export class Replayer {
d.adds.forEach(({ rule, index }) => {
if (styleSheet) {
try {
let _index;
if (Array.isArray(index)) {
const positions = [...index];
_index = positions.pop();
const insertAt = positions.pop();
const nestedRule = getNestedRule(
styleSheet.cssRules,
positions,
);
nestedRule.insertRule(rule, insertAt);
} else {
_index =
index === undefined
? undefined
: Math.min(index, styleSheet.cssRules.length);
}
try {
const _index =
index === undefined
? undefined
: Math.min(index, styleSheet.cssRules.length);
styleSheet.insertRule(rule, _index);
} catch (e) {
/**
* sometimes we may capture rules with browser prefix
* insert rule with prefixs in other browsers may cause Error
*/
}
} catch (e) {
/**
* sometimes we may capture rules with browser prefix
* insert rule with prefixs in other browsers may cause Error
*/
/**
* accessing styleSheet rules may cause SecurityError
* for specific access control settings
Expand All @@ -1131,12 +1132,14 @@ export class Replayer {
try {
if (Array.isArray(index)) {
const positions = [...index];
const _index = positions.pop();
if (_index) {
styleSheet?.deleteRule(_index);
}
const deleteAt = positions.pop();
const nestedRule = getNestedRule(
styleSheet!.cssRules,
positions,
);
nestedRule.deleteRule(deleteAt || 0);
} else {
styleSheet?.deleteRule(index);
styleSheet?.deleteRule(index);
}
} catch (e) {
/**
Expand All @@ -1157,7 +1160,7 @@ export class Replayer {
return this.debugNodeNotFound(d, d.id);
}
try {
const ctx = (target as unknown as HTMLCanvasElement).getContext(
const ctx = ((target as unknown) as HTMLCanvasElement).getContext(
'2d',
)!;
if (d.setter) {
Expand Down Expand Up @@ -1466,9 +1469,9 @@ export class Replayer {
const value = mutation.attributes[attributeName];
try {
if (value !== null) {
(target as Node as Element).setAttribute(attributeName, value);
((target as Node) as Element).setAttribute(attributeName, value);
} else {
(target as Node as Element).removeAttribute(attributeName);
((target as Node) as Element).removeAttribute(attributeName);
}
} catch (error) {
if (this.config.showWarning) {
Expand Down Expand Up @@ -1496,8 +1499,8 @@ export class Replayer {
});
} else {
try {
(target as Node as Element).scrollTop = d.y;
(target as Node as Element).scrollLeft = d.x;
((target as Node) as Element).scrollTop = d.y;
((target as Node) as Element).scrollLeft = d.x;
} catch (error) {
/**
* Seldomly we may found scroll target was removed before
Expand All @@ -1513,8 +1516,8 @@ export class Replayer {
return this.debugNodeNotFound(d, d.id);
}
try {
(target as Node as HTMLInputElement).checked = d.isChecked;
(target as Node as HTMLInputElement).value = d.text;
((target as Node) as HTMLInputElement).checked = d.isChecked;
((target as Node) as HTMLInputElement).value = d.text;
} catch (error) {
// for safe
}
Expand Down Expand Up @@ -1668,7 +1671,7 @@ export class Replayer {
private storeState(parent: INode) {
if (parent) {
if (parent.nodeType === parent.ELEMENT_NODE) {
const parentElement = parent as unknown as HTMLElement;
const parentElement = (parent as unknown) as HTMLElement;
if (parentElement.scrollLeft || parentElement.scrollTop) {
// store scroll position state
this.elementStateMap.set(parent, {
Expand All @@ -1682,7 +1685,7 @@ export class Replayer {
);
const children = parentElement.children;
for (const child of Array.from(children)) {
this.storeState(child as unknown as INode);
this.storeState((child as unknown) as INode);
}
}
}
Expand All @@ -1694,7 +1697,7 @@ export class Replayer {
*/
private restoreState(parent: INode) {
if (parent.nodeType === parent.ELEMENT_NODE) {
const parentElement = parent as unknown as HTMLElement;
const parentElement = (parent as unknown) as HTMLElement;
if (this.elementStateMap.has(parent)) {
const storedState = this.elementStateMap.get(parent)!;
// restore scroll position
Expand All @@ -1706,7 +1709,7 @@ export class Replayer {
}
const children = parentElement.children;
for (const child of Array.from(children)) {
this.restoreState(child as unknown as INode);
this.restoreState((child as unknown) as INode);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/replay/virtual-styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type SnapshotRule = {
export type VirtualStyleRules = Array<InsertRule | RemoveRule | SnapshotRule>;
export type VirtualStyleRulesMap = Map<INode, VirtualStyleRules>;

function getNestedRule(
export function getNestedRule(
rules: CSSRuleList,
position: number[],
): CSSGroupingRule {
Expand Down