vueless 0.0.544 → 0.0.545

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vueless",
-  "version": "0.0.544",
+  "version": "0.0.545",
   "license": "MIT",
   "description": "Vue Styleless UI Component Library, powered by Tailwind CSS.",
   "keywords": [

package/ui.dropdown-list/UDropdownList.vue

@@ -85,7 +85,7 @@ const addOptionKeyCombination = computed(() => {
 });
 
 watch(
-  () => props.options,
+  () => [props.options, props.size],
   () => {
     nextTick(() => {
       const options = [
@@ -100,7 +100,20 @@ watch(
 
       const maxHeight = options
         .slice(0, props.visibleOptions)
-        .map((el) => el.getBoundingClientRect().height)
+        .map((el) => {
+          const elHeight = el.getBoundingClientRect().height;
+
+          const styles = window.getComputedStyle(el);
+          const marginTop = parseFloat(styles.marginTop || "0");
+          const marginBottom = parseFloat(styles.marginBottom || "0");
+
+          const [childDiv] = el.getElementsByTagName("div");
+          const childStyles = childDiv && window.getComputedStyle(childDiv);
+          const childMarginTop = parseFloat(childStyles?.marginTop || "0");
+          const childMarginBottom = parseFloat(childStyles?.marginBottom || "0");
+
+          return elHeight + marginTop + marginBottom + childMarginTop + childMarginBottom;
+        })
         .reduce((acc, cur) => acc + cur, 0);
 
       wrapperMaxHeight.value = `${maxHeight + 10}px`;
@@ -134,7 +147,7 @@ function isSelectedOption(option: Option) {
 }
 
 function getMarginForSubCategory(level: number = 0) {
-  const baseMargin = 1;
+  const baseMargin = 0.5;
 
   if (level > 1) {
     return `margin-left: ${baseMargin * (level - 1)}rem`;

package/ui.dropdown-list/config.ts

@@ -28,19 +28,8 @@ export default /*tw*/ {
   optionContent: "overflow-visible text-ellipsis",
   optionSelected: "font-bold",
   optionHighlighted: "bg-brand-50",
-  group: {
-    base: `pointer-events-none bg-transparent font-medium !leading-none uppercase text-gray-400 pt-4 pb-1
-      group-first/item:pt-2`,
-    variants: {
-      size: {
-        sm: "text-2xs",
-        md: "text-xs",
-        lg: "text-sm",
-      },
-    },
-  },
-  subGroup: {
-    base: "pointer-events-none bg-transparent font-medium !leading-none uppercase text-gray-400 pt-2",
+  groupBase: {
+    base: "px-2 pb-2.5 font-medium !leading-none text-gray-400 overflow-hidden text-ellipsis",
     variants: {
       size: {
         sm: "text-2xs",
@@ -49,6 +38,12 @@ export default /*tw*/ {
       },
     },
   },
+  group: `
+    border-t border-gray-100 group-first/item:border-none
+    mt-1.5 group-first/item:mt-0
+    pt-4 group-first/item:pt-2
+  `,
+  subGroup: "pt-2",
   addOptionLabelWrapper: "-mb-[1.375rem] active:bg-brand-100",
   addOptionLabel: "leading-none font-medium",
   addOptionLabelHotkey: "text-gray-500",

package/ui.dropdown-list/storybook/stories.ts

@@ -91,12 +91,29 @@ VisibleOptions.args = { visibleOptions: 3 };
 export const WithoutOptions = DefaultTemplate.bind({});
 WithoutOptions.args = { options: [] };
 
+export const GroupedOptions = DefaultTemplate.bind({});
+GroupedOptions.args = {
+  labelKey: "name",
+  valueKey: "name",
+  options: [
+    { groupLabel: "Javascript" },
+    { name: "Vue.js" },
+    { name: "Adonis" },
+    { groupLabel: "Ruby" },
+    { name: "Frameworks", isSubGroup: true, level: 2 },
+    { name: "Rails", level: 2 },
+    { name: "Sinatra", level: 2 },
+    { groupLabel: "Other" },
+    { name: "Laravel" },
+    { name: "Phoenix" },
+  ],
+};
+
 export const OptionSettings = DefaultTemplate.bind({});
 OptionSettings.args = {
   options: [
     { label: "option 1", id: "1" },
     { label: "option 2", id: "2", isHidden: true },
-
     {
       label: "option 3",
       id: "3",

package/ui.dropdown-list/types.ts

@@ -6,7 +6,7 @@ export type OnClickOption = (option: Omit<Option, "onClick">) => void;
 
 export interface BaseOption {
   isSubGroup?: boolean;
-  groupLabel?: boolean;
+  groupLabel?: string;
   level?: number;
   isHidden?: boolean;
   onClick?: OnClickOption;

package/ui.dropdown-list/useAttrs.ts

@@ -12,7 +12,7 @@ export default function useAttrs(props: UDropdownListProps): UseAttrs<Config> {
     () => props.config,
   );
 
-  const extendingKeys = ["option"];
+  const extendingKeys = ["option", "groupBase"];
   const extendingKeysClasses = getExtendingKeysClasses(extendingKeys);
 
   const keysAttrs = getKeysAttrs({}, [], {
@@ -20,10 +20,10 @@ export default function useAttrs(props: UDropdownListProps): UseAttrs<Config> {
       base: computed(() => [extendingKeysClasses.option.value]),
     },
     group: {
-      base: computed(() => [extendingKeysClasses.option.value]),
+      base: computed(() => [extendingKeysClasses.groupBase.value]),
     },
     subGroup: {
-      base: computed(() => [extendingKeysClasses.option.value]),
+      base: computed(() => [extendingKeysClasses.groupBase.value]),
     },
   });
 

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "vueless",
-  "version": "0.0.544",
+  "version": "0.0.545",
   "contributions": {
     "html": {
       "description-markup": "markdown",