Skip to content

Commit ea0bac6

Browse files
authored
Merge branch 'master' into master
2 parents 8a46c01 + 080f89f commit ea0bac6

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@netdata/netdata-ui",
3-
"version": "5.1.8",
3+
"version": "5.1.11",
44
"description": "netdata UI kit",
55
"main": "dist/index.js",
66
"module": "dist/es6/index.js",

src/components/input/styled.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export const Input = styled(Flex).attrs(props => ({
3232
${({ hasIconLeft }) => hasIconLeft && "padding-left: 24px;"}
3333
${({ hasIconRight, hasIndicator }) =>
3434
(hasIconRight || hasIndicator) && `padding-right: ${hasIconRight && hasIndicator ? 48 : 24}px;`}
35+
${({ textAlign }) => (textAlign ? `text-align: ${textAlign};` : "")}
3536
3637
&::placeholder {
3738
font-size: 12px;

src/components/table/body/row.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,7 @@ export default memo(
8585
GroupRow,
8686
...rest
8787
}) => {
88-
const { columnVisibility } = useTableState(rerenderSelector)
89-
90-
const leftHeaders = useMemo(() => table.getLeftLeafHeaders(), [table, columnVisibility])
91-
const centerHeaders = useMemo(() => table.getCenterLeafHeaders(), [table, columnVisibility])
92-
const rightHeaders = useMemo(() => table.getRightLeafHeaders(), [table, columnVisibility])
88+
useTableState(rerenderSelector)
9389

9490
const isClickable = useMemo(() => {
9591
if (typeof onClickRow !== "function") return false
@@ -153,7 +149,7 @@ export default memo(
153149
row={row}
154150
key={cell.id}
155151
testPrefix={testPrefix}
156-
header={leftHeaders[index]}
152+
header={table.getLeftLeafHeaders()[index]}
157153
{...rest}
158154
/>
159155
))}
@@ -175,7 +171,7 @@ export default memo(
175171
row={row}
176172
key={cell.id}
177173
testPrefix={testPrefix}
178-
header={centerHeaders[index]}
174+
header={table.getCenterLeafHeaders()[index]}
179175
{...rest}
180176
/>
181177
))}
@@ -202,7 +198,7 @@ export default memo(
202198
row={row}
203199
key={cell.id}
204200
testPrefix={testPrefix}
205-
header={rightHeaders[index]}
201+
header={table.getRightLeafHeaders()[index]}
206202
{...rest}
207203
/>
208204
))}

src/components/tabs/tabs.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export const Tabs = ({
1111
TabContent = Fragment,
1212
noDefaultBorder,
1313
tabsProps,
14+
tabHeaderProps,
1415
tabContentProps,
1516
ref,
1617
...rest
@@ -29,7 +30,7 @@ export const Tabs = ({
2930

3031
return (
3132
<StyledTabsWrapper className={className} {...rest} ref={ref}>
32-
<TabsHeader>
33+
<TabsHeader {...tabHeaderProps}>
3334
<StyledTabs className="tabs" noDefaultBorder={noDefaultBorder} {...tabsProps}>
3435
{nav}
3536
</StyledTabs>

0 commit comments

Comments
 (0)