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

Jump to bottom

use offsetParent for correct position of children of statically positioned nodes #48

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use offsetParent for correct position of children of statically positioned nodes #48

Show file tree
Hide file tree
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
30 changes: 12 additions & 18 deletions src/Wrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { cloneNode } from './utils/node.js';
import parseColor from './utils/parseColor.js';
import parseBorderRadius from './utils/parseBorderRadius.js';
import { svgns } from './utils/svg.js';
import { findTransformParent, findParentByTagName } from './utils/findParent.js';
import { findParentByTagName } from './utils/findParent.js';
import {
ANIMATION,
ANIMATION_DIRECTION,
Expand Down Expand Up @@ -46,7 +46,6 @@ export default class Wrapper {

init ( node ) {
this._node = node;

this._clone = cloneNode( node );

const style = window.getComputedStyle( node );
Expand All @@ -63,12 +62,6 @@ export default class Wrapper {
const bcr = getBoundingClientRect( node, this.invertedParentCTM );
this.bcr = bcr;

const opacity = +( style.opacity );

const rgba = parseColor( style.backgroundColor );



// TODO create a flat array? easier to work with later?
const borderRadius = {
tl: parseBorderRadius( style.borderTopLeftRadius ),
Expand All @@ -78,8 +71,8 @@ export default class Wrapper {
};

this.borderRadius = borderRadius;
this.opacity = opacity;
this.rgba = rgba;
this.opacity = +( style.opacity );
this.rgba = parseColor( style.backgroundColor );

this.left = bcr.left;
this.top = bcr.top;
Expand All @@ -90,29 +83,30 @@ export default class Wrapper {
insert () {
const bcr = this.bcr;

const offsetParent = this._node.offsetParent;

let clone;
let container;

if ( this._node.namespaceURI === svgns ) { // TODO what if it's the <svg> itself, not a child?
const svg = findParentByTagName( this._node, 'svg' ); // TODO should be the namespace boundary - could be SVG inside SVG
container = findTransformParent( svg );

clone = svg.cloneNode( false );
clone.appendChild( this._clone ); // TODO what about transforms?
} else {
container = findTransformParent( this._node );
clone = this._clone;
}

const containerStyle = window.getComputedStyle( container );
const containerBcr = getBoundingClientRect( container, invert( getCumulativeTransformMatrix( container.parentNode ) ) );
const offsetParentStyle = window.getComputedStyle( offsetParent );
const offsetParentBcr = getBoundingClientRect( offsetParent, invert( getCumulativeTransformMatrix( offsetParent.parentNode ) ) );

clone.style.position = 'absolute';
clone.style[ TRANSFORM_ORIGIN ] = '0 0';
clone.style.top = ( bcr.top - parseInt( this.style.marginTop, 10 ) - ( containerBcr.top - parseInt( containerStyle.marginTop, 10 ) ) ) + 'px';
clone.style.left = ( bcr.left - parseInt( this.style.marginLeft, 10 ) - ( containerBcr.left - parseInt( containerStyle.marginLeft, 10 ) ) ) + 'px';
clone.style.top = ( bcr.top - parseInt( this.style.marginTop, 10 ) - ( offsetParentBcr.top - parseInt( offsetParentStyle.marginTop, 10 ) ) ) + 'px';
clone.style.left = ( bcr.left - parseInt( this.style.marginLeft, 10 ) - ( offsetParentBcr.left - parseInt( offsetParentStyle.marginLeft, 10 ) ) ) + 'px';

// TODO we need to account for transforms *between* the offset parent and the node

container.appendChild( clone );
offsetParent.appendChild( clone );
}

detach () {
Expand Down
4 changes: 4 additions & 0 deletions test/samples/relative-inside-static.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<div>
<div class='a' style='position: relative;'>a</div>
</div>
<div class='b'>b</div>
6 changes: 6 additions & 0 deletions test/samples/relative-inside-transformed-static.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<div>
<div style='transform: rotate(30deg) translate(20px,20px);'>
<div class='a' style='position: relative;'>a</div>
</div>
</div>
<div class='b'>b</div>