@vuetify/nightly 3.0.0-alpha.8 → 3.0.0-beta.3

package/lib/components/VBadge/VBadge.mjs

@@ -1,42 +1,35 @@
 import { withDirectives as _withDirectives, mergeProps as _mergeProps, vShow as _vShow, createVNode as _createVNode } from "vue";
 // Styles
-import "./VBadge.sass"; // Components
+import "./VBadge.css"; // Components
 
 import { VIcon } from "../VIcon/index.mjs"; // Composables
 
 import { makeRoundedProps, useRounded } from "../../composables/rounded.mjs";
 import { makeTagProps } from "../../composables/tag.mjs";
+import { makeThemeProps, useTheme } from "../../composables/theme.mjs";
 import { makeTransitionProps, MaybeTransition } from "../../composables/transition.mjs";
-import { useBackgroundColor, useTextColor } from "../../composables/color.mjs"; // Utilities
+import { useBackgroundColor, useTextColor } from "../../composables/color.mjs";
+import { useLocale } from "../../composables/locale.mjs";
+import { makeLocationProps, useLocation } from "../../composables/location.mjs";
+import { IconValue } from "../../composables/icons.mjs"; // Utilities
 
-import { computed, defineComponent, toRef } from 'vue';
-import { convertToUnit, extract, makeProps } from "../../util/index.mjs";
-export default defineComponent({
+import { toRef } from 'vue';
+import { defineComponent, pick } from "../../util/index.mjs";
+export const VBadge = defineComponent({
   name: 'VBadge',
   inheritAttrs: false,
-  props: makeProps({
+  props: {
     bordered: Boolean,
-    color: {
-      type: String,
-      default: 'primary'
-    },
-    content: String,
+    color: String,
+    content: [Number, String],
     dot: Boolean,
     floating: Boolean,
-    icon: String,
+    icon: IconValue,
     inline: Boolean,
     label: {
       type: String,
       default: '$vuetify.badge'
     },
-    location: {
-      type: String,
-      default: 'top-right',
-      validator: value => {
-        const [vertical, horizontal] = (value != null ? value : '').split('-');
-        return ['top', 'bottom'].includes(vertical) && ['left', 'right'].includes(horizontal);
-      }
-    },
     max: [Number, String],
     modelValue: {
       type: Boolean,
@@ -45,12 +38,16 @@ export default defineComponent({
     offsetX: [Number, String],
     offsetY: [Number, String],
     textColor: String,
+    ...makeLocationProps({
+      location: 'top end'
+    }),
     ...makeRoundedProps(),
     ...makeTagProps(),
+    ...makeThemeProps(),
     ...makeTransitionProps({
       transition: 'scale-rotate-transition'
     })
-  }),
+  },
 
   setup(props, ctx) {
     const {
@@ -59,44 +56,31 @@ export default defineComponent({
     } = useBackgroundColor(toRef(props, 'color'));
     const {
       roundedClasses
-    } = useRounded(props, 'v-badge');
+    } = useRounded(props);
+    const {
+      t
+    } = useLocale();
     const {
       textColorClasses,
       textColorStyles
     } = useTextColor(toRef(props, 'textColor'));
-    const position = computed(() => {
-      return props.floating ? props.dot ? 2 : 4 : props.dot ? 8 : 12;
-    });
-
-    function calculatePosition(offset) {
-      return `calc(100% - ${convertToUnit(position.value + parseInt(offset != null ? offset : 0, 10))})`;
-    }
-
-    const locationStyles = computed(() => {
-      var _props$location;
-
-      const [vertical, horizontal] = ((_props$location = props.location) != null ? _props$location : '').split('-'); // TODO: RTL support
-
-      const styles = {
-        bottom: 'auto',
-        left: 'auto',
-        right: 'auto',
-        top: 'auto'
-      };
-
-      if (!props.inline) {
-        styles[horizontal === 'left' ? 'right' : 'left'] = calculatePosition(props.offsetX);
-        styles[vertical === 'top' ? 'bottom' : 'top'] = calculatePosition(props.offsetY);
-      }
+    const {
+      themeClasses
+    } = useTheme();
+    const {
+      locationStyles
+    } = useLocation(props, true, side => {
+      var _props$offsetY, _props$offsetX;
 
-      return styles;
+      const base = props.floating ? props.dot ? 2 : 4 : props.dot ? 8 : 12;
+      return base + (['top', 'bottom'].includes(side) ? +((_props$offsetY = props.offsetY) != null ? _props$offsetY : 0) : ['left', 'right'].includes(side) ? +((_props$offsetX = props.offsetX) != null ? _props$offsetX : 0) : 0);
     });
     return () => {
       var _ctx$slots$default, _ctx$slots, _ctx$slots$badge, _ctx$slots2;
 
       const value = Number(props.content);
       const content = !props.max || isNaN(value) ? props.content : value <= props.max ? value : `${props.max}+`;
-      const [badgeAttrs, attrs] = extract(ctx.attrs, ['aria-atomic', 'aria-label', 'aria-live', 'role', 'title']);
+      const [badgeAttrs, attrs] = pick(ctx.attrs, ['aria-atomic', 'aria-label', 'aria-live', 'role', 'title']);
       return _createVNode(props.tag, _mergeProps({
         "class": ['v-badge', {
           'v-badge--bordered': props.bordered,
@@ -111,19 +95,17 @@ export default defineComponent({
           "transition": props.transition
         }, {
           default: () => [_withDirectives(_createVNode("span", _mergeProps({
-            "class": ['v-badge__badge', backgroundColorClasses.value, roundedClasses.value, textColorClasses.value],
-            "style": [backgroundColorStyles.value, locationStyles.value, textColorStyles.value],
+            "class": ['v-badge__badge', backgroundColorClasses.value, roundedClasses.value, textColorClasses.value, themeClasses.value],
+            "style": [backgroundColorStyles.value, textColorStyles.value, props.inline ? {} : locationStyles.value],
             "aria-atomic": "true",
-            "aria-label": "locale string here",
+            "aria-label": t(props.label, value),
             "aria-live": "polite",
             "role": "status"
           }, badgeAttrs), [props.dot ? undefined : ctx.slots.badge ? (_ctx$slots$badge = (_ctx$slots2 = ctx.slots).badge) == null ? void 0 : _ctx$slots$badge.call(_ctx$slots2) : props.icon ? _createVNode(VIcon, {
             "icon": props.icon
-          }, null, 8, ["icon"]) : _createVNode("span", {
-            "class": "v-badge__content"
-          }, [content])], 16), [[_vShow, props.modelValue]])]
-        }, 8, ["transition"])])]
-      }, 16, ["class"]);
+          }, null) : content]), [[_vShow, props.modelValue]])]
+        })])]
+      });
     };
   }
 

