Repackaged ScrollPane, ComponentGroup and ComponentList

PurpleKingdomGames · Aug 3, 2024 · 072a88c · 072a88c
1 parent 3929453
commit 072a88c
Show file tree

Hide file tree

Showing 28 changed files with 109 additions and 100 deletions.
diff --git a/demo/src/main/scala/demo/ColourWindow.scala b/demo/src/main/scala/demo/ColourWindow.scala
@@ -5,17 +5,17 @@ import roguelikestarterkit.*
 import roguelikestarterkit.syntax.*
 import roguelikestarterkit.ui.component.Component
 import roguelikestarterkit.ui.components.BoundsType
+import roguelikestarterkit.ui.components.ComponentGroup
+import roguelikestarterkit.ui.components.ScrollPane
 import roguelikestarterkit.ui.components.TerminalButton
 import roguelikestarterkit.ui.components.TerminalLabel
 import roguelikestarterkit.ui.components.TerminalScrollPane
-import roguelikestarterkit.ui.components.common.Anchor
-import roguelikestarterkit.ui.components.common.ComponentLayout
-import roguelikestarterkit.ui.components.common.Overflow
-import roguelikestarterkit.ui.components.common.Padding
-import roguelikestarterkit.ui.components.group.BoundsMode
-import roguelikestarterkit.ui.components.group.ComponentGroup
-import roguelikestarterkit.ui.components.group.FitMode
-import roguelikestarterkit.ui.components.group.ScrollPane
+import roguelikestarterkit.ui.components.datatypes.Anchor
+import roguelikestarterkit.ui.components.datatypes.BoundsMode
+import roguelikestarterkit.ui.components.datatypes.ComponentLayout
+import roguelikestarterkit.ui.components.datatypes.FitMode
+import roguelikestarterkit.ui.components.datatypes.Overflow
+import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.window.Space
 import roguelikestarterkit.ui.window.TerminalWindow
 

diff --git a/demo/src/main/scala/demo/ComponentsWindow.scala b/demo/src/main/scala/demo/ComponentsWindow.scala
@@ -3,12 +3,12 @@ package demo
 import indigo.*
 import roguelikestarterkit.*
 import roguelikestarterkit.syntax.*
+import roguelikestarterkit.ui.components.ComponentGroup
 import roguelikestarterkit.ui.components.TerminalButton
 import roguelikestarterkit.ui.components.TerminalLabel
-import roguelikestarterkit.ui.components.common.ComponentLayout
-import roguelikestarterkit.ui.components.common.Overflow
-import roguelikestarterkit.ui.components.common.Padding
-import roguelikestarterkit.ui.components.group.ComponentGroup
+import roguelikestarterkit.ui.components.datatypes.ComponentLayout
+import roguelikestarterkit.ui.components.datatypes.Overflow
+import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.window.TerminalWindow
 
 object ComponentsWindow:

diff --git a/demo/src/main/scala/demo/ComponentsWindow2.scala b/demo/src/main/scala/demo/ComponentsWindow2.scala
@@ -3,16 +3,16 @@ package demo
 import indigo.*
 import indigo.syntax.*
 import roguelikestarterkit.*
+import roguelikestarterkit.ui.components.ComponentGroup
+import roguelikestarterkit.ui.components.ComponentList
 import roguelikestarterkit.ui.components.TerminalButton
 import roguelikestarterkit.ui.components.TerminalInput
 import roguelikestarterkit.ui.components.TerminalLabel
 import roguelikestarterkit.ui.components.TerminalTextArea
-import roguelikestarterkit.ui.components.common.ComponentId
-import roguelikestarterkit.ui.components.common.ComponentLayout
-import roguelikestarterkit.ui.components.common.Overflow
-import roguelikestarterkit.ui.components.common.Padding
-import roguelikestarterkit.ui.components.group.ComponentGroup
-import roguelikestarterkit.ui.components.list.ComponentList
+import roguelikestarterkit.ui.components.datatypes.ComponentId
+import roguelikestarterkit.ui.components.datatypes.ComponentLayout
+import roguelikestarterkit.ui.components.datatypes.Overflow
+import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.window.TerminalWindow
 
 object ComponentsWindow2:

diff --git a/demo/src/main/scala/demo/MenuWindow.scala b/demo/src/main/scala/demo/MenuWindow.scala
@@ -2,13 +2,13 @@ package demo
 
 import indigo.*
 import roguelikestarterkit.*
