Skip to content

isBlocked factors in the selector #894

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 16 commits into from
Aug 30, 2022
Merged

isBlocked factors in the selector #894

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
83c1866
isBlocked factors in the selector
dbseel May 10, 2022
97da83f
Ensure contains parameter is a node
dbseel May 12, 2022
2caf35e
Merge branch 'master' into master
dbseel May 12, 2022
7014901
Update to latest
dbseel May 27, 2022
6ae3795
Fix blockSelector blocking for closest nodes
dbseel May 26, 2022
e4bd73c
Fix integration test
dbseel May 30, 2022
4ea8306
adding ignoreCSSAttributes to ignore the addition of certain css attr…
Jun 8, 2022
a55b7f8
tested ignoreCSSAttributes
Jun 8, 2022
f364f41
Merge branch 'master' of https://github.com/rrweb-io/rrweb
dbseel Jun 14, 2022
3341e7f
Update test snapshot
dbseel Jun 14, 2022
eedcc00
Resolve merge conflicts
dbseel Aug 19, 2022
0524137
swapped the wrapping of htmlelement to be element
dbseel Aug 19, 2022
0f1c600
Fix linter errors
dbseel Aug 19, 2022
bd4d101
Address MR feedback
dbseel Aug 29, 2022
eb76c1a
Merge branch 'master' of https://github.com/rrweb-io/rrweb
dbseel Aug 29, 2022
55387b0
Rebase
dbseel Aug 29, 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
Prev Previous commit
Next Next commit
Fix linter errors
  • Loading branch information
@dbseel
dbseel committed Aug 19, 2022
commit 0f1c6000a535a6143a19e6157241f2b5ab9f7dbb
10 changes: 5 additions & 5 deletions packages/rrweb/src/record/observer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ function initStyleDeclarationObserver(
) {
// ignore this mutation if we do not care about this css attribute
if (ignoreCSSAttributes.has(property)) {
return setProperty.apply(this, arguments);
return setProperty.apply(this, [property, value, priority]);
}
const id = mirror.getId(this.parentRule?.parentStyleSheet?.ownerNode);
if (id !== -1) {
Expand All @@ -654,7 +654,7 @@ function initStyleDeclarationObserver(
) {
// ignore this mutation if we do not care about this css attribute
if (ignoreCSSAttributes.has(property)) {
return setProperty.apply(this, arguments);
return removeProperty.apply(this, [property]);
}
const id = mirror.getId(this.parentRule?.parentStyleSheet?.ownerNode);
if (id !== -1) {
Expand Down Expand Up @@ -767,7 +767,7 @@ function initFontObserver({ fontCb, doc }: observerParam): listenerHandler {
}

function initSelectionObserver(param: observerParam): listenerHandler {
const { doc, mirror, blockClass, selectionCb } = param;
const { doc, mirror, blockClass, blockSelector, selectionCb } = param;
let collapsed = true;

const updateSelection = () => {
Expand All @@ -786,8 +786,8 @@ function initSelectionObserver(param: observerParam): listenerHandler {
const { startContainer, startOffset, endContainer, endOffset } = range;

const blocked =
isBlocked(startContainer, blockClass, true) ||
isBlocked(endContainer, blockClass, true);
isBlocked(startContainer, blockClass, blockSelector, true) ||
isBlocked(endContainer, blockClass, blockSelector, true);

if (blocked) continue;

Expand Down