package/lib/components/VBadge/VBadge.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/VBadge/VBadge.tsx"],"names":["VIcon","makeRoundedProps","useRounded","makeTagProps","makeTransitionProps","MaybeTransition","useBackgroundColor","useTextColor","computed","defineComponent","toRef","convertToUnit","extract","makeProps","name","inheritAttrs","props","bordered","Boolean","color","type","String","default","content","dot","floating","icon","inline","label","location","validator","value","vertical","horizontal","split","includes","max","Number","modelValue","offsetX","offsetY","textColor","transition","setup","ctx","backgroundColorClasses","backgroundColorStyles","roundedClasses","textColorClasses","textColorStyles","position","calculatePosition","offset","parseInt","locationStyles","styles","bottom","left","right","top","isNaN","badgeAttrs","attrs","slots","undefined","badge"],"mappings":";AAAA;AACA,uB,CAEA;;SACSA,K,8BAET;;SACSC,gB,EAAkBC,U;SAClBC,Y;SACAC,mB,EAAqBC,e;SACrBC,kB,EAAoBC,Y,uCAE7B;;AACA,SAASC,QAAT,EAAmBC,eAAnB,EAAoCC,KAApC,QAAiD,KAAjD;SACSC,a,EAAeC,O,EAASC,S;AAEjC,eAAeJ,eAAe,CAAC;AAC7BK,EAAAA,IAAI,EAAE,QADuB;AAG7BC,EAAAA,YAAY,EAAE,KAHe;AAK7BC,EAAAA,KAAK,EAAEH,SAAS,CAAC;AACfI,IAAAA,QAAQ,EAAEC,OADK;AAEfC,IAAAA,KAAK,EAAE;AACLC,MAAAA,IAAI,EAAEC,MADD;AAELC,MAAAA,OAAO,EAAE;AAFJ,KAFQ;AAMfC,IAAAA,OAAO,EAAEF,MANM;AAOfG,IAAAA,GAAG,EAAEN,OAPU;AAQfO,IAAAA,QAAQ,EAAEP,OARK;AASfQ,IAAAA,IAAI,EAAEL,MATS;AAUfM,IAAAA,MAAM,EAAET,OAVO;AAWfU,IAAAA,KAAK,EAAE;AACLR,MAAAA,IAAI,EAAEC,MADD;AAELC,MAAAA,OAAO,EAAE;AAFJ,KAXQ;AAefO,IAAAA,QAAQ,EAAE;AACRT,MAAAA,IAAI,EAAEC,MADE;AAERC,MAAAA,OAAO,EAAE,WAFD;AAGRQ,MAAAA,SAAS,EAAGC,KAAD,IAAmB;AAC5B,cAAM,CAACC,QAAD,EAAWC,UAAX,IAAyB,CAACF,KAAD,WAACA,KAAD,GAAU,EAAV,EAAcG,KAAd,CAAoB,GAApB,CAA/B;AAEA,eACE,CAAC,KAAD,EAAQ,QAAR,EAAkBC,QAAlB,CAA2BH,QAA3B,KACA,CAAC,MAAD,EAAS,OAAT,EAAkBG,QAAlB,CAA2BF,UAA3B,CAFF;AAID;AAVO,KAfK;AA2BfG,IAAAA,GAAG,EAAE,CAACC,MAAD,EAAShB,MAAT,CA3BU;AA4BfiB,IAAAA,UAAU,EAAE;AACVlB,MAAAA,IAAI,EAAEF,OADI;AAEVI,MAAAA,OAAO,EAAE;AAFC,KA5BG;AAgCfiB,IAAAA,OAAO,EAAE,CAACF,MAAD,EAAShB,MAAT,CAhCM;AAiCfmB,IAAAA,OAAO,EAAE,CAACH,MAAD,EAAShB,MAAT,CAjCM;AAkCfoB,IAAAA,SAAS,EAAEpB,MAlCI;AAmCf,OAAGpB,gBAAgB,EAnCJ;AAoCf,OAAGE,YAAY,EApCA;AAqCf,OAAGC,mBAAmB,CAAC;AAAEsC,MAAAA,UAAU,EAAE;AAAd,KAAD;AArCP,GAAD,CALa;;AA6C7BC,EAAAA,KAAK,CAAE3B,KAAF,EAAS4B,GAAT,EAAc;AACjB,UAAM;AAAEC,MAAAA,sBAAF;AAA0BC,MAAAA;AAA1B,QAAoDxC,kBAAkB,CAACI,KAAK,CAACM,KAAD,EAAQ,OAAR,CAAN,CAA5E;AACA,UAAM;AAAE+B,MAAAA;AAAF,QAAqB7C,UAAU,CAACc,KAAD,EAAQ,SAAR,CAArC;AACA,UAAM;AAAEgC,MAAAA,gBAAF;AAAoBC,MAAAA;AAApB,QAAwC1C,YAAY,CAACG,KAAK,CAACM,KAAD,EAAQ,WAAR,CAAN,CAA1D;AAEA,UAAMkC,QAAQ,GAAG1C,QAAQ,CAAC,MAAM;AAC9B,aAAOQ,KAAK,CAACS,QAAN,GACFT,KAAK,CAACQ,GAAN,GAAY,CAAZ,GAAgB,CADd,GAEFR,KAAK,CAACQ,GAAN,GAAY,CAAZ,GAAgB,EAFrB;AAGD,KAJwB,CAAzB;;AAMA,aAAS2B,iBAAT,CAA4BC,MAA5B,EAAsD;AACpD,aAAQ,eAAczC,aAAa,CAACuC,QAAQ,CAACnB,KAAT,GAAiBsB,QAAQ,CAACD,MAAD,WAACA,MAAD,GAAW,CAAX,EAAc,EAAd,CAA1B,CAA6C,GAAhF;AACD;;AAED,UAAME,cAAc,GAAG9C,QAAQ,CAAC,MAAM;AAAA;;AACpC,YAAM,CAACwB,QAAD,EAAWC,UAAX,IAAyB,oBAACjB,KAAK,CAACa,QAAP,8BAAmB,EAAnB,EAAuBK,KAAvB,CAA6B,GAA7B,CAA/B,CADoC,CAGpC;;AAEA,YAAMqB,MAAM,GAAG;AACbC,QAAAA,MAAM,EAAE,MADK;AAEbC,QAAAA,IAAI,EAAE,MAFO;AAGbC,QAAAA,KAAK,EAAE,MAHM;AAIbC,QAAAA,GAAG,EAAE;AAJQ,OAAf;;AAOA,UAAI,CAAC3C,KAAK,CAACW,MAAX,EAAmB;AACjB4B,QAAAA,MAAM,CAACtB,UAAU,KAAK,MAAf,GAAwB,OAAxB,GAAkC,MAAnC,CAAN,GAAmDkB,iBAAiB,CAACnC,KAAK,CAACuB,OAAP,CAApE;AACAgB,QAAAA,MAAM,CAACvB,QAAQ,KAAK,KAAb,GAAqB,QAArB,GAAgC,KAAjC,CAAN,GAAgDmB,iBAAiB,CAACnC,KAAK,CAACwB,OAAP,CAAjE;AACD;;AAED,aAAOe,MAAP;AACD,KAlB8B,CAA/B;AAoBA,WAAO,MAAM;AAAA;;AACX,YAAMxB,KAAK,GAAGM,MAAM,CAACrB,KAAK,CAACO,OAAP,CAApB;AACA,YAAMA,OAAO,GAAI,CAACP,KAAK,CAACoB,GAAP,IAAcwB,KAAK,CAAC7B,KAAD,CAApB,GAA+Bf,KAAK,CAACO,OAArC,GACZQ,KAAK,IAAIf,KAAK,CAACoB,GAAf,GAAqBL,KAArB,GACC,GAAEf,KAAK,CAACoB,GAAI,GAFjB;AAIA,YAAM,CAACyB,UAAD,EAAaC,KAAb,IAAsBlD,OAAO,CAACgC,GAAG,CAACkB,KAAL,EAAY,CAC7C,aAD6C,EAE7C,YAF6C,EAG7C,WAH6C,EAI7C,MAJ6C,EAK7C,OAL6C,CAAZ,CAAnC;AAQA;AAAA,iBAEW,CACL,SADK,EAEL;AACE,+BAAqB9C,KAAK,CAACC,QAD7B;AAEE,0BAAgBD,KAAK,CAACQ,GAFxB;AAGE,+BAAqBR,KAAK,CAACS,QAH7B;AAIE,6BAAmBT,KAAK,CAACW;AAJ3B,SAFK;AAFX,SAWSmC,KAXT;AAAA;AAAA,mBAae;AAbf,kCAcQ,cAAAlB,GAAG,CAACmB,KAAJ,EAAUzC,OAdlB,qBAcQ,mCAdR;AAAA,wBAgBoCN,KAAK,CAAC0B;AAhB1C;AAAA;AAAA,qBAmBiB,CACL,gBADK,EAELG,sBAAsB,CAACd,KAFlB,EAGLgB,cAAc,CAAChB,KAHV,EAILiB,gBAAgB,CAACjB,KAJZ,CAnBjB;AAAA,qBAyBiB,CACLe,qBAAqB,CAACf,KADjB,EAELuB,cAAc,CAACvB,KAFV,EAGLkB,eAAe,CAAClB,KAHX,CAzBjB;AAAA,2BA8BsB,MA9BtB;AAAA,0BA+BqB,oBA/BrB;AAAA,yBAgCoB,QAhCpB;AAAA,oBAiCe;AAjCf,aAkCe8B,UAlCf,IAqCY7C,KAAK,CAACQ,GAAN,GAAYwC,SAAZ,GACEpB,GAAG,CAACmB,KAAJ,CAAUE,KAAV,uBAAkB,eAAArB,GAAG,CAACmB,KAAJ,EAAUE,KAA5B,qBAAkB,kCAAlB,GACAjD,KAAK,CAACU,IAAN;AAAA,oBAA0BV,KAAK,CAACU;AAAhC;AAAA,qBACY;AADZ,cACgCH,OADhC,EAvCd,kBAkBmBP,KAAK,CAACsB,UAlBzB;AAAA;AAAA;AA+CD,KA7DD;AA8DD;;AA9I4B,CAAD,CAA9B","sourcesContent":["// Styles\nimport './VBadge.sass'\n\n// Components\nimport { VIcon } from '@/components/VIcon'\n\n// Composables\nimport { makeRoundedProps, useRounded } from '@/composables/rounded'\nimport { makeTagProps } from '@/composables/tag'\nimport { makeTransitionProps, MaybeTransition } from '@/composables/transition'\nimport { useBackgroundColor, useTextColor } from '@/composables/color'\n\n// Utilities\nimport { computed, defineComponent, toRef } from 'vue'\nimport { convertToUnit, extract, makeProps } from '@/util'\n\nexport default defineComponent({\n  name: 'VBadge',\n\n  inheritAttrs: false,\n\n  props: makeProps({\n    bordered: Boolean,\n    color: {\n      type: String,\n      default: 'primary',\n    },\n    content: String,\n    dot: Boolean,\n    floating: Boolean,\n    icon: String,\n    inline: Boolean,\n    label: {\n      type: String,\n      default: '$vuetify.badge',\n    },\n    location: {\n      type: String,\n      default: 'top-right',\n      validator: (value: string) => {\n        const [vertical, horizontal] = (value ?? '').split('-')\n\n        return (\n          ['top', 'bottom'].includes(vertical) &&\n          ['left', 'right'].includes(horizontal)\n        )\n      },\n    },\n    max: [Number, String],\n    modelValue: {\n      type: Boolean,\n      default: true,\n    },\n    offsetX: [Number, String],\n    offsetY: [Number, String],\n    textColor: String,\n    ...makeRoundedProps(),\n    ...makeTagProps(),\n    ...makeTransitionProps({ transition: 'scale-rotate-transition' }),\n  }),\n\n  setup (props, ctx) {\n    const { backgroundColorClasses, backgroundColorStyles } = useBackgroundColor(toRef(props, 'color'))\n    const { roundedClasses } = useRounded(props, 'v-badge')\n    const { textColorClasses, textColorStyles } = useTextColor(toRef(props, 'textColor'))\n\n    const position = computed(() => {\n      return props.floating\n        ? (props.dot ? 2 : 4)\n        : (props.dot ? 8 : 12)\n    })\n\n    function calculatePosition (offset?: number | string) {\n      return `calc(100% - ${convertToUnit(position.value + parseInt(offset ?? 0, 10))})`\n    }\n\n    const locationStyles = computed(() => {\n      const [vertical, horizontal] = (props.location ?? '').split('-')\n\n      // TODO: RTL support\n\n      const styles = {\n        bottom: 'auto',\n        left: 'auto',\n        right: 'auto',\n        top: 'auto',\n      }\n\n      if (!props.inline) {\n        styles[horizontal === 'left' ? 'right' : 'left'] = calculatePosition(props.offsetX)\n        styles[vertical === 'top' ? 'bottom' : 'top'] = calculatePosition(props.offsetY)\n      }\n\n      return styles\n    })\n\n    return () => {\n      const value = Number(props.content)\n      const content = (!props.max || isNaN(value)) ? props.content\n        : value <= props.max ? value\n        : `${props.max}+`\n\n      const [badgeAttrs, attrs] = extract(ctx.attrs, [\n        'aria-atomic',\n        'aria-label',\n        'aria-live',\n        'role',\n        'title',\n      ])\n\n      return (\n        <props.tag\n          class={[\n            'v-badge',\n            {\n              'v-badge--bordered': props.bordered,\n              'v-badge--dot': props.dot,\n              'v-badge--floating': props.floating,\n              'v-badge--inline': props.inline,\n            },\n          ]}\n          { ...attrs }\n        >\n          <div class=\"v-badge__wrapper\">\n            { ctx.slots.default?.() }\n\n            <MaybeTransition transition={ props.transition }>\n              <span\n                v-show={ props.modelValue }\n                class={[\n                  'v-badge__badge',\n                  backgroundColorClasses.value,\n                  roundedClasses.value,\n                  textColorClasses.value,\n                ]}\n                style={[\n                  backgroundColorStyles.value,\n                  locationStyles.value,\n                  textColorStyles.value,\n                ] as any} // TODO: Fix this :(\n                aria-atomic=\"true\"\n                aria-label=\"locale string here\" // TODO: locale string here\n                aria-live=\"polite\"\n                role=\"status\"\n                { ...badgeAttrs }\n              >\n                {\n                  props.dot ? undefined\n                  : ctx.slots.badge ? ctx.slots.badge?.()\n                  : props.icon ? <VIcon icon={props.icon} />\n                  : <span class=\"v-badge__content\">{content}</span>\n                }\n              </span>\n            </MaybeTransition>\n          </div>\n        </props.tag>\n      )\n    }\n  },\n})\n"],"file":"VBadge.mjs"}
+{"version":3,"file":"VBadge.mjs","names":["VIcon","makeRoundedProps","useRounded","makeTagProps","makeThemeProps","useTheme","makeTransitionProps","MaybeTransition","useBackgroundColor","useTextColor","useLocale","makeLocationProps","useLocation","IconValue","toRef","defineComponent","pick","VBadge","name","inheritAttrs","props","bordered","Boolean","color","String","content","Number","dot","floating","icon","inline","label","type","default","max","modelValue","offsetX","offsetY","textColor","location","transition","setup","ctx","backgroundColorClasses","backgroundColorStyles","roundedClasses","t","textColorClasses","textColorStyles","themeClasses","locationStyles","side","base","includes","value","isNaN","badgeAttrs","attrs","slots","undefined","badge"],"sources":["../../../src/components/VBadge/VBadge.tsx"],"sourcesContent":["// Styles\nimport './VBadge.sass'\n\n// Components\nimport { VIcon } from '@/components/VIcon'\n\n// Composables\nimport { makeRoundedProps, useRounded } from '@/composables/rounded'\nimport { makeTagProps } from '@/composables/tag'\nimport { makeThemeProps, useTheme } from '@/composables/theme'\nimport { makeTransitionProps, MaybeTransition } from '@/composables/transition'\nimport { useBackgroundColor, useTextColor } from '@/composables/color'\nimport { useLocale } from '@/composables/locale'\nimport { makeLocationProps, useLocation } from '@/composables/location'\nimport { IconValue } from '@/composables/icons'\n\n// Utilities\nimport { toRef } from 'vue'\nimport { defineComponent, pick } from '@/util'\n\nexport const VBadge = defineComponent({\n  name: 'VBadge',\n\n  inheritAttrs: false,\n\n  props: {\n    bordered: Boolean,\n    color: String,\n    content: [Number, String],\n    dot: Boolean,\n    floating: Boolean,\n    icon: IconValue,\n    inline: Boolean,\n    label: {\n      type: String,\n      default: '$vuetify.badge',\n    },\n    max: [Number, String],\n    modelValue: {\n      type: Boolean,\n      default: true,\n    },\n    offsetX: [Number, String],\n    offsetY: [Number, String],\n    textColor: String,\n\n    ...makeLocationProps({ location: 'top end' } as const),\n    ...makeRoundedProps(),\n    ...makeTagProps(),\n    ...makeThemeProps(),\n    ...makeTransitionProps({ transition: 'scale-rotate-transition' }),\n  },\n\n  setup (props, ctx) {\n    const { backgroundColorClasses, backgroundColorStyles } = useBackgroundColor(toRef(props, 'color'))\n    const { roundedClasses } = useRounded(props)\n    const { t } = useLocale()\n    const { textColorClasses, textColorStyles } = useTextColor(toRef(props, 'textColor'))\n    const { themeClasses } = useTheme()\n\n    const { locationStyles } = useLocation(props, true, side => {\n      const base = props.floating\n        ? (props.dot ? 2 : 4)\n        : (props.dot ? 8 : 12)\n\n      return base + (\n        ['top', 'bottom'].includes(side) ? +(props.offsetY ?? 0)\n        : ['left', 'right'].includes(side) ? +(props.offsetX ?? 0)\n        : 0\n      )\n    })\n\n    return () => {\n      const value = Number(props.content)\n      const content = (!props.max || isNaN(value)) ? props.content\n        : value <= props.max ? value\n        : `${props.max}+`\n\n      const [badgeAttrs, attrs] = pick(ctx.attrs as Record<string, any>, [\n        'aria-atomic',\n        'aria-label',\n        'aria-live',\n        'role',\n        'title',\n      ])\n\n      return (\n        <props.tag\n          class={[\n            'v-badge',\n            {\n              'v-badge--bordered': props.bordered,\n              'v-badge--dot': props.dot,\n              'v-badge--floating': props.floating,\n              'v-badge--inline': props.inline,\n            },\n          ]}\n          { ...attrs }\n        >\n          <div class=\"v-badge__wrapper\">\n            { ctx.slots.default?.() }\n\n            <MaybeTransition transition={ props.transition }>\n              <span\n                v-show={ props.modelValue }\n                class={[\n                  'v-badge__badge',\n                  backgroundColorClasses.value,\n                  roundedClasses.value,\n                  textColorClasses.value,\n                  themeClasses.value,\n                ]}\n                style={[\n                  backgroundColorStyles.value,\n                  textColorStyles.value,\n                  props.inline ? {} : locationStyles.value,\n                ]}\n                aria-atomic=\"true\"\n                aria-label={ t(props.label, value) }\n                aria-live=\"polite\"\n                role=\"status\"\n                { ...badgeAttrs }\n              >\n                {\n                  props.dot ? undefined\n                  : ctx.slots.badge ? ctx.slots.badge?.()\n                  : props.icon ? <VIcon icon={ props.icon } />\n                  : content\n                }\n              </span>\n            </MaybeTransition>\n          </div>\n        </props.tag>\n      )\n    }\n  },\n})\n\nexport type VBadge = InstanceType<typeof VBadge>\n"],"mappings":";AAAA;AACA,sB,CAEA;;SACSA,K,8BAET;;SACSC,gB,EAAkBC,U;SAClBC,Y;SACAC,c,EAAgBC,Q;SAChBC,mB,EAAqBC,e;SACrBC,kB,EAAoBC,Y;SACpBC,S;SACAC,iB,EAAmBC,W;SACnBC,S,uCAET;;AACA,SAASC,KAAT,QAAsB,KAAtB;SACSC,e,EAAiBC,I;AAE1B,OAAO,MAAMC,MAAM,GAAGF,eAAe,CAAC;EACpCG,IAAI,EAAE,QAD8B;EAGpCC,YAAY,EAAE,KAHsB;EAKpCC,KAAK,EAAE;IACLC,QAAQ,EAAEC,OADL;IAELC,KAAK,EAAEC,MAFF;IAGLC,OAAO,EAAE,CAACC,MAAD,EAASF,MAAT,CAHJ;IAILG,GAAG,EAAEL,OAJA;IAKLM,QAAQ,EAAEN,OALL;IAMLO,IAAI,EAAEhB,SAND;IAOLiB,MAAM,EAAER,OAPH;IAQLS,KAAK,EAAE;MACLC,IAAI,EAAER,MADD;MAELS,OAAO,EAAE;IAFJ,CARF;IAYLC,GAAG,EAAE,CAACR,MAAD,EAASF,MAAT,CAZA;IAaLW,UAAU,EAAE;MACVH,IAAI,EAAEV,OADI;MAEVW,OAAO,EAAE;IAFC,CAbP;IAiBLG,OAAO,EAAE,CAACV,MAAD,EAASF,MAAT,CAjBJ;IAkBLa,OAAO,EAAE,CAACX,MAAD,EAASF,MAAT,CAlBJ;IAmBLc,SAAS,EAAEd,MAnBN;IAqBL,GAAGb,iBAAiB,CAAC;MAAE4B,QAAQ,EAAE;IAAZ,CAAD,CArBf;IAsBL,GAAGtC,gBAAgB,EAtBd;IAuBL,GAAGE,YAAY,EAvBV;IAwBL,GAAGC,cAAc,EAxBZ;IAyBL,GAAGE,mBAAmB,CAAC;MAAEkC,UAAU,EAAE;IAAd,CAAD;EAzBjB,CAL6B;;EAiCpCC,KAAK,CAAErB,KAAF,EAASsB,GAAT,EAAc;IACjB,MAAM;MAAEC,sBAAF;MAA0BC;IAA1B,IAAoDpC,kBAAkB,CAACM,KAAK,CAACM,KAAD,EAAQ,OAAR,CAAN,CAA5E;IACA,MAAM;MAAEyB;IAAF,IAAqB3C,UAAU,CAACkB,KAAD,CAArC;IACA,MAAM;MAAE0B;IAAF,IAAQpC,SAAS,EAAvB;IACA,MAAM;MAAEqC,gBAAF;MAAoBC;IAApB,IAAwCvC,YAAY,CAACK,KAAK,CAACM,KAAD,EAAQ,WAAR,CAAN,CAA1D;IACA,MAAM;MAAE6B;IAAF,IAAmB5C,QAAQ,EAAjC;IAEA,MAAM;MAAE6C;IAAF,IAAqBtC,WAAW,CAACQ,KAAD,EAAQ,IAAR,EAAc+B,IAAI,IAAI;MAAA;;MAC1D,MAAMC,IAAI,GAAGhC,KAAK,CAACQ,QAAN,GACRR,KAAK,CAACO,GAAN,GAAY,CAAZ,GAAgB,CADR,GAERP,KAAK,CAACO,GAAN,GAAY,CAAZ,GAAgB,EAFrB;MAIA,OAAOyB,IAAI,IACT,CAAC,KAAD,EAAQ,QAAR,EAAkBC,QAAlB,CAA2BF,IAA3B,IAAmC,oBAAE/B,KAAK,CAACiB,OAAR,6BAAmB,CAAnB,CAAnC,GACE,CAAC,MAAD,EAAS,OAAT,EAAkBgB,QAAlB,CAA2BF,IAA3B,IAAmC,oBAAE/B,KAAK,CAACgB,OAAR,6BAAmB,CAAnB,CAAnC,GACA,CAHO,CAAX;IAKD,CAVqC,CAAtC;IAYA,OAAO,MAAM;MAAA;;MACX,MAAMkB,KAAK,GAAG5B,MAAM,CAACN,KAAK,CAACK,OAAP,CAApB;MACA,MAAMA,OAAO,GAAI,CAACL,KAAK,CAACc,GAAP,IAAcqB,KAAK,CAACD,KAAD,CAApB,GAA+BlC,KAAK,CAACK,OAArC,GACZ6B,KAAK,IAAIlC,KAAK,CAACc,GAAf,GAAqBoB,KAArB,GACC,GAAElC,KAAK,CAACc,GAAI,GAFjB;MAIA,MAAM,CAACsB,UAAD,EAAaC,KAAb,IAAsBzC,IAAI,CAAC0B,GAAG,CAACe,KAAL,EAAmC,CACjE,aADiE,EAEjE,YAFiE,EAGjE,WAHiE,EAIjE,MAJiE,EAKjE,OALiE,CAAnC,CAAhC;MAQA;QAAA,SAEW,CACL,SADK,EAEL;UACE,qBAAqBrC,KAAK,CAACC,QAD7B;UAEE,gBAAgBD,KAAK,CAACO,GAFxB;UAGE,qBAAqBP,KAAK,CAACQ,QAH7B;UAIE,mBAAmBR,KAAK,CAACU;QAJ3B,CAFK;MAFX,GAWS2B,KAXT;QAAA;UAAA,SAae;QAbf,0BAcQ,cAAAf,GAAG,CAACgB,KAAJ,EAAUzB,OAdlB,qBAcQ,mCAdR;UAAA,cAgBoCb,KAAK,CAACoB;QAhB1C;UAAA;YAAA,SAmBiB,CACL,gBADK,EAELG,sBAAsB,CAACW,KAFlB,EAGLT,cAAc,CAACS,KAHV,EAILP,gBAAgB,CAACO,KAJZ,EAKLL,YAAY,CAACK,KALR,CAnBjB;YAAA,SA0BiB,CACLV,qBAAqB,CAACU,KADjB,EAELN,eAAe,CAACM,KAFX,EAGLlC,KAAK,CAACU,MAAN,GAAe,EAAf,GAAoBoB,cAAc,CAACI,KAH9B,CA1BjB;YAAA,eA+BsB,MA/BtB;YAAA,cAgCuBR,CAAC,CAAC1B,KAAK,CAACW,KAAP,EAAcuB,KAAd,CAhCxB;YAAA,aAiCoB,QAjCpB;YAAA,QAkCe;UAlCf,GAmCeE,UAnCf,IAsCYpC,KAAK,CAACO,GAAN,GAAYgC,SAAZ,GACEjB,GAAG,CAACgB,KAAJ,CAAUE,KAAV,uBAAkB,eAAAlB,GAAG,CAACgB,KAAJ,EAAUE,KAA5B,qBAAkB,kCAAlB,GACAxC,KAAK,CAACS,IAAN;YAAA,QAA2BT,KAAK,CAACS;UAAjC,WACAJ,OAzCd,cAkBmBL,KAAK,CAACe,UAlBzB;QAAA;MAAA;IAgDD,CA9DD;EA+DD;;AAnHmC,CAAD,CAA9B"}