+import roguelikestarterkit.ui.components.ComponentGroup
+import roguelikestarterkit.ui.components.ComponentList
 import roguelikestarterkit.ui.components.TerminalButton
-import roguelikestarterkit.ui.components.common.ComponentId
-import roguelikestarterkit.ui.components.common.ComponentLayout
-import roguelikestarterkit.ui.components.common.Overflow
-import roguelikestarterkit.ui.components.common.Padding
-import roguelikestarterkit.ui.components.group.ComponentGroup
-import roguelikestarterkit.ui.components.list.ComponentList
+import roguelikestarterkit.ui.components.datatypes.ComponentId
+import roguelikestarterkit.ui.components.datatypes.ComponentLayout
+import roguelikestarterkit.ui.components.datatypes.Overflow
+import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.window.TerminalWindow
 
 object MenuWindow:

diff --git a/demo/src/main/scala/demo/NoTerminalUI.scala b/demo/src/main/scala/demo/NoTerminalUI.scala
@@ -5,8 +5,8 @@ import indigo.scenes.*
 import indigo.shared.subsystems.SubSystemFrameContext.*
 import roguelikestarterkit.*
 import roguelikestarterkit.ui.component.Component
-import roguelikestarterkit.ui.components.group.ComponentGroup
-import roguelikestarterkit.ui.components.list.ComponentList
+import roguelikestarterkit.ui.components.ComponentGroup
+import roguelikestarterkit.ui.components.ComponentList
 
 object NoTerminalUI extends Scene[Size, Model, ViewModel]:
 

diff --git a/demo/src/main/scala/demo/RogueLikeGame.scala b/demo/src/main/scala/demo/RogueLikeGame.scala
@@ -4,10 +4,10 @@ import indigo.*
 import indigo.scenes.*
 import indigoextras.subsystems.FPSCounter
 import roguelikestarterkit.*
-import roguelikestarterkit.ui.components.common.ComponentId
-import roguelikestarterkit.ui.components.group.BoundsMode
-import roguelikestarterkit.ui.components.group.ComponentGroup
-import roguelikestarterkit.ui.components.list.ComponentList
+import roguelikestarterkit.ui.components.ComponentGroup
+import roguelikestarterkit.ui.components.ComponentList
+import roguelikestarterkit.ui.components.datatypes.BoundsMode
+import roguelikestarterkit.ui.components.datatypes.ComponentId
 
 import scala.scalajs.js.annotation.JSExportTopLevel
 

diff --git a/...like-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalScrollPane.scala b/...like-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalScrollPane.scala
@@ -3,8 +3,7 @@ package roguelikestarterkit.ui.components
 import indigo.*
 import roguelikestarterkit.tiles.Tile
 import roguelikestarterkit.ui.component.Component
-import roguelikestarterkit.ui.components.group.BoundsMode
-import roguelikestarterkit.ui.components.group.ScrollPane
+import roguelikestarterkit.ui.components.datatypes.BoundsMode
 import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.CharSheet
 import roguelikestarterkit.ui.datatypes.Dimensions

diff --git a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/window/TerminalWindow.scala b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/window/TerminalWindow.scala
@@ -11,7 +11,7 @@ import roguelikestarterkit.Tile
 import roguelikestarterkit.UIContext
 import roguelikestarterkit.terminal.RogueTerminalEmulator
 import roguelikestarterkit.ui.component.Component
-import roguelikestarterkit.ui.components.common.Padding
+import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.datatypes.Bounds
 
 object TerminalWindow:

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/BoundsType.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/BoundsType.scala
@@ -1,6 +1,6 @@
 package roguelikestarterkit.ui.components
 
-import roguelikestarterkit.ui.components.common.Padding
+import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.datatypes.Bounds
 
 enum BoundsType[ReferenceData, A]:

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/Button.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/Button.scala
@@ -3,7 +3,7 @@ package roguelikestarterkit.ui.components
 import indigo.*
 import indigo.syntax.*
 import roguelikestarterkit.ui.component.Component
-import roguelikestarterkit.ui.components.common.ComponentLayout.Horizontal
+import roguelikestarterkit.ui.components.datatypes.ComponentLayout.Horizontal
 import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.Coords
 import roguelikestarterkit.ui.datatypes.Dimensions

