Skip to content

Properly handle margin-left and margin-right specified on the input elements. #1456

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
dpvc wants to merge 1 commit into
base: develop
Choose a base branch
from
+35 −8
Open

Properly handle margin-left and margin-right specified on the input elements. #1456

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
29 changes: 23 additions & 6 deletions ts/output/common/Wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ export const SPACE: StringMap = {
* Padding and border data from the style attribute
*/
export type StyleData = {
margin: [number, number, number, number];
padding: [number, number, number, number];
border: {
width: [number, number, number, number];
Expand Down Expand Up @@ -596,9 +597,10 @@ export class CommonWrapper<
if (!this.styleData) return bbox;
const padding = this.styleData.padding;
const border = this.styleData.border?.width || [0, 0, 0, 0];
const margin = this.styleData.margin || [0, 0, 0, 0];
const obox = bbox.copy();
for (const [, i, side] of BBox.boxSides) {
(obox as any)[side] += padding[i] + border[i];
(obox as any)[side] += padding[i] + border[i] + margin[i];
}
return obox;
}
Expand Down Expand Up @@ -748,7 +750,9 @@ export class CommonWrapper<
if (!this.styleData) return;
const border = this.styleData.border;
const padding = this.styleData.padding;
bbox.w += (border?.width?.[3] || 0) + (padding?.[3] || 0);
const margin = this.styleData.margin;
bbox.w +=
(border?.width?.[3] || 0) + (padding?.[3] || 0) + (margin?.[3] || 0);
}

/**
Expand All @@ -758,8 +762,11 @@ export class CommonWrapper<
if (!this.styleData) return;
const border = this.styleData.border;
const padding = this.styleData.padding;
bbox.h += (border?.width?.[0] || 0) + (padding?.[0] || 0);
bbox.d += (border?.width?.[2] || 0) + (padding?.[2] || 0);
const margin = this.styleData.margin;
bbox.h +=
(border?.width?.[0] || 0) + (padding?.[0] || 0) + (margin?.[0] || 0);
bbox.d +=
(border?.width?.[2] || 0) + (padding?.[2] || 0) + (margin?.[2] || 0);
}

/**
Expand All @@ -769,7 +776,9 @@ export class CommonWrapper<
if (!this.styleData) return;
const border = this.styleData.border;
const padding = this.styleData.padding;
bbox.w += (border?.width?.[1] || 0) + (padding?.[1] || 0);
const margin = this.styleData.margin;
bbox.w +=
(border?.width?.[1] || 0) + (padding?.[1] || 0) + (margin?.[1] || 0);
}

/**
Expand Down Expand Up @@ -875,11 +884,13 @@ export class CommonWrapper<
protected getStyleData() {
if (!this.styles) return;
const padding = Array(4).fill(0);
const margin = Array(4).fill(0);
const width = Array(4).fill(0);
const style = Array(4);
const color = Array(4);
let hasPadding = false;
let hasBorder = false;
let hasMargin = false;
for (const [name, i] of BBox.boxSides) {
const key = 'border' + name;
const w = this.styles.get(key + 'Width');
Expand All @@ -894,11 +905,17 @@ export class CommonWrapper<
hasPadding = true;
padding[i] = Math.max(0, this.length2em(p, 1));
}
const m = this.styles.get('margin' + name);
if (m) {
hasMargin = true;
margin[i] = this.length2em(m, 1);
}
}
this.styleData =
hasPadding || hasBorder
hasPadding || hasBorder || hasMargin
? ({
padding,
margin,
border: hasBorder ? { width, style, color } : null,
} as StyleData)
: null;
Expand Down
14 changes: 12 additions & 2 deletions ts/output/svg/Wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ export class SvgWrapper<N, T, D> extends CommonWrapper<
* @param {N[]} parents The HTML nodes in which the output is to be placed
* @returns {N[]} The roots of the HTML tree for the node's output
*/
protected handleHref(parents: N[]) {
protected handleHref(parents: N[]): N[] {
const href = this.node.attributes.get('href');
if (!href) return parents;
let i = 0;
Expand Down Expand Up @@ -278,10 +278,17 @@ export class SvgWrapper<N, T, D> extends CommonWrapper<
);
}
const padding = (this.styleData?.padding || [0, 0, 0, 0])[3];
const margin = (this.styleData?.margin || [0, 0, 0, 0])[3];
const border = (this.styleData?.border?.width || [0, 0, 0, 0])[3];
if (padding || border) {
this.dx = padding + border;
}
if (margin) {
const transform = `translate(${this.fixed(margin)},0)`;
this.dom.forEach((node) =>
this.adaptor.setAttribute(node, 'transform', transform)
);
}
}

/**
Expand Down Expand Up @@ -346,6 +353,7 @@ export class SvgWrapper<N, T, D> extends CommonWrapper<
protected handleBorder() {
const border = this.styleData?.border;
if (!border) return;
const margin = this.styleData?.margin ?? [0, 0, 0, 0];
const f = SvgWrapper.borderFuzz;
const adaptor = this.adaptor;
let k = 0;
Expand All @@ -355,7 +363,9 @@ export class SvgWrapper<N, T, D> extends CommonWrapper<
const L = !n || !k ? 1 : 0;
const R = !n || k === n ? 1 : 0;
const bbox = isEmbellished ? this.getOuterBBox() : this.getLineBBox(k++);
const [h, d, w] = [bbox.h + f, bbox.d + f, bbox.w + f];
const h = bbox.h - margin[0] + f;
const d = bbox.d - margin[2] + f;
const w = bbox.w - margin[1] - margin[3] + f;
const outerRT = [w, h];
const outerLT = [-f, h];
const outerRB = [w, -d];
Expand Down
Loading