package/lib/components/VBadge/VBadge.sass

@@ -1,5 +1,6 @@
-// Imports
-@import ./index
+@forward './variables'
+@use '../../styles/tools'
+@use './variables' as *
 
 .v-badge
   display: inline-block
@@ -8,7 +9,6 @@
 .v-badge__badge
   align-items: center
   border-radius: $badge-border-radius
-  display: flex
   font-size: $badge-font-size
   font-weight: $badge-font-weight
   height: $badge-height
@@ -22,6 +22,8 @@
   transition: $badge-transition
   white-space: nowrap
 
+  @include tools.theme($badge-theme...)
+
   .v-badge--bordered &
     &::after
       border-radius: inherit
@@ -43,8 +45,6 @@
     padding: 0
     width: $badge-dot-width
 
-    @include theme($badge-theme...)
-
     &::after
       border-width: $badge-dot-border-width
 
@@ -55,17 +55,13 @@
   .v-icon
     color: inherit
     font-size: $badge-font-size
-    height: $badge-font-size
-    width: $badge-font-size
+    margin: $badge-icon-margin
 
   img,
   .v-img
     height: 100%
     width: 100%
 
-.v-badge__content
-  padding: $badge-content-padding
-
 .v-badge__wrapper
   display: flex
   position: relative