diff --git a/.../ui/components/group/ComponentGroup.scala → ...terkit/ui/components/ComponentGroup.scala b/.../ui/components/group/ComponentGroup.scala → ...terkit/ui/components/ComponentGroup.scala
@@ -1,22 +1,24 @@
-package roguelikestarterkit.ui.components.group
+package roguelikestarterkit.ui.components
 
 import indigo.*
 import roguelikestarterkit.ui.component.*
-import roguelikestarterkit.ui.components.common.Anchor
-import roguelikestarterkit.ui.components.common.ComponentEntry
-import roguelikestarterkit.ui.components.common.ComponentId
-import roguelikestarterkit.ui.components.common.ComponentLayout
-import roguelikestarterkit.ui.components.common.ContainerLikeFunctions
-import roguelikestarterkit.ui.components.common.Overflow
-import roguelikestarterkit.ui.components.common.Padding
+import roguelikestarterkit.ui.components.datatypes.Anchor
+import roguelikestarterkit.ui.components.datatypes.BoundsMode
+import roguelikestarterkit.ui.components.datatypes.ComponentEntry
+import roguelikestarterkit.ui.components.datatypes.ComponentId
+import roguelikestarterkit.ui.components.datatypes.ComponentLayout
+import roguelikestarterkit.ui.components.datatypes.ContainerLikeFunctions
+import roguelikestarterkit.ui.components.datatypes.FitMode
+import roguelikestarterkit.ui.components.datatypes.Overflow
+import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.datatypes.*
 
 import scala.annotation.tailrec
 
 /** Describes a fixed arrangement of components, manages their layout, which may include anchored
   * components.
   */
