Skip to content

Commit 60d91a3

Browse files
cgero-ethcgero-eth
committed
Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/tiptap/pm-3.0.1
2 parents 49b893d + af61040 commit 60d91a3

13 files changed

Lines changed: 393 additions & 351 deletions

File tree

‎.changeset/flat-breads-jam.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/nasty-windows-wear.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aragon/gov-ui-kit': minor
3+
---
4+
5+
Bump cross-env to v10

‎.changeset/nice-dogs-dance.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aragon/gov-ui-kit': minor
3+
---
4+
5+
Bump linkifyjs from 4.2.0 to 4.3.2

.changeset/lemon-hoops-serve.md renamed to .changeset/pink-poems-glow.md

File renamed without changes.

‎.changeset/witty-berries-move.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
# @aragon/gov-ui-kit
22

3+
## 1.14.0
4+
5+
### Minor Changes
6+
7+
- [#538](https://github.com/aragon/gov-ui-kit/pull/538) [`c0375a5`](https://github.com/aragon/gov-ui-kit/commit/c0375a5f0d25ac0861c39f147d9af260b6b32928) Thanks [@thekidnamedkd](https://github.com/thekidnamedkd)! - Expose additional props on DataListContainer for more control over EmptyState usage
8+
9+
### Patch Changes
10+
11+
- [#537](https://github.com/aragon/gov-ui-kit/pull/537) [`44ec981`](https://github.com/aragon/gov-ui-kit/commit/44ec981cbff82065e6147e23ec816a783cba777c) Thanks [@evanaronson](https://github.com/evanaronson)! - Reduce text size of the descriptions on the RadioCard and CheckboxCard components
12+
13+
## 1.13.1
14+
15+
### Patch Changes
16+
17+
- [#536](https://github.com/aragon/gov-ui-kit/pull/536) [`113b5ac`](https://github.com/aragon/gov-ui-kit/commit/113b5ac3f1ddf0bcf7d14f240caafead6554fcb5) Thanks [@cgero-eth](https://github.com/cgero-eth)! - Fix `asChild` variant style of SmartContractFunction data list component
18+
19+
## 1.13.0
20+
21+
### Minor Changes
22+
23+
- [#533](https://github.com/aragon/gov-ui-kit/pull/533) [`d98379a`](https://github.com/aragon/gov-ui-kit/commit/d98379acd6c5773bba9651785e86058820af35fe) Thanks [@dependabot](https://github.com/apps/dependabot)! - Update minor and patch NPM dependencies
24+
25+
### Patch Changes
26+
27+
- [#531](https://github.com/aragon/gov-ui-kit/pull/531) [`26c1793`](https://github.com/aragon/gov-ui-kit/commit/26c1793d64c9cf0545fa7396ae5519e54a7efa65) Thanks [@shan8851](https://github.com/shan8851)! - Fix export of SmartContractFunctionDataListItem component
28+
29+
- [#530](https://github.com/aragon/gov-ui-kit/pull/530) [`af2c2d5`](https://github.com/aragon/gov-ui-kit/commit/af2c2d5743dfcca8fdb57b5e5e72af0511642587) Thanks [@shan8851](https://github.com/shan8851)! - Implement SmartContractFunctionDataListItem module component
30+
331
## 1.12.0
432

533
### Minor Changes

‎package.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aragon/gov-ui-kit",
3-
"version": "1.12.0",
3+
"version": "1.14.0",
44
"description": "Implementation of the Aragon's Governance UI Kit",
55
"main": "dist/index.es.js",
66
"types": "dist/types/src/index.d.ts",
@@ -74,7 +74,7 @@
7474
"@tanstack/react-query": "^5.83.0",
7575
"react": "^18.2.0 || ^19.0.0",
7676
"react-dom": "^18.2.0 || ^19.0.0",
77-
"react-hook-form": "^7.60.0",
77+
"react-hook-form": "^7.61.0",
7878
"tailwindcss": "^4.1.0",
7979
"viem": "^2.33.0",
8080
"wagmi": "^2.16.0"
@@ -92,54 +92,54 @@
9292
"@rollup/plugin-node-resolve": "^16.0.1",
9393
"@rollup/plugin-terser": "^0.4.4",
9494
"@rollup/plugin-typescript": "^12.1.4",
95-
"@storybook/addon-docs": "^9.0.17",
96-
"@storybook/react-vite": "^9.0.17",
95+
"@storybook/addon-docs": "^9.0.18",
96+
"@storybook/react-vite": "^9.0.18",
9797
"@svgr/rollup": "^8.1.0",
9898
"@tailwindcss/postcss": "^4.1.11",
9999
"@tailwindcss/typography": "^0.5.16",
100100
"@tanstack/react-query": "^5.83.0",
101-
"@testing-library/dom": "^10.4.0",
102-
"@testing-library/jest-dom": "^6.6.3",
101+
"@testing-library/dom": "^10.4.1",
102+
"@testing-library/jest-dom": "^6.6.4",
103103
"@testing-library/react": "^16.3.0",
104104
"@testing-library/user-event": "^14.6.1",
105105
"@types/jest": "^30.0.0",
106-
"@types/luxon": "^3.6.2",
106+
"@types/luxon": "^3.7.0",
107107
"@types/react": "^19.1.8",
108108
"@types/react-dom": "^19.1.6",
109109
"@types/sanitize-html": "^2.16.0",
110-
"cross-env": "^7.0.3",
111-
"eslint": "^9.31.0",
110+
"cross-env": "^10.0.0",
111+
"eslint": "^9.32.0",
112112
"eslint-import-resolver-typescript": "^4.4.4",
113113
"eslint-plugin-import": "^2.32.0",
114114
"eslint-plugin-jsx-a11y": "^6.10.2",
115115
"eslint-plugin-react": "^7.37.5",
116116
"eslint-plugin-react-hooks": "^5.2.0",
117-
"eslint-plugin-storybook": "^9.0.17",
118-
"eslint-plugin-testing-library": "^7.6.0",
117+
"eslint-plugin-storybook": "^9.0.18",
118+
"eslint-plugin-testing-library": "^7.6.3",
119119
"husky": "^9.1.7",
120120
"jest": "^30.0.5",
121121
"jest-environment-jsdom": "^30.0.5",
122122
"lint-staged": "^16.1.2",
123123
"postcss": "^8.5.6",
124124
"postcss-loader": "^8.1.1",
125125
"prettier": "^3.6.2",
126-
"prettier-plugin-organize-imports": "^4.1.0",
126+
"prettier-plugin-organize-imports": "^4.2.0",
127127
"prettier-plugin-tailwindcss": "^0.6.14",
128128
"react": "^19.1.0",
129129
"react-dom": "^19.1.0",
130-
"react-hook-form": "^7.60.0",
131-
"rollup": "^4.45.1",
130+
"react-hook-form": "^7.61.1",
131+
"rollup": "^4.46.1",
132132
"rollup-plugin-peer-deps-external": "^2.2.4",
133133
"rollup-plugin-postcss": "^4.0.2",
134134
"rollup-plugin-visualizer": "^6.0.3",
135-
"storybook": "^9.0.17",
135+
"storybook": "^9.0.18",
136136
"tailwindcss": "^4.1.11",
137137
"ts-jest": "^29.4.0",
138138
"typescript": "^5.8.3",
139139
"typescript-eslint": "^8.38.0",
140-
"vercel": "^44.5.1",
141-
"viem": "^2.33.0",
142-
"vite": "^7.0.5",
140+
"vercel": "^44.6.4",
141+
"viem": "^2.33.1",
142+
"vite": "^7.0.6",
143143
"vite-plugin-node-polyfills": "^0.24.0",
144144
"vite-plugin-static-copy": "^3.1.1",
145145
"vite-plugin-svgr": "^4.3.0",

‎src/core/components/dataList/dataListContainer/dataListContainer.tsx‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ import { useDataListContext } from '../dataListContext';
66
import { DataListContainerSkeletonLoader } from './dataListContainerSkeletonLoader';
77

88
export interface IDataListContainerState
9-
extends Pick<IEmptyStateProps, 'heading' | 'description' | 'primaryButton' | 'secondaryButton'> {}
9+
extends Pick<
10+
IEmptyStateProps,
11+
'heading' | 'description' | 'objectIllustration' | 'isStacked' | 'primaryButton' | 'secondaryButton'
12+
> {}
1013

1114
export interface IDataListContainerProps extends ComponentProps<'div'> {
1215
/**
@@ -81,13 +84,22 @@ export const DataListContainer: React.FC<IDataListContainerProps> = (props) => {
8184
>
8285
{displayLoadingElements && loadingItems.map((_value, index) => <SkeletonLoader key={index} />)}
8386
{isError && errorState != null && (
84-
<CardEmptyState objectIllustration={{ object: 'ERROR' }} {...errorState} />
87+
<CardEmptyState
88+
objectIllustration={errorState.objectIllustration ?? { object: 'ERROR' }}
89+
{...errorState}
90+
/>
8591
)}
8692
{isEmpty && emptyState != null && (
87-
<CardEmptyState objectIllustration={{ object: 'ERROR' }} {...emptyState} />
93+
<CardEmptyState
94+
objectIllustration={emptyState.objectIllustration ?? { object: 'ERROR' }}
95+
{...emptyState}
96+
/>
8897
)}
8998
{isEmptyFiltered && emptyFilteredState != null && (
90-
<CardEmptyState objectIllustration={{ object: 'NOT_FOUND' }} {...emptyFilteredState} />
99+
<CardEmptyState
100+
objectIllustration={emptyFilteredState.objectIllustration ?? { object: 'NOT_FOUND' }}
101+
{...emptyFilteredState}
102+
/>
91103
)}
92104
{displayItems && paginatedChildren}
93105
</div>

‎src/core/components/forms/checkboxCard/checkboxCard.tsx‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,22 @@ export const CheckboxCard = forwardRef<HTMLButtonElement, ICheckboxCardProps>((p
6464
const randomId = useRandomId(id);
6565
const labelId = `${randomId}-label`;
6666

67+
const containerClasses = classNames(
68+
'group flex min-w-0 cursor-pointer flex-col gap-3 outline-hidden transition-all', // Layout
69+
'bg-neutral-0 focus-ring-primary rounded-xl border px-4 py-3 md:gap-4 md:px-6 md:py-4', // Style
70+
'border-primary-400 shadow-primary hover:shadow-primary-md', // Checked/indeterminate & hover
71+
'data-[state=unchecked]:enabled:shadow-neutral-sm data-[state=unchecked]:enabled:border-neutral-100', // Unchecked
72+
'data-[state=unchecked]:enabled:hover:shadow-neutral', // Unchecked hover
73+
'disabled:cursor-default disabled:border-neutral-300 disabled:bg-neutral-100 disabled:shadow-none', // Checked/indeterminate & disabled
74+
'disabled:data-[state=unchecked]:border-neutral-200', // Disabled & unchecked
75+
className,
76+
);
77+
78+
const labelClasses = classNames(
79+
'max-w-full cursor-pointer truncate text-neutral-800 group-data-[state=unchecked]:text-neutral-800 md:text-base',
80+
'group-data-disabled:cursor-default group-data-[state=unchecked]:group-data-disabled:text-neutral-300',
81+
);
82+
6783
return (
6884
<RadixCheckbox.Root
6985
id={randomId}
@@ -72,28 +88,13 @@ export const CheckboxCard = forwardRef<HTMLButtonElement, ICheckboxCardProps>((p
7288
checked={checked}
7389
onCheckedChange={onCheckedChange}
7490
disabled={disabled}
75-
className={classNames(
76-
'group flex min-w-0 cursor-pointer flex-col gap-3 outline-hidden transition-all', // Layout
77-
'bg-neutral-0 focus-ring-primary rounded-xl border px-4 py-3 md:gap-4 md:px-6 md:py-4', // Style
78-
'border-primary-400 shadow-primary hover:shadow-primary-md', // Checked/indeterminate & hover
79-
'data-[state=unchecked]:enabled:shadow-neutral-sm data-[state=unchecked]:enabled:border-neutral-100', // Unchecked
80-
'data-[state=unchecked]:enabled:hover:shadow-neutral', // Unchecked hover
81-
'disabled:cursor-default disabled:border-neutral-300 disabled:bg-neutral-100 disabled:shadow-none', // Checked/indeterminate & disabled
82-
'disabled:data-[state=unchecked]:border-neutral-200', // Disabled & unchecked
83-
className,
84-
)}
91+
className={containerClasses}
8592
{...otherProps}
8693
>
8794
<div className={classNames('flex w-full min-w-0 flex-row gap-3', { 'items-center': !description })}>
8895
{avatar && <Avatar size="sm" responsiveSize={{ md: 'md' }} src={avatar} />}
89-
<div className="flex min-w-0 flex-1 flex-col items-start gap-0.5 text-sm leading-tight font-normal md:gap-1 md:text-base">
90-
<p
91-
id={randomId}
92-
className={classNames(
93-
'max-w-full cursor-pointer truncate text-neutral-800 group-data-[state=unchecked]:text-neutral-800',
94-
'group-data-disabled:cursor-default group-data-[state=unchecked]:group-data-disabled:text-neutral-300',
95-
)}
96-
>
96+
<div className="flex min-w-0 flex-1 flex-col items-start gap-0.5 text-sm leading-tight font-normal md:gap-1">
97+
<p id={randomId} className={labelClasses}>
9798
{label}
9899
</p>
99100
{description && (

‎src/core/components/forms/radioCard/radioCard.tsx‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,8 @@ export const RadioCard = forwardRef<HTMLButtonElement, IRadioCardProps>((props,
5353
className,
5454
);
5555

56-
const baseTextClasses =
57-
'text-sm leading-tight text-left text-neutral-500 md:text-base w-full group-disabled:text-neutral-300 truncate';
58-
5956
const labelClasses = classNames(
60-
baseTextClasses,
57+
'text-left text-neutral-500 w-full group-disabled:text-neutral-300 truncate md:text-base',
6158
'group-data-[state=checked]:text-neutral-800 group-data-[state=checked]:group-disabled:text-neutral-800',
6259
);
6360

@@ -74,15 +71,17 @@ export const RadioCard = forwardRef<HTMLButtonElement, IRadioCardProps>((props,
7471
<div className="flex size-full items-center gap-x-3 md:gap-x-4">
7572
{avatar && <Avatar size="sm" responsiveSize={{ md: 'md' }} src={avatar} />}
7673
<div
77-
className={classNames('flex min-w-0 flex-1 gap-x-0.5 md:gap-x-4', {
78-
'items-center': !description,
79-
})}
74+
className={classNames('flex min-w-0 flex-1 gap-x-0.5 md:gap-x-4', { 'items-center': !description })}
8075
>
81-
<div className="flex min-w-0 flex-1 flex-col gap-y-0.5 md:gap-y-1">
76+
<div className="flex min-w-0 flex-1 flex-col gap-y-0.5 text-sm leading-tight font-normal md:gap-y-1">
8277
<p className={labelClasses} id={labelId}>
8378
{label}
8479
</p>
85-
{description && <p className={baseTextClasses}>{description}</p>}
80+
{description && (
81+
<p className="w-full truncate text-left text-neutral-500 group-disabled:text-neutral-300">
82+
{description}
83+
</p>
84+
)}
8685
</div>
8786
{tag && <Tag {...tag} />}
8887
</div>

0 commit comments

Comments
 (0)