package/lib/components/VBadge/_variables.scss

@@ -1,19 +1,19 @@
-@import '../../styles/styles.sass';
+@use '../../styles/settings';
 
 // Defaults
+
+$badge-background: rgb(var(--v-theme-surface-variant)) !default;
+$badge-color: rgba(var(--v-theme-on-surface-variant), var(--v-high-emphasis-opacity)) !default;
 $badge-border-color: rgb(var(--v-theme-background)) !default;
 $badge-border-radius: 10px !default;
 $badge-border-style: solid !default;
 $badge-border-transform: scale(1.20) !default;
 $badge-border-width: 2px !default;
-$badge-background: rgb(var(--v-theme-surface)) !default;
-$badge-color: rgb(var(--v-theme-on-surface)) !default;
-$badge-content-padding: 0 2px !default;
 $badge-dot-border-radius: 4.5px;
 $badge-dot-border-width: 1.5px !default;
 $badge-dot-height: 9px !default;
 $badge-dot-width: 9px !default;
-$badge-font-family: $body-font-family !default;
+$badge-font-family: settings.$body-font-family !default;
 $badge-font-size: .75rem !default;
 $badge-font-weight: 500 !default;
 $badge-height: 1.25rem !default;
@@ -22,8 +22,8 @@ $badge-icon-padding: 4px 6px !default;
 $badge-inline-vertical-align: middle !default;
 $badge-line-height: 1 !default;
 $badge-min-width: 20px !default;
