Skip to content

Commit 3e577fa

Browse files
committed
fix placment and offset of boxquads
1 parent 9d15bcd commit 3e577fa

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

packages/web-component-designer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"description": "A WYSIWYG designer webcomponent for html components",
33
"name": "@node-projects/web-component-designer",
4-
"version": "0.1.311",
4+
"version": "0.1.312",
55
"type": "module",
66
"main": "./dist/index.js",
77
"author": "[email protected]",

packages/web-component-designer/src/elements/helper/LayoutHelper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ export function placeDesignItem(container: IDesignItem, designItem: IDesignItem,
8787
designItem.setStyle('left', roundValue(designItem, offset.x + (oldLeft ?? 0) + containerLeft) + "px");
8888
if (oldTop || oldBottom == null)
8989
designItem.setStyle('top', roundValue(designItem, offset.y + (oldTop ?? 0) + containerTop) + "px");
90-
if (oldRight)
90+
if (oldRight != null)
9191
designItem.setStyle('right', roundValue(designItem, (oldRight ?? 0) - offset.x + containerRight) + "px");
92-
if (oldBottom)
92+
if (oldBottom != null)
9393
designItem.setStyle('bottom', roundValue(designItem, (oldBottom ?? 0) - offset.y + containerBottom) + "px");
9494
}
9595
}

packages/web-component-designer/src/elements/helper/getBoxQuads.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,12 @@ export function getElementSize(node, matrix) {
292292
*/
293293
function getElementOffsetsInContainer(node, includeScroll, iframes) {
294294
if ((node instanceof HTMLElement || node instanceof (node.ownerDocument.defaultView ?? window).HTMLElement)) {
295-
return new DOMPoint(node.offsetLeft - (includeScroll ? node.scrollLeft : 0), node.offsetTop - (includeScroll ? node.scrollTop : 0));
295+
if (includeScroll) {
296+
const cs = (node.ownerDocument.defaultView ?? window).getComputedStyle(node);
297+
return new DOMPoint(node.offsetLeft - (includeScroll ? node.scrollLeft - parseFloat(cs.borderLeftWidth) : 0), node.offsetTop - (includeScroll ? node.scrollTop - parseFloat(cs.borderTopWidth) : 0));
298+
} else {
299+
return new DOMPoint(node.offsetLeft, node.offsetTop);
300+
}
296301
} else if ((node instanceof Text || node instanceof (node.ownerDocument.defaultView ?? window).Text)) {
297302
const range = document.createRange();
298303
range.selectNodeContents(node);

0 commit comments

Comments
 (0)