Skip to content

with within specified from and to are only looked for in within #61

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
kfritsch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

with within specified from and to are only looked for in within #61

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
41 changes: 25 additions & 16 deletions src/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,32 +127,41 @@ export default class LineTo extends Component {
return document.getElementsByClassName(className)[0];
}

findElementWithin(className, within) {
return within.querySelector(`.${CSS.escape(className)}`);
}
Copy link
Copy Markdown
Owner

@kdeloach kdeloach Dec 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be more or less equivalent to the existing findElement method. Maybe we could add an optional param to the original method instead?

    findElement(className, parent=document) {
        return parent.getElementsByClassName(className)[0];
    }


detect() {
const { from, to, within = '' } = this.props;
const { from, to, within = "" } = this.props;
let parent = document;
let offsetX = window.pageXOffset;
let offsetY = window.pageYOffset;
if (within) {
parent = this.findElement(within);
if (!parent) return false;
const parentBox = parent.getBoundingClientRect();
offsetX -=
parentBox.left +
(window.pageXOffset || document.documentElement.scrollLeft) -
parent.scrollLeft;
offsetY -=
parentBox.top +
(window.pageYOffset || document.documentElement.scrollTop) -
parent.scrollTop;
Copy link
Copy Markdown
Owner

@kdeloach kdeloach Dec 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting of these lines seems off.

}

const a = this.findElement(from);
const b = this.findElement(to);
const a = this.findElementWithin(from, parent);
const b = this.findElementWithin(to, parent);

if (!a || !b) {
return false;
}

const anchor0 = this.fromAnchor;
const anchor1 = this.toAnchor;

const box0 = a.getBoundingClientRect();
const box1 = b.getBoundingClientRect();

let offsetX = window.pageXOffset;
let offsetY = window.pageYOffset;

if (within) {
const p = this.findElement(within);
const boxp = p.getBoundingClientRect();

offsetX -= boxp.left + (window.pageXOffset || document.documentElement.scrollLeft) - p.scrollLeft;
offsetY -= boxp.top + (window.pageYOffset || document.documentElement.scrollTop) - p.scrollTop;
}
const anchor0 = this.fromAnchor;
const anchor1 = this.toAnchor;

const x0 = box0.left + box0.width * anchor0.x + offsetX;
const x1 = box1.left + box1.width * anchor1.x + offsetX;
Expand Down