Skip to content

Commit 025faf3

Browse files
mitkinsmitkins
authored
Merge pull request #382 from petalframework/live_view_1.0
Implement used_input? instead of phx-feedback-for
2 parents 2778d68 + de0e34b commit 025faf3

35 files changed

+419
-427
lines changed

‎assets/default.css

+18-28
Original file line numberDiff line numberDiff line change
@@ -808,26 +808,22 @@
808808
@apply mb-0;
809809
}
810810

811-
:not(.phx-no-feedback).pc-form-field-wrapper--error input,
812-
:not(.phx-no-feedback).pc-form-field-wrapper--error select,
813-
:not(.phx-no-feedback).pc-form-field-wrapper--error textarea {
811+
.pc-form-field-wrapper--error input,
812+
.pc-form-field-wrapper--error select,
813+
.pc-form-field-wrapper--error textarea {
814814
@apply border-danger-500 focus:border-danger-500 text-danger-900 placeholder-danger-700 bg-danger-50 dark:text-danger-100 dark:placeholder-danger-300 dark:bg-danger-900 focus:ring-danger-500;
815815
}
816-
:not(.phx-no-feedback).pc-form-field-wrapper--error input[type="checkbox"] {
816+
.pc-form-field-wrapper--error input[type="checkbox"] {
817817
@apply bg-danger-200 dark:bg-danger-700;
818818
}
819-
:not(.phx-no-feedback).pc-form-field-wrapper--error
820-
.pc-switch
821-
.pc-switch__fake-input {
819+
.pc-form-field-wrapper--error .pc-switch .pc-switch__fake-input {
822820
@apply bg-danger-200 border-danger-500 dark:bg-danger-600 dark:border-danger-800;
823821
}
824-
:not(.phx-no-feedback).pc-form-field-wrapper--error
825-
.pc-radio-card
826-
.pc-radio-card__fake-input {
822+
.pc-form-field-wrapper--error .pc-radio-card .pc-radio-card__fake-input {
827823
@apply bg-danger-200 dark:bg-danger-800 border-danger-500;
828824
}
829-
:not(.phx-no-feedback).pc-form-field-wrapper--error .pc-label,
830-
:not(.phx-no-feedback).pc-form-field-wrapper--error .pc-checkbox-label {
825+
.pc-form-field-wrapper--error .pc-label,
826+
.pc-form-field-wrapper--error .pc-checkbox-label {
831827
@apply !text-danger-600 dark:!text-danger-200;
832828
}
833829
.pc-checkbox-label {
@@ -844,19 +840,9 @@
844840
content: " *";
845841
display: inline;
846842
}
847-
.phx-no-feedback.pc-error,
848-
.phx-no-feedback .pc-error {
849-
@apply hidden;
850-
}
851843
.pc-form-field-error {
852844
@apply mt-1 text-xs italic text-danger-500;
853845
}
854-
.phx-no-feedback.pc-form-field-error {
855-
@apply hidden;
856-
}
857-
.phx-no-feedback .pc-form-field-error {
858-
@apply hidden;
859-
}
860846
.pc-form-help-text {
861847
@apply mt-2 text-sm text-gray-500 dark:text-gray-400;
862848
}
@@ -1015,7 +1001,7 @@
10151001
}
10161002

10171003
/* Add error state styles */
1018-
:not(.phx-no-feedback).pc-form-field-wrapper--error .pc-date-input-icon {
1004+
.pc-form-field-wrapper--error .pc-date-input-icon {
10191005
@apply bg-danger-50 dark:bg-danger-900;
10201006
}
10211007

@@ -2531,17 +2517,21 @@
25312517
@apply text-sm border-gray-300 rounded-md shadow-sm cursor-pointer disabled:bg-gray-100 disabled:cursor-not-allowed focus:border-primary-500 focus:ring-primary-500 dark:border-gray-600 dark:focus:border-primary-500 dark:bg-gray-800 dark:text-gray-300 focus:outline-none;
25322518
}
25332519

2534-
label.has-error:not(.phx-no-feedback) {
2520+
label.has-error {
2521+
@apply !text-danger-900 dark:!text-danger-200;
2522+
}
2523+
2524+
span.has-error {
25352525
@apply !text-danger-900 dark:!text-danger-200;
25362526
}
25372527

2538-
textarea.has-error:not(.phx-no-feedback),
2539-
input.has-error:not(.phx-no-feedback):not(:checked),
2540-
select.has-error:not(.phx-no-feedback) {
2528+
textarea.has-error,
2529+
input.has-error:not(:checked),
2530+
select.has-error {
25412531
@apply !border-danger-500 focus:!border-danger-500 !text-danger-900 !placeholder-danger-700 !bg-danger-50 dark:!text-danger-100 dark:!placeholder-danger-300 dark:!bg-danger-900 focus:!ring-danger-500;
25422532
}
25432533

2544-
input[type="file_input"].has-error:not(.phx-no-feedback) {
2534+
input[type="file_input"].has-error {
25452535
@apply !border-danger-500 !rounded-md focus:!border-danger-500 !text-danger-900 !placeholder-danger-700 !bg-danger-50 file:!border-none dark:!border-none dark:!bg-gray-950 dark:text-danger-400;
25462536
}
25472537

‎lib/petal_components/accordion.ex

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ defmodule PetalComponents.Accordion do
8989
else: "pc-accordion-item__heading"
9090
)
9191
}>
92-
<%= current_item.heading %>
92+
{current_item.heading}
9393
</span>
9494
9595
<%= if @variant == "ghost" do %>
@@ -134,7 +134,7 @@ defmodule PetalComponents.Accordion do
134134
]
135135
)
136136
}>
137-
<%= render_slot(current_item, current_item.entry) %>
137+
{render_slot(current_item, current_item.entry)}
138138
</div>
139139
</div>
140140
</div>

‎lib/petal_components/alert.ex

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ defmodule PetalComponents.Alert do
5454
<div>
5555
<%= if @heading do %>
5656
<h2 id={@heading_id} class="pc-alert__heading">
57-
<%= @heading %>
57+
{@heading}
5858
</h2>
5959
<% end %>
6060
6161
<div id={@label_id} class="pc-alert__label">
62-
<%= render_slot(@inner_block) || @label %>
62+
{render_slot(@inner_block) || @label}
6363
</div>
6464
</div>
6565

‎lib/petal_components/avatar.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ defmodule PetalComponents.Avatar do
4444
@class
4545
]}
4646
>
47-
<%= generate_initials(@name) %>
47+
{generate_initials(@name)}
4848
</div>
4949
<% else %>
5050
<img

