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

package/dist/dropdown-menu.es.js

@@ -1,37 +1,34 @@
-import { h as d, resolveComponent as m, openBlock as u, createElementBlock as f, normalizeClass as w, createVNode as h, withCtx as y, renderSlot as g } from "vue";
+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 i(e, t) {
-  return (n) => {
-    typeof t == "function" && t(n), n.cancelBubble || e(n);
+  return (o) => {
+    typeof t == "function" && t(o), o.cancelBubble || e(o);
   };
 }
 function p(e, t) {
   return e.attrs.on[t] || e.type && e.type.listeners && e.componentOptions.listeners[t];
 }
-function _(e) {
-  return e && e.type && (e.type === "fragment" || typeof e.type == "symbol");
-}
-function a(e) {
-  for (const t of e) {
-    if (_(t))
-      return a(t.children);
+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/), r = t.props.class && t.props.class.match(/dropdown-divider/);
-    t.attrs.on.click = i((o) => {
-      context.parent.$emit("click-item", o, t);
-    }, p(t, "click")), t.attrs.on.blur = i((o) => {
-      context.parent.$emit("blur-item", o, 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")) : !n && !r && s(t, "dropdown-item");
+    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;
 }
-const b = (e, t) => d("div", {}, a(t.slots.default())), $ = b, k = (e, t) => {
-  const n = e.__vccOpts || e;
-  for (const [r, o] of t)
-    n[r] = o;
-  return n;
+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: {
@@ -47,28 +44,28 @@ const b = (e, t) => d("div", {}, a(t.slots.default())), $ = b, k = (e, t) => {
     },
     show: Boolean
   }
-}, D = ["aria-labelledby"];
-function I(e, t, n, r, o, M) {
-  const l = m("dropdown-menu-items");
-  return u(), 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": n.align === "left",
-      "dropdown-menu-right": n.align === "right",
-      show: n.show
+      "dropdown-menu-left": o.align === "left",
+      "dropdown-menu-right": o.align === "right",
+      show: o.show
     }]),
     "aria-labelledby": e.$attrs.id
   }, [
     h(l, null, {
-      default: y(() => [
+      default: _(() => [
         g(e.$slots, "default", {
-          onClick: t[0] || (t[0] = (...c) => e.onItemClick && e.onItemClick(...c))
+          onClick: t[0] || (t[0] = (...a) => e.onItemClick && e.onItemClick(...a))
         })
       ]),
       _: 3
     })
-  ], 10, D);
+  ], 10, v);
 }
-const v = /* @__PURE__ */ k(C, [["render", I]]);
+const O = /* @__PURE__ */ k(C, [["render", D]]);
 export {
-  v as DropdownMenu
+  O as DropdownMenu
 };

package/dist/dropdown-menu.umd.js

@@ -1 +1 @@
-(function(r,n){typeof exports=="object"&&typeof module<"u"?n(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],n):(r=typeof globalThis<"u"?globalThis:r||self,n(r.DropdownMenu={},r.Vue))})(this,function(r,n){"use strict";function p(t,e){t.props.class=`${t.props.class||""} ${e}`.trim()}function d(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){return t&&t.type&&(t.type==="fragment"||typeof t.type=="symbol")}function a(t){for(const e of t){if(c(e))return a(e.children);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=d(s=>{context.parent.$emit("click-item",s,e)},l(e,"click")),e.attrs.on.blur=d(s=>{context.parent.$emit("blur-item",s,e)},l(e,"blur")),typeof e.type=="string"&&e.type.match(/^h\d$/)?p(e,"dropdown-header"):e.type==="hr"&&!i?(e.type="div",p(e,"dropdown-divider")):!o&&!i&&p(e,"dropdown-item")}return t}const u=(t,e)=>n.h("div",{},a(e.slots.default())),f=(t,e)=>{const o=t.__vccOpts||t;for(const[i,s]of e)o[i]=s;return o},m={name:"DropdownMenu",components:{DropdownMenuItems:u},props:{align:{type:String,default:"left",validate(t){return["left","right"].indexOf(t.toLowerCase())!==-1}},show:Boolean}},w=["aria-labelledby"];function h(t,e,o,i,s,D){const g=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(g,null,{default:n.withCtx(()=>[n.renderSlot(t.$slots,"default",{onClick:e[0]||(e[0]=(..._)=>t.onItemClick&&t.onItemClick(..._))})]),_:3})],10,w)}const y=f(m,[["render",h]]);r.DropdownMenu=y,Object.defineProperties(r,{__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.1",
+  "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,17 +24,20 @@ function listener(vnode, key) {
         vnode.componentOptions.listeners[key]
     );
 }
-
-function isFragment(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');
+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');
+// }
+
 function changeMenuItems(items) {
-    for(const vnode of items) {
-        if(isFragment(vnode)) {
-            return changeMenuItems(vnode.children);
+    for(const vnode of items[0].children) {
+        if(!isVNode(vnode)) {
+            continue;
         }
 
         vnode.props = Object.assign({ class: undefined }, vnode.props);