Skip to content

Commit 1c0f564

Browse files
authored
feat(Slider): remove InputGroup cascade parameter (#5170)
* refactor: 精简逻辑移除对 InputGroup 依赖 * style: 增加 InputGroup 兼容样式 * doc: 更新示例代码
1 parent da655c5 commit 1c0f564

File tree

5 files changed

+15
-31
lines changed

5 files changed

+15
-31
lines changed

src/BootstrapBlazor.Server/Components/Samples/Sliders.razor

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,13 @@
7070
<BootstrapInputGroup>
7171
<BootstrapInputGroupLabel DisplayText="@DisplayText" />
7272
<Slider @bind-Value="@CurrentValue" Max="MaxValue" Min="MinValue" Step="Step" UseInputEvent="UseInput"
73-
DisplayText="@DisplayText" ShowLabel="ShowLabel" IsDisabled="IsDisabled" OnValueChanged="OnRangeSliderValueChanged" />
74-
73+
DisplayText="@DisplayText" ShowLabel="ShowLabel" IsDisabled="IsDisabled" OnValueChanged="OnRangeSliderValueChanged"></Slider>
7574
</BootstrapInputGroup>
7675
}
7776
else
7877
{
7978
<Slider @bind-Value="@CurrentValue" Max="MaxValue" Min="MinValue" Step="Step" UseInputEvent="UseInput"
80-
DisplayText="@DisplayText" ShowLabel="ShowLabel" IsDisabled="IsDisabled" OnValueChanged="OnRangeSliderValueChanged" />
79+
DisplayText="@DisplayText" ShowLabel="ShowLabel" IsDisabled="IsDisabled" OnValueChanged="OnRangeSliderValueChanged"></Slider>
8180
}
8281
<section ignore>
8382
<ConsoleLogger @ref="Logger" />

src/BootstrapBlazor/Components/Input/BootstrapInputGroup.razor.scss

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,23 @@
6161

6262
> .form-check {
6363
--bb-form-check-padding: 0.375rem 0.75rem;
64+
display: flex;
65+
align-items: center;
66+
padding: var(--bb-form-check-padding);
67+
}
68+
69+
> .form-range {
70+
--bb-form-range-padding: 0.375rem 0.75rem;
71+
height: var(--bb-height);
72+
padding: var(--bb-form-range-padding);
73+
}
74+
75+
> .form-check, .form-range {
6476
border: 1px solid var(--bs-border-color);
6577
border-radius: var(--bs-border-radius);
6678
flex-grow: 1;
6779
width: 1%;
6880
min-width: 0;
69-
display: flex;
70-
align-items: center;
71-
padding: var(--bb-form-check-padding);
7281

7382
&:hover {
7483
border: 1px solid var(--bb-border-hover-color);

src/BootstrapBlazor/Components/Slider/Slider.razor

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,5 @@
77
{
88
<BootstrapLabel Value="@DisplayText" ShowLabelTooltip="ShowLabelTooltip" for="@Id" />
99
}
10-
@if (InputGroup == null)
11-
{
12-
@RenderRange
13-
}
14-
else
15-
{
16-
<div class="form-control range-group">
17-
@RenderRange
18-
</div>
19-
}
2010

21-
@code {
22-
RenderFragment RenderRange =>
23-
@<input type="range" id="@Id" @attributes="@AdditionalAttributes" class="@ClassString" disabled="@IsDisabled" @bind-value="CurrentValueAsString" @bind-value:event="@EventString" step="@StepString" min="@MinString" max="@MaxString" @onblur="OnBlur">;
24-
}
11+
<input @attributes="@AdditionalAttributes" type="range" id="@Id" class="@ClassString" disabled="@IsDisabled" @bind-value="CurrentValueAsString" @bind-value:event="@EventString" step="@StepString" min="@MinString" max="@MaxString" @onblur="OnBlur">

src/BootstrapBlazor/Components/Slider/Slider.razor.scss

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
.range-group {
2-
display: flex;
3-
align-items: center;
4-
--bb-form-range-height: #{$bb-form-range-height};
5-
6-
.form-range {
7-
height: var(--bb-form-range-height);
8-
}
9-
}
10-
111
.row {
122
--bb-form-range-margin-top: #{$bb-form-range-margin-top};
133

src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,6 @@ $bb-skeleton-gradient-from-color: rgba(var(--bs-body-color-rgb), 0.06);
536536
$bb-skeleton-gradient-to-color: rgba(var(--bs-body-color-rgb), 0.15);
537537

538538
// Slider
539-
$bb-form-range-height: 1rem;
540539
$bb-form-range-margin-top: 6px;
541540

542541
// Speech

0 commit comments

Comments
 (0)