@vue-interface/dropdown-menu 2.0.0-beta.0 → 2.0.0-beta.2

package/dist/dropdown-menu.es.js

@@ -1,68 +1,71 @@
-import { h as m, resolveComponent as u, openBlock as d, createElementBlock as f, normalizeClass as w, createVNode as h, withCtx as _, renderSlot as b } from "vue";
-function l(r, s) {
-  r.props.class = `${r.props.class || ""} ${s}`.trim();
+import { h as c, isVNode as d, resolveComponent as u, openBlock as m, createElementBlock as f, normalizeClass as w, createVNode as h, withCtx as _, renderSlot as g } from "vue";
+function s(e, t) {
+  e.props.class = `${e.props.class || ""} ${t}`.trim();
 }
-function p(r, s) {
-  return (e) => {
-    typeof s == "function" && s(e), e.cancelBubble || r(e);
+function i(e, t) {
+  return (o) => {
+    typeof t == "function" && t(o), o.cancelBubble || e(o);
   };
 }
-function a(r, s) {
-  return r.attrs.on[s] || r.type && r.type.listeners && r.componentOptions.listeners[s];
+function p(e, t) {
+  return e.attrs.on[t] || e.type && e.type.listeners && e.componentOptions.listeners[t];
 }
-const g = (r, s) => {
-  const e = s.slots.default()[0].children;
-  return e.forEach((t) => {
+function b(e) {
+  for (const t of e[0].children) {
+    if (!d(t))
+      continue;
     t.props = Object.assign({ class: void 0 }, t.props), t.attrs = Object.assign({}, t.attrs), t.attrs.on || (t.attrs.on = {});
-    const n = t.props.class && t.props.class.match(/dropdown-item/), i = t.props.class && t.props.class.match(/dropdown-divider/);
-    t.attrs.on.click = p((o) => {
-      s.parent.$emit("click-item", o, t);
-    }, a(t, "click")), t.attrs.on.blur = p((o) => {
-      s.parent.$emit("blur-item", o, t);
-    }, a(t, "blur")), typeof t.type == "string" && t.type.match(/^h\d$/) ? l(t, "dropdown-header") : t.type === "hr" && !i ? (t.type = "div", l(t, "dropdown-divider")) : !n && !i && l(t, "dropdown-item");
-  }), m("div", {}, e);
-}, y = g, $ = (r, s) => {
-  const e = r.__vccOpts || r;
-  for (const [t, n] of s)
-    e[t] = n;
+    const o = t.props.class && t.props.class.match(/dropdown-item/), r = t.props.class && t.props.class.match(/dropdown-divider/);
+    t.attrs.on.click = i((n) => {
+      context.parent.$emit("click-item", n, t);
+    }, p(t, "click")), t.attrs.on.blur = i((n) => {
+      context.parent.$emit("blur-item", n, t);
+    }, p(t, "blur")), typeof t.type == "string" && t.type.match(/^h\d$/) ? s(t, "dropdown-header") : t.type === "hr" && !r ? (t.type = "div", s(t, "dropdown-divider")) : !o && !r && s(t, "dropdown-item");
+  }
   return e;
-}, k = {
+}
+const y = (e, t) => c("div", {}, b(t.slots.default())), $ = y, k = (e, t) => {
+  const o = e.__vccOpts || e;
+  for (const [r, n] of t)
+    o[r] = n;
+  return o;
+}, C = {
   name: "DropdownMenu",
   components: {
-    DropdownMenuItems: y
+    DropdownMenuItems: $
   },
   props: {
     align: {
       type: String,
       default: "left",
-      validate(r) {
-        return ["left", "right"].indexOf(r.toLowerCase()) !== -1;
+      validate(e) {
+        return ["left", "right"].indexOf(e.toLowerCase()) !== -1;
       }
     },
     show: Boolean
   }
-}, C = ["aria-labelledby"];
-function D(r, s, e, t, n, i) {
-  const o = u("dropdown-menu-items");
-  return d(), f("div", {
+}, v = ["aria-labelledby"];
+function D(e, t, o, r, n, I) {
+  const l = u("dropdown-menu-items");
+  return m(), f("div", {
     class: w(["dropdown-menu", {
-      "dropdown-menu-left": e.align === "left",
-      "dropdown-menu-right": e.align === "right",
-      show: e.show
+      "dropdown-menu-left": o.align === "left",
+      "dropdown-menu-right": o.align === "right",
+      show: o.show
     }]),
-    "aria-labelledby": r.$attrs.id
+    "aria-labelledby": e.$attrs.id
   }, [
-    h(o, null, {
+    h(l, null, {
       default: _(() => [
-        b(r.$slots, "default", {
-          onClick: s[0] || (s[0] = (...c) => r.onItemClick && r.onItemClick(...c))
+        g(e.$slots, "default", {
+          onClick: t[0] || (t[0] = (...a) => e.onItemClick && e.onItemClick(...a))
         })
       ]),
       _: 3
     })
-  ], 10, C);
+  ], 10, v);
 }
-const O = /* @__PURE__ */ $(k, [["render", D]]);
+const O = /* @__PURE__ */ k(C, [["render", D]]);
 export {
   O as DropdownMenu
 };

package/dist/dropdown-menu.umd.js

@@ -1 +1 @@
-(function(o,r){typeof exports=="object"&&typeof module<"u"?r(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],r):(o=typeof globalThis<"u"?globalThis:o||self,r(o.DropdownMenu={},o.Vue))})(this,function(o,r){"use strict";function l(e,s){e.props.class=`${e.props.class||""} ${s}`.trim()}function c(e,s){return n=>{typeof s=="function"&&s(n),n.cancelBubble||e(n)}}function d(e,s){return e.attrs.on[s]||e.type&&e.type.listeners&&e.componentOptions.listeners[s]}const u=(e,s)=>{const n=s.slots.default()[0].children;return n.forEach(t=>{t.props=Object.assign({class:void 0},t.props),t.attrs=Object.assign({},t.attrs),t.attrs.on||(t.attrs.on={});const p=t.props.class&&t.props.class.match(/dropdown-item/),a=t.props.class&&t.props.class.match(/dropdown-divider/);t.attrs.on.click=c(i=>{s.parent.$emit("click-item",i,t)},d(t,"click")),t.attrs.on.blur=c(i=>{s.parent.$emit("blur-item",i,t)},d(t,"blur")),typeof t.type=="string"&&t.type.match(/^h\d$/)?l(t,"dropdown-header"):t.type==="hr"&&!a?(t.type="div",l(t,"dropdown-divider")):!p&&!a&&l(t,"dropdown-item")}),r.h("div",{},n)},f=(e,s)=>{const n=e.__vccOpts||e;for(const[t,p]of s)n[t]=p;return n},m={name:"DropdownMenu",components:{DropdownMenuItems:u},props:{align:{type:String,default:"left",validate(e){return["left","right"].indexOf(e.toLowerCase())!==-1}},show:Boolean}},w=["aria-labelledby"];function h(e,s,n,t,p,a){const i=r.resolveComponent("dropdown-menu-items");return r.openBlock(),r.createElementBlock("div",{class:r.normalizeClass(["dropdown-menu",{"dropdown-menu-left":n.align==="left","dropdown-menu-right":n.align==="right",show:n.show}]),"aria-labelledby":e.$attrs.id},[r.createVNode(i,null,{default:r.withCtx(()=>[r.renderSlot(e.$slots,"default",{onClick:s[0]||(s[0]=(...y)=>e.onItemClick&&e.onItemClick(...y))})]),_:3})],10,w)}const _=f(m,[["render",h]]);o.DropdownMenu=_,Object.defineProperties(o,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(function(s,n){typeof exports=="object"&&typeof module<"u"?n(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],n):(s=typeof globalThis<"u"?globalThis:s||self,n(s.DropdownMenu={},s.Vue))})(this,function(s,n){"use strict";function d(t,e){t.props.class=`${t.props.class||""} ${e}`.trim()}function p(t,e){return o=>{typeof e=="function"&&e(o),o.cancelBubble||t(o)}}function l(t,e){return t.attrs.on[e]||t.type&&t.type.listeners&&t.componentOptions.listeners[e]}function c(t){for(const e of t[0].children){if(!n.isVNode(e))continue;e.props=Object.assign({class:void 0},e.props),e.attrs=Object.assign({},e.attrs),e.attrs.on||(e.attrs.on={});const o=e.props.class&&e.props.class.match(/dropdown-item/),i=e.props.class&&e.props.class.match(/dropdown-divider/);e.attrs.on.click=p(r=>{context.parent.$emit("click-item",r,e)},l(e,"click")),e.attrs.on.blur=p(r=>{context.parent.$emit("blur-item",r,e)},l(e,"blur")),typeof e.type=="string"&&e.type.match(/^h\d$/)?d(e,"dropdown-header"):e.type==="hr"&&!i?(e.type="div",d(e,"dropdown-divider")):!o&&!i&&d(e,"dropdown-item")}return t}const a=(t,e)=>n.h("div",{},c(e.slots.default())),u=(t,e)=>{const o=t.__vccOpts||t;for(const[i,r]of e)o[i]=r;return o},f={name:"DropdownMenu",components:{DropdownMenuItems:a},props:{align:{type:String,default:"left",validate(t){return["left","right"].indexOf(t.toLowerCase())!==-1}},show:Boolean}},m=["aria-labelledby"];function w(t,e,o,i,r,g){const _=n.resolveComponent("dropdown-menu-items");return n.openBlock(),n.createElementBlock("div",{class:n.normalizeClass(["dropdown-menu",{"dropdown-menu-left":o.align==="left","dropdown-menu-right":o.align==="right",show:o.show}]),"aria-labelledby":t.$attrs.id},[n.createVNode(_,null,{default:n.withCtx(()=>[n.renderSlot(t.$slots,"default",{onClick:e[0]||(e[0]=(...y)=>t.onItemClick&&t.onItemClick(...y))})]),_:3})],10,m)}const h=u(f,[["render",w]]);s.DropdownMenu=h,Object.defineProperties(s,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-interface/dropdown-menu",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "description": "A Vue dropdown menu component.",
   "files": [
     "index.js",
@@ -47,19 +47,19 @@
     "vue": "^3.0.0"
   },
   "devDependencies": {
-    "@rollup/plugin-babel": "^5.3.1",
-    "@vitejs/plugin-vue": "^3.0.3",
-    "autoprefixer": "^10.4.8",
+    "@rollup/plugin-babel": "^6.0.0",
+    "@vitejs/plugin-vue": "^3.1.2",
+    "autoprefixer": "^10.4.12",
     "babel-eslint": "^10.1.0",
     "babel-preset-vue": "^2.0.2",
     "change-case": "^4.1.2",
-    "eslint": "^8.22.0",
-    "eslint-plugin-vue": "^9.4.0",
+    "eslint": "^8.25.0",
+    "eslint-plugin-vue": "^9.6.0",
     "pascalcase": "^2.0.0",
-    "postcss": "^8.4.16",
+    "postcss": "^8.4.18",
     "tailwindcss": "^3.1.8",
-    "vite": "^3.0.9",
-    "vue": "^3.2.37",
-    "vue-router": "^4.1.4"
+    "vite": "^3.1.7",
+    "vue": "^3.2.40",
+    "vue-router": "^4.1.5"
   }
 }

package/src/DropdownMenuItems.vue

@@ -1,5 +1,5 @@
 <script>
-import { h } from 'vue';
+import { h, isVNode } from 'vue';
 
 function appendClass(vnode, str) {
     vnode.props.class = `${vnode.props.class || ''} ${str}`.trim();
@@ -24,11 +24,22 @@ function listener(vnode, key) {
         vnode.componentOptions.listeners[key]
     );
 }
+function isDropdownItem(vnode) {
+    return vnode && vnode.type && vnode.type.name === 'DropdownItem';
+}
+
+// function isSymbol(vnode) {
+//     // We'll go ahead and assume that if the type is a symbol, then the vnode is fragment.
+//     // This may be a faulty assumption; if it is, it'll need to be changed.
+//     return vnode && vnode.type && (vnode.type === 'fragment' || typeof vnode.type === 'symbol');
+// }
 
-const DropdownMenuItems = (props, context) => {
-    const children = context.slots.default()[0].children;
+function changeMenuItems(items) {
+    for(const vnode of items[0].children) {
+        if(!isVNode(vnode)) {
+            continue;
+        }
 
-    children.forEach(vnode => {
         vnode.props = Object.assign({ class: undefined }, vnode.props);
         vnode.attrs = Object.assign({}, vnode.attrs);
 
@@ -58,10 +69,12 @@ const DropdownMenuItems = (props, context) => {
         else if(!isDropdownItem && !isDropdownDivider) {
             appendClass(vnode, 'dropdown-item');
         }
-    });
+    }
+
+    return items;
+}
 
-    return h('div', {}, children);
-};
+const DropdownMenuItems = (props, context) => h('div', {}, changeMenuItems(context.slots.default()));
 
 export default DropdownMenuItems;
 </script>