Merge branch 'main' into dependabot/npm_and_yarn/esbuild-0.21.5

adevinta · Jun 12, 2024 · 8482d95 · 8482d95
2 parents f9a1728 + f5a2f12
commit 8482d95
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/components/collapsible/CHANGELOG.md b/packages/components/collapsible/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.1](https://github.com/adevinta/spark/compare/@spark-ui/[email protected]...@spark-ui/[email protected]) (2024-06-10)
+
+**Note:** Version bump only for package @spark-ui/collapsible
+
 # 0.1.0 (2024-06-07)
 
 ### Bug Fixes

diff --git a/packages/components/collapsible/package.json b/packages/components/collapsible/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spark-ui/collapsible",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "An interactive component which expands/collapses a panel.",
   "publishConfig": {
     "access": "public"

diff --git a/packages/components/collapsible/src/Collapsible.doc.mdx b/packages/components/collapsible/src/Collapsible.doc.mdx
@@ -1,5 +1,5 @@
 import { Meta, Canvas } from '@storybook/addon-docs'
-import { ArgTypes } from '@storybook/blocks'
+import { ArgTypes } from '@docs/helpers/ArgTypes'
 import { Kbd } from '@spark-ui/kbd'
 
 import { Collapsible } from '.'
@@ -26,7 +26,20 @@ import { Collapsible } from '@spark-ui/collapsible'
 
 ## Props
 
-<ArgTypes of={Collapsible} />
+<ArgTypes
+  of={Collapsible}
+  description="An interactive component which expands/collapses a panel."
+  subcomponents={{
+    'Collapsible.Trigger': {
+      of: Collapsible.Trigger,
+      description: 'The button that toggles the collapsible.',
+    },
+    'Collapsible.Content': {
+      of: Collapsible.Content,
+      description: 'The component that contains the collapsible content.',
+    },
+  }}
+/>
 
 ## Usage
 

diff --git a/packages/components/collapsible/src/CollapsibleTrigger.tsx b/packages/components/collapsible/src/CollapsibleTrigger.tsx
@@ -1,13 +1,11 @@
 import { Slot } from '@spark-ui/slot'
 import { mergeProps } from '@zag-js/react'
-import { type ComponentPropsWithoutRef, forwardRef, type ReactNode } from 'react'
+import { type ComponentPropsWithoutRef, forwardRef } from 'react'
 
 import { useCollapsibleContext } from './Collapsible'
 
 export interface CollapsibleTriggerProps extends ComponentPropsWithoutRef<'button'> {
   asChild?: boolean
-  children: ReactNode
-  className?: string
 }
 
 export const Trigger = forwardRef<HTMLButtonElement, CollapsibleTriggerProps>(

diff --git a/packages/components/combobox/CHANGELOG.md b/packages/components/combobox/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.3](https://github.com/adevinta/spark/compare/@spark-ui/[email protected]...@spark-ui/[email protected]) (2024-06-11)
+
+### Bug Fixes
+
+- **combobox:** missing key attribute on selected items ([c1f7d60](https://github.com/adevinta/spark/commit/c1f7d60e31cb4deb7b4341e4ecb3affbb6ff7121))
+
 ## [1.1.2](https://github.com/adevinta/spark/compare/@spark-ui/[email protected]...@spark-ui/[email protected]) (2024-06-06)
 
 **Note:** Version bump only for package @spark-ui/combobox

diff --git a/packages/components/combobox/package.json b/packages/components/combobox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spark-ui/combobox",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "An input that behaves similarly to a select, with the addition of a free text input to filter options.",
   "publishConfig": {
     "access": "public"

diff --git a/packages/components/combobox/src/ComboboxSelectedItems.tsx b/packages/components/combobox/src/ComboboxSelectedItems.tsx
@@ -90,7 +90,7 @@ export const SelectedItems = () => {
   return ctx.multiple && ctx.selectedItems.length ? (
     <>
       {ctx.selectedItems.map((item, index) => (
-        <SelectedItem item={item} index={index} />
+        <SelectedItem key={item.value} item={item} index={index} />
       ))}
     </>
   ) : null