Skip to content

feat(Slider): remove InputGroup cascade parameter #5170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 21, 2025
Merged

feat(Slider): remove InputGroup cascade parameter #5170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26437fe
refactor: 精简逻辑移除对 InputGroup 依赖
ArgoZhang Jan 21, 2025
4aed0f1
style: 增加 InputGroup 兼容样式
ArgoZhang Jan 21, 2025
7c84917
doc: 更新示例代码
ArgoZhang Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/BootstrapBlazor.Server/Components/Samples/Sliders.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,13 @@
<BootstrapInputGroup>
<BootstrapInputGroupLabel DisplayText="@DisplayText" />
<Slider @bind-Value="@CurrentValue" Max="MaxValue" Min="MinValue" Step="Step" UseInputEvent="UseInput"
DisplayText="@DisplayText" ShowLabel="ShowLabel" IsDisabled="IsDisabled" OnValueChanged="OnRangeSliderValueChanged" />

DisplayText="@DisplayText" ShowLabel="ShowLabel" IsDisabled="IsDisabled" OnValueChanged="OnRangeSliderValueChanged"></Slider>
</BootstrapInputGroup>
}
else
{
<Slider @bind-Value="@CurrentValue" Max="MaxValue" Min="MinValue" Step="Step" UseInputEvent="UseInput"
DisplayText="@DisplayText" ShowLabel="ShowLabel" IsDisabled="IsDisabled" OnValueChanged="OnRangeSliderValueChanged" />
DisplayText="@DisplayText" ShowLabel="ShowLabel" IsDisabled="IsDisabled" OnValueChanged="OnRangeSliderValueChanged"></Slider>
}
<section ignore>
<ConsoleLogger @ref="Logger" />
Expand Down
15 changes: 12 additions & 3 deletions src/BootstrapBlazor/Components/Input/BootstrapInputGroup.razor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,23 @@

> .form-check {
--bb-form-check-padding: 0.375rem 0.75rem;
display: flex;
align-items: center;
padding: var(--bb-form-check-padding);
}

> .form-range {
--bb-form-range-padding: 0.375rem 0.75rem;
height: var(--bb-height);
padding: var(--bb-form-range-padding);
}

> .form-check, .form-range {
border: 1px solid var(--bs-border-color);
border-radius: var(--bs-border-radius);
flex-grow: 1;
width: 1%;
min-width: 0;
display: flex;
align-items: center;
padding: var(--bb-form-check-padding);

&:hover {
border: 1px solid var(--bb-border-hover-color);
Expand Down
15 changes: 1 addition & 14 deletions src/BootstrapBlazor/Components/Slider/Slider.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,5 @@
{
<BootstrapLabel Value="@DisplayText" ShowLabelTooltip="ShowLabelTooltip" for="@Id" />
}
@if (InputGroup == null)
{
@RenderRange
}
else
{
<div class="form-control range-group">
@RenderRange
</div>
}

@code {
RenderFragment RenderRange =>
@<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">;
}
<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">
10 changes: 0 additions & 10 deletions src/BootstrapBlazor/Components/Slider/Slider.razor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
.range-group {
display: flex;
align-items: center;
--bb-form-range-height: #{$bb-form-range-height};

.form-range {
height: var(--bb-form-range-height);
}
}

.row {
--bb-form-range-margin-top: #{$bb-form-range-margin-top};

Expand Down
1 change: 0 additions & 1 deletion src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,6 @@ $bb-skeleton-gradient-from-color: rgba(var(--bs-body-color-rgb), 0.06);
$bb-skeleton-gradient-to-color: rgba(var(--bs-body-color-rgb), 0.15);

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

// Speech
Expand Down
Loading