fix: validate widget extended when moved

reearth · Sep 26, 2021 · a7daf79 · a7daf79
1 parent 94611f9
commit a7daf79
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/internal/usecase/interactor/scene.go b/internal/usecase/interactor/scene.go
@@ -298,10 +298,18 @@ func (i *Scene) UpdateWidget(ctx context.Context, param interfaces.UpdateWidgetP
 	}
 
 	if param.Extended != nil {
-		if layout := extension.WidgetLayout(); layout != nil {
-			if layout.HorizontallyExtendable() && location.Horizontal() || layout.VerticallyExtendable() && location.Vertical() {
-				widget.SetExtended(*param.Extended)
-			}
+		widget.SetExtended(*param.Extended)
+	}
+
+	// check extendable
+	if layout := extension.WidgetLayout(); layout != nil {
+		extendable := layout.Extendable(plugin.WidgetLocation{
+			Zone:    plugin.WidgetZoneType(location.Zone),
+			Section: plugin.WidgetSectionType(location.Section),
+			Area:    plugin.WidgetAreaType(location.Area),
+		})
+		if extendable && widget.Extended() {
+			widget.SetExtended(*param.Extended)
 		}
 	}
 

diff --git a/pkg/plugin/extension.go b/pkg/plugin/extension.go
@@ -88,6 +88,10 @@ type WidgetLayout struct {
 	defaultLocation        *WidgetLocation
 }
 
+func (l WidgetLayout) Extendable(loc WidgetLocation) bool {
+	return l.HorizontallyExtendable() && loc.Horizontal() || l.VerticallyExtendable() && loc.Vertical()
+}
+
 func NewWidgetLayout(horizontallyExtendable, verticallyExtendable, extended, floating bool, defaultLocation *WidgetLocation) WidgetLayout {
 	return WidgetLayout{
 		horizontallyExtendable: horizontallyExtendable,
@@ -131,6 +135,14 @@ type WidgetLocation struct {
 	Area    WidgetAreaType
 }
 
+func (l WidgetLocation) Horizontal() bool {
+	return l.Section == WidgetSectionCenter
+}
+
+func (l WidgetLocation) Vertical() bool {
+	return l.Area == WidgetAreaMiddle
+}
+
 func (l *WidgetLocation) CopyRef() *WidgetLocation {
 	if l == nil {
 		return nil