From c56abfd7ddfb2116675bc1f0dbe44680c260171f Mon Sep 17 00:00:00 2001 From: Antoine Doeraene Date: Sun, 14 Jan 2024 17:05:07 +0100 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20Laminar=20to=2017?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- build.sbt | 2 +- .../scala/be/doeraene/webcomponents/WebComponent.scala | 8 ++++---- .../main/scala/be/doeraene/webcomponents/ui5/Avatar.scala | 6 +++--- .../scala/be/doeraene/webcomponents/ui5/AvatarGroup.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/Badge.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Bar.scala | 8 +++----- .../doeraene/webcomponents/ui5/BarcodeScannerDialog.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/Breadcrumbs.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/BreadcrumbsItem.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/BusyIndicator.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Button.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/Calendar.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/CalendarDate.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Card.scala | 8 +++----- .../scala/be/doeraene/webcomponents/ui5/CardHeader.scala | 8 +++----- .../scala/be/doeraene/webcomponents/ui5/Carousel.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/CheckBox.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/ColourPalette.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/ColourPaletteItem.scala | 6 +++--- .../doeraene/webcomponents/ui5/ColourPalettePopover.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/ColourPicker.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/ComboBox.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/ComboBoxGroupItem.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/ComboBoxItem.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/CustomListItem.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/DatePicker.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/DateRangePicker.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/DateTimePicker.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/Dialog.scala | 4 ++-- .../doeraene/webcomponents/ui5/DynamicSideContent.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/FileUploader.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/FilterItem.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/FilterItemOption.scala | 8 +++----- .../doeraene/webcomponents/ui5/FlexibleColumnLayout.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Icon.scala | 4 ++-- .../doeraene/webcomponents/ui5/IllustratedMessage.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/Input.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/Label.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Link.scala | 8 +++----- .../scala/be/doeraene/webcomponents/ui5/ListItem.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/MediaGallery.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/MediaGalleryItem.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Menu.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/MenuItem.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/MessageStrip.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/MultiComboBox.scala | 4 ++-- .../webcomponents/ui5/MultiComboBoxGroupItem.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/MultiComboBoxItem.scala | 8 +++----- .../scala/be/doeraene/webcomponents/ui5/MultiInput.scala | 4 ++-- .../doeraene/webcomponents/ui5/NotificationAction.scala | 6 +++--- .../webcomponents/ui5/NotificationListGroupItem.scala | 8 +++----- .../doeraene/webcomponents/ui5/NotificationListItem.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Page.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Panel.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/Popover.scala | 8 ++++---- .../be/doeraene/webcomponents/ui5/ProductSwitch.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/ProductSwitchItem.scala | 6 +++--- .../be/doeraene/webcomponents/ui5/ProgressIndicator.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/RadioButton.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/RangeSlider.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/RatingIndicator.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/ResponsivePopover.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/SegmentedButton.scala | 4 ++-- .../doeraene/webcomponents/ui5/SegmentedButtonItem.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/Select.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/SelectOption.scala | 8 +++----- .../scala/be/doeraene/webcomponents/ui5/ShellBar.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/ShellBarItem.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/SideNavigation.scala | 4 ++-- .../doeraene/webcomponents/ui5/SideNavigationItem.scala | 4 ++-- .../webcomponents/ui5/SideNavigationSubItem.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Slider.scala | 8 +++----- .../scala/be/doeraene/webcomponents/ui5/SortItem.scala | 8 +++----- .../scala/be/doeraene/webcomponents/ui5/SplitButton.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/StepInput.scala | 8 +++----- .../doeraene/webcomponents/ui5/SuggestionGroupItem.scala | 6 +++--- .../be/doeraene/webcomponents/ui5/SuggestionItem.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Switch.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/Tab.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/TabContainer.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/Table.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/TableCell.scala | 6 ++---- .../scala/be/doeraene/webcomponents/ui5/TableColumn.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/TableRow.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/TextArea.scala | 8 +++----- .../scala/be/doeraene/webcomponents/ui5/TimePicker.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/Timeline.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/TimelineItem.scala | 8 +++----- .../main/scala/be/doeraene/webcomponents/ui5/Title.scala | 6 +++--- .../main/scala/be/doeraene/webcomponents/ui5/Toast.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/ToggleButton.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/Token.scala | 8 +++----- .../scala/be/doeraene/webcomponents/ui5/Toolbar.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/ToolbarButton.scala | 8 ++++---- .../be/doeraene/webcomponents/ui5/ToolbarSelect.scala | 4 ++-- .../doeraene/webcomponents/ui5/ToolbarSelectOption.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/ToolbarSeparator.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/ToolbarSpacer.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/Tree.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/TreeItem.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/TreeItemCustom.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/UList.scala | 4 ++-- .../be/doeraene/webcomponents/ui5/UListGroupHeader.scala | 8 +++----- .../be/doeraene/webcomponents/ui5/UploadCollection.scala | 4 ++-- .../doeraene/webcomponents/ui5/UploadCollectionItem.scala | 8 +++----- .../doeraene/webcomponents/ui5/ViewSettingsDialog.scala | 4 ++-- .../main/scala/be/doeraene/webcomponents/ui5/Wizard.scala | 4 ++-- .../scala/be/doeraene/webcomponents/ui5/WizardStep.scala | 6 +++--- .../be/doeraene/webcomponents/ui5/internal/Slot.scala | 8 ++++---- 110 files changed, 271 insertions(+), 349 deletions(-) diff --git a/README.md b/README.md index 5dd30ef..18ee75f 100644 --- a/README.md +++ b/README.md @@ -239,7 +239,7 @@ In the `object`, add the following things: - add an object `RawImport` extending `js.Object` and annotated with both `@js.native` and `@JSImport`, specifying the correct import (available in the official docs), setting `JSImport.Default` as second argument - call `used(RawImport)` the line after (this is done to be sure that scala-js actually import the JS dependency) - define an alias `type Ref` as `dom.html.Element with RawElement` -- define the protected `tag` variable of type `HtmlTag[Ref]` specifying the ui5 tag name from the doc (for example, for the Button component, it's `protected val tag: HtmlTag[Ref] = htmlTag("ui5-button")`). ⚠️: when copy-pasting from an existing component, this is usually the one we forget! When that happens, you will observe a component doing basically nothing. It's a sign you put the wrong import. +- define the protected `tag` variable of type `CustomHtmlTag[Ref]` specifying the ui5 tag name from the doc (for example, for the Button component, it's `protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-button")`). ⚠️: when copy-pasting from an existing component, this is usually the one we forget! When that happens, you will observe a component doing basically nothing. It's a sign you put the wrong import. - create an empty object `slots` - create an empty object `events` - in the case where your component is linked to other components (for example a `TableCell` is always contained in `TableRow`, so the `TableRow` object will have a reference to the `TableCell` object) diff --git a/build.sbt b/build.sbt index 7096734..a70598b 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ val withSourceMaps = Def.task { Seq(s"${sourcesOptionName}:$localSourcesPath->$remoteSourcesPath") ++ usedScalacOptions.value } -val laminarVersion = "16.0.0" +val laminarVersion = "17.0.0-M2" inThisBuild( List( diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/WebComponent.scala b/web-components/src/main/scala/be/doeraene/webcomponents/WebComponent.scala index e4bcdae..b861d5c 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/WebComponent.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/WebComponent.scala @@ -4,21 +4,21 @@ import com.raquo.laminar.api.L.* import org.scalajs.dom import com.raquo.laminar.nodes.ReactiveHtmlElement -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag /** Marker trait that all web components inherit. * * This can allow you to implement some shenanigans and abstract over some thins. */ trait WebComponent { - val id: HtmlProp[String] = idAttr + val id: HtmlProp[String, String] = idAttr type Ref <: dom.HTMLElement - type ModFunction = this.type => Mod[ReactiveHtmlElement[Ref]] + type ModFunction = this.type => Mod[ReactiveHtmlElement[Ref]] type ComponentMod = ModFunction | Mod[ReactiveHtmlElement[Ref]] - protected def tag: HtmlTag[Ref] + protected def tag: CustomHtmlTag[Ref] /** Instantiate this component using the specified modifiers. * diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Avatar.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Avatar.scala index 2f300a0..f4fd28a 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Avatar.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Avatar.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{AvatarColorScheme, AvatarInitials, AvatarShape, AvatarSize, IconName} import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -//import com.raquo.laminar.tags.HtmlTag +//import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -12,7 +12,7 @@ import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import be.doeraene.webcomponents.WebComponent import be.doeraene.webcomponents.ui5.internal.Slot -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag /** An image-like component that has different display options for representing images and icons in different shapes and * sizes, depending on the use case. The shape can be circular or square. There are several predefined sizes, as well @@ -35,7 +35,7 @@ object Avatar extends WebComponent with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-avatar") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-avatar") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) lazy val colorScheme: HtmlAttr[AvatarColorScheme] = htmlAttr("color-scheme", AvatarColorScheme.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/AvatarGroup.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/AvatarGroup.scala index d721b82..f8c1ba6 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/AvatarGroup.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/AvatarGroup.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.AvatarGroupType import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -49,7 +49,7 @@ object AvatarGroup extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-avatar-group") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-avatar-group") lazy val tpe: HtmlAttr[AvatarGroupType] = htmlAttr("type", AvatarGroupType.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Badge.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Badge.scala index 4a9ead6..fa431c6 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Badge.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Badge.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -34,7 +34,7 @@ object Badge extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-badge") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-badge") lazy val colourScheme: HtmlAttr[ColourScheme] = htmlAttr("color-scheme", ColourScheme.AsStringCodec) @@ -46,6 +46,4 @@ object Badge extends WebComponent { object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Bar.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Bar.scala index 850e35f..b7a500b 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Bar.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Bar.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.BarDesign import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object Bar extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-bar") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-bar") lazy val design: HtmlAttr[BarDesign] = htmlAttr("design", BarDesign.AsStringCodec) @@ -44,6 +44,4 @@ object Bar extends WebComponent { val startContent: Slot = new Slot("startContent") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BarcodeScannerDialog.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BarcodeScannerDialog.scala index a56deee..fb5c4a9 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BarcodeScannerDialog.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BarcodeScannerDialog.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -39,7 +39,7 @@ object BarcodeScannerDialog extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-barcode-scanner-dialog") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-barcode-scanner-dialog") object slots {} diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Breadcrumbs.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Breadcrumbs.scala index b2dbf54..6c886b8 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Breadcrumbs.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Breadcrumbs.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{BreadcrumbsDesign, BreadcrumbsS import be.doeraene.webcomponents.ui5.eventtypes.EventWithPreciseTarget import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -42,7 +42,7 @@ object Breadcrumbs extends WebComponent with HasIcon { } } - protected val tag: HtmlTag[Ref] = htmlTag("ui5-breadcrumbs") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-breadcrumbs") lazy val separatorStyle: HtmlAttr[BreadcrumbsSeparatorStyle] = htmlAttr("separator-style", BreadcrumbsSeparatorStyle.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BreadcrumbsItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BreadcrumbsItem.scala index 4b13d22..e47360c 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BreadcrumbsItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BreadcrumbsItem.scala @@ -3,8 +3,8 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, IconName, LinkTarget} import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -32,7 +32,7 @@ object BreadcrumbsItem extends WebComponent with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-breadcrumbs-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-breadcrumbs-item") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) @@ -41,6 +41,4 @@ object BreadcrumbsItem extends WebComponent with HasIcon { lazy val target: HtmlAttr[LinkTarget] = htmlAttr("target", LinkTarget.AsStringCodec) - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BusyIndicator.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BusyIndicator.scala index 11d8bab..ee49f22 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BusyIndicator.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/BusyIndicator.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{BusyIndicatorSize, ButtonDesign import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -36,7 +36,7 @@ object BusyIndicator extends WebComponent with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-busy-indicator") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-busy-indicator") lazy val active: HtmlAttr[Boolean] = htmlAttr[Boolean]("active", BooleanAsAttrPresenceCodec) @@ -45,6 +45,4 @@ object BusyIndicator extends WebComponent with HasText { lazy val size: HtmlAttr[BusyIndicatorSize] = htmlAttr[BusyIndicatorSize]("size", BusyIndicatorSize.AsStringCodec) - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Button.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Button.scala index e3f6c3a..df3f4d4 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Button.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Button.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ButtonType, IconN import be.doeraene.webcomponents.ui5.eventtypes.EventWithPreciseTarget import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -33,7 +33,7 @@ object Button extends WebComponent with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-button") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-button") lazy val design: HtmlAttr[ButtonDesign] = htmlAttr("design", ButtonDesign.AsStringCodec) lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Calendar.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Calendar.scala index 20f44ba..815cb8f 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Calendar.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Calendar.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{CalendarSelectionMode, Calendar import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -41,7 +41,7 @@ object Calendar extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-calendar") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-calendar") lazy val hideWeekNumbers: HtmlAttr[Boolean] = htmlAttr("hide-week-numbers", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CalendarDate.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CalendarDate.scala index 1432c72..e91e1d8 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CalendarDate.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CalendarDate.scala @@ -3,8 +3,8 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -27,12 +27,10 @@ object CalendarDate extends WebComponent with HasValue { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-date") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-date") object slots {} object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Card.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Card.scala index 7032623..8ba71ce 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Card.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Card.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -33,7 +33,7 @@ object Card extends WebComponent with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-card") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-card") object slots { @@ -41,8 +41,6 @@ object Card extends WebComponent with HasAccessibleName { val header: Slot = new Slot("header") } - - def header: CardHeader.type = CardHeader } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CardHeader.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CardHeader.scala index c948a0b..8dfa331 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CardHeader.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CardHeader.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -32,7 +32,7 @@ object CardHeader extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-card-header") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-card-header") lazy val interactive: HtmlAttr[Boolean] = htmlAttr("interactive", BooleanAsAttrPresenceCodec) @@ -52,6 +52,4 @@ object CardHeader extends WebComponent { val onClick: EventProp[dom.MouseEvent] = new EventProp("click") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Carousel.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Carousel.scala index 6cabb32..98b4ebf 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Carousel.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Carousel.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.{HasDetail, HasSelectedIndex} import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, IntAsStringCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -39,7 +39,7 @@ object Carousel extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-carousel") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-carousel") lazy val arrowsPlacement: HtmlAttr[CarouselArrowsPlacement] = htmlAttr("arrows-placement", CarouselArrowsPlacement.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CheckBox.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CheckBox.scala index 2811197..6a835fc 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CheckBox.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CheckBox.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, IconName, ValueSt import be.doeraene.webcomponents.ui5.eventtypes.EventWithPreciseTarget import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object CheckBox extends WebComponent with HasIcon with HasAccessibleName with Ha type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-checkbox") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-checkbox") lazy val checked: HtmlAttr[Boolean] = htmlAttr("checked", BooleanAsAttrPresenceCodec) lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) @@ -53,6 +53,4 @@ object CheckBox extends WebComponent with HasIcon with HasAccessibleName with Ha val onChange: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("change") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPalette.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPalette.scala index 53d26f2..ae51731 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPalette.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPalette.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.{HasColor, HasDetail} import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object ColourPalette extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-color-palette") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-color-palette") object slots {} diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPaletteItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPaletteItem.scala index f78a966..2aeb002 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPaletteItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPaletteItem.scala @@ -5,8 +5,8 @@ import be.doeraene.webcomponents.ui5.internal.Slot import be.doeraene.webcomponents.ui5.scaladsl.colour.Colour import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -34,7 +34,7 @@ object ColourPaletteItem extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-color-palette-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-color-palette-item") lazy val value: HtmlAttr[Colour] = htmlAttr("value", Colour.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPalettePopover.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPalettePopover.scala index a2fec28..92fe149 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPalettePopover.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPalettePopover.scala @@ -6,7 +6,7 @@ import be.doeraene.webcomponents.ui5.internal.Slot import be.doeraene.webcomponents.ui5.scaladsl.colour.Colour import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -43,7 +43,7 @@ object ColourPalettePopover extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-color-palette-popover") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-color-palette-popover") lazy val defaultColour: HtmlAttr[Colour] = htmlAttr("default-color", Colour.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPicker.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPicker.scala index ba767e8..9f2a36d 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPicker.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ColourPicker.scala @@ -6,7 +6,7 @@ import be.doeraene.webcomponents.ui5.internal.Slot import be.doeraene.webcomponents.ui5.scaladsl.colour.Colour import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -46,7 +46,7 @@ object ColourPicker extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-color-picker") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-color-picker") lazy val colour: HtmlAttr[Colour] = htmlAttr("color", Colour.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBox.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBox.scala index ecfe1fe..dc5f842 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBox.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBox.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.{EventWithPreciseTarget, HasDeta import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object ComboBox extends WebComponent with HasAccessibleName with HasValue { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-combobox") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-combobox") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) lazy val filter: HtmlAttr[ComboBoxFilter] = htmlAttr("filter", ComboBoxFilter.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBoxGroupItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBoxGroupItem.scala index 24ef96c..39cfb17 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBoxGroupItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBoxGroupItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -37,12 +37,10 @@ object ComboBoxGroupItem extends WebComponent with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-cb-group-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-cb-group-item") object slots {} object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBoxItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBoxItem.scala index 1af94e6..e29a953 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBoxItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ComboBoxItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -36,7 +36,7 @@ object ComboBoxItem extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-cb-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-cb-item") lazy val text: HtmlAttr[String] = htmlAttr("text", StringAsIsCodec) lazy val additionalText: HtmlAttr[String] = htmlAttr("additional-text", StringAsIsCodec) @@ -45,6 +45,4 @@ object ComboBoxItem extends WebComponent { object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CustomListItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CustomListItem.scala index df716ed..5c4b0aa 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CustomListItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/CustomListItem.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object CustomListItem extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-li-custom") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-li-custom") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) lazy val tpe: HtmlAttr[ListItemType] = htmlAttr("type", ListItemType.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DatePicker.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DatePicker.scala index 48dc155..ec970be 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DatePicker.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DatePicker.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.HasDetail import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.{EventProcessor, HtmlAttr} import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -58,7 +58,7 @@ object DatePicker extends WebComponent with HasAccessibleName with HasName with type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-date-picker") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-date-picker") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) lazy val hideWeekNumbers: HtmlAttr[Boolean] = htmlAttr("hide-week-numbers", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DateRangePicker.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DateRangePicker.scala index c36acff..1d57e0d 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DateRangePicker.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DateRangePicker.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.* import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -54,7 +54,7 @@ object DateRangePicker extends WebComponent with HasAccessibleName with HasName type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-daterange-picker") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-daterange-picker") lazy val delimiter: HtmlAttr[String] = htmlAttr("delimiter", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DateTimePicker.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DateTimePicker.scala index e547695..ce04c63 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DateTimePicker.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DateTimePicker.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.* import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -52,7 +52,7 @@ object DateTimePicker extends WebComponent with HasAccessibleName with HasName w type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-datetime-picker") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-datetime-picker") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) lazy val hideWeekNumbers: HtmlAttr[Boolean] = htmlAttr("hide-week-numbers", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Dialog.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Dialog.scala index 39bfe75..86c24c0 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Dialog.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Dialog.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, IconName, PopupAc import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -41,7 +41,7 @@ object Dialog extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-dialog") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-dialog") lazy val accessibleRole: HtmlAttr[PopupAccessibleRole] = htmlAttr("accessible-role", PopupAccessibleRole.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DynamicSideContent.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DynamicSideContent.scala index ba3fe54..070dad2 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DynamicSideContent.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/DynamicSideContent.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{SideContentFallDown, SideConten import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -41,7 +41,7 @@ object DynamicSideContent extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-dynamic-side-content") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-dynamic-side-content") lazy val equalSplit: HtmlAttr[Boolean] = htmlAttr("equal-split", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FileUploader.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FileUploader.scala index 06bafd6..4d34b26 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FileUploader.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FileUploader.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -49,7 +49,7 @@ object FileUploader extends WebComponent with HasName with HasValue { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-file-uploader") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-file-uploader") lazy val accept: HtmlAttr[List[String]] = htmlAttr("accept", ListCodec(StringAsIsCodec)) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FilterItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FilterItem.scala index 551a992..08202a4 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FilterItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FilterItem.scala @@ -3,8 +3,8 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -32,7 +32,7 @@ object FilterItem extends WebComponent with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-filter-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-filter-item") object slots { val values: Slot = Slot("values") @@ -40,8 +40,6 @@ object FilterItem extends WebComponent with HasText { object events {} - - def option: FilterItemOption.type = FilterItemOption } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FilterItemOption.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FilterItemOption.scala index ca1cdae..94e26c8 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FilterItemOption.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FilterItemOption.scala @@ -3,8 +3,8 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -32,7 +32,7 @@ object FilterItemOption extends WebComponent with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-filter-item-option") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-filter-item-option") lazy val selected: HtmlAttr[Boolean] = htmlAttr("selected", BooleanAsAttrPresenceCodec) @@ -40,6 +40,4 @@ object FilterItemOption extends WebComponent with HasText { object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FlexibleColumnLayout.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FlexibleColumnLayout.scala index 47ddf8a..277bc9d 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FlexibleColumnLayout.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/FlexibleColumnLayout.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.FCLLayout import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -52,7 +52,7 @@ object FlexibleColumnLayout extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-flexible-column-layout") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-flexible-column-layout") lazy val hideArrows: HtmlAttr[Boolean] = htmlAttr("hide-arrows", BooleanAsAttrPresenceCodec) @@ -66,6 +66,4 @@ object FlexibleColumnLayout extends WebComponent { val startColumn: Slot = new Slot("startColumn") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Icon.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Icon.scala index c18d481..a4a849f 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Icon.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Icon.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -34,7 +34,7 @@ object Icon extends WebComponent with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-icon") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-icon") lazy val name: HtmlAttr[IconName] = htmlAttr("name", IconName.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/IllustratedMessage.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/IllustratedMessage.scala index 764c2b4..f283bac 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/IllustratedMessage.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/IllustratedMessage.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.IllustratedMessageType import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -38,7 +38,7 @@ object IllustratedMessage extends WebComponent with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-illustrated-message") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-illustrated-message") lazy val accessibleNameRef: HtmlAttr[String] = htmlAttr("accessible-name-ref", StringAsIsCodec) lazy val name: HtmlAttr[IllustratedMessageType] = diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Input.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Input.scala index f330bad..7f71c42 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Input.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Input.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{InputType, ValueState} import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, IntAsStringCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -40,7 +40,7 @@ object Input extends WebComponent with HasValue with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-input") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-input") lazy val placeholder: HtmlAttr[String] = htmlAttr("placeholder", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Label.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Label.scala index 16d0371..0b4bd40 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Label.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Label.scala @@ -2,8 +2,8 @@ package be.doeraene.webcomponents.ui5 import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -31,7 +31,7 @@ object Label extends WebComponent with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-label") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-label") lazy val required: HtmlAttr[Boolean] = htmlAttr("required", BooleanAsAttrPresenceCodec) lazy val showColon: HtmlAttr[Boolean] = htmlAttr("show-colon", BooleanAsAttrPresenceCodec) @@ -40,6 +40,4 @@ object Label extends WebComponent with HasIcon { val isRequired: Setter[HtmlElement] = required := true - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Link.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Link.scala index 2a9bf38..0104b68 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Link.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Link.scala @@ -3,8 +3,8 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, EmbeddingAsIsCodec, IconName, LinkDesign, LinkTarget} import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -33,7 +33,7 @@ object Link extends WebComponent with HasIcon with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-link") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-link") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) @@ -51,6 +51,4 @@ object Link extends WebComponent with HasIcon with HasAccessibleName { val onClick: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("click") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ListItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ListItem.scala index d90c13b..a33a3a2 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ListItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ListItem.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{ListItemType, ValueState} import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -33,7 +33,7 @@ object ListItem extends WebComponent with HasIcon with HasDescription with HasAd type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-li") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-li") lazy val additionalTextState: HtmlAttr[ValueState] = htmlAttr("additional-text-state", ValueState.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MediaGallery.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MediaGallery.scala index 7c472ea..8bee49b 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MediaGallery.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MediaGallery.scala @@ -8,7 +8,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -46,7 +46,7 @@ object MediaGallery extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-media-gallery") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-media-gallery") lazy val interactiveDisplayArea: HtmlAttr[Boolean] = htmlAttr("interactive-display-area", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MediaGalleryItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MediaGalleryItem.scala index 79133b6..466bb9d 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MediaGalleryItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MediaGalleryItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.MediaGalleryItemLayout import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -37,7 +37,7 @@ object MediaGalleryItem extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-media-gallery-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-media-gallery-item") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) @@ -52,6 +52,4 @@ object MediaGalleryItem extends WebComponent { object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Menu.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Menu.scala index 3a50a18..0603960 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Menu.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Menu.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.eventtypes.{HasDetail, HasEscPressed, HasItem, HasTargetRef} import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -38,7 +38,7 @@ object Menu extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-menu") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-menu") lazy val busy: HtmlAttr[Boolean] = htmlAttr("busy", BooleanAsAttrPresenceCodec) lazy val busyDelay: HtmlAttr[FiniteDuration] = htmlAttr("busy-delay", FiniteDurationCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MenuItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MenuItem.scala index 64e2de6..30f1e12 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MenuItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MenuItem.scala @@ -2,8 +2,8 @@ package be.doeraene.webcomponents.ui5 import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -31,7 +31,7 @@ object MenuItem extends WebComponent with HasIcon with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-menu-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-menu-item") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) @@ -41,8 +41,6 @@ object MenuItem extends WebComponent with HasIcon with HasText { lazy val startsSection: HtmlAttr[Boolean] = htmlAttr("starts-section", BooleanAsAttrPresenceCodec) - - // reference to itself, useful for sub-menus def item: MenuItem.type = this diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MessageStrip.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MessageStrip.scala index ab661fb..eea40d5 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MessageStrip.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MessageStrip.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object MessageStrip extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-message-strip") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-message-strip") lazy val design: HtmlAttr[MessageStripDesign] = htmlAttr("design", MessageStripDesign.AsStringCodec) @@ -51,6 +51,4 @@ object MessageStrip extends WebComponent { val onClose: EventProp[dom.Event] = new EventProp("close") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBox.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBox.scala index 036803f..15d1f84 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBox.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBox.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.{EventWithPreciseTarget, HasDeta import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object MultiComboBox extends WebComponent with HasAccessibleName with HasValue { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-multi-combobox") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-multi-combobox") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) lazy val filter: HtmlAttr[ComboBoxFilter] = htmlAttr("filter", ComboBoxFilter.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBoxGroupItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBoxGroupItem.scala index 68be5a0..0bfd5e8 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBoxGroupItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBoxGroupItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -27,12 +27,10 @@ object MultiComboBoxGroupItem extends WebComponent with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-mcb-group-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-mcb-group-item") object slots {} object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBoxItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBoxItem.scala index 7d30a12..c42d495 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBoxItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiComboBoxItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, BooleanAsIsCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -36,7 +36,7 @@ object MultiComboBoxItem extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-mcb-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-mcb-item") lazy val selected: HtmlAttr[Boolean] = htmlAttr("selected", BooleanAsAttrPresenceCodec) lazy val text: HtmlAttr[String] = htmlAttr("text", StringAsIsCodec) @@ -46,6 +46,4 @@ object MultiComboBoxItem extends WebComponent { object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiInput.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiInput.scala index 53d5dd3..af8befd 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiInput.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/MultiInput.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -55,7 +55,7 @@ object MultiInput extends WebComponent with HasAccessibleName with HasName with type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-multi-input") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-multi-input") lazy val showValueHelpIcon: HtmlAttr[Boolean] = htmlAttr("show-value-help-icon", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationAction.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationAction.scala index baa068c..ea6fa76 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationAction.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationAction.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.ButtonDesign import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -34,7 +34,7 @@ object NotificationAction extends WebComponent with HasText with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-notification-action") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-notification-action") lazy val design: HtmlAttr[ButtonDesign] = htmlAttr("design", ButtonDesign.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationListGroupItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationListGroupItem.scala index 87d2b08..468602c 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationListGroupItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationListGroupItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, IconName, Priorit import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -37,7 +37,7 @@ object NotificationListGroupItem extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-li-notification-group") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-li-notification-group") lazy val collapsed: HtmlAttr[Boolean] = htmlAttr("collapsed", BooleanAsAttrPresenceCodec) @@ -64,8 +64,6 @@ object NotificationListGroupItem extends WebComponent { val onClose: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("close") } - - def item: NotificationListItem.type = NotificationListItem } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationListItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationListItem.scala index 9ea26ef..37ad12d 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationListItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/NotificationListItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.Priority import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -39,7 +39,7 @@ object NotificationListItem extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-li-notification") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-li-notification") lazy val wrappingType: HtmlAttr[WrappingType] = htmlAttr("wrapping-type", WrappingType.AsStringCodec) @@ -65,8 +65,6 @@ object NotificationListItem extends WebComponent { val onClose: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("close") } - - def action: NotificationAction.type = NotificationAction } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Page.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Page.scala index dc2cbb1..bae6d8b 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Page.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Page.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.PageBackgroundDesign import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -33,7 +33,7 @@ object Page extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-page") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-page") lazy val backgroundDesign: HtmlAttr[PageBackgroundDesign] = htmlAttr("background-design", PageBackgroundDesign.AsStringCodec) @@ -54,6 +54,4 @@ object Page extends WebComponent { object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Panel.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Panel.scala index bf1bda0..958e9f9 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Panel.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Panel.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.EventWithPreciseTarget import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -36,7 +36,7 @@ object Panel extends WebComponent with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-panel") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-panel") lazy val accessibleRole: HtmlAttr[PanelAccessibleRole] = htmlAttr("accessible-role", PanelAccessibleRole.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Popover.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Popover.scala index 245e1e4..27bff9a 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Popover.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Popover.scala @@ -1,15 +1,15 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{ - PopupAccessibleRole, PopoverHorizontalAlign, PopoverPlacementType, - PopoverVerticalAlign + PopoverVerticalAlign, + PopupAccessibleRole } import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -48,7 +48,7 @@ object Popover extends WebComponent with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-popover") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-popover") lazy val accessibleRole: HtmlAttr[PopupAccessibleRole] = htmlAttr("accessible-role", PopupAccessibleRole.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProductSwitch.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProductSwitch.scala index c9fd77f..fe822d0 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProductSwitch.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProductSwitch.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -34,14 +34,12 @@ object ProductSwitch extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-product-switch") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-product-switch") object slots {} object events {} - - def item: ProductSwitchItem.type = ProductSwitchItem } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProductSwitchItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProductSwitchItem.scala index 37e9343..e9cfce5 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProductSwitchItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProductSwitchItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -36,7 +36,7 @@ object ProductSwitchItem extends WebComponent with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-product-switch-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-product-switch-item") lazy val subtitleText: HtmlAttr[String] = htmlAttr[String]("subtitle-text", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProgressIndicator.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProgressIndicator.scala index 23022bb..8c6f6ec 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProgressIndicator.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ProgressIndicator.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.ValueState import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, IntAsStringCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object ProgressIndicator extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-progress-indicator") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-progress-indicator") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RadioButton.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RadioButton.scala index d0dab79..52142e2 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RadioButton.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RadioButton.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.eventtypes.EventWithPreciseTarget import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -38,7 +38,7 @@ object RadioButton extends WebComponent with HasAccessibleName with HasName with type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-radio-button") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-radio-button") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) lazy val checked: HtmlAttr[Boolean] = htmlAttr("checked", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RangeSlider.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RangeSlider.scala index 1805506..ab994a9 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RangeSlider.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RangeSlider.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -40,7 +40,7 @@ object RangeSlider extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-range-slider") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-range-slider") lazy val endValue: HtmlAttr[Double] = htmlAttr("end-value", DoubleAsStringCodec) @@ -69,6 +69,4 @@ object RangeSlider extends WebComponent { val onInput: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("input") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RatingIndicator.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RatingIndicator.scala index c1e8c55..cdb212e 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RatingIndicator.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/RatingIndicator.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -39,7 +39,7 @@ object RatingIndicator extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-rating-indicator") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-rating-indicator") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) lazy val accessibleNameRef: HtmlAttr[String] = htmlAttr("accessible-name-ref", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ResponsivePopover.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ResponsivePopover.scala index 01759c7..0ea62b3 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ResponsivePopover.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ResponsivePopover.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.* import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -44,7 +44,7 @@ object ResponsivePopover extends WebComponent with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-responsive-popover") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-responsive-popover") lazy val allowTargetOverlap: HtmlAttr[Boolean] = htmlAttr("allow-target-overlap", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SegmentedButton.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SegmentedButton.scala index 25c6c91..d914d53 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SegmentedButton.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SegmentedButton.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.{HasDetail, HasSelectedItem, Has import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -47,7 +47,7 @@ object SegmentedButton extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-segmented-button") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-segmented-button") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) lazy val mode: HtmlAttr[SegmentedButtonMode] = htmlAttr("mode", SegmentedButtonMode.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SegmentedButtonItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SegmentedButtonItem.scala index 895375a..bf3007a 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SegmentedButtonItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SegmentedButtonItem.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.EventWithPreciseTarget import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -42,7 +42,7 @@ object SegmentedButtonItem extends WebComponent with HasAccessibleName with HasI type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-segmented-button-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-segmented-button-item") lazy val design: HtmlAttr[ButtonDesign] = htmlAttr("design", ButtonDesign.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Select.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Select.scala index e76f7ad..9dce20f 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Select.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Select.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.HasDetail import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -38,7 +38,7 @@ object Select extends WebComponent with HasIcon with HasAccessibleName with HasN type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-select") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-select") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) lazy val required: HtmlAttr[Boolean] = htmlAttr("required", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SelectOption.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SelectOption.scala index bad0162..0c4ee80 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SelectOption.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SelectOption.scala @@ -2,8 +2,8 @@ package be.doeraene.webcomponents.ui5 import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -34,11 +34,9 @@ object SelectOption extends WebComponent with HasIcon with HasAdditionalText wit type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-option") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-option") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) lazy val selected: HtmlAttr[Boolean] = htmlAttr("selected", BooleanAsAttrPresenceCodec) - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ShellBar.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ShellBar.scala index 38579d5..6d7ad4a 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ShellBar.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ShellBar.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, IconName} import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -48,7 +48,7 @@ object ShellBar extends WebComponent with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-shellbar") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-shellbar") lazy val primaryTitle: HtmlAttr[String] = htmlAttr("primary-title", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ShellBarItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ShellBarItem.scala index f0712e3..485351e 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ShellBarItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ShellBarItem.scala @@ -2,7 +2,7 @@ package be.doeraene.webcomponents.ui5 import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -34,7 +34,7 @@ object ShellBarItem extends WebComponent with HasIcon with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-shellbar-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-shellbar-item") lazy val count: HtmlAttr[String] = htmlAttr("count", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigation.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigation.scala index af69d0e..ee0cc65 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigation.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigation.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.{HasDetail, HasItem} import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object SideNavigation extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-side-navigation") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-side-navigation") lazy val collapsed: HtmlAttr[Boolean] = htmlAttr[Boolean]("collapsed", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigationItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigationItem.scala index 42043cd..1fd00d8 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigationItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigationItem.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object SideNavigationItem extends WebComponent with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-side-navigation-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-side-navigation-item") lazy val expanded: HtmlAttr[Boolean] = htmlAttr("expanded", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigationSubItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigationSubItem.scala index 227c600..65bc074 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigationSubItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SideNavigationSubItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -34,7 +34,7 @@ object SideNavigationSubItem extends WebComponent with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-side-navigation-sub-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-side-navigation-sub-item") lazy val icon: HtmlAttr[IconName] = htmlAttr("icon", IconName.AsStringCodec) @@ -44,6 +44,4 @@ object SideNavigationSubItem extends WebComponent with HasText { object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Slider.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Slider.scala index 06d5ef0..1bb5d1b 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Slider.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Slider.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -38,7 +38,7 @@ object Slider extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-slider") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-slider") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) @@ -65,6 +65,4 @@ object Slider extends WebComponent { val onInput: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("input") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SortItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SortItem.scala index b4536eb..e49be69 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SortItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SortItem.scala @@ -3,8 +3,8 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -32,7 +32,7 @@ object SortItem extends WebComponent with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-sort-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-sort-item") lazy val selected: HtmlAttr[Boolean] = htmlAttr("selected", BooleanAsAttrPresenceCodec) @@ -40,6 +40,4 @@ object SortItem extends WebComponent with HasText { object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SplitButton.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SplitButton.scala index a68e543..95da739 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SplitButton.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SplitButton.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -38,7 +38,7 @@ object SplitButton extends WebComponent with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-split-button") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-split-button") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) lazy val activeIcon: HtmlAttr[IconName] = htmlAttr("active-icon", IconName.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/StepInput.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/StepInput.scala index c76341d..067e424 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/StepInput.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/StepInput.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -44,7 +44,7 @@ object StepInput extends WebComponent with HasAccessibleName with HasName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-step-input") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-step-input") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) @@ -74,6 +74,4 @@ object StepInput extends WebComponent with HasAccessibleName with HasName { val onChange: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("change") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SuggestionGroupItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SuggestionGroupItem.scala index 473422b..37ba00d 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SuggestionGroupItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SuggestionGroupItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -32,7 +32,7 @@ object SuggestionGroupItem extends WebComponent with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-ui5-suggestion-group-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-ui5-suggestion-group-item") object slots {} diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SuggestionItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SuggestionItem.scala index 6b80b8d..c47349e 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SuggestionItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/SuggestionItem.scala @@ -2,8 +2,8 @@ package be.doeraene.webcomponents.ui5 import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -34,7 +34,7 @@ object SuggestionItem extends WebComponent with HasIcon with HasDescription with type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-suggestion-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-suggestion-item") lazy val iconEnd: HtmlAttr[Boolean] = htmlAttr("icon-end", BooleanAsAttrPresenceCodec) @@ -45,6 +45,4 @@ object SuggestionItem extends WebComponent with HasIcon with HasDescription with lazy val additionalTextState: HtmlAttr[ValueState] = htmlAttr("additional-text-state", ValueState.AsStringCodec) - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Switch.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Switch.scala index 1ec8335..a2d929c 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Switch.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Switch.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, IconName, SwitchDesign} import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object Switch extends WebComponent with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-switch") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-switch") lazy val textOn: HtmlAttr[String] = htmlAttr("text-on", StringAsIsCodec) lazy val textOff: HtmlAttr[String] = htmlAttr("text-off", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Tab.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Tab.scala index 4ee0e74..0cf1fed 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Tab.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Tab.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.SemanticColour import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object Tab extends WebComponent with HasIcon with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-tab") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-tab") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) lazy val selected: HtmlAttr[Boolean] = htmlAttr("selected", BooleanAsAttrPresenceCodec) @@ -48,6 +48,4 @@ object Tab extends WebComponent with HasIcon with HasText { val subTabs: Slot = new Slot("subTabs") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TabContainer.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TabContainer.scala index 648eed0..338c712 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TabContainer.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TabContainer.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.HasDetail import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -41,7 +41,7 @@ object TabContainer extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-tabcontainer") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-tabcontainer") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) lazy val collapsed: HtmlAttr[Boolean] = htmlAttr("collapsed", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Table.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Table.scala index a3affe8..7d36a4b 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Table.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Table.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.HasDetail import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -32,7 +32,7 @@ object Table extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-table") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-table") lazy val busy: HtmlAttr[Boolean] = htmlAttr("busy", BooleanAsAttrPresenceCodec) lazy val busyDelay: HtmlAttr[FiniteDuration] = htmlAttr("busy-delay", FiniteDurationCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableCell.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableCell.scala index ed6a905..4eca89e 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableCell.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableCell.scala @@ -1,7 +1,7 @@ package be.doeraene.webcomponents.ui5 import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -23,8 +23,6 @@ object TableCell extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-table-cell") - - + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-table-cell") } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableColumn.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableColumn.scala index 4a21498..dad2482 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableColumn.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableColumn.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{EmbeddingAsIsCodec, TableColumnPopinDisplay} import com.raquo.laminar.codecs.StringAsIsCodec import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -29,7 +29,7 @@ object TableColumn extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-table-column") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-table-column") lazy val demandPopin: HtmlAttr[Boolean] = htmlAttr("demand-popin", BooleanAsAttrPresenceCodec) lazy val minWidth: HtmlAttr[Int] = htmlAttr("min-width", IntAsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableRow.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableRow.scala index b1bcfc5..0994ba2 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableRow.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TableRow.scala @@ -1,7 +1,7 @@ package be.doeraene.webcomponents.ui5 import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -25,7 +25,7 @@ object TableRow extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-table-row") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-table-row") lazy val navigated: HtmlAttr[Boolean] = htmlAttr("navigated", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TextArea.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TextArea.scala index abe8c94..56d0259 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TextArea.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TextArea.scala @@ -2,8 +2,8 @@ package be.doeraene.webcomponents.ui5 import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object TextArea extends WebComponent with HasValue with HasAccessibleName with H type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-textarea") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-textarea") lazy val required: HtmlAttr[Boolean] = htmlAttr("required", BooleanAsAttrPresenceCodec) lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) @@ -59,6 +59,4 @@ object TextArea extends WebComponent with HasValue with HasAccessibleName with H val onInput: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("input") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TimePicker.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TimePicker.scala index f0032ef..f820632 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TimePicker.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TimePicker.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -52,7 +52,7 @@ object TimePicker extends WebComponent with HasValue { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-time-picker") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-time-picker") lazy val disabled: HtmlAttr[Boolean] = htmlAttr("disabled", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Timeline.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Timeline.scala index 9780f1c..ca30479 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Timeline.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Timeline.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -38,7 +38,7 @@ object Timeline extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-timeline") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-timeline") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) @@ -48,8 +48,6 @@ object Timeline extends WebComponent { object events {} - - //noinspection TypeAnnotation def item = TimelineItem diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TimelineItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TimelineItem.scala index 17188a1..1197b73 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TimelineItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TimelineItem.scala @@ -5,8 +5,8 @@ import be.doeraene.webcomponents.ui5.eventtypes.EventWithPreciseTarget import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -42,7 +42,7 @@ object TimelineItem extends WebComponent with HasIcon with HasName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-timeline-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-timeline-item") lazy val nameClickable: HtmlAttr[Boolean] = htmlAttr("name-clickable", BooleanAsAttrPresenceCodec) @@ -56,6 +56,4 @@ object TimelineItem extends WebComponent with HasIcon with HasName { val onNameClick: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("name-click") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Title.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Title.scala index 64c8c17..17bedfc 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Title.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Title.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object Title extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-title") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-title") lazy val level: HtmlAttr[TitleLevel] = htmlAttr("level", TitleLevel.AsStringCodec) lazy val wrappingType: HtmlAttr[WrappingType] = htmlAttr("wrapping-type", WrappingType.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Toast.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Toast.scala index 76599c9..cb4ca3a 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Toast.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Toast.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.ToastPlacement import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -34,7 +34,7 @@ object Toast extends WebComponent with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-toast") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-toast") lazy val placement: HtmlAttr[ToastPlacement] = htmlAttr("placement", ToastPlacement.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToggleButton.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToggleButton.scala index 97a18f1..7a00db5 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToggleButton.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToggleButton.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -40,7 +40,7 @@ object ToggleButton extends WebComponent with HasAccessibleName with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-toggle-button") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-toggle-button") lazy val pressed: HtmlAttr[Boolean] = htmlAttr("pressed", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Token.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Token.scala index 034e638..4c699f4 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Token.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Token.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -37,7 +37,7 @@ object Token extends WebComponent with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-token") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-token") lazy val readonly: HtmlAttr[Boolean] = htmlAttr("readonly", BooleanAsAttrPresenceCodec) @@ -51,6 +51,4 @@ object Token extends WebComponent with HasText { val onSelect: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("select") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Toolbar.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Toolbar.scala index 513ce66..73a6e65 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Toolbar.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Toolbar.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.HasDetail import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -30,7 +30,7 @@ object Toolbar extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-toolbar") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-toolbar") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) lazy val accessibleNameRef: HtmlAttr[String] = htmlAttr("accessible-name-ref", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarButton.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarButton.scala index 08f30c3..d1c4071 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarButton.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarButton.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.HasDetail import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -21,17 +21,17 @@ object ToolbarButton extends WebComponent { @js.native trait RawElement extends js.Object - + @js.native @JSImport("@ui5/webcomponents/dist/ToolbarButton.js", JSImport.Default) object RawImport extends js.Object // object-s are lazy so you need to actually use them in your code to prevent dead code elimination used(RawImport) - + type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-toolbar-button") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-toolbar-button") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) lazy val accessibleNameRef: HtmlAttr[String] = htmlAttr("accessible-name-ref", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSelect.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSelect.scala index 3747a8f..36c529c 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSelect.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSelect.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.HasDetail import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -31,7 +31,7 @@ object ToolbarSelect extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-toolbar-select") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-toolbar-select") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) lazy val accessibleNameRef: HtmlAttr[String] = htmlAttr("accessible-name-ref", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSelectOption.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSelectOption.scala index c874a2c..630317d 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSelectOption.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSelectOption.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.HasDetail import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -24,7 +24,7 @@ object ToolbarSelectOption extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-toolbar-select-option") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-toolbar-select-option") lazy val selected: HtmlAttr[Boolean] = htmlAttr("selected", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSeparator.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSeparator.scala index 94ca13d..4f46f3c 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSeparator.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSeparator.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.HasDetail import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -31,7 +31,7 @@ object ToolbarSeparator extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-toolbar-separator") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-toolbar-separator") object slots {} diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSpacer.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSpacer.scala index f390711..0e48c9a 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSpacer.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ToolbarSpacer.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.eventtypes.HasDetail import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -31,7 +31,7 @@ object ToolbarSpacer extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-toolbar-spacer") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-toolbar-spacer") lazy val widthJS: HtmlAttr[String] = htmlAttr("width", StringAsIsCodec) lazy val width: HtmlAttr[CSSSize] = htmlAttr("width", CSSSize.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Tree.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Tree.scala index 961c017..41383ea 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Tree.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Tree.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.ListMode import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -38,7 +38,7 @@ object Tree extends WebComponent with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-tree") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-tree") lazy val footerText: HtmlAttr[String] = htmlAttr("footer-text", StringAsIsCodec) lazy val headerText: HtmlAttr[String] = htmlAttr("header-text", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TreeItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TreeItem.scala index 7ae5756..5634d9d 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TreeItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TreeItem.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, IconName} import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -39,7 +39,7 @@ object TreeItem extends WebComponent with HasIcon with HasText { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-tree-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-tree-item") lazy val expanded: HtmlAttr[Boolean] = htmlAttr[Boolean]("expanded", BooleanAsAttrPresenceCodec) lazy val hasChildren: HtmlAttr[Boolean] = htmlAttr[Boolean]("has-children", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TreeItemCustom.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TreeItemCustom.scala index a2dbcd1..65cc8bf 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TreeItemCustom.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/TreeItemCustom.scala @@ -3,7 +3,7 @@ package be.doeraene.webcomponents.ui5 import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, IconName} import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -46,7 +46,7 @@ object TreeItemCustom extends WebComponent with HasIcon with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-tree-item-custom") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-tree-item-custom") lazy val expanded: HtmlAttr[Boolean] = htmlAttr[Boolean]("expanded", BooleanAsAttrPresenceCodec) lazy val hasChildren: HtmlAttr[Boolean] = htmlAttr[Boolean]("has-children", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UList.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UList.scala index 17dab4b..4bd0c64 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UList.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UList.scala @@ -5,7 +5,7 @@ import be.doeraene.webcomponents.ui5.internal.Slot import be.doeraene.webcomponents.ui5.eventtypes.* import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object UList extends WebComponent with HasAccessibleName { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-list") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-list") lazy val accessibleRole: HtmlAttr[String] = htmlAttr("accessible-role", StringAsIsCodec) lazy val busy: HtmlAttr[Boolean] = htmlAttr("busy", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UListGroupHeader.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UListGroupHeader.scala index ba8c0de..be4a0a1 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UListGroupHeader.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UListGroupHeader.scala @@ -2,8 +2,8 @@ package be.doeraene.webcomponents.ui5 import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, IntAsStringCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -32,7 +32,7 @@ object UListGroupHeader extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-li-groupheader") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-li-groupheader") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) lazy val selected: HtmlAttr[Boolean] = htmlAttr("selected", BooleanAsAttrPresenceCodec) @@ -41,6 +41,4 @@ object UListGroupHeader extends WebComponent { object events {} - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UploadCollection.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UploadCollection.scala index e5c719e..220afb2 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UploadCollection.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UploadCollection.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -38,7 +38,7 @@ object UploadCollection extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-upload-collection") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-upload-collection") lazy val accessibleName: HtmlAttr[String] = htmlAttr("accessible-name", StringAsIsCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UploadCollectionItem.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UploadCollectionItem.scala index b0f238e..0cd9b05 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UploadCollectionItem.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/UploadCollectionItem.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.{ButtonDesign, ColourScheme, Ico import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -49,7 +49,7 @@ object UploadCollectionItem extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-upload-collection-item") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-upload-collection-item") lazy val disableDeleteButton: HtmlAttr[Boolean] = htmlAttr("disable-delete-button", BooleanAsAttrPresenceCodec) @@ -82,6 +82,4 @@ object UploadCollectionItem extends WebComponent { val onTerminate: EventProp[EventWithPreciseTarget[Ref]] = new EventProp("terminate") } - - } diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ViewSettingsDialog.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ViewSettingsDialog.scala index 718d977..6c18890 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ViewSettingsDialog.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/ViewSettingsDialog.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.* import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -44,7 +44,7 @@ object ViewSettingsDialog extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-view-settings-dialog") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-view-settings-dialog") lazy val sortDescending: HtmlAttr[Boolean] = htmlAttr("sort-descending", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Wizard.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Wizard.scala index 1ff751b..2cc9cd9 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Wizard.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/Wizard.scala @@ -4,7 +4,7 @@ import be.doeraene.webcomponents.ui5.configkeys.* import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag +import com.raquo.laminar.tags.CustomHtmlTag import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -35,7 +35,7 @@ object Wizard extends WebComponent { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-wizard") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-wizard") lazy val contentLayout: HtmlAttr[WizardContentLayout] = htmlAttr("content-layout", WizardContentLayout.AsStringCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/WizardStep.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/WizardStep.scala index 01066db..cd41749 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/WizardStep.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/WizardStep.scala @@ -4,8 +4,8 @@ import be.doeraene.webcomponents.ui5.configkeys.* import be.doeraene.webcomponents.ui5.internal.Slot import com.raquo.laminar.codecs.{BooleanAsAttrPresenceCodec, StringAsIsCodec} import com.raquo.laminar.api.L.* -import com.raquo.laminar.tags.HtmlTag -import com.raquo.laminar.keys.{HtmlAttr} +import com.raquo.laminar.tags.CustomHtmlTag +import com.raquo.laminar.keys.HtmlAttr import com.raquo.laminar.nodes.ReactiveHtmlElement import org.scalajs.dom @@ -26,7 +26,7 @@ object WizardStep extends WebComponent with HasIcon { type Ref = dom.html.Element with RawElement - protected val tag: HtmlTag[Ref] = htmlTag("ui5-wizard-step") + protected val tag: CustomHtmlTag[Ref] = CustomHtmlTag("ui5-wizard-step") lazy val branching: HtmlAttr[Boolean] = htmlAttr("branching", BooleanAsAttrPresenceCodec) diff --git a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/internal/Slot.scala b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/internal/Slot.scala index 239e251..9025d87 100644 --- a/web-components/src/main/scala/be/doeraene/webcomponents/ui5/internal/Slot.scala +++ b/web-components/src/main/scala/be/doeraene/webcomponents/ui5/internal/Slot.scala @@ -18,14 +18,14 @@ final class Slot(name: String) { private val slot: HtmlAttr[String] = htmlAttr("slot", StringAsIsCodec) - def :=(element: HtmlElement): Inserter[Base] = <--(Val(element.amend(slot := name))) + def :=(element: HtmlElement): Inserter = <--(Val(element.amend(slot := name))) - def :=(elements: Seq[HtmlElement])(using DummyImplicit): Inserter[Base] = <--(Val(elements)) + def :=(elements: Seq[HtmlElement])(using DummyImplicit): Inserter = <--(Val(elements)) - def <--(elementObservable: Observable[HtmlElement]): Inserter[Base] = + def <--(elementObservable: Observable[HtmlElement]): Inserter = child <-- elementObservable.map(_.amend(slot := name)) - def <--(elementsObservable: Observable[Seq[HtmlElement]])(using DummyImplicit): Inserter[Base] = + def <--(elementsObservable: Observable[Seq[HtmlElement]])(using DummyImplicit): Inserter = children <-- elementsObservable.map(_.map(_.amend(slot := name))) }