Skip to content
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

Fix ButtonGroup rounding #5010

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Fix ButtonGroup rounding #5010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7730838
feat(html): add rounded prop to button-group
Juveniel Apr 29, 2024
f7b9452
chore: update visual previews
kendo-bot Apr 29, 2024
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
11 changes: 8 additions & 3 deletions packages/html/src/button-group/button-group.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { classNames, optionClassNames, stateClassNames, States, FillMode } from '../misc';
import { classNames, optionClassNames, stateClassNames, States, Roundness, FillMode } from '../misc';

export const BUTTONGROUP_CLASSNAME = `k-button-group`;

Expand All @@ -8,10 +8,12 @@ const states = [

const options = {
fillMode: [ FillMode.solid, FillMode.flat, FillMode.outline, FillMode.clear, FillMode.link ],
rounded: [ Roundness.small, Roundness.medium, Roundness.large, Roundness.full ]
};

export type KendoButtonGroupOptions = {
fillMode?: (typeof options.fillMode)[number] | null;
rounded?: (typeof options.rounded)[number] | null;
};

export type KendoButtonGroupProps = KendoButtonGroupOptions & {
Expand All @@ -21,7 +23,8 @@ export type KendoButtonGroupProps = KendoButtonGroupOptions & {
export type KendoButtonGroupState = { [K in (typeof states)[number]]?: boolean };

const defaultProps = {
fillMode: FillMode.solid
fillMode: FillMode.solid,
rounded: Roundness.medium
};

export const ButtonGroup = (
Expand All @@ -31,6 +34,7 @@ export const ButtonGroup = (
) => {
const {
fillMode = defaultProps.fillMode,
rounded = defaultProps.rounded,
disabled,
stretched,
...other
Expand All @@ -43,7 +47,8 @@ export const ButtonGroup = (
props.className,
BUTTONGROUP_CLASSNAME,
optionClassNames(BUTTONGROUP_CLASSNAME, {
fillMode
fillMode,
rounded
}),
stateClassNames(BUTTONGROUP_CLASSNAME, {
disabled
Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/button-group/templates/icon-button-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ButtonGroup } from "../button-group.spec";
import { Button } from "../../button";

export const IconButtonGroup = (props) => (
<ButtonGroup children={
<ButtonGroup {...props} children={
<>
<Button className="k-group-start" {...props} icon="bold" />
<Button {...props} icon="italic" />
Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/button-group/templates/icon-text-button-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ButtonGroup } from "../button-group.spec";
import { Button } from "../../button";

export const IconTextButtonGroup = (props) => (
<ButtonGroup children={
<ButtonGroup {...props} children={
<>
<Button className="k-group-start" {...props} icon="star">First</Button>
<Button {...props} icon="star">Middle</Button>
Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/button-group/templates/mixed-button-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ButtonGroup } from "../button-group.spec";
import { Button } from "../../button";

export const MixedButtonGroup = (props) => (
<ButtonGroup children={
<ButtonGroup {...props} children={
<>
<Button className="k-group-start" {...props}>First</Button>
<Button {...props} icon="star">Middle</Button>
Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/button-group/templates/text-button-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ButtonGroup } from "../button-group.spec";
import { Button } from "../../button";

export const TextButtonGroup = (props) => (
<ButtonGroup children={
<ButtonGroup {...props} children={
<>
<Button className="k-group-start" {...props}>First</Button>
<Button {...props}>Middle</Button>
Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/button-group/tests/button-group-rounded.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default () => (
<span>medium</span>
<span>large</span>

{[ "null", ...Button.options.rounded ].map((rounded: any) => (
{[ "null", ...Button.options.rounded ].map((rounded) => (
<>
<span>{rounded}</span>
{Button.options.size.map((size) => (
Expand Down
Binary file modified tests/_output/material/button-group/button-group-rounded.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/material/button-group/button-group.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/material/datetime-selector/datetime-selector.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/material/datetimepicker/datetimepicker-adaptive.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/material/datetimepicker/datetimepicker-opened.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/material/imageeditor/imageeditor-crop-pane.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/material/scheduler/scheduler-edit-dialog.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/material/scheduler/scheduler-editing-weekly.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions tests/button-group/button-group-rounded.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</span>
<span>small</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-sm">
<button class="k-group-start k-button k-button-sm k-button-solid k-button-solid-base k-rounded-sm k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -124,7 +124,7 @@
</div>
</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-sm">
<button class="k-group-start k-button k-button-md k-button-solid k-button-solid-base k-rounded-sm k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -149,7 +149,7 @@
</div>
</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-sm">
<button class="k-group-start k-button k-button-lg k-button-solid k-button-solid-base k-rounded-sm k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -175,7 +175,7 @@
</span>
<span>medium</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-md">
<button class="k-group-start k-button k-button-sm k-button-solid k-button-solid-base k-rounded-md k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -200,7 +200,7 @@
</div>
</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-solid k-button-solid-base k-rounded-md k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -225,7 +225,7 @@
</div>
</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-md">
<button class="k-group-start k-button k-button-lg k-button-solid k-button-solid-base k-rounded-md k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -251,7 +251,7 @@
</span>
<span>large</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-lg">
<button class="k-group-start k-button k-button-sm k-button-solid k-button-solid-base k-rounded-lg k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -276,7 +276,7 @@
</div>
</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-lg">
<button class="k-group-start k-button k-button-md k-button-solid k-button-solid-base k-rounded-lg k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -301,7 +301,7 @@
</div>
</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-lg">
<button class="k-group-start k-button k-button-lg k-button-solid k-button-solid-base k-rounded-lg k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -327,7 +327,7 @@
</span>
<span>full</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-full">
<button class="k-group-start k-button k-button-sm k-button-solid k-button-solid-base k-rounded-full k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -352,7 +352,7 @@
</div>
</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-full">
<button class="k-group-start k-button k-button-md k-button-solid k-button-solid-base k-rounded-full k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand All @@ -377,7 +377,7 @@
</div>
</span>
<span>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-full">
<button class="k-group-start k-button k-button-lg k-button-solid k-button-solid-base k-rounded-full k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-bold">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand Down
18 changes: 9 additions & 9 deletions tests/button-group/button-group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div id="test-area" class="k-d-grid k-grid-cols-1">
<section>
<div>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-solid k-button-solid-base k-rounded-md">
<span class="k-button-text">normal</span>
</button>
Expand All @@ -45,7 +45,7 @@
</div>
</div>
<div>
<div class="k-button-group k-button-group-outline">
<div class="k-button-group k-button-group-outline k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-outline k-button-outline-base k-rounded-md">
<span class="k-button-text">normal</span>
</button>
Expand All @@ -70,7 +70,7 @@
</div>
</div>
<div>
<div class="k-button-group k-button-group-flat">
<div class="k-button-group k-button-group-flat k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-flat k-button-flat-base k-rounded-md">
<span class="k-button-text">normal</span>
</button>
Expand All @@ -97,7 +97,7 @@
</section>
<section style="background-color: rgb(120, 120, 120); color: rgb(255, 255, 255);">
<div>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-solid k-button-solid-base k-rounded-md">
<span class="k-button-text">normal</span>
</button>
Expand All @@ -122,7 +122,7 @@
</div>
</div>
<div>
<div class="k-button-group k-button-group-outline">
<div class="k-button-group k-button-group-outline k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-outline k-button-outline-base k-rounded-md">
<span class="k-button-text">normal</span>
</button>
Expand All @@ -147,7 +147,7 @@
</div>
</div>
<div>
<div class="k-button-group k-button-group-flat">
<div class="k-button-group k-button-group-flat k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-flat k-button-flat-base k-rounded-md">
<span class="k-button-text">normal</span>
</button>
Expand All @@ -174,7 +174,7 @@
</section>
<section style="color: rgb(255, 0, 255);">
<div>
<div class="k-button-group k-button-group-solid">
<div class="k-button-group k-button-group-solid k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-solid k-button-solid-base k-rounded-md">
<span class="k-button-text">normal</span>
</button>
Expand All @@ -199,7 +199,7 @@
</div>
</div>
<div>
<div class="k-button-group k-button-group-outline">
<div class="k-button-group k-button-group-outline k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-outline k-button-outline-base k-rounded-md">
<span class="k-button-text">normal</span>
</button>
Expand All @@ -224,7 +224,7 @@
</div>
</div>
<div>
<div class="k-button-group k-button-group-flat">
<div class="k-button-group k-button-group-flat k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-flat k-button-flat-base k-rounded-md">
<span class="k-button-text">normal</span>
</button>
Expand Down
4 changes: 2 additions & 2 deletions tests/coloreditor/coloreditor-rtl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<div class="k-flatcolorpicker k-coloreditor" dir="rtl">
<div class="k-coloreditor-header k-hstack">
<div class="k-coloreditor-header-actions k-hstack">
<div class="k-button-group k-button-group-flat">
<div class="k-button-group k-button-group-flat k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-flat k-button-flat-base k-rounded-md k-selected k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-droplet-slider">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand Down Expand Up @@ -352,7 +352,7 @@
<div class="k-flatcolorpicker k-coloreditor" dir="rtl">
<div class="k-coloreditor-header k-hstack">
<div class="k-coloreditor-header-actions k-hstack">
<div class="k-button-group k-button-group-flat">
<div class="k-button-group k-button-group-flat k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-flat k-button-flat-base k-rounded-md k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-droplet-slider">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand Down
4 changes: 2 additions & 2 deletions tests/coloreditor/coloreditor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<div class="k-flatcolorpicker k-coloreditor">
<div class="k-coloreditor-header k-hstack">
<div class="k-coloreditor-header-actions k-hstack">
<div class="k-button-group k-button-group-flat">
<div class="k-button-group k-button-group-flat k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-flat k-button-flat-base k-rounded-md k-selected k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-droplet-slider">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand Down Expand Up @@ -352,7 +352,7 @@
<div class="k-flatcolorpicker k-coloreditor">
<div class="k-coloreditor-header k-hstack">
<div class="k-coloreditor-header-actions k-hstack">
<div class="k-button-group k-button-group-flat">
<div class="k-button-group k-button-group-flat k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-flat k-button-flat-base k-rounded-md k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-droplet-slider">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand Down
4 changes: 2 additions & 2 deletions tests/colorpicker/colorpicker-opened.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<div class="k-flatcolorpicker k-coloreditor">
<div class="k-coloreditor-header k-hstack">
<div class="k-coloreditor-header-actions k-hstack">
<div class="k-button-group k-button-group-flat">
<div class="k-button-group k-button-group-flat k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-flat k-button-flat-base k-rounded-md k-selected k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-droplet-slider">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand Down Expand Up @@ -177,7 +177,7 @@
<div class="k-flatcolorpicker k-coloreditor">
<div class="k-coloreditor-header k-hstack">
<div class="k-coloreditor-header-actions k-hstack">
<div class="k-button-group k-button-group-flat">
<div class="k-button-group k-button-group-flat k-rounded-md">
<button class="k-group-start k-button k-button-md k-button-flat k-button-flat-base k-rounded-md k-icon-button">
<span class="k-button-icon k-icon k-svg-icon k-svg-i-droplet-slider">
<svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
Expand Down
Loading