refactor widget align padding

reearth · Feb 7, 2023 · f52b3f0 · f52b3f0
1 parent a019c54
commit f52b3f0
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 66 deletions.
diff --git a/server/internal/adapter/gql/generated.go b/server/internal/adapter/gql/generated.go
diff --git a/server/internal/adapter/gql/gqldataloader/workspaceloader_gen.go b/server/internal/adapter/gql/gqldataloader/workspaceloader_gen.go
diff --git a/server/internal/adapter/gql/gqlmodel/convert_scene_align.go b/server/internal/adapter/gql/gqlmodel/convert_scene_align.go
@@ -39,7 +39,7 @@ func ToWidgetSection(s *scene.WidgetSection) *WidgetSection {
 }
 func ToWidgetAreaPadding(p *scene.WidgetAreaPadding) *WidgetAreaPadding {
 	if p == nil {
-		return &WidgetAreaPadding{}
+		return nil
 	}
 
 	return &WidgetAreaPadding{

diff --git a/server/internal/adapter/gql/gqlmodel/models_gen.go b/server/internal/adapter/gql/gqlmodel/models_gen.go
diff --git a/server/internal/infrastructure/mongo/mongodoc/scene_align.go b/server/internal/infrastructure/mongo/mongodoc/scene_align.go
@@ -25,7 +25,7 @@ type WidgetAreaDocument struct {
 	WidgetIDs  []string
 	Align      string
 	Padding    *WidgetAreaPaddingDocument
-	Gap        int
+	Gap        *int
 	Centered   bool
 	Background *string
 }

diff --git a/server/internal/usecase/interactor/scene.go b/server/internal/usecase/interactor/scene.go
@@ -353,7 +353,7 @@ func (i *Scene) UpdateWidgetAlignSystem(ctx context.Context, param interfaces.Up
 		area.SetPadding(param.Padding)
 	}
 	if param.Gap != nil {
-		area.SetGap(*param.Gap)
+		area.SetGap(param.Gap)
 	}
 	if param.Centered != nil {
 		area.SetCentered(*param.Centered)

diff --git a/server/pkg/scene/builder/encoder.go b/server/pkg/scene/builder/encoder.go
@@ -166,7 +166,7 @@ type widgetAreaJSON struct {
 	WidgetIDs  []string               `json:"widgetIds"`
 	Align      string                 `json:"align"`
 	Padding    *widgetAreaPaddingJSON `json:"padding"`
-	Gap        int                    `json:"gap"`
+	Gap        *int                   `json:"gap"`
 	Centered   bool                   `json:"centered"`
 	Background *string                `json:"background"`
 }

diff --git a/server/pkg/scene/builder/scene_test.go b/server/pkg/scene/builder/scene_test.go
@@ -113,7 +113,7 @@ func TestBuildWidgetAlignSystem(t *testing.T) {
 								Left:   0,
 								Right:  0,
 							},
-							Gap:        0,
+							Gap:        nil,
 							Centered:   false,
 							Background: nil,
 						},

diff --git a/server/pkg/scene/widget_area.go b/server/pkg/scene/widget_area.go
@@ -10,7 +10,7 @@ type WidgetArea struct {
 	widgetIds  WidgetIDList
 	align      WidgetAlignType
 	padding    *WidgetAreaPadding
-	gap        int
+	gap        *int
 	centered   bool
 	background *string
 }
@@ -23,7 +23,7 @@ const (
 	WidgetAlignEnd      WidgetAlignType = "end"
 )
 
-func NewWidgetArea(widgetIds []WidgetID, align WidgetAlignType, padding *WidgetAreaPadding, gap int, centered bool, background *string) *WidgetArea {
+func NewWidgetArea(widgetIds []WidgetID, align WidgetAlignType, padding *WidgetAreaPadding, gap *int, centered bool, background *string) *WidgetArea {
 	wa := &WidgetArea{}
 	wa.AddAll(widgetIds)
 	wa.SetAlignment(align)
@@ -61,9 +61,9 @@ func (a *WidgetArea) Padding() *WidgetAreaPadding {
 	return a.padding
 }
 
-func (a *WidgetArea) Gap() int {
+func (a *WidgetArea) Gap() *int {
 	if a == nil {
-		return 0
+		return nil
 	}
 
 	return a.gap
@@ -134,7 +134,7 @@ func (a *WidgetArea) SetPadding(ap *WidgetAreaPadding) {
 	a.padding = ap
 }
 
-func (a *WidgetArea) SetGap(g int) {
+func (a *WidgetArea) SetGap(g *int) {
 	a.gap = g
 }
 

diff --git a/server/pkg/scene/widget_area_test.go b/server/pkg/scene/widget_area_test.go
@@ -14,7 +14,7 @@ func TestWidgetArea(t *testing.T) {
 		WidgetIds  WidgetIDList
 		Align      WidgetAlignType
 		Padding    *WidgetAreaPadding
-		Gap        int
+		Gap        *int
 		Centered   bool
 		Background *string
 	}
@@ -50,7 +50,7 @@ func TestWidgetArea(t *testing.T) {
 					left:   5,
 					right:  5,
 				},
-				Gap:        40,
+				Gap:        lo.ToPtr(40),
 				Centered:   true,
 				Background: lo.ToPtr("#ffffff"),
 			},
@@ -63,7 +63,7 @@ func TestWidgetArea(t *testing.T) {
 					left:   5,
 					right:  5,
 				},
-				gap:        40,
+				gap:        lo.ToPtr(40),
 				centered:   true,
 				background: lo.ToPtr("#ffffff"),
 			},
@@ -90,13 +90,13 @@ func TestWidgetArea(t *testing.T) {
 
 func TestWidgetArea_WidgetIDs(t *testing.T) {
 	wid := NewWidgetID()
-	wa := NewWidgetArea(WidgetIDList{wid}, WidgetAlignStart, nil, 0, false, nil)
+	wa := NewWidgetArea(WidgetIDList{wid}, WidgetAlignStart, nil, nil, false, nil)
 	assert.Equal(t, wa.widgetIds, wa.WidgetIDs())
 	assert.Nil(t, (*WidgetArea)(nil).WidgetIDs())
 }
 
 func TestWidgetArea_Alignment(t *testing.T) {
-	wa := NewWidgetArea(nil, WidgetAlignEnd, nil, 0, false, nil)
+	wa := NewWidgetArea(nil, WidgetAlignEnd, nil, nil, false, nil)
 	assert.Equal(t, WidgetAlignEnd, wa.Alignment())
 	assert.Equal(t, WidgetAlignType(""), (*WidgetArea)(nil).Alignment())
 }
@@ -135,7 +135,7 @@ func TestWidgetArea_Find(t *testing.T) {
 
 			var wa *WidgetArea
 			if !tc.Nil {
-				wa = NewWidgetArea(WidgetIDList{wid}, WidgetAlignStart, nil, 0, false, nil)
+				wa = NewWidgetArea(WidgetIDList{wid}, WidgetAlignStart, nil, nil, false, nil)
 			}
 			assert.Equal(t, tc.Expected, wa.Find(tc.Input))
 		})
@@ -188,7 +188,7 @@ func TestWidgetArea_Add(t *testing.T) {
 				return
 			}
 
-			wa := NewWidgetArea(WidgetIDList{wid1, wid2}, WidgetAlignStart, nil, 0, false, nil)
+			wa := NewWidgetArea(WidgetIDList{wid1, wid2}, WidgetAlignStart, nil, nil, false, nil)
 			wa.Add(tc.Input, tc.Input2)
 			assert.Equal(t, tc.Expected, wa.WidgetIDs())
 		})
@@ -231,7 +231,7 @@ func TestWidgetArea_AddAll(t *testing.T) {
 				return
 			}
 
-			wa := NewWidgetArea(nil, WidgetAlignStart, nil, 0, false, nil)
+			wa := NewWidgetArea(nil, WidgetAlignStart, nil, nil, false, nil)
 			wa.AddAll(tc.Input)
 			assert.Equal(t, tc.Expected, wa.WidgetIDs())
 		})
@@ -269,7 +269,7 @@ func TestWidgetArea_SetAlignment(t *testing.T) {
 
 			var wa *WidgetArea
 			if !tc.Nil {
-				wa = NewWidgetArea(nil, WidgetAlignStart, nil, 0, false, nil)
+				wa = NewWidgetArea(nil, WidgetAlignStart, nil, nil, false, nil)
 			}
 			wa.SetAlignment(tc.Input)
 			if !tc.Nil {
@@ -312,7 +312,7 @@ func TestWidgetArea_Remove(t *testing.T) {
 
 			var wa *WidgetArea
 			if !tc.Nil {
-				wa = NewWidgetArea(WidgetIDList{wid}, "", nil, 0, false, nil)
+				wa = NewWidgetArea(WidgetIDList{wid}, "", nil, nil, false, nil)
 			}
 			wa.Remove(tc.Input)
 			if !tc.Nil {
@@ -358,7 +358,7 @@ func TestWidgetArea_Move(t *testing.T) {
 
 			var wa *WidgetArea
 			if !tc.Nil {
-				wa = NewWidgetArea(WidgetIDList{wid, wid2, wid3}, "", nil, 0, false, nil)
+				wa = NewWidgetArea(WidgetIDList{wid, wid2, wid3}, "", nil, nil, false, nil)
 			}
 			wa.Move(tc.Input1, tc.Input2)
 			if !tc.Nil {
@@ -379,10 +379,12 @@ func TestWidgetArea_Background(t *testing.T) {
 
 func TestWidgetArea_Gap(t *testing.T) {
 	var wa *WidgetArea
-	assert.Equal(t, 0, wa.Gap())
+	var v *int
+	assert.Equal(t, v, wa.Gap())
 	wa = &WidgetArea{}
-	wa.SetGap(39)
-	assert.Equal(t, 39, wa.Gap())
+	v = lo.ToPtr(39)
+	wa.SetGap(v)
+	assert.Equal(t, v, wa.Gap())
 }
 
 func TestWidgetArea_Centered(t *testing.T) {

diff --git a/server/pkg/scene/widget_section.go b/server/pkg/scene/widget_section.go
@@ -27,17 +27,17 @@ func (s *WidgetSection) Area(t WidgetAreaType) *WidgetArea {
 	switch t {
 	case WidgetAreaTop:
 		if s.top == nil {
-			s.top = NewWidgetArea(nil, WidgetAlignStart, nil, 0, false, nil)
+			s.top = NewWidgetArea(nil, WidgetAlignStart, nil, nil, false, nil)
 		}
 		return s.top
 	case WidgetAreaMiddle:
 		if s.middle == nil {
-			s.middle = NewWidgetArea(nil, WidgetAlignStart, nil, 0, false, nil)
+			s.middle = NewWidgetArea(nil, WidgetAlignStart, nil, nil, false, nil)
 		}
 		return s.middle
 	case WidgetAreaBottom:
 		if s.bottom == nil {
-			s.bottom = NewWidgetArea(nil, WidgetAlignStart, nil, 0, false, nil)
+			s.bottom = NewWidgetArea(nil, WidgetAlignStart, nil, nil, false, nil)
 		}
 		return s.bottom
 	}