Merge pull request #9 from arskang/hotfix/ancho-clumna

fix: se puede definir un ancho de columna
arskang · Oct 11, 2024 · 3533d78 · 3533d78
2 parents 72b5473 + 66a55c9
commit 3533d78
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 14 deletions.
diff --git a/acorn/boilerplate.go b/acorn/boilerplate.go
@@ -1,17 +1,22 @@
 package acorn
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/arskang/acornmail/acorntypes"
 )
 
 // Generate a new boilerplate html element
-func (h HTML) GetBoilerplate(elements acorntypes.AcornComponents, withoutMargins *bool) string {
+func (h HTML) GetBoilerplate(elements acorntypes.AcornComponents, withoutMargins *bool, width ...int) string {
 	spacer := h.NewSpacer()
 	if withoutMargins != nil && *withoutMargins {
 		spacer = ""
 	}
+	defaultWidth := 600
+	if len(width) > 0 {
+		defaultWidth = width[0]
+	}
 	return `
 	<!DOCTYPE html>
 	<html lang="es" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
@@ -149,7 +154,7 @@ func (h HTML) GetBoilerplate(elements acorntypes.AcornComponents, withoutMargins
 		<table lang="es" bgcolor="#EEEEEE" cellpadding="16" cellspacing="0" role="presentation" width="100%">
 			<tr>
 				<td align="center">
-					<table class="container" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" role="presentation" width="600">
+					<table class="container" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" role="presentation" width="` + fmt.Sprint(defaultWidth) + `">
 						<tr>
 							<td align="left">
 								` + spacer + strings.Join(elements, " ") + spacer + `

diff --git a/acornstyles/columns.go b/acornstyles/columns.go
@@ -1,6 +1,10 @@
 package acornstyles
 
-import "github.com/arskang/acornmail/acorntypes"
+import (
+	"fmt"
+
+	"github.com/arskang/acornmail/acorntypes"
+)
 
 type widthColumns struct {
 	Full, Quarter, Medium, ThreeQuarters, OneThird, TwoThird *acorntypes.WidthColumn
@@ -10,18 +14,43 @@ func setColumn(s string) *acorntypes.WidthColumn {
 	return (*acorntypes.WidthColumn)(&s)
 }
 
+func calculateWidths(width int) map[string]int {
+	return map[string]int{
+		"Quarter":       width / 4,
+		"Medium":        width / 2,
+		"ThreeQuarters": (3 * width) / 4,
+		"OneThird":      width / 3,
+		"TwoThird":      (2 * width) / 3,
+	}
+}
+
 // Return width columns:
 // Full, Quarter, Medium, ThreeQuarters, OneThird and TwoThird
 // (*acorntypes.WidthColumn)
-func GetWidthColumns() *widthColumns {
-	return &widthColumns{
-		Full:          setColumn("100%"),
-		Quarter:       setColumn("138"),
-		Medium:        setColumn("276"),
-		ThreeQuarters: setColumn("414"),
-		OneThird:      setColumn("184"),
-		TwoThird:      setColumn("368"),
+func GetWidthColumns(width ...int) *widthColumns {
+	defaultWidth := 600
+	if len(width) > 0 {
+		defaultWidth = width[0]
+	}
+	values := calculateWidths(defaultWidth)
+	WidthColumns := &widthColumns{
+		Full: setColumn("100%"),
+	}
+	for key, v := range values {
+		switch key {
+		case "Quarter":
+			WidthColumns.Quarter = setColumn(fmt.Sprint(v))
+		case "Medium":
+			WidthColumns.Medium = setColumn(fmt.Sprint(v))
+		case "ThreeQuarters":
+			WidthColumns.ThreeQuarters = setColumn(fmt.Sprint(v))
+		case "OneThird":
+			WidthColumns.OneThird = setColumn(fmt.Sprint(v))
+		case "TwoThird":
+			WidthColumns.TwoThird = setColumn(fmt.Sprint(v))
+		}
 	}
+	return WidthColumns
 }
 
 func WithoutMargins() *bool {

diff --git a/test/main_test.go b/test/main_test.go
@@ -184,10 +184,10 @@ func TestExample(t *testing.T) {
 }
 
 func TestGrid(t *testing.T) {
-
+	width := 800
 	acorn := acornmail.NewAcornEmailComponents()
 
-	widthColumns := acornstyles.GetWidthColumns()
+	widthColumns := acornstyles.GetWidthColumns(width)
 	colors := acornstyles.GetColors()
 
 	grid := acorn.NewGrid([][]*acorntypes.ColumnParams{
@@ -218,7 +218,7 @@ func TestGrid(t *testing.T) {
 		},
 	})
 
-	boilerplate := acorn.GetBoilerplate(acorntypes.AcornComponents{grid}, nil)
+	boilerplate := acorn.GetBoilerplate(acorntypes.AcornComponents{grid}, nil, width)
 
 	t.Log(boilerplate)