‎lib/petal_components/badge.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ defmodule PetalComponents.Badge do
2929
@class
3030
]}
3131
>
32-
<%= render_slot(@inner_block) || @label %>
32+
{render_slot(@inner_block) || @label}
3333
</badge>
3434
"""
3535
end

‎lib/petal_components/breadcrumbs.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ defmodule PetalComponents.Breadcrumbs do
3939
<.icon name={link[:icon]} class={["pc-breadcrumb-icon", link[:icon_class]]} />
4040
<% end %>
4141
<%= if link[:label] do %>
42-
<%= link.label %>
42+
{link.label}
4343
<% end %>
4444
</div>
4545
</Link.a>

‎lib/petal_components/button.ex

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ defmodule PetalComponents.Button do
6969
<% end %>
7070
<% end %>
7171
72-
<%= render_slot(@inner_block) || @label %>
72+
{render_slot(@inner_block) || @label}
7373
</Link.a>
7474
"""
7575
end
@@ -134,11 +134,11 @@ defmodule PetalComponents.Button do
134134
<%= if @loading do %>
135135
<Loading.spinner show={true} size_class={"pc-icon-button-spinner--#{@size}"} />
136136
<% else %>
137-
<%= render_slot(@inner_block) %>
137+
{render_slot(@inner_block)}
138138
139139
<div :if={@tooltip} role="tooltip" class="pc-icon-button__tooltip">
140140
<span class="pc-icon-button__tooltip__text">
141-
<%= @tooltip %>
141+
{@tooltip}
142142
</span>
143143
<div class="pc-icon-button__tooltip__arrow"></div>
144144
</div>

‎lib/petal_components/button_group.ex