-final case class ComponentGroup[ReferenceData] private[group] (
+final case class ComponentGroup[ReferenceData] private[components] (
     boundsMode: BoundsMode,
     layout: ComponentLayout,
     components: Batch[ComponentEntry[?, ReferenceData]],
@@ -70,7 +72,7 @@ object ComponentGroup:
 
   def apply[ReferenceData](): ComponentGroup[ReferenceData] =
     ComponentGroup(
-      BoundsMode.default,
+      roguelikestarterkit.ui.components.datatypes.BoundsMode.default,
       ComponentLayout.Horizontal(Padding.zero, Overflow.Wrap),
       Batch.empty,
       _ => Layer.empty,
@@ -92,7 +94,7 @@ object ComponentGroup:
 
   def apply[ReferenceData](dimensions: Dimensions): ComponentGroup[ReferenceData] =
     ComponentGroup(
-      BoundsMode.fixed(dimensions),
+      roguelikestarterkit.ui.components.datatypes.BoundsMode.fixed(dimensions),
       ComponentLayout.Horizontal(Padding.zero, Overflow.Wrap),
       Batch.empty,
       _ => Layer.empty,

diff --git a/...it/ui/components/list/ComponentList.scala → ...rterkit/ui/components/ComponentList.scala b/...it/ui/components/list/ComponentList.scala → ...rterkit/ui/components/ComponentList.scala
@@ -1,21 +1,21 @@
-package roguelikestarterkit.ui.components.list
+package roguelikestarterkit.ui.components
 
 import indigo.*
 import roguelikestarterkit.ui.component.*
-import roguelikestarterkit.ui.components.common.Anchor
-import roguelikestarterkit.ui.components.common.ComponentEntry
-import roguelikestarterkit.ui.components.common.ComponentId
-import roguelikestarterkit.ui.components.common.ComponentLayout
-import roguelikestarterkit.ui.components.common.ContainerLikeFunctions
-import roguelikestarterkit.ui.components.common.Padding
+import roguelikestarterkit.ui.components.datatypes.Anchor
+import roguelikestarterkit.ui.components.datatypes.ComponentEntry
+import roguelikestarterkit.ui.components.datatypes.ComponentId
+import roguelikestarterkit.ui.components.datatypes.ComponentLayout
+import roguelikestarterkit.ui.components.datatypes.ContainerLikeFunctions
+import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.datatypes.*
 import ultraviolet.syntax.layout
 
 import scala.annotation.tailrec
 
 /** Describes a dynamic list of components, and their realtive layout.
   */
-final case class ComponentList[ReferenceData] private (
+final case class ComponentList[ReferenceData] private[components] (
     content: ReferenceData => Batch[ComponentEntry[?, ReferenceData]],
     stateMap: Map[ComponentId, Any],
     layout: ComponentLayout,

diff --git a/...rkit/ui/components/group/ScrollPane.scala → ...starterkit/ui/components/ScrollPane.scala b/...rkit/ui/components/group/ScrollPane.scala → ...starterkit/ui/components/ScrollPane.scala
@@ -1,16 +1,20 @@
-package roguelikestarterkit.ui.components.group
+package roguelikestarterkit.ui.components
 
 import indigo.*
 import roguelikestarterkit.ui.component.*
 import roguelikestarterkit.ui.components.Button
 import roguelikestarterkit.ui.components.DragData
-import roguelikestarterkit.ui.components.common.Anchor
-import roguelikestarterkit.ui.components.common.ComponentEntry
-import roguelikestarterkit.ui.components.common.ComponentId
-import roguelikestarterkit.ui.components.common.ComponentLayout
-import roguelikestarterkit.ui.components.common.ContainerLikeFunctions
-import roguelikestarterkit.ui.components.common.Overflow
-import roguelikestarterkit.ui.components.common.Padding
+import roguelikestarterkit.ui.components.datatypes.Anchor
+import roguelikestarterkit.ui.components.datatypes.BoundsMode
+import roguelikestarterkit.ui.components.datatypes.ComponentEntry
+import roguelikestarterkit.ui.components.datatypes.ComponentId
+import roguelikestarterkit.ui.components.datatypes.ComponentLayout
+import roguelikestarterkit.ui.components.datatypes.ContainerLikeFunctions
+import roguelikestarterkit.ui.components.datatypes.FitMode
+import roguelikestarterkit.ui.components.datatypes.Overflow
+import roguelikestarterkit.ui.components.datatypes.Padding
+import roguelikestarterkit.ui.components.datatypes.ScrollMode
+import roguelikestarterkit.ui.components.datatypes.ScrollOptions
 import roguelikestarterkit.ui.datatypes.*
 import roguelikestarterkit.ui.shaders.LayerMask
 
@@ -20,7 +24,7 @@ import scala.annotation.tailrec
 /** Describes a fixed arrangement of components, manages their layout, which may include anchored
   * components.
   */
-final case class ScrollPane[A, ReferenceData] private[group] (
+final case class ScrollPane[A, ReferenceData] private[components] (
     bindingKey: BindingKey,
     boundsMode: BoundsMode,
     dimensions: Dimensions, // The actual cached dimensions of the scroll pane
@@ -97,14 +101,14 @@ object ScrollPane:
   )(using c: Component[A, ReferenceData]): ScrollPane[A, ReferenceData] =
     ScrollPane(
       bindingKey,
-      BoundsMode.default,
+      roguelikestarterkit.ui.components.datatypes.BoundsMode.default,
       Dimensions.zero,
       Bounds.zero,
       0.0,
       ScrollPane.makeComponentEntry(content),
       setupScrollButton(bindingKey, scrollBar),
       _ => Layer.empty,
-      ScrollOptions.default
+      roguelikestarterkit.ui.components.datatypes.ScrollOptions.default
     )
 
   def apply[A, ReferenceData](
@@ -124,7 +128,7 @@ object ScrollPane:
       ScrollPane.makeComponentEntry(content),
       setupScrollButton(bindingKey, scrollBar),
       _ => Layer.empty,
-      ScrollOptions.default
+      roguelikestarterkit.ui.components.datatypes.ScrollOptions.default
     )
 
   def apply[A, ReferenceData](
@@ -137,14 +141,14 @@ object ScrollPane:
   ): ScrollPane[A, ReferenceData] =
     ScrollPane(
       bindingKey,
-      BoundsMode.fixed(dimensions),
+      roguelikestarterkit.ui.components.datatypes.BoundsMode.fixed(dimensions),
       dimensions,
       Bounds.zero,
       0.0,
       ScrollPane.makeComponentEntry(content),
       setupScrollButton(bindingKey, scrollBar),
       _ => Layer.empty,
-      ScrollOptions.default
+      roguelikestarterkit.ui.components.datatypes.ScrollOptions.default
     )
 
   def apply[A, ReferenceData](

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/common/ComponentId.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/common/ComponentId.scala
diff --git a/...rterkit/ui/components/common/Anchor.scala → ...rkit/ui/components/datatypes/Anchor.scala b/...rterkit/ui/components/common/Anchor.scala → ...rkit/ui/components/datatypes/Anchor.scala
@@ -1,4 +1,4 @@
-package roguelikestarterkit.ui.components.common
+package roguelikestarterkit.ui.components.datatypes
 
 import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.Coords

diff --git a/...rkit/ui/components/group/BoundsMode.scala → .../ui/components/datatypes/BoundsMode.scala b/...rkit/ui/components/group/BoundsMode.scala → .../ui/components/datatypes/BoundsMode.scala
@@ -1,4 +1,4 @@
-package roguelikestarterkit.ui.components.group
+package roguelikestarterkit.ui.components.datatypes
 
 import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.Coords

diff --git a/...ui/components/common/ComponentEntry.scala → ...components/datatypes/ComponentEntry.scala b/...ui/components/common/ComponentEntry.scala → ...components/datatypes/ComponentEntry.scala
@@ -1,4 +1,4 @@
-package roguelikestarterkit.ui.components.common
+package roguelikestarterkit.ui.components.datatypes
 
 import indigo.*
 import roguelikestarterkit.ui.component.Component

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/ComponentId.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/ComponentId.scala
@@ -0,0 +1,10 @@
+package roguelikestarterkit.ui.components.datatypes
+
+opaque type ComponentId = String
+
+object ComponentId:
+
+  def apply(value: String): ComponentId = value
+  def None: ComponentId                 = ""
+
+  extension (c: ComponentId) def value: String = c
diff --git a/...i/components/common/ComponentLayout.scala → ...omponents/datatypes/ComponentLayout.scala b/...i/components/common/ComponentLayout.scala → ...omponents/datatypes/ComponentLayout.scala
@@ -1,4 +1,4 @@
-package roguelikestarterkit.ui.components.common
+package roguelikestarterkit.ui.components.datatypes
 
 import roguelikestarterkit.ui.datatypes.Dimensions
 

diff --git a/...nents/common/ContainerLikeFunctions.scala → ...ts/datatypes/ContainerLikeFunctions.scala b/...nents/common/ContainerLikeFunctions.scala → ...ts/datatypes/ContainerLikeFunctions.scala
@@ -1,4 +1,4 @@
-package roguelikestarterkit.ui.components.common
+package roguelikestarterkit.ui.components.datatypes
 
 import indigo.*
 import roguelikestarterkit.ui.datatypes.Bounds

diff --git a/...rterkit/ui/components/group/FitMode.scala → ...kit/ui/components/datatypes/FitMode.scala b/...rterkit/ui/components/group/FitMode.scala → ...kit/ui/components/datatypes/FitMode.scala
@@ -1,4 +1,4 @@
-package roguelikestarterkit.ui.components.group
+package roguelikestarterkit.ui.components.datatypes
 
 /** Fit mode describes how dynamic bounds decide to expand and shink based on their contents or the
   * available space, in one dimension, i.e. width or height. This allows us to say "fill the

diff --git a/...erkit/ui/components/common/Overflow.scala → ...it/ui/components/datatypes/Overflow.scala b/...erkit/ui/components/common/Overflow.scala → ...it/ui/components/datatypes/Overflow.scala
@@ -1,4 +1,4 @@
-package roguelikestarterkit.ui.components.common
+package roguelikestarterkit.ui.components.datatypes
 
 /** Overflow describes what to do in the event that a component's layout position is beyond the
   * bounds of the `ComponentGroup`.

diff --git a/...terkit/ui/components/common/Padding.scala → ...kit/ui/components/datatypes/Padding.scala b/...terkit/ui/components/common/Padding.scala → ...kit/ui/components/datatypes/Padding.scala
@@ -1,4 +1,4 @@
-package roguelikestarterkit.ui.components.common
+package roguelikestarterkit.ui.components.datatypes
 
 import roguelikestarterkit.ui.datatypes.Bounds
 

diff --git a/...t/ui/components/group/ScrollOptions.scala → .../components/datatypes/ScrollOptions.scala b/...t/ui/components/group/ScrollOptions.scala → .../components/datatypes/ScrollOptions.scala
@@ -1,4 +1,4 @@
-package roguelikestarterkit.ui.components.group
+package roguelikestarterkit.ui.components.datatypes
 
 final case class ScrollOptions(
     scrollMode: ScrollMode,