Merge pull request #151 from Shyrro/fix/playground

fix(playground): fix accordion and form group issues

Author: codebender828

packages/c-accordion/src/accordion.tsx

@@ -1,15 +1,4 @@
-import {
-  h,
-  defineComponent,
-  PropType,
-  computed,
-  ComputedRef,
-  ref,
-  onMounted,
-  Fragment,
-  onBeforeMount,
-  watchEffect,
-} from "vue"
+import { h, defineComponent, PropType, computed, ComputedRef, ref } from "vue"
 import * as accordion from "@zag-js/accordion"
 import { normalizeProps, useMachine, useSetup } from "@zag-js/vue"
 import {
@@ -24,7 +13,13 @@ import {
   DeepPartial,
 } from "@chakra-ui/vue-system"
 import { useIds, useId } from "@chakra-ui/vue-composables"
-import { createContext, genId, vueThemingProps } from "@chakra-ui/vue-utils"
+import {
+  createContext,
+  genId,
+  SNAO,
+  getValidChildren,
+  vueThemingProps,
+} from "@chakra-ui/vue-utils"
 import { filterUndefined, mergeWith } from "@chakra-ui/utils"
 import { SystemStyleObject } from "@chakra-ui/styled-system"
 import { CCollapse } from "@chakra-ui/c-motion"
@@ -47,6 +42,7 @@ export interface CAccordionProps
    * The index(es) of the expanded accordion item
    */
   index?: ExpandedValues
+  defaultIndex?: ExpandedValues
   /**
    * The initial index(es) of the expanded accordion item
    */
@@ -78,8 +74,8 @@ export const CAccordion: ComponentWithProps<DeepPartial<CAccordionProps>> =
       },
       allowMultiple: Boolean as PropType<CAccordionProps["allowMultiple"]>,
       allowToggle: Boolean as PropType<CAccordionProps["allowToggle"]>,
-      index: Number as PropType<CAccordionProps["index"]>,
-      defaultIndex: Number as PropType<CAccordionProps["defaultIndex"]>,
+      index: SNAO as PropType<CAccordionProps["index"]>,
+      defaultIndex: SNAO as PropType<CAccordionProps["defaultIndex"]>,
       reduceMotion: {
         type: Boolean as PropType<CAccordionProps["reduceMotion"]>,
         default: false,
@@ -134,11 +130,9 @@ export const CAccordion: ComponentWithProps<DeepPartial<CAccordionProps>> =
             }}
           >
             {() => (
-              <>
-                <div ref={accordionRef} {...api.rootProps}>
-                  {slots}
-                </div>
-              </>
+              <div ref={accordionRef} {...api.rootProps}>
+                {getValidChildren(slots)}
+              </div>
             )}
           </chakra.div>
         )
@@ -202,7 +196,7 @@ export const CAccordionItem: ComponentWithProps<CAccordionItemProps> =
           })}
           {...attrs}
         >
-          {slots}
+          {getValidChildren(slots)}
         </chakra.div>
       )
     },
@@ -239,7 +233,7 @@ export const CAccordionButton: ComponentWithProps<CAccordionButtonProps> =
           __css={buttonStyles.value}
           {...attrs}
         >
-          {slots}
+          {getValidChildren(slots)}
         </chakra.button>
       )
     },
@@ -266,15 +260,9 @@ export const CAccordionPanel: ComponentWithProps<CAccordionPanelProps> =
         })
         return (
           <CCollapse isOpen={isOpen.value}>
-            {() => (
-              <chakra.div
-                {...contentProps}
-                __css={styles.value.panel}
-                {...attrs}
-              >
-                {slots}
-              </chakra.div>
-            )}
+            <chakra.div {...contentProps} __css={styles.value.panel} {...attrs}>
+              {getValidChildren(slots)}
+            </chakra.div>
           </CCollapse>
         )
       }
@@ -305,14 +293,10 @@ export const CAccordionIcon: ComponentWithProps<CAccordionIconProps> =
           __css={iconStyles.value}
           {...attrs}
         >
-          {() => (
-            <>
-              <path
-                fill="currentColor"
-                d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
-              />
-            </>
-          )}
+          <path
+            fill="currentColor"
+            d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
+          />
         </CIcon>
       )
     },

packages/c-form-control/examples/select-example.vue

@@ -14,27 +14,38 @@
   </c-form-control>
 </template>
 
-<script lang="tsx" setup>
-import { h, defineComponent, computed, toRefs } from 'vue'
+<script lang="tsx">
+import { h, defineComponent, computed, toRefs } from "vue"
 import {
   chakra,
   useMultiStyleConfig,
   omitThemingProps,
-} from '@chakra-ui/vue-system'
-import { useFormControl } from '@chakra-ui/c-form-control'
-import { vueThemingProps } from '@chakra-ui/vue-utils'
+} from "@chakra-ui/vue-system"
+import { filterUndefined } from "@chakra-ui/utils"
+import { useFormControl } from "@chakra-ui/c-form-control"
+import { getValidChildren, vueThemingProps } from "@chakra-ui/vue-utils"
 
 const CSelect = defineComponent({
-  props: vueThemingProps,
-  setup(props, { slots }) {
-    const styles = useMultiStyleConfig('Select', props)
+  props: { ...vueThemingProps },
+  setup(props, { slots, attrs }) {
+    const themingProps = computed<ThemingProps>(() =>
+      filterUndefined({
+        colorScheme: props.colorScheme,
+        variant: props.variant,
+        size: props.size,
+        styleConfig: props.styleConfig,
+      })
+    )
+    const styles = useMultiStyleConfig("Select", themingProps.value)
     const _props = computed(() => toRefs(omitThemingProps(props)))
     const inputProps = useFormControl(_props.value)
     return () => (
       <chakra.select __css={styles.value.field} {...inputProps.value}>
-        {slots}
+        {() => getValidChildren(slots)}
       </chakra.select>
     )
   },
 })
+
+export default CSelect
 </script>

packages/c-form-control/examples/textarea-example.vue

@@ -10,7 +10,7 @@
   </c-form-control>
 </template>
 
-<script lang="tsx" setup>
+<script lang="tsx">
 import { h, defineComponent, computed, toRefs } from "vue"
 import {
   chakra,
@@ -29,4 +29,5 @@ const CTextarea = defineComponent({
     return () => <chakra.textarea __css={styles.value} {...inputProps.value} />
   },
 })
+export default CTextarea
 </script>