OOPS: Finished making use of Wrapping

Author: davesmith00000

tyrian-next/src/main/scala/tyrian/ui/elements/stateless/link/LinkTheme.scala

@@ -8,6 +8,7 @@ import tyrian.ui.datatypes.RGBA
 import tyrian.ui.datatypes.TextAlignment
 import tyrian.ui.datatypes.TextDecoration
 import tyrian.ui.datatypes.TextStyle
+import tyrian.ui.datatypes.Wrapping
 import tyrian.ui.elements.stateless.text.TextTheme
 import tyrian.ui.theme.Theme
 
@@ -34,8 +35,12 @@ final case class LinkTheme(
   def withLineHeight(value: LineHeight): LinkTheme =
     this.copy(base = base.withLineHeight(value))
 
-  def withWrap(value: Boolean): LinkTheme =
-    this.copy(base = base.withWrap(value))
+  def withWrapping(value: Wrapping): LinkTheme =
+    this.copy(base = base.withWrapping(value))
+  def noWrap: LinkTheme =
+    withWrapping(Wrapping.NoWrap)
+  def wrap: LinkTheme =
+    withWrapping(Wrapping.Wrap)
 
   def withStyle(value: TextStyle): LinkTheme =
     this.copy(base = base.withStyle(value))
@@ -77,9 +82,6 @@ final case class LinkTheme(
   def alignRight: LinkTheme   = this.copy(base = base.alignRight)
   def alignJustify: LinkTheme = this.copy(base = base.alignJustify)
 
-  def wrap: LinkTheme   = this.copy(base = base.wrap)
-  def noWrap: LinkTheme = this.copy(base = base.noWrap)
-
   def toStyles(theme: Theme): Style =
     base.toStyles(theme)
 
@@ -102,7 +104,7 @@ object LinkTheme:
         textColor = RGBA.fromHex("#0066cc"), // Classic link blue..
         alignment = TextAlignment.Left,
         lineHeight = LineHeight.Normal,
-        wrapping = true,
+        wrapping = Wrapping.Wrap,
         style = TextStyle.Normal,
         decoration = TextDecoration.Underline // Links are underlined
       ),

tyrian-next/src/main/scala/tyrian/ui/elements/stateless/text/TextTheme.scala

@@ -51,12 +51,12 @@ final case class TextTheme(
   def withLineHeight(value: LineHeight): TextTheme =
     this.copy(lineHeight = value)
 
-  def withWrap(value: Wrapping): TextTheme =
+  def withWrapping(value: Wrapping): TextTheme =
     this.copy(wrapping = value)
   def wrap: TextTheme =
-    withWrap(Wrapping.Wrap)
+    withWrapping(Wrapping.Wrap)
   def noWrap: TextTheme =
-    withWrap(Wrapping.NoWrap)
+    withWrapping(Wrapping.NoWrap)
 
   def withStyle(value: TextStyle): TextTheme =
     this.copy(style = value)

tyrian-next/src/main/scala/tyrian/ui/elements/stateless/text/TextThemes.scala

@@ -7,6 +7,7 @@ import tyrian.ui.datatypes.RGBA
 import tyrian.ui.datatypes.TextAlignment
 import tyrian.ui.datatypes.TextDecoration
 import tyrian.ui.datatypes.TextStyle
+import tyrian.ui.datatypes.Wrapping
 
 final case class TextThemes(
     normal: TextTheme,
@@ -102,7 +103,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#333333"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Relaxed,
-      wrapping = true,
+      wrapping = Wrapping.Wrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )
@@ -114,7 +115,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#333333"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Relaxed,
-      wrapping = true,
+      wrapping = Wrapping.Wrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )
@@ -126,7 +127,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#1a1a1a"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Tight,
-      wrapping = true,
+      wrapping = Wrapping.Wrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )
@@ -138,7 +139,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#1a1a1a"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Tight,
-      wrapping = true,
+      wrapping = Wrapping.Wrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )
@@ -150,7 +151,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#1a1a1a"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Relative(1.3),
-      wrapping = true,
+      wrapping = Wrapping.Wrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )
@@ -162,7 +163,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#1a1a1a"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Relative(1.3),
-      wrapping = true,
+      wrapping = Wrapping.Wrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )
@@ -174,7 +175,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#1a1a1a"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Normal,
-      wrapping = true,
+      wrapping = Wrapping.Wrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )
@@ -186,7 +187,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#1a1a1a"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Normal,
-      wrapping = true,
+      wrapping = Wrapping.Wrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )
@@ -198,7 +199,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#666666"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Normal,
-      wrapping = true,
+      wrapping = Wrapping.Wrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )
@@ -210,7 +211,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#d73a49"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Normal,
-      wrapping = false,
+      wrapping = Wrapping.NoWrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )
@@ -222,7 +223,7 @@ object TextThemes:
       textColor = RGBA.fromHex("#333333"),
       alignment = TextAlignment.Left,
       lineHeight = LineHeight.Normal,
-      wrapping = false,
+      wrapping = Wrapping.NoWrap,
       style = TextStyle.Normal,
       decoration = TextDecoration.None
     )