@byyuurin/ui 0.3.0 → 0.4.0

package/dist/runtime/components/DropdownMenu.vue

@@ -7,7 +7,7 @@ import { reactivePick } from "@vueuse/core";
 import { DropdownMenuArrow, DropdownMenuRoot, DropdownMenuTrigger, useForwardPropsEmits } from "reka-ui";
 import { computed, toRef } from "vue";
 import { useAppConfig } from "#imports";
-import { omit } from "../utils";
+import { omit, pick } from "../utils";
 import { cv, merge } from "../utils/style";
 import DropdownMenuContent from "./DropdownMenuContent.vue";
 const props = defineProps({
@@ -37,36 +37,36 @@ const getProxySlots = () => omit(slots, ["default"]);
 const appConfig = useAppConfig();
 const ui = computed(() => {
   const styler = cv(merge(theme, appConfig.ui.dropdownMenu));
-  return styler(props);
+  return styler(pick(props, ["size"]));
 });
 </script>
 
 <template>
-  <DropdownMenuRoot v-slot="{ open }" v-bind="rootProps">
-    <DropdownMenuTrigger v-if="!!slots.default" as-child :class="props.class" :disabled="props.disabled">
-      <slot :open="open"></slot>
-    </DropdownMenuTrigger>
-
-    <DropdownMenuContent
-      v-bind="contentProps"
-      :size="props.size"
-      :items="props.items"
-      :portal="props.portal"
-      :label-key="props.labelKey"
-      :description-key="props.descriptionKey"
-      :checked-icon="props.checkedIcon"
-      :loading-icon="props.loadingIcon"
-      :external-icon="props.externalIcon"
-      :ui="ui"
-      :ui-override="props.ui"
-      :class="ui.content({ class: [props.ui?.content, !slots.default && props.class] })"
-      data-part="content"
-    >
-      <template v-for="(_, name) in getProxySlots()" #[name]="slotProps">
-        <slot :name="name" v-bind="slotProps"></slot>
-      </template>
-
-      <DropdownMenuArrow v-if="props.arrow" v-bind="arrowProps" :class="ui.arrow({ class: props.ui?.arrow })" data-part="arrow" />
-    </DropdownMenuContent>
-  </DropdownMenuRoot>
+  <DropdownMenuRoot v-slot="{ open }" v-bind="rootProps">
+    <DropdownMenuTrigger v-if="!!slots.default" as-child :class="props.class" :disabled="props.disabled">
+      <slot :open="open"></slot>
+    </DropdownMenuTrigger>
+
+    <DropdownMenuContent
+      v-bind="contentProps"
+      :size="props.size"
+      :items="props.items"
+      :portal="props.portal"
+      :label-key="props.labelKey"
+      :description-key="props.descriptionKey"
+      :checked-icon="props.checkedIcon"
+      :loading-icon="props.loadingIcon"
+      :external-icon="props.externalIcon"
+      :ui="ui"
+      :ui-override="props.ui"
+      :class="ui.content({ class: [props.ui?.content, !slots.default && props.class] })"
+      data-part="content"
+    >
+      <template v-for="(_, name) in getProxySlots()" #[name]="slotProps">
+        <slot :name="name" v-bind="slotProps"></slot>
+      </template>
+
+      <DropdownMenuArrow v-if="props.arrow" v-bind="arrowProps" :class="ui.arrow({ class: props.ui?.arrow })" data-part="arrow" />
+    </DropdownMenuContent>
+  </DropdownMenuRoot>
 </template>

package/dist/runtime/components/DropdownMenuContent.vue

@@ -66,156 +66,156 @@ const groups = computed(
 </script>
 
 <template>
-  <DefineItemTemplate v-slot="{ item, active, index }">
-    <slot :name="item.slot || 'item'" :item="item" :index="index" :ui="ui">
-      <slot :name="`${item.slot || 'item'}-leading`" :item="item" :active="active" :index="index" :ui="ui">
-        <Icon
-          v-if="item.loading"
-          :name="loadingIcon || appConfig.ui.icons.loading"
-          :class="props.ui.itemLeadingIcon({ class: [props.uiOverride?.itemLeadingIcon, item.ui?.itemLeadingIcon], color: item.color, loading: true })"
-          data-part="itemLeadingIcon"
-        />
-        <Icon
-          v-else-if="item.icon"
-          :name="item.icon"
-          :class="props.ui.itemLeadingIcon({ class: [props.uiOverride?.itemLeadingIcon, item.ui?.itemLeadingIcon], color: item.color, active })"
-          data-part="itemLeadingIcon"
-        />
-        <Avatar
-          v-else-if="item.avatar"
-          v-bind="item.avatar"
-          :size="item.avatar.size || props.size"
-          :class="props.ui.itemLeadingAvatar({ class: [props.uiOverride?.itemLeadingAvatar, item.ui?.itemLeadingAvatar], active })"
-          data-part="itemLeadingAvatar"
-        />
-      </slot>
-
-      <span
-        v-if="get(item, props.labelKey) || !!slots[`${item.slot || 'item'}-label`] || (get(item, props.descriptionKey) || !!slots[`${item.slot || 'item'}-description`])"
-        :class="props.ui.itemWrapper({ class: [props.uiOverride?.itemWrapper, item.ui?.itemWrapper] })"
-        data-part="itemWrapper"
-      >
-        <span
-          v-if="get(item, props.labelKey) || !!slots[`${item.slot || 'item'}-label`]"
-          :class="props.ui.itemLabel({ class: [props.uiOverride?.itemLabel, item.ui?.itemLabel], active })"
-          data-part="itemLabel"
-        >
-          <slot :name="`${item.slot || 'item'}-label`" :item="item" :active="active" :index="index">
-            {{ get(item, props.labelKey) }}
-          </slot>
-
-          <Icon
-            v-if="item.target === '_blank' && props.externalIcon !== false"
-            :name="typeof props.externalIcon === 'string' ? props.externalIcon : appConfig.ui.icons.external"
-            :class="props.ui.itemLabelExternalIcon({ class: [props.uiOverride?.itemLabelExternalIcon, item.ui?.itemLabelExternalIcon], color: item.color, active })"
-            data-part="itemLabelExternalIcon"
-          />
-        </span>
-
-        <span v-if="get(item, props.descriptionKey)" :class="props.ui.itemDescription({ class: [props.uiOverride?.itemDescription, item.ui?.itemDescription] })" data-part="itemDescription">
-          <slot :name="`${item.slot || 'item'}-description`" :item="item" :active="active" :index="index">
-            {{ get(item, props.descriptionKey) }}
-          </slot>
-        </span>
-      </span>
-
-      <span :class="props.ui.itemTrailing({ class: [props.uiOverride?.itemTrailing, item.ui?.itemTrailing] })" data-part="itemTrailing">
-        <slot :name="`${item.slot || 'item'}-trailing`" :item="item" :active="active" :index="index" :ui="ui">
-          <Icon v-if="item.children?.length" :name="childrenIcon" :class="props.ui.itemTrailingIcon({ class: [props.uiOverride?.itemTrailingIcon, item.ui?.itemTrailingIcon], color: item.color, active })" data-part="itemTrailingIcon" />
-          <span v-else-if="item.kbds?.length" :class="props.ui.itemTrailingKbds({ class: [props.uiOverride?.itemTrailingKbds, item.ui?.itemTrailingKbds] })" data-part="itemTrailingKbds">
-            <Kbd
-              v-for="(kbd, kbdIndex) in item.kbds"
-              :key="kbdIndex"
-              :size="item.ui?.itemTrailingKbdsSize || props.uiOverride?.itemTrailingKbdsSize || ui.itemTrailingKbdsSize()"
-              v-bind="typeof kbd === 'string' ? { value: kbd } : kbd"
-            />
-          </span>
-        </slot>
-
-        <DropdownMenu.ItemIndicator as-child>
-          <Icon :name="props.checkedIcon || appConfig.ui.icons.check" :class="props.ui.itemTrailingIcon({ class: [props.uiOverride?.itemTrailingIcon, item.ui?.itemTrailingIcon], color: item.color })" data-part="itemTrailingIcon" />
-        </DropdownMenu.ItemIndicator>
-      </span>
-    </slot>
-  </DefineItemTemplate>
-
-  <DropdownMenu.Portal v-bind="portalProps">
-    <component :is="props.sub ? DropdownMenu.SubContent : DropdownMenu.Content" v-bind="{ ...contentProps, ...$attrs }" :class="props.class">
-      <slot name="content-top" :sub="props.sub ?? false"></slot>
-
-      <div role="presentation" :class="props.ui.viewport({ class: props.uiOverride?.viewport })" data-part="viewport">
-        <DropdownMenu.Group v-for="(group, groupIndex) in groups" :key="`group-${groupIndex}`" :class="props.ui.group({ class: props.uiOverride?.group })" data-part="group">
-          <template v-for="(item, index) in group" :key="`group-${groupIndex}-${index}`">
-            <DropdownMenu.Label v-if="item.type === 'label'" :class="props.ui.label({ class: [props.uiOverride?.label, item.ui?.label, item.class] })" data-part="label">
-              <ReuseItemTemplate :item="item" :index="index" />
-            </DropdownMenu.Label>
-            <DropdownMenu.Separator v-else-if="item.type === 'separator'" :class="props.ui.separator({ class: [props.uiOverride?.separator, item.ui?.separator, item.class] })" data-part="separator" />
-            <DropdownMenu.Sub v-else-if="item?.children?.length" :open="item.open" :default-open="item.defaultOpen">
-              <DropdownMenu.SubTrigger
-                as="button"
-                type="button"
-                :disabled="item.disabled"
-                :text-value="get(item, props.labelKey)"
-                :class="props.ui.item({ class: [props.uiOverride?.item, item.ui?.item, item.class], color: item.color })"
-                data-part="item"
-              >
-                <ReuseItemTemplate :item="item" :index="index" />
-              </DropdownMenu.SubTrigger>
-
-              <DropdownMenuContent
-                sub
-                :class="props.class"
-                :ui="props.ui"
-                :ui-override="props.uiOverride"
-                :portal="props.portal"
-                :items="item.children"
-                side="right"
-                align="start"
-                :align-offset="-4"
-                :side-offset="3"
-                :label-key="props.labelKey"
-                :description-key="props.descriptionKey"
-                :checked-icon="props.checkedIcon"
-                :loading-icon="props.loadingIcon"
-                :external-icon="props.externalIcon"
-                v-bind="item.content"
-              >
-                <template v-for="(_, name) in getProxySlots()" #[name]="slotProps">
-                  <slot :name="name" v-bind="slotProps"></slot>
-                </template>
-              </DropdownMenuContent>
-            </DropdownMenu.Sub>
-            <DropdownMenu.CheckboxItem
-              v-else-if="item.type === 'checkbox'"
-              :model-value="item.checked"
-              :disabled="item.disabled"
-              :text-value="get(item, props.labelKey)"
-              :class="props.ui.item({ class: [props.uiOverride?.item, item.ui?.item, item.class], color: item.color })"
-              data-part="item"
-              @update:model-value="item.onUpdateChecked"
-              @select="item.onSelect"
-            >
-              <ReuseItemTemplate :item="item" :index="index" />
-            </DropdownMenu.CheckboxItem>
-            <Link v-else v-slot="{ active, ...slotProps }" v-bind="pickLinkProps(item)" custom>
-              <DropdownMenu.Item
-                as-child
-                :disabled="item.disabled"
-                :text-value="get(item, props.labelKey)"
-                @select="item.onSelect"
-              >
-                <LinkBase v-bind="slotProps" :class="props.ui.item({ class: [props.uiOverride?.item, item.ui?.item, item.class], color: item.color, active })" data-part="item">
-                  <ReuseItemTemplate :item="item" :active="active" :index="index" />
-                </LinkBase>
-              </DropdownMenu.Item>
-            </Link>
-          </template>
-        </DropdownMenu.Group>
-      </div>
-
-      <slot></slot>
-
-      <slot name="content-bottom" :sub="props.sub ?? false"></slot>
-    </component>
-  </DropdownMenu.Portal>
+  <DefineItemTemplate v-slot="{ item, active, index }">
+    <slot :name="item.slot || 'item'" :item="item" :index="index" :ui="ui">
+      <slot :name="`${item.slot || 'item'}-leading`" :item="item" :active="active" :index="index" :ui="ui">
+        <Icon
+          v-if="item.loading"
+          :name="loadingIcon || appConfig.ui.icons.loading"
+          :class="props.ui.itemLeadingIcon({ class: [props.uiOverride?.itemLeadingIcon, item.ui?.itemLeadingIcon], color: item.color, loading: true })"
+          data-part="itemLeadingIcon"
+        />
+        <Icon
+          v-else-if="item.icon"
+          :name="item.icon"
+          :class="props.ui.itemLeadingIcon({ class: [props.uiOverride?.itemLeadingIcon, item.ui?.itemLeadingIcon], color: item.color, active })"
+          data-part="itemLeadingIcon"
+        />
+        <Avatar
+          v-else-if="item.avatar"
+          v-bind="item.avatar"
+          :size="item.avatar.size || props.size"
+          :class="props.ui.itemLeadingAvatar({ class: [props.uiOverride?.itemLeadingAvatar, item.ui?.itemLeadingAvatar], active })"
+          data-part="itemLeadingAvatar"
+        />
+      </slot>
+
+      <span
+        v-if="get(item, props.labelKey) || !!slots[`${item.slot || 'item'}-label`] || (get(item, props.descriptionKey) || !!slots[`${item.slot || 'item'}-description`])"
+        :class="props.ui.itemWrapper({ class: [props.uiOverride?.itemWrapper, item.ui?.itemWrapper] })"
+        data-part="itemWrapper"
+      >
+        <span
+          v-if="get(item, props.labelKey) || !!slots[`${item.slot || 'item'}-label`]"
+          :class="props.ui.itemLabel({ class: [props.uiOverride?.itemLabel, item.ui?.itemLabel], active })"
+          data-part="itemLabel"
+        >
+          <slot :name="`${item.slot || 'item'}-label`" :item="item" :active="active" :index="index">
+            {{ get(item, props.labelKey) }}
+          </slot>
+
+          <Icon
+            v-if="item.target === '_blank' && props.externalIcon !== false"
+            :name="typeof props.externalIcon === 'string' ? props.externalIcon : appConfig.ui.icons.external"
+            :class="props.ui.itemLabelExternalIcon({ class: [props.uiOverride?.itemLabelExternalIcon, item.ui?.itemLabelExternalIcon], color: item.color, active })"
+            data-part="itemLabelExternalIcon"
+          />
+        </span>
+
+        <span v-if="get(item, props.descriptionKey)" :class="props.ui.itemDescription({ class: [props.uiOverride?.itemDescription, item.ui?.itemDescription] })" data-part="itemDescription">
+          <slot :name="`${item.slot || 'item'}-description`" :item="item" :active="active" :index="index">
+            {{ get(item, props.descriptionKey) }}
+          </slot>
+        </span>
+      </span>
+
+      <span :class="props.ui.itemTrailing({ class: [props.uiOverride?.itemTrailing, item.ui?.itemTrailing] })" data-part="itemTrailing">
+        <slot :name="`${item.slot || 'item'}-trailing`" :item="item" :active="active" :index="index" :ui="ui">
+          <Icon v-if="item.children?.length" :name="childrenIcon" :class="props.ui.itemTrailingIcon({ class: [props.uiOverride?.itemTrailingIcon, item.ui?.itemTrailingIcon], color: item.color, active })" data-part="itemTrailingIcon" />
+          <span v-else-if="item.kbds?.length" :class="props.ui.itemTrailingKbds({ class: [props.uiOverride?.itemTrailingKbds, item.ui?.itemTrailingKbds] })" data-part="itemTrailingKbds">
+            <Kbd
+              v-for="(kbd, kbdIndex) in item.kbds"
+              :key="kbdIndex"
+              :size="item.ui?.itemTrailingKbdsSize || props.uiOverride?.itemTrailingKbdsSize || ui.itemTrailingKbdsSize()"
+              v-bind="typeof kbd === 'string' ? { value: kbd } : kbd"
+            />
+          </span>
+        </slot>
+
+        <DropdownMenu.ItemIndicator as-child>
+          <Icon :name="props.checkedIcon || appConfig.ui.icons.check" :class="props.ui.itemTrailingIcon({ class: [props.uiOverride?.itemTrailingIcon, item.ui?.itemTrailingIcon], color: item.color })" data-part="itemTrailingIcon" />
+        </DropdownMenu.ItemIndicator>
+      </span>
+    </slot>
+  </DefineItemTemplate>
+
+  <DropdownMenu.Portal v-bind="portalProps">
+    <component :is="props.sub ? DropdownMenu.SubContent : DropdownMenu.Content" v-bind="{ ...contentProps, ...$attrs }" :class="props.class">
+      <slot name="content-top" :sub="props.sub ?? false"></slot>
+
+      <div role="presentation" :class="props.ui.viewport({ class: props.uiOverride?.viewport })" data-part="viewport">
+        <DropdownMenu.Group v-for="(group, groupIndex) in groups" :key="`group-${groupIndex}`" :class="props.ui.group({ class: props.uiOverride?.group })" data-part="group">
+          <template v-for="(item, index) in group" :key="`group-${groupIndex}-${index}`">
+            <DropdownMenu.Label v-if="item.type === 'label'" :class="props.ui.label({ class: [props.uiOverride?.label, item.ui?.label, item.class] })" data-part="label">
+              <ReuseItemTemplate :item="item" :index="index" />
+            </DropdownMenu.Label>
+            <DropdownMenu.Separator v-else-if="item.type === 'separator'" :class="props.ui.separator({ class: [props.uiOverride?.separator, item.ui?.separator, item.class] })" data-part="separator" />
+            <DropdownMenu.Sub v-else-if="item?.children?.length" :open="item.open" :default-open="item.defaultOpen">
+              <DropdownMenu.SubTrigger
+                as="button"
+                type="button"
+                :disabled="item.disabled"
+                :text-value="get(item, props.labelKey)"
+                :class="props.ui.item({ class: [props.uiOverride?.item, item.ui?.item, item.class], color: item.color })"
+                data-part="item"
+              >
+                <ReuseItemTemplate :item="item" :index="index" />
+              </DropdownMenu.SubTrigger>
+
+              <DropdownMenuContent
+                sub
+                :class="props.class"
+                :ui="props.ui"
+                :ui-override="props.uiOverride"
+                :portal="props.portal"
+                :items="item.children"
+                side="right"
+                align="start"
+                :align-offset="-4"
+                :side-offset="3"
+                :label-key="props.labelKey"
+                :description-key="props.descriptionKey"
+                :checked-icon="props.checkedIcon"
+                :loading-icon="props.loadingIcon"
+                :external-icon="props.externalIcon"
+                v-bind="item.content"
+              >
+                <template v-for="(_, name) in getProxySlots()" #[name]="slotProps">
+                  <slot :name="name" v-bind="slotProps"></slot>
+                </template>
+              </DropdownMenuContent>
+            </DropdownMenu.Sub>
+            <DropdownMenu.CheckboxItem
+              v-else-if="item.type === 'checkbox'"
+              :model-value="item.checked"
+              :disabled="item.disabled"
+              :text-value="get(item, props.labelKey)"
+              :class="props.ui.item({ class: [props.uiOverride?.item, item.ui?.item, item.class], color: item.color })"
+              data-part="item"
+              @update:model-value="item.onUpdateChecked"
+              @select="item.onSelect"
+            >
+              <ReuseItemTemplate :item="item" :index="index" />
+            </DropdownMenu.CheckboxItem>
+            <Link v-else v-slot="{ active, ...slotProps }" v-bind="pickLinkProps(item)" custom>
+              <DropdownMenu.Item
+                as-child
+                :disabled="item.disabled"
+                :text-value="get(item, props.labelKey)"
+                @select="item.onSelect"
+              >
+                <LinkBase v-bind="slotProps" :class="props.ui.item({ class: [props.uiOverride?.item, item.ui?.item, item.class], color: item.color, active })" data-part="item">
+                  <ReuseItemTemplate :item="item" :active="active" :index="index" />
+                </LinkBase>
+              </DropdownMenu.Item>
+            </Link>
+          </template>
+        </DropdownMenu.Group>
+      </div>
+
+      <slot></slot>
+
+      <slot name="content-bottom" :sub="props.sub ?? false"></slot>
+    </component>
+  </DropdownMenu.Portal>
 </template>

package/dist/runtime/components/FieldGroup.vue

@@ -7,6 +7,7 @@ import { Primitive } from "reka-ui";
 import { computed } from "vue";
 import { useAppConfig } from "#imports";
 import { provideFieldGroup } from "../composables/useFieldGroup";
+import { pick } from "../utils";
 import { cv, merge } from "../utils/style";
 const props = defineProps({
   as: { type: null, required: false },
@@ -18,7 +19,7 @@ defineSlots();
 const appConfig = useAppConfig();
 const ui = computed(() => {
   const styler = cv(merge(theme, appConfig.ui.fieldGroup));
-  return styler(props);
+  return styler(pick(props, ["orientation", "size"]));
 });
 provideFieldGroup(computed(() => ({
   orientation: props.orientation,
@@ -27,7 +28,7 @@ provideFieldGroup(computed(() => ({
 </script>
 
 <template>
-  <Primitive :as="props.as" :class="ui.base({ class: props.class })" :data-orientation="props.orientation" data-part="base">
-    <slot></slot>
-  </Primitive>
+  <Primitive :as="props.as" :class="ui.base({ class: props.class })" :data-orientation="props.orientation" data-part="base">
+    <slot></slot>
+  </Primitive>
 </template>