Skip to content

v5.2.4 #613

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
kapantzak merged 2 commits into from
Feb 4, 2026
Merged

v5.2.4 #613

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
010cdfe
Refactor ButtonGroup
kapantzak Feb 4, 2026
fa8714b
v5.2.4
kapantzak Feb 4, 2026
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@netdata/netdata-ui",
"version": "5.2.3",
"version": "5.2.4",
"description": "netdata UI kit",
"main": "dist/index.js",
"module": "dist/es6/index.js",
Expand Down
52 changes: 41 additions & 11 deletions src/components/button/buttonGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React, { Children, isValidElement, cloneElement, useCallback } from "react"
import React, { Children, isValidElement, cloneElement } from "react"
import Flex from "@/components/templates/flex"
import { Button } from "./button"

const noop = () => {}

const getButtonGroupProps = (itemIndex, itemsLength) => {
const groupFirst = itemIndex == 0
const groupLast = itemIndex == itemsLength - 1
Expand Down Expand Up @@ -30,20 +32,34 @@ const Content = ({ children }) => {
)
}

const RadioButtons = ({ items, checked, buttonProps = {}, onChange }) => {
const RadioButtons = ({ items, value, isMulti, buttonProps = {}, onChange }) => {
return (
<>
{items.map(({ label, value, title }, index) => {
{items.map((item, index) => {
const buttonGroupProps = getButtonGroupProps(index, items.length)
const isChecked = checked === value || (Array.isArray(checked) && checked.includes(value))
const isSelected =
value === item.value || (Array.isArray(value) && value.includes(item.value))

const onClick = () => {
if (isMulti) {
const newValue = Array.isArray(value)
? value.includes(item.value)
? value.filter(v => v !== item.value)
: [...value, item.value]
: [item.value]
onChange(newValue)
} else {
onChange(item.value)
}
}

return (
<Button
key={value}
label={label}
onClick={() => onChange(value)}
{...(title ? { title } : {})}
{...(!isChecked ? { flavour: "hollow" } : {})}
key={item.value}
label={item.label}
onClick={onClick}
{...(item.title ? { title: item.title } : {})}
{...(!isSelected ? { flavour: "hollow" } : {})}
{...buttonGroupProps}
{...buttonProps}
/>
Expand All @@ -53,10 +69,24 @@ const RadioButtons = ({ items, checked, buttonProps = {}, onChange }) => {
)
}

export const ButtonGroup = ({ items, checked, onChange, children, buttonProps, ...props }) => (
export const ButtonGroup = ({
items,
value,
isMulti,
onChange = noop,
children,
buttonProps,
...props
}) => (
<Flex alignItems="center" {...props}>
{items?.length ? (
<RadioButtons items={items} checked={checked} onChange={onChange} buttonProps={buttonProps} />
<RadioButtons
items={items}
value={value}
isMulti={isMulti}
onChange={onChange}
buttonProps={buttonProps}
/>
) : (
<Content>{children}</Content>
)}
Expand Down
42 changes: 10 additions & 32 deletions src/components/button/buttonGroup.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,17 @@
import React, { useCallback, useState } from "react"
import React, { useState } from "react"
import { ButtonGroup } from "."

export const RadioButtonGroup = args => {
const [checked, setChecked] = useState(args.checked)
const [value, setValue] = useState(args.value)

return (
<ButtonGroup
items={args.items.map(item => ({ ...item }))}
checked={checked}
buttonProps={args}
onChange={setChecked}
/>
)
return <ButtonGroup items={args.items} value={value} buttonProps={args} onChange={setValue} />
}

export const MultiButtonGroup = args => {
const [checked, setChecked] = useState([args.checked])

const onChange = useCallback(
value => {
setChecked(prev => {
if (prev.includes(value)) return prev.filter(v => v !== value)
return [...prev, value]
})
},
[setChecked]
)
const [value, setValue] = useState([args.value])

return (
<ButtonGroup
items={args.items.map(item => ({ ...item }))}
checked={checked}
buttonProps={args}
onChange={onChange}
/>
<ButtonGroup items={args.items} value={value} isMulti buttonProps={args} onChange={setValue} />
)
}

Expand All @@ -42,14 +20,14 @@ export default {
tags: ["autodocs"],
args: {
items: [
{ label: "One", value: 1 },
{ label: "Two", value: 2 },
{ label: "Three", value: 3 },
{ label: "One", value: "1" },
{ label: "Two", value: "2" },
{ label: "Three", value: "3" },
],
checked: 1,
value: "1",
buttonProps: {},
},
argTypes: {
checked: { control: "text" },
value: { control: "text" },
},
}
12 changes: 6 additions & 6 deletions src/components/button/buttonGroup.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe("ButtonGroup", () => {
{ label: "Option 3", value: "opt3" },
]

renderWithProviders(<ButtonGroup items={items} checked="opt1" onChange={() => {}} />)
renderWithProviders(<ButtonGroup items={items} value="opt1" onChange={() => {}} />)

expect(screen.getByText("Option 1")).toBeInTheDocument()
expect(screen.getByText("Option 2")).toBeInTheDocument()
Expand Down Expand Up @@ -90,7 +90,7 @@ describe("ButtonGroup", () => {
{ label: "Option 2", value: "opt2" },
]

renderWithProviders(<ButtonGroup items={items} checked="opt1" onChange={handleChange} />)
renderWithProviders(<ButtonGroup items={items} value="opt1" onChange={handleChange} />)

await user().click(screen.getByText("Option 2"))
expect(handleChange).toHaveBeenCalledWith("opt2")
Expand All @@ -103,7 +103,7 @@ describe("ButtonGroup", () => {
]

const { container } = renderWithProviders(
<ButtonGroup items={items} checked="checked" onChange={() => {}} />
<ButtonGroup items={items} value="checked" onChange={() => {}} />
)

const buttons = container.querySelectorAll("button")
Expand All @@ -119,7 +119,7 @@ describe("ButtonGroup", () => {
renderWithProviders(
<ButtonGroup
items={items}
checked="btn1"
value="btn1"
onChange={() => {}}
buttonProps={{ disabled: true }}
/>
Expand All @@ -137,7 +137,7 @@ describe("ButtonGroup", () => {
{ label: "Cancel", value: "cancel" },
]

renderWithProviders(<ButtonGroup items={items} checked="save" onChange={() => {}} />)
renderWithProviders(<ButtonGroup items={items} value="save" onChange={() => {}} />)

expect(screen.getByTitle("Save the document")).toBeInTheDocument()
})
Expand Down Expand Up @@ -192,7 +192,7 @@ describe("ButtonGroup", () => {

it("handles empty items array", () => {
const { container } = renderWithProviders(
<ButtonGroup items={[]} checked={null} onChange={() => {}} />
<ButtonGroup items={[]} value={null} onChange={() => {}} />
)

expect(container.firstChild).toBeInTheDocument()
Expand Down