-$badge-padding: 4px !default;
-$badge-transition: .225s $standard-easing !default;
+$badge-padding: 4px 6px !default;
+$badge-transition: .225s settings.$standard-easing !default;
 $badge-wrapper-margin: 0 4px !default;
 
 $badge-theme: (

package/lib/components/VBadge/index.mjs

@@ -1,2 +1,2 @@
-export { default as VBadge } from "./VBadge.mjs";
+export { VBadge } from "./VBadge.mjs";
 //# sourceMappingURL=index.mjs.map

package/lib/components/VBadge/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/VBadge/index.ts"],"names":["default","VBadge"],"mappings":"SAASA,OAAO,IAAIC,M","sourcesContent":["export { default as VBadge } from './VBadge'\n"],"file":"index.mjs"}
+{"version":3,"file":"index.mjs","names":["VBadge"],"sources":["../../../src/components/VBadge/index.ts"],"sourcesContent":["export { VBadge } from './VBadge'\n"],"mappings":"SAASA,M"}

package/lib/components/VBanner/VBanner.css

@@ -0,0 +1,157 @@
+.v-banner {
+  align-items: center;
+  display: grid;
+  flex: 1 1;
+  font-size: 0.875rem;
+  grid-template-areas: "prepend text actions";
+  grid-template-columns: max-content auto max-content;
+  grid-template-rows: max-content max-content;
+  line-height: 1.375rem;
+  overflow: hidden;
+  padding-inline-start: 16px;
+  padding-inline-end: 8px;
+  padding-top: 16px;
+  padding-bottom: 16px;
+  position: relative;
+  width: 100%;
+  border-color: rgba(var(--v-border-color), var(--v-border-opacity));
+  border-style: solid;
+  border-width: 0 0 thin 0;
+  box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 0px rgba(0, 0, 0, 0.14), 0px 0px 0px 0px rgba(0, 0, 0, 0.12);
+  border-radius: 0;
+  background: rgb(var(--v-theme-surface));
+  color: rgba(var(--v-theme-on-surface), var(--v-high-emphasis-opacity));
+}
+.v-banner--border {
+  border-width: thin;
+  box-shadow: none;
+}
+.v-banner--absolute {
+  position: absolute;
+}
+.v-banner--fixed {
+  position: fixed;
+}
+.v-banner--sticky {
+  position: sticky;
+}
+.v-banner--rounded {
+  border-radius: 4px;
+}
+.v-banner--stacked:not(.v-banner--one-line) {
+  grid-template-areas: "prepend text" ". actions";
+}
+.v-banner--stacked .v-banner-text {
+  padding-inline-end: 36px;
+}
+.v-banner--density-default .v-banner-actions {
+  margin-bottom: -8px;
+}
+.v-banner--density-default.v-banner--one-line {
+  padding-top: 8px;
+  padding-bottom: 8px;
+}
+.v-banner--density-default.v-banner--one-line .v-banner-actions {
+  margin-bottom: 0;
+}
+.v-banner--density-default.v-banner--one-line {
+  padding-top: 10px;
+}
+.v-banner--density-default.v-banner--two-line {
+  padding-top: 16px;
+  padding-bottom: 16px;
+}
+.v-banner--density-default.v-banner--three-line {
+  padding-top: 24px;
+  padding-bottom: 16px;
+}
+.v-banner--density-default:not(.v-banner--one-line) .v-banner-actions, .v-banner--density-default.v-banner--two-line .v-banner-actions, .v-banner--density-default.v-banner--three-line .v-banner-actions {
+  margin-top: 20px;
+}
+
+.v-banner--density-comfortable .v-banner-actions {
+  margin-bottom: -4px;
+}
+.v-banner--density-comfortable.v-banner--one-line {
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+.v-banner--density-comfortable.v-banner--one-line .v-banner-actions {
+  margin-bottom: 0;
+}
+.v-banner--density-comfortable.v-banner--two-line {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
+.v-banner--density-comfortable.v-banner--three-line {
+  padding-top: 20px;
+  padding-bottom: 12px;
+}
+.v-banner--density-comfortable:not(.v-banner--one-line) .v-banner-actions, .v-banner--density-comfortable.v-banner--two-line .v-banner-actions, .v-banner--density-comfortable.v-banner--three-line .v-banner-actions {
+  margin-top: 16px;
+}
+
+.v-banner--density-compact .v-banner-actions {
+  margin-bottom: 0px;
+}
+.v-banner--density-compact.v-banner--one-line {
+  padding-top: 0px;
+  padding-bottom: 0px;
+}
+.v-banner--density-compact.v-banner--one-line .v-banner-actions {
+  margin-bottom: 0;
+}
+.v-banner--density-compact.v-banner--two-line {
+  padding-top: 8px;
+  padding-bottom: 8px;
+}
+.v-banner--density-compact.v-banner--three-line {
+  padding-top: 16px;
+  padding-bottom: 8px;
+}
+.v-banner--density-compact:not(.v-banner--one-line) .v-banner-actions, .v-banner--density-compact.v-banner--two-line .v-banner-actions, .v-banner--density-compact.v-banner--three-line .v-banner-actions {
+  margin-top: 12px;
+}
+
+.v-banner--sticky {
+  top: 0;
+}
+
+.v-banner-avatar,
+.v-banner-icon,
+.v-banner__prepend {
+  align-self: flex-start;
+  grid-area: prepend;
+  margin-inline-end: 24px;
+}
+
+.v-banner-actions {
+  align-self: flex-end;
+  display: flex;
+  flex: 0 1;
+  grid-area: actions;
+  justify-content: flex-end;
+}
+.v-banner--two-line .v-banner-actions, .v-banner--three-line .v-banner-actions {
+  margin-top: 20px;
+}
+
+.v-banner-text {
+  -webkit-box-orient: vertical;
+  display: -webkit-box;
+  grid-area: text;
+  overflow: hidden;
+  padding-inline-end: 90px;
+}
+.v-banner--one-line .v-banner-text {
+  -webkit-line-clamp: 1;
+}
+.v-banner--two-line .v-banner-text {
+  -webkit-line-clamp: 2;
+}
+.v-banner--three-line .v-banner-text {
+  -webkit-line-clamp: 3;
+}
+.v-banner--two-line .v-banner-text, .v-banner--three-line .v-banner-text {
+  align-self: flex-start;
+}

package/lib/components/VBanner/VBanner.mjs

@@ -1,112 +1,120 @@
-import { resolveDirective as _resolveDirective, createVNode as _createVNode } from "vue";
+import { createVNode as _createVNode, Fragment as _Fragment } from "vue";
 // Styles
-import "./VBanner.sass"; // Components
+import "./VBanner.css"; // Components
 
-import { VAvatar } from "../VAvatar/index.mjs";
-import VBannerActions from "./VBannerActions.mjs";
-import VBannerAvatar from "./VBannerAvatar.mjs";
-import VBannerContent from "./VBannerContent.mjs";
-import VBannerText from "./VBannerText.mjs"; // Composables
+import { VBannerActions } from "./VBannerActions.mjs";
+import { VBannerAvatar } from "./VBannerAvatar.mjs";
+import { VBannerIcon } from "./VBannerIcon.mjs";
+import { VBannerText } from "./VBannerText.mjs"; // Composables
 
 import { makeBorderProps, useBorder } from "../../composables/border.mjs";
 import { makeDensityProps, useDensity } from "../../composables/density.mjs";
 import { makeDimensionProps, useDimension } from "../../composables/dimensions.mjs";
 import { makeElevationProps, useElevation } from "../../composables/elevation.mjs";
+import { makeLocationProps, useLocation } from "../../composables/location.mjs";
 import { makePositionProps, usePosition } from "../../composables/position.mjs";
 import { makeRoundedProps, useRounded } from "../../composables/rounded.mjs";
 import { makeTagProps } from "../../composables/tag.mjs";
-import { makeThemeProps, useTheme } from "../../composables/theme.mjs";
+import { makeThemeProps, provideTheme } from "../../composables/theme.mjs";
+import { provideDefaults } from "../../composables/defaults.mjs";
 import { useDisplay } from "../../composables/display.mjs";
-import { useTextColor } from "../../composables/color.mjs"; // Utilities
+import { IconValue } from "../../composables/icons.mjs"; // Utilities
 
-import { defineComponent, toRef } from 'vue';
-import { makeProps } from "../../util/index.mjs";
-export default defineComponent({
+import { defineComponent, useRender } from "../../util/index.mjs";
+import { toRef } from 'vue'; // Types
+
+export const VBanner = defineComponent({
   name: 'VBanner',
-  props: makeProps({
+  props: {
     avatar: String,
     color: String,
-    icon: String,
-    lines: {
-      type: String,
-      default: 'one'
-    },
+    icon: IconValue,
+    lines: String,
+    stacked: Boolean,
     sticky: Boolean,
     text: String,
     ...makeBorderProps(),
     ...makeDensityProps(),
     ...makeDimensionProps(),
     ...makeElevationProps(),
+    ...makeLocationProps(),
     ...makePositionProps(),
     ...makeRoundedProps(),
     ...makeTagProps(),
     ...makeThemeProps()
-  }),
+  },
 
-  setup(props, {
-    slots
-  }) {
-    const {
-      themeClasses
-    } = useTheme(props);
+  setup(props, _ref) {
+    let {
+      slots
+    } = _ref;
     const {
       borderClasses
-    } = useBorder(props, 'v-banner');
+    } = useBorder(props);
     const {
       densityClasses
-    } = useDensity(props, 'v-banner');
-    const {
-      dimensionStyles
-    } = useDimension(props);
+    } = useDensity(props);
     const {
       mobile
     } = useDisplay();
+    const {
+      dimensionStyles
+    } = useDimension(props);
     const {
       elevationClasses
     } = useElevation(props);
     const {
-      positionClasses,
-      positionStyles
-    } = usePosition(props, 'v-banner');
+      locationStyles
+    } = useLocation(props);
+    const {
+      positionClasses
+    } = usePosition(props);
     const {
       roundedClasses
-    } = useRounded(props, 'v-banner');
+    } = useRounded(props);
     const {
-      textColorClasses,
-      textColorStyles
-    } = useTextColor(toRef(props, 'color'));
-    return () => {
+      themeClasses
+    } = provideTheme(props);
+    const color = toRef(props, 'color');
+    const density = toRef(props, 'density');
+    provideDefaults({
+      VBannerActions: {
+        color,
+        density
+      },
+      VBannerAvatar: {
+        density,
+        image: toRef(props, 'avatar')
+      },
+      VBannerIcon: {
+        color,
+        density,
+        icon: toRef(props, 'icon')
+      }
+    });
+    useRender(() => {
       var _slots$default;
 
-      const hasAvatar = !!(props.avatar || props.icon || slots.avatar || slots.icon);
       const hasText = !!(props.text || slots.text);
-      const hasContent = hasAvatar || hasText || slots.default;
+      const hasPrepend = !!(slots.prepend || props.avatar || props.icon);
       return _createVNode(props.tag, {
         "class": ['v-banner', {
-          'v-banner--mobile': mobile.value,
+          'v-banner--stacked': props.stacked || mobile.value,
           'v-banner--sticky': props.sticky,
-          [`v-banner--${props.lines}-line`]: true
-        }, borderClasses.value, densityClasses.value, elevationClasses.value, positionClasses.value, roundedClasses.value, textColorClasses.value, themeClasses.value],
-        "style": [dimensionStyles.value, positionStyles.value, textColorStyles.value],
+          [`v-banner--${props.lines}-line`]: !!props.lines
+        }, borderClasses.value, densityClasses.value, elevationClasses.value, positionClasses.value, roundedClasses.value, themeClasses.value],
+        "style": [dimensionStyles.value, locationStyles.value],
         "role": "banner"
       }, {
-        default: () => [hasContent && _createVNode(VBannerContent, null, {
-          default: () => [hasAvatar && _createVNode(VBannerAvatar, null, {
-            default: () => [slots.avatar ? slots.avatar() : _createVNode(VAvatar, {
-              "density": props.density,
-              "icon": props.icon,
-              "image": props.avatar
-            }, null, 8, ["density", "icon", "image"])]
-          }), hasText && _createVNode(VBannerText, null, {
-            default: () => [slots.text ? slots.text() : props.text]
-          }), (_slots$default = slots.default) == null ? void 0 : _slots$default.call(slots)],
-          _: 1
-        }), slots.actions && _createVNode(VBannerActions, null, {
-          default: slots.actions
-        })],
-        _: 1
-      }, 8, ["class", "style"]);
-    };
+        default: () => [hasPrepend && _createVNode(_Fragment, null, [slots.prepend ? _createVNode("div", {
+          "class": "v-banner__prepend"
+        }, [slots.prepend()]) : props.avatar ? _createVNode(VBannerAvatar, null, null) : props.icon ? _createVNode(VBannerIcon, null, null) : undefined]), hasText && _createVNode(VBannerText, null, {
+          default: () => [slots.text ? slots.text() : props.text]
+        }), (_slots$default = slots.default) == null ? void 0 : _slots$default.call(slots), slots.actions && _createVNode(VBannerActions, null, {
+          default: () => [slots.actions()]
+        })]
+      });
+    });
   }
 
 });