+5-5
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ defmodule PetalComponents.ButtonGroup do
9595
{group_btn_assigns}
9696
>
9797
<%= if is_function(group_btn_assigns.inner_block) do %>
98-
<%= render_slot(group_btn_assigns) %>
98+
{render_slot(group_btn_assigns)}
9999
<% else %>
100-
<%= group_btn_assigns.label %>
100+
{group_btn_assigns.label}
101101
<% end %>
102102
</.group_button>
103103
</div>
@@ -129,7 +129,7 @@ defmodule PetalComponents.ButtonGroup do
129129
class={[@class | group_btn_class(assigns)]}
130130
{@rest}
131131
>
132-
<%= render_slot(@inner_block) %>
132+
{render_slot(@inner_block)}
133133
</button>
134134
"""
135135
end
@@ -140,15 +140,15 @@ defmodule PetalComponents.ButtonGroup do
140140

141141
~H"""
142142
<button disabled aria-disabled class={[@class | group_btn_class(assigns)]} {@rest}>
143-
<%= render_slot(@inner_block) %>
143+
{render_slot(@inner_block)}
144144
</button>
145145
"""
146146
end
147147

148148
defp group_button(%{kind: "link"} = assigns) do
149149
~H"""
150150
<.link class={[@class | group_btn_class(assigns)]} {@rest}>
151-
<%= render_slot(@inner_block) %>
151+
{render_slot(@inner_block)}
152152
</.link>
153153
"""
154154
end

‎lib/petal_components/card.ex

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ defmodule PetalComponents.Card do
1212
~H"""
1313
<div {@rest} class={["pc-card", "pc-card--#{@variant}", @class]}>
1414
<div class="pc-card__inner">
15-
<%= render_slot(@inner_block) %>
15+
{render_slot(@inner_block)}
1616
</div>
1717
</div>
1818
"""
@@ -50,14 +50,14 @@ defmodule PetalComponents.Card do
5050
~H"""
5151
<div {@rest} class={["pc-card__content", @class]}>
5252
<div :if={@category} class={["pc-card__category", @category_color_class]}>
53-
<%= @category %>
53+
{@category}
5454
</div>
5555
5656
<div :if={@heading} class="pc-card__heading">
57-
<%= @heading %>
57+
{@heading}
5858
</div>
5959
60-
<%= render_slot(@inner_block) || @label %>
60+
{render_slot(@inner_block) || @label}
6161
</div>
6262
"""
6363
end
@@ -69,7 +69,7 @@ defmodule PetalComponents.Card do
6969
def card_footer(assigns) do
7070
~H"""
7171
<div {@rest} class={["pc-card__footer", @class]}>
72-
<%= render_slot(@inner_block) %>
72+
{render_slot(@inner_block)}
7373
</div>
7474
"""
7575
end
@@ -88,13 +88,13 @@ defmodule PetalComponents.Card do
8888
<.avatar src={@img} alt={@name} size="md" />
8989
<div class="pc-review-meta">
9090
<figcaption>
91-
<.p no_margin class="text-sm pc-review-name"><%= @name %></.p>
91+
<.p no_margin class="text-sm pc-review-name">{@name}</.p>
9292
</figcaption>
93-
<p class="pc-review-username"><%= @username %></p>
93+
<p class="pc-review-username">{@username}</p>
9494
</div>
9595
</div>
9696
<blockquote class="pc-review-body">
97-
<.p class="text-sm" no_margin><%= @body %></.p>
97+
<.p class="text-sm" no_margin>{@body}</.p>
9898
</blockquote>
9999
</figure>
100100
"""

‎lib/petal_components/container.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ defmodule PetalComponents.Container do
2222
@class
2323
]}
2424
>
25-
<%= render_slot(@inner_block) %>
25+
{render_slot(@inner_block)}
2626
</div>
2727
"""
2828
end

‎lib/petal_components/dropdown.ex

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ defmodule PetalComponents.Dropdown do
7171
<span class="sr-only">Open options</span>
7272
7373
<%= if @label do %>
74-
<%= @label %>
74+
{@label}
7575
<.icon name="hero-chevron-down-solid" class="w-5 h-5 pc-dropdown__chevron" />
7676
<% end %>
7777
7878
<%= if @trigger_element do %>
79-
<%= render_slot(@trigger_element) %>
79+
{render_slot(@trigger_element)}
8080
<% end %>
8181
8282
<%= if !@label && @trigger_element == [] do %>
@@ -97,7 +97,7 @@ defmodule PetalComponents.Dropdown do
9797
aria-labelledby="options-menu"
9898
>
9999
<div class="py-1" role="none">
100-
<%= render_slot(@inner_block) %>
100+
{render_slot(@inner_block)}
101101
</div>
102102
</div>
103103
</div>
@@ -126,7 +126,7 @@ defmodule PetalComponents.Dropdown do
126126
role="menuitem"
127127
{@rest}
128128
>
129-
<%= render_slot(@inner_block) || @label %>
129+
{render_slot(@inner_block) || @label}
130130
</Link.a>
131131
"""
132132
end

0 commit comments

Comments
 (0)