Skip to content

Commit

Permalink
update live view to 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@woylie
woylie committed Dec 4, 2024
1 parent 4da6e3d commit 47b3862
Show file tree
Hide file tree
Showing 67 changed files with 166 additions and 161 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Changed

- Require Phoenix LiveView ~> 1.0.0.

## [0.10.1] - 2024-11-20

### Changed
Expand Down
4 changes: 2 additions & 2 deletions demo/lib/demo_web/components/layouts/app.html.heex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<img src={~p"/images/logo.svg"} width="36" />
</a>
<p class="bg-brand/5 text-brand rounded-full px-2 font-medium leading-6">
v<%= Application.spec(:phoenix, :vsn) %>
v{Application.spec(:phoenix, :vsn)}
</p>
</div>
<div class="flex items-center gap-4 font-semibold leading-6 text-zinc-900">
Expand All @@ -29,6 +29,6 @@
</header>
<main class="px-4 py-20 sm:px-6 lg:px-8">
<div class="mx-auto max-w-2xl">
<%= @inner_content %>
{@inner_content}
</div>
</main>
4 changes: 2 additions & 2 deletions demo/lib/demo_web/components/layouts/root.html.heex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="csrf-token" content={get_csrf_token()} />
<.live_title suffix=" · Phoenix Framework">
<%= assigns[:page_title] || "Demo" %>
{assigns[:page_title] || "Demo"}
</.live_title>
<link phx-track-static rel="stylesheet" href={~p"/assets/app.css"} />
<script
Expand All @@ -17,6 +17,6 @@
</script>
</head>
<body class="bg-white antialiased demo-web">
<%= @inner_content %>
{@inner_content}
</body>
</html>
2 changes: 1 addition & 1 deletion demo/mix.exs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ defmodule Demo.MixProject do
{:phoenix, "~> 1.7.10"},
{:phoenix_html, "~> 4.0"},
{:phoenix_live_reload, "~> 1.2", only: :dev},
{:phoenix_live_view, "~> 1.0.0-rc.7"},
{:phoenix_live_view, "~> 1.0.0"},
{:floki, ">= 0.30.0", only: :test},
{:esbuild, "~> 0.8", runtime: Mix.env() == :dev},
{:gettext, "~> 0.20"},
Expand Down
6 changes: 3 additions & 3 deletions demo/mix.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"mimerl": {:hex, :mimerl, "1.3.0", "d0cd9fc04b9061f82490f6581e0128379830e78535e017f7780f37fea7545726", [:rebar3], [], "hexpm", "a1e15a50d1887217de95f0b9b0793e32853f7c258a5cd227650889b38839fe9d"},
"nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
"parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
"phoenix": {:hex, :phoenix, "1.7.14", "a7d0b3f1bc95987044ddada111e77bd7f75646a08518942c72a8440278ae7825", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"},
"phoenix": {:hex, :phoenix, "1.7.17", "2fcdceecc6fb90bec26fab008f96abbd0fd93bc9956ec7985e5892cf545152ca", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "50e8ad537f3f7b0efb1509b2f75b5c918f697be6a45d48e49a30d3b7c0e464c9"},
"phoenix_html": {:hex, :phoenix_html, "4.1.1", "4c064fd3873d12ebb1388425a8f2a19348cef56e7289e1998e2d2fa758aa982e", [:mix], [], "hexpm", "f2f2df5a72bc9a2f510b21497fd7d2b86d932ec0598f0210fed4114adc546c6f"},
"phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
"phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.3", "f2161c207fda0e4fb55165f650f7f8db23f02b29e3bff00ff7ef161d6ac1f09d", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "b4ec9cd73cb01ff1bd1cac92e045d13e7030330b74164297d1aee3907b54803c"},
"phoenix_live_view": {:hex, :phoenix_live_view, "1.0.0-rc.7", "d2abca526422adea88896769529addb6443390b1d4f1ff9cbe694312d8875fb2", [:mix], [{:floki, "~> 0.36", [hex: :floki, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b82a4575f6f3eb5b97922ec6874b0c52b3ca0cc5dcb4b14ddc478cbfa135dd01"},
"phoenix_live_view": {:hex, :phoenix_live_view, "1.0.0", "3a10dfce8f87b2ad4dc65de0732fc2a11e670b2779a19e8d3281f4619a85bce4", [:mix], [{:floki, "~> 0.36", [hex: :floki, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "254caef0028765965ca6bd104cc7d68dcc7d57cc42912bef92f6b03047251d99"},
"phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
"phoenix_storybook": {:hex, :phoenix_storybook, "0.7.1", "d693b4d1acd2a31cb38ce5bdd5602f4c8f1d94ff2befd5791311cdc021d54af2", [:mix], [{:earmark, "~> 1.4", [hex: :earmark, repo: "hexpm", optional: false]}, {:heroicons, "~> 0.5", [hex: :heroicons, repo: "hexpm", optional: true]}, {:jason, "~> 1.3", [hex: :jason, repo: "hexpm", optional: true]}, {:makeup_eex, "~> 1.0.0", [hex: :makeup_eex, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: false]}, {:phoenix_live_view, "> 0.18.7", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}], "hexpm", "a9f71929764fb305c0ece5b0d4614050a1f5fd0fd1f3b02d4e046bb23167b43d"},
"phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
Expand All @@ -35,7 +35,7 @@
"plug_crypto": {:hex, :plug_crypto, "2.1.0", "f44309c2b06d249c27c8d3f65cfe08158ade08418cf540fd4f72d4d6863abb7b", [:mix], [], "hexpm", "131216a4b030b8f8ce0f26038bc4421ae60e4bb95c5cf5395e1421437824c4fa"},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
"telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
"thousand_island": {:hex, :thousand_island, "1.3.6", "835a626a8a6f6a1e681b63e1132a8427e87ce443aaf4888fbf63b2df77539b97", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "0ed8798084c8c49a223840b20598b022e4eb8c9f390fb6701864c307fc9aa2cd"},
"thousand_island": {:hex, :thousand_island, "1.3.7", "1da7598c0f4f5f50562c097a3f8af308ded48cd35139f0e6f17d9443e4d0c9c5", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "0139335079953de41d381a6134d8b618d53d084f558c734f2662d1a72818dd12"},
"tzdata": {:hex, :tzdata, "1.1.2", "45e5f1fcf8729525ec27c65e163be5b3d247ab1702581a94674e008413eef50b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "cec7b286e608371602318c414f344941d5eb0375e14cfdab605cca2fe66cba8b"},
"unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
"websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
Expand Down
2 changes: 1 addition & 1 deletion demo/storybook/introduction.story.exs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ defmodule Storybook.MyPage do
target="_blank"
>Components documentation</a>.
</p>
<p>This storybook was compiled with Doggo <%= @version %>.</p>
<p>This storybook was compiled with Doggo {@version}.</p>
<h2>Resources</h2>
<ul>
Expand Down
4 changes: 2 additions & 2 deletions lib/doggo/components/accordion.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ defmodule Doggo.Components.Accordion do
aria-controls={"#{@id}-section-#{@index}"}
phx-click={Doggo.toggle_accordion_section(@id, @index)}
>
<span><%= @section.title %></span>
<span>{@section.title}</span>
</button>
</.dynamic_tag>
<div
Expand All @@ -136,7 +136,7 @@ defmodule Doggo.Components.Accordion do
aria-labelledby={"#{@id}-trigger-#{@index}"}
hidden={@aria_expanded != "true"}
>
<%= render_slot(@section) %>
{render_slot(@section)}
</div>
</div>
"""
Expand Down
2 changes: 1 addition & 1 deletion lib/doggo/components/action_bar.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ defmodule Doggo.Components.ActionBar do
~H"""
<div role="toolbar" class={@class} {@rest}>
<button :for={item <- @item} phx-click={item.on_click} title={item.label}>
<%= render_slot(item) %>
{render_slot(item)}
</button>
</div>
"""
Expand Down
8 changes: 4 additions & 4 deletions lib/doggo/components/alert.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,16 @@ defmodule Doggo.Components.Alert do
{@rest}
>
<div :if={@icon != []} class={"#{@base_class}-icon"}>
<%= render_slot(@icon) %>
{render_slot(@icon)}
</div>
<div class={"#{@base_class}-body"}>
<div :if={@title} id={"#{@id}-title"} class={"#{@base_class}-title"}>
<%= @title %>
{@title}
</div>
<div class={"#{@base_class}-message"}><%= render_slot(@inner_block) %></div>
<div class={"#{@base_class}-message"}>{render_slot(@inner_block)}</div>
</div>
<button :if={@on_close} phx-click={@on_close}>
<%= @close_label %>
{@close_label}
</button>
</div>
"""
Expand Down
8 changes: 4 additions & 4 deletions lib/doggo/components/alert_dialog.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,16 +175,16 @@ defmodule Doggo.Components.AlertDialog do
aria-label={@close_label}
phx-click={Phoenix.LiveView.JS.exec("data-cancel", to: "##{@id}")}
>
<%= render_slot(@close) %>
{render_slot(@close)}
<span :if={@close == []}>close</span>
</button>
<h2 id={"#{@id}-title"}><%= render_slot(@title) %></h2>
<h2 id={"#{@id}-title"}>{render_slot(@title)}</h2>
</header>
<div id={"#{@id}-content"} class={"#{@base_class}-content"}>
<%= render_slot(@inner_block) %>
{render_slot(@inner_block)}
</div>
<footer :if={@footer != []}>
<%= render_slot(@footer) %>
{render_slot(@footer)}
</footer>
</section>
</.focus_wrap>
Expand Down
6 changes: 3 additions & 3 deletions lib/doggo/components/app_bar.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@ defmodule Doggo.Components.AppBar do
phx-click={navigation.on_click}
title={navigation.label}
>
<%= render_slot(navigation) %>
{render_slot(navigation)}
</.link>
</div>
<h1 :if={@title}><%= @title %></h1>
<h1 :if={@title}>{@title}</h1>
<div :if={@action != []} class={"#{@base_class}-actions"}>
<.link
:for={action <- @action}
phx-click={action.on_click}
title={action.label}
>
<%= render_slot(action) %>
{render_slot(action)}
</.link>
</div>
</header>
Expand Down
2 changes: 1 addition & 1 deletion lib/doggo/components/avatar.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ defmodule Doggo.Components.Avatar do

defp inner_avatar(assigns) do
~H"""
<span><%= @placeholder_content %></span>
<span>{@placeholder_content}</span>
"""
end
end
2 changes: 1 addition & 1 deletion lib/doggo/components/badge.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ defmodule Doggo.Components.Badge do
def render(assigns) do
~H"""
<span class={@class} {@rest}>
<%= render_slot(@inner_block) %>
{render_slot(@inner_block)}
</span>
"""
end
Expand Down
4 changes: 2 additions & 2 deletions lib/doggo/components/bottom_navigation.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ defmodule Doggo.Components.BottomNavigation do
aria-current={@current_value in List.wrap(item.value) && "page"}
aria-label={item.label}
>
<span class={"#{@base_class}-icon"}><%= render_slot(item) %></span>
<span :if={!@hide_labels}><%= item.label %></span>
<span class={"#{@base_class}-icon"}>{render_slot(item)}</span>
<span :if={!@hide_labels}>{item.label}</span>
</.link>
</li>
</ul>
Expand Down
10 changes: 5 additions & 5 deletions lib/doggo/components/box.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,21 @@ defmodule Doggo.Components.Box do
~H"""
<section class={@class} {@rest}>
<header :if={@title != [] || @banner != [] || @action != []}>
<h2 :if={@title != []}><%= render_slot(@title) %></h2>
<h2 :if={@title != []}>{render_slot(@title)}</h2>
<div :if={@action != []} class={"#{@base_class}-actions"}>
<%= for action <- @action do %>
<%= render_slot(action) %>
{render_slot(action)}
<% end %>
</div>
<div :if={@banner != []} class={"#{@base_class}-banner"}>
<%= render_slot(@banner) %>
{render_slot(@banner)}
</div>
</header>
<div class={"#{@base_class}-body"}>
<%= render_slot(@inner_block) %>
{render_slot(@inner_block)}
</div>
<footer :if={@footer != []}>
<%= render_slot(@footer) %>
{render_slot(@footer)}
</footer>
</section>
"""
Expand Down
4 changes: 2 additions & 2 deletions lib/doggo/components/breadcrumb.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ defmodule Doggo.Components.Breadcrumb do
href={@item[:href]}
aria-current="page"
>
<%= render_slot(@item) %>
{render_slot(@item)}
</.link>
"""
end

defp breadcrumb_link(assigns) do
~H"""
<.link navigate={@item[:navigate]} patch={@item[:patch]} href={@item[:href]}>
<%= render_slot(@item) %>
{render_slot(@item)}
</.link>
"""
end
Expand Down
2 changes: 1 addition & 1 deletion lib/doggo/components/button.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ defmodule Doggo.Components.Button do
def render(assigns) do
~H"""
<button type={@type} class={@class} disabled={@disabled} {@rest}>
<%= render_slot(@inner_block) %>
{render_slot(@inner_block)}
</button>
"""
end
Expand Down
2 changes: 1 addition & 1 deletion lib/doggo/components/button_link.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ defmodule Doggo.Components.ButtonLink do
def render(assigns) do
~H"""
<.link class={@class} {@rest}>
<%= render_slot(@inner_block) %>
{render_slot(@inner_block)}
</.link>
"""
end
Expand Down
6 changes: 3 additions & 3 deletions lib/doggo/components/callout.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ defmodule Doggo.Components.Callout do
{@rest}
>
<div :if={@icon != []} class={"#{@base_class}-icon"}>
<%= render_slot(@icon) %>
{render_slot(@icon)}
</div>
<div class={"#{@base_class}-body"}>
<div :if={@title} id={"#{@id}-title"} class={"#{@base_class}-title"}>
<%= @title %>
{@title}
</div>
<div class={"#{@base_class}-message"}>
<%= render_slot(@inner_block) %>
{render_slot(@inner_block)}
</div>
</div>
</aside>
Expand Down
8 changes: 4 additions & 4 deletions lib/doggo/components/card.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ defmodule Doggo.Components.Card do
def render(assigns) do
~H"""
<article class={@class} {@rest}>
<figure :if={@image != []}><%= render_slot(@image) %></figure>
<header :if={@header != []}><%= render_slot(@header) %></header>
<main :if={@main != []}><%= render_slot(@main) %></main>
<footer :if={@footer != []}><%= render_slot(@footer) %></footer>
<figure :if={@image != []}>{render_slot(@image)}</figure>
<header :if={@header != []}>{render_slot(@header)}</header>
<main :if={@main != []}>{render_slot(@main)}</main>
<footer :if={@footer != []}>{render_slot(@footer)}</footer>
</article>
"""
end
Expand Down
6 changes: 3 additions & 3 deletions lib/doggo/components/carousel.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ defmodule Doggo.Components.Carousel do
aria-controls={"#{@id}-items"}
aria-label={previous.label}
>
<%= render_slot(previous) %>
{render_slot(previous)}
</button>
<button
:for={next <- @next}
Expand All @@ -204,7 +204,7 @@ defmodule Doggo.Components.Carousel do
aria-controls={"#{@id}-items"}
aria-label={next.label}
>
<%= render_slot(next) %>
{render_slot(next)}
</button>
<div :if={@pagination} class={"#{@base_class}-pagination"}>
<div role="tablist" aria-label={@pagination_label}>
Expand Down Expand Up @@ -233,7 +233,7 @@ defmodule Doggo.Components.Carousel do
aria-roledescription={@slide_roledescription}
aria-label={item.label}
>
<%= render_slot(item) %>
{render_slot(item)}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion lib/doggo/components/cluster.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ defmodule Doggo.Components.Cluster do
def render(assigns) do
~H"""
<div role="group" class={@class} {@rest}>
<%= render_slot(@inner_block) %>
{render_slot(@inner_block)}
</div>
"""
end
Expand Down
8 changes: 4 additions & 4 deletions lib/doggo/components/combobox.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ defmodule Doggo.Components.Combobox do

~H"""
<li role="option" data-value={@value}>
<span class={"#{@base_class}-option-label"}><%= @label %></span>
<span class={"#{@base_class}-option-label"}>{@label}</span>
</li>
"""
end
Expand All @@ -223,16 +223,16 @@ defmodule Doggo.Components.Combobox do

~H"""
<li role="option" data-value={@value}>
<span class={"#{@base_class}-option-label"}><%= @label %></span>
<span class={"#{@base_class}-option-description"}><%= @description %></span>
<span class={"#{@base_class}-option-label"}>{@label}</span>
<span class={"#{@base_class}-option-description"}>{@description}</span>
</li>
"""
end

defp combobox_option(assigns) do
~H"""
<li role="option" data-value={@option}>
<span class={"#{@base_class}-option-label"}><%= @option %></span>
<span class={"#{@base_class}-option-label"}>{@option}</span>
</li>
"""
end
Expand Down
2 changes: 1 addition & 1 deletion lib/doggo/components/date.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ defmodule Doggo.Components.Date do

~H"""
<time :if={@value} class={@class} datetime={@datetime} title={@title} {@rest}>
<%= @value %>
{@value}
</time>
"""
end
Expand Down
Loading

0 comments on commit 47b3862

Please sign in to comment.