fix: nuxt ssr

teleskop150750 · teleskop150750 · commit ae9a31d50406 · 2024-06-17T02:15:18.000+03:00
diff --git a/packages/vue-primitives/src/accordion/Accordion.ts b/packages/vue-primitives/src/accordion/Accordion.ts
@@ -76,6 +76,7 @@ export const ACCORDION_KEYS = ['Home', 'End', 'ArrowDown', 'ArrowUp', 'ArrowLeft
 export const [Collection, useCollection] = createCollection<HTMLButtonElement, undefined>('Accordion')
 
 export interface AccordionContext {
+  id: string
   collapsible: boolean
 
   disabled: Ref<boolean>
diff --git a/packages/vue-primitives/src/accordion/Accordion.vue b/packages/vue-primitives/src/accordion/Accordion.vue
@@ -5,6 +5,7 @@ import { useControllableState } from '../hooks/useControllableState.ts'
 import { Primitive } from '../primitive/index.ts'
 import { composeEventHandlers } from '../utils/composeEventHandlers.ts'
 import { arrayify } from '../utils/array.ts'
+import { useId } from '../hooks/useId.ts'
 import { ACCORDION_KEYS, type AccordionEmits, type AccordionProps, type AccordionType, Collection, provideAccordionContext, useCollection } from './Accordion.ts'
 
 defineOptions({
@@ -110,6 +111,7 @@ const handleKeydown = composeEventHandlers<KeyboardEvent>(() => {
 })
 
 provideAccordionContext({
+  id: useId(),
   collapsible: props.collapsible,
 
   disabled: toRef(props, 'disabled'),
diff --git a/packages/vue-primitives/src/accordion/AccordionItem.vue b/packages/vue-primitives/src/accordion/AccordionItem.vue
@@ -26,7 +26,7 @@ function onUpdateOpen(open: boolean) {
 provideAccordionItemContext({
   open,
   disabled,
-  triggerId: useId(),
+  triggerId: `${context.id}-${props.value}`,
 })
 </script>
 
diff --git a/packages/vue-primitives/src/hooks/useId.ts b/packages/vue-primitives/src/hooks/useId.ts
@@ -22,9 +22,7 @@ export function useId(deterministicId?: string | null | undefined) {
 
   const { useId } = useConfigContext() || {}
   if (useId && typeof useId === 'function') {
-    const id = `nuxt-${useId()}`
-    // console.error('N', id)
-    return id
+    return `radix-${useId()}`
   }
 
   return `count-${++count}`

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,7 @@ export function useId(deterministicId?: string \| null \| undefined) {`
`22`	`22`
`23`	`23`	`const { useId } = useConfigContext() \|\| {}`
`24`	`24`	`if (useId && typeof useId === 'function') {`
`25`		- const id = `nuxt-${useId()}`
`26`		`- // console.error('N', id)`
`27`		`- return id`
	`25`	+ return `radix-${useId()}`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	return `count-${++count}`