Skip to content

Commit 2eed140

Browse files
authored
Merge pull request #658 from buildo/BEN-99-improvements
2 parents 4c72b5e + d1a5e29 commit 2eed140

File tree

8 files changed

+43
-16
lines changed

8 files changed

+43
-16
lines changed

packages/bento-design-system/src/List/ListItem.css.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ export const listItemRecipe = strictRecipe({
77
true: bentoSprinkles({
88
cursor: { default: "pointer", disabled: "notAllowed" },
99
background: {
10-
hover: "primaryTransparentHoverBackground",
11-
focus: "primaryTransparentFocusBackground",
10+
default: "secondaryTransparentEnabledBackground",
11+
hover: "secondaryTransparentHoverBackground",
12+
focus: "secondaryTransparentFocusBackground",
13+
disabled: "disabledTransparentBackground",
1214
},
1315
}),
1416
},
1517
focused: {
1618
true: bentoSprinkles({
17-
background: "primaryTransparentFocusBackground",
19+
background: "secondaryTransparentFocusBackground",
1820
}),
1921
},
2022
selected: {

packages/bento-design-system/src/Navigation/Config.ts

+1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ type ActiveVisualElementConfig = {
2222
lineWidth: SizeConfig<number | "100%">;
2323
lineHeight: SizeConfig<number>;
2424
lineColor: BentoSprinkles["decoration"];
25+
lineOffset: SizeConfig<Exclude<BentoSprinkles["height"], "full">>;
2526
};

packages/bento-design-system/src/Navigation/Navigation.css.ts

+6-8
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@ import { bentoSprinkles } from "../internal";
44
export const destinationRecipe = strictRecipe({
55
base: bentoSprinkles({
66
position: "relative",
7+
background: {
8+
default: "primaryTransparentEnabledBackground",
9+
hover: "primaryTransparentHoverBackground",
10+
focus: "primaryTransparentFocusBackground",
11+
},
712
color: { disabled: "disabledTransparentForeground" },
813
fill: { disabled: "disabledTransparentForeground" },
9-
cursor: { disabled: "notAllowed" },
14+
cursor: { default: "pointer", disabled: "notAllowed" },
1015
outline: "none",
1116
}),
1217
variants: {
@@ -17,15 +22,8 @@ export const destinationRecipe = strictRecipe({
1722
hover: "secondaryTransparentHoverForeground",
1823
focus: "secondaryTransparentFocusForeground",
1924
},
20-
background: {
21-
default: "secondaryTransparentEnabledBackground",
22-
hover: "secondaryTransparentHoverBackground",
23-
focus: "secondaryTransparentFocusBackground",
24-
},
25-
cursor: "pointer",
2625
}),
2726
true: bentoSprinkles({
28-
background: "secondaryTransparentEnabledBackground",
2927
color: "textPrimary",
3028
}),
3129
},

packages/bento-design-system/src/Navigation/Navigation.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function Destination({
7272
position="absolute"
7373
left={0}
7474
right={0}
75-
bottom={0}
75+
bottom={config.activeVisualElement.lineOffset[size]}
7676
background="currentColor"
7777
color={config.activeVisualElement.lineColor}
7878
style={{
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
import { ButtonProps, PaginationItemsPerPage } from "..";
1+
import { ButtonProps, IconButtonProps, PaginationItemsPerPage } from "..";
22
import { BentoSprinkles } from "../internal";
33

44
export type PaginationConfig = {
55
paddingY: BentoSprinkles["paddingY"];
66
itemsPerPageOptions: PaginationItemsPerPage;
77
dropdownButtonKind: ButtonProps["kind"];
8+
dropdownButtonSize: ButtonProps["size"];
89
navigationButtonKind: ButtonProps["kind"];
10+
navigationButtonSize: IconButtonProps["size"];
911
navigationButtonSpacing: BentoSprinkles["gap"];
1012
showDivider: boolean;
1113
};

packages/bento-design-system/src/Pagination/Pagination.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ function DropdownButton({ label, onPress, isDisabled }: DropdownButtonProps) {
5050
<Button
5151
kind={config.dropdownButtonKind}
5252
hierarchy="secondary"
53+
size={config.dropdownButtonSize}
5354
label={label}
5455
icon={IconChevronDown}
5556
iconPosition="trailing"
@@ -158,7 +159,7 @@ export function Pagination(props: Props) {
158159
hierarchy="secondary"
159160
icon={IconChevronLeft}
160161
label={messages.previousPageButtonLabel}
161-
size={24}
162+
size={config.navigationButtonSize}
162163
onPress={() => onPageChange(page - 1)}
163164
isDisabled={page === 1}
164165
/>
@@ -167,7 +168,7 @@ export function Pagination(props: Props) {
167168
hierarchy="secondary"
168169
icon={IconChevronRight}
169170
label={messages.nextPageButtonLabel}
170-
size={24}
171+
size={config.navigationButtonSize}
171172
onPress={() => onPageChange(page + 1)}
172173
isDisabled={page === pageCount}
173174
/>

packages/bento-design-system/src/util/defaultConfigs.tsx

+6
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,10 @@ export const navigation: NavigationConfig = {
421421
medium: 16,
422422
large: 16,
423423
},
424+
lineOffset: {
425+
medium: 0,
426+
large: 0,
427+
},
424428
},
425429
uppercaseLabel: false,
426430
radius: {
@@ -433,7 +437,9 @@ export const pagination: PaginationConfig = {
433437
paddingY: 12,
434438
itemsPerPageOptions: [10, 25, 50, 100],
435439
dropdownButtonKind: "transparent",
440+
dropdownButtonSize: "medium",
436441
navigationButtonKind: "transparent",
442+
navigationButtonSize: 24,
437443
navigationButtonSpacing: 24,
438444
showDivider: true,
439445
};

packages/storybook/stories/Components/Pagination.stories.tsx

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Meta, StoryObj } from "@storybook/react";
2-
import { PaginationItemsPerPage as ItemsPerPage, Pagination } from "../";
2+
import { BentoConfigProvider, PaginationItemsPerPage as ItemsPerPage, Pagination } from "..";
33
import { action } from "@storybook/addon-actions";
44

55
const meta = {
@@ -40,3 +40,20 @@ export const SinglePage = {
4040
pageCount: 1,
4141
},
4242
} satisfies Story;
43+
44+
export const SmallButtons = {
45+
decorators: [
46+
(Story) => (
47+
<BentoConfigProvider
48+
value={{
49+
pagination: {
50+
dropdownButtonSize: "small",
51+
navigationButtonSize: 16,
52+
},
53+
}}
54+
>
55+
<Story />
56+
</BentoConfigProvider>
57+
),
58+
],
59+
} satisfies Story;

0 commit comments

Comments
 (0)