element-ps 2.0.34 → 2.0.35

package/lib/components/popper/src/trigger.js

@@ -2,35 +2,24 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var vue = require('vue');
-require('../../slot/index.js');
-var trigger = require('./trigger2.js');
-var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
-var onlyChild = require('../../slot/src/only-child.js');
+require('../../../utils/index.js');
+var props = require('../../../utils/vue/props.js');
 
-const __default__ = {
-  name: "PsPopperTrigger",
-  inheritAttrs: false
-};
-const _sfc_main = /* @__PURE__ */ vue.defineComponent({
-  ...__default__,
-  props: trigger.usePopperTriggerProps,
-  setup(__props, { expose }) {
-    const props = __props;
-    expose({});
-    return (_ctx, _cache) => {
-      return !_ctx.virtualTriggering ? (vue.openBlock(), vue.createBlock(vue.unref(onlyChild.OnlyChild), vue.mergeProps({ key: 0 }, _ctx.$attrs, {
-        "aria-describedby": _ctx.open ? _ctx.id : void 0
-      }), {
-        default: vue.withCtx(() => [
-          vue.renderSlot(_ctx.$slots, "default")
-        ]),
-        _: 3
-      }, 16, ["aria-describedby"])) : vue.createCommentVNode("v-if", true);
-    };
-  }
+const usePopperTriggerProps = props.buildProps({
+  virtualRef: {
+    type: props.definePropType(Object)
+  },
+  virtualTriggering: Boolean,
+  onMouseenter: Function,
+  onMouseleave: Function,
+  onClick: Function,
+  onKeydown: Function,
+  onFocus: Function,
+  onBlur: Function,
+  onContextmenu: Function,
+  id: String,
+  open: Boolean
 });
-var PsPopperTrigger = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "/Users/meng/workspace/element-ps/packages/components/popper/src/trigger.vue"]]);
 
-exports["default"] = PsPopperTrigger;
+exports.usePopperTriggerProps = usePopperTriggerProps;
 //# sourceMappingURL=trigger.js.map

package/lib/components/popper/src/trigger.js.map

@@ -1 +1 @@
-{"version":3,"file":"trigger.js","sources":["../../../../../../packages/components/popper/src/trigger.vue"],"sourcesContent":["<template>\n  <ps-only-child\n    v-if=\"!virtualTriggering\"\n    v-bind=\"$attrs\"\n    :aria-describedby=\"open ? id : undefined\"\n  >\n    <slot />\n  </ps-only-child>\n</template>\n\n<script lang=\"ts\" setup>\nimport { inject } from 'vue'\nimport { PsOnlyChild } from '@element-ps/components/slot'\nimport { useForwardRef } from '@element-ps/hooks'\nimport { POPPER_INJECTION_KEY } from '@element-ps/tokens'\nimport { usePopperTriggerProps } from './trigger'\n\ndefineOptions({\n  name: 'PsPopperTrigger',\n  inheritAttrs: false,\n})\n\nconst props = defineProps(usePopperTriggerProps)\n\n// const { triggerRef } = inject(POPPER_INJECTION_KEY, undefined)!\n\n// useForwardRef(triggerRef)\n\ndefineExpose({\n  /**\n   * @description trigger element\n   */\n  // triggerRef,\n})\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AA4BA,IAAA,MAAA,CAAA,EAKA,CAAA,CAAA;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"trigger.js","sources":["../../../../../../packages/components/popper/src/trigger.ts"],"sourcesContent":["import { buildProps, definePropType } from '@element-ps/utils'\nimport type { Measurable } from '@element-ps/tokens'\n\nexport const usePopperTriggerProps = buildProps({\n  virtualRef: {\n    type: definePropType<Measurable>(Object),\n  },\n  virtualTriggering: Boolean,\n  onMouseenter: Function,\n  onMouseleave: Function,\n  onClick: Function,\n  onKeydown: Function,\n  onFocus: Function,\n  onBlur: Function,\n  onContextmenu: Function,\n  id: String,\n  open: Boolean,\n} as const)\n\nexport type PopperTriggerProps = typeof usePopperTriggerProps\n"],"names":["buildProps","definePropType"],"mappings":";;;;;;;AACY,MAAC,qBAAqB,GAAGA,gBAAU,CAAC;AAChD,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAEC,oBAAc,CAAC,MAAM,CAAC;AAChC,GAAG;AACH,EAAE,iBAAiB,EAAE,OAAO;AAC5B,EAAE,YAAY,EAAE,QAAQ;AACxB,EAAE,YAAY,EAAE,QAAQ;AACxB,EAAE,OAAO,EAAE,QAAQ;AACnB,EAAE,SAAS,EAAE,QAAQ;AACrB,EAAE,OAAO,EAAE,QAAQ;AACnB,EAAE,MAAM,EAAE,QAAQ;AAClB,EAAE,aAAa,EAAE,QAAQ;AACzB,EAAE,EAAE,EAAE,MAAM;AACZ,EAAE,IAAI,EAAE,OAAO;AACf,CAAC;;;;"}

package/lib/components/popper/src/trigger2.js

@@ -2,24 +2,35 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../../utils/index.js');
-var props = require('../../../utils/vue/props.js');
+var vue = require('vue');
+require('../../slot/index.js');
+var trigger = require('./trigger.js');
+var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
+var onlyChild = require('../../slot/src/only-child.js');
 
-const usePopperTriggerProps = props.buildProps({
-  virtualRef: {
-    type: props.definePropType(Object)
-  },
-  virtualTriggering: Boolean,
-  onMouseenter: Function,
-  onMouseleave: Function,
-  onClick: Function,
-  onKeydown: Function,
-  onFocus: Function,
-  onBlur: Function,
-  onContextmenu: Function,
-  id: String,
-  open: Boolean
+const __default__ = {
+  name: "PsPopperTrigger",
+  inheritAttrs: false
+};
+const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...__default__,
+  props: trigger.usePopperTriggerProps,
+  setup(__props, { expose }) {
+    const props = __props;
+    expose({});
+    return (_ctx, _cache) => {
+      return !_ctx.virtualTriggering ? (vue.openBlock(), vue.createBlock(vue.unref(onlyChild.OnlyChild), vue.mergeProps({ key: 0 }, _ctx.$attrs, {
+        "aria-describedby": _ctx.open ? _ctx.id : void 0
+      }), {
+        default: vue.withCtx(() => [
+          vue.renderSlot(_ctx.$slots, "default")
+        ]),
+        _: 3
+      }, 16, ["aria-describedby"])) : vue.createCommentVNode("v-if", true);
+    };
+  }
 });
+var PsPopperTrigger = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "/Users/meng/workspace/element-ps/packages/components/popper/src/trigger.vue"]]);
 
-exports.usePopperTriggerProps = usePopperTriggerProps;
+exports["default"] = PsPopperTrigger;
 //# sourceMappingURL=trigger2.js.map

package/lib/components/popper/src/trigger2.js.map

@@ -1 +1 @@
-{"version":3,"file":"trigger2.js","sources":["../../../../../../packages/components/popper/src/trigger.ts"],"sourcesContent":["import { buildProps, definePropType } from '@element-ps/utils'\nimport type { Measurable } from '@element-ps/tokens'\n\nexport const usePopperTriggerProps = buildProps({\n  virtualRef: {\n    type: definePropType<Measurable>(Object),\n  },\n  virtualTriggering: Boolean,\n  onMouseenter: Function,\n  onMouseleave: Function,\n  onClick: Function,\n  onKeydown: Function,\n  onFocus: Function,\n  onBlur: Function,\n  onContextmenu: Function,\n  id: String,\n  open: Boolean,\n} as const)\n\nexport type PopperTriggerProps = typeof usePopperTriggerProps\n"],"names":["buildProps","definePropType"],"mappings":";;;;;;;AACY,MAAC,qBAAqB,GAAGA,gBAAU,CAAC;AAChD,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAEC,oBAAc,CAAC,MAAM,CAAC;AAChC,GAAG;AACH,EAAE,iBAAiB,EAAE,OAAO;AAC5B,EAAE,YAAY,EAAE,QAAQ;AACxB,EAAE,YAAY,EAAE,QAAQ;AACxB,EAAE,OAAO,EAAE,QAAQ;AACnB,EAAE,SAAS,EAAE,QAAQ;AACrB,EAAE,OAAO,EAAE,QAAQ;AACnB,EAAE,MAAM,EAAE,QAAQ;AAClB,EAAE,aAAa,EAAE,QAAQ;AACzB,EAAE,EAAE,EAAE,MAAM;AACZ,EAAE,IAAI,EAAE,OAAO;AACf,CAAC;;;;"}
+{"version":3,"file":"trigger2.js","sources":["../../../../../../packages/components/popper/src/trigger.vue"],"sourcesContent":["<template>\n  <ps-only-child\n    v-if=\"!virtualTriggering\"\n    v-bind=\"$attrs\"\n    :aria-describedby=\"open ? id : undefined\"\n  >\n    <slot />\n  </ps-only-child>\n</template>\n\n<script lang=\"ts\" setup>\nimport { inject } from 'vue'\nimport { PsOnlyChild } from '@element-ps/components/slot'\nimport { useForwardRef } from '@element-ps/hooks'\nimport { POPPER_INJECTION_KEY } from '@element-ps/tokens'\nimport { usePopperTriggerProps } from './trigger'\n\ndefineOptions({\n  name: 'PsPopperTrigger',\n  inheritAttrs: false,\n})\n\nconst props = defineProps(usePopperTriggerProps)\n\n// const { triggerRef } = inject(POPPER_INJECTION_KEY, undefined)!\n\n// useForwardRef(triggerRef)\n\ndefineExpose({\n  /**\n   * @description trigger element\n   */\n  // triggerRef,\n})\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AA4BA,IAAA,MAAA,CAAA,EAKA,CAAA,CAAA;;;;;;;;;;;;;;;;;"}

package/lib/components/radio/index.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('../../utils/index.js');
-var radio$1 = require('./src/radio2.js');
+var radio$1 = require('./src/radio.js');
 var radioButton$1 = require('./src/radio-button2.js');
-var radioGroup$1 = require('./src/radio-group2.js');
-var radio = require('./src/radio.js');
-var radioGroup = require('./src/radio-group.js');
+var radioGroup$1 = require('./src/radio-group.js');
+var radio = require('./src/radio2.js');
+var radioGroup = require('./src/radio-group2.js');
 var radioButton = require('./src/radio-button.js');
 var install = require('../../utils/vue/install.js');
 

package/lib/components/radio/src/radio-button.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('../../../utils/index.js');
-var radio = require('./radio.js');
+var radio = require('./radio2.js');
 var props = require('../../../utils/vue/props.js');
 
 const radioButtonProps = props.buildProps({

package/lib/components/radio/src/radio-button2.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 require('../../../hooks/index.js');
-var radio = require('./radio.js');
+var radio = require('./radio2.js');
 var radioButton = require('./radio-button.js');
 var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
 var index = require('../../../hooks/use-namespace/index.js');

package/lib/components/radio/src/radio-group.js

@@ -2,27 +2,46 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../../utils/index.js');
+var vue = require('vue');
+require('../../../tokens/index.js');
 require('../../../hooks/index.js');
-var props = require('../../../utils/vue/props.js');
-var index = require('../../../hooks/use-common-props/index.js');
+var radioGroup = require('./radio-group2.js');
+var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
+var index = require('../../../hooks/use-namespace/index.js');
+var radio = require('../../../tokens/radio.js');
 
-const radioGroupProps = props.buildProps({
-  size: index.useSizeProp,
-  disabled: Boolean,
-  modelValue: {
-    type: [String, Number, Boolean],
-    default: ""
-  },
-  fill: {
-    type: String,
-    default: ""
-  },
-  textColor: {
-    type: String,
-    default: ""
+const _sfc_main = vue.defineComponent({
+  name: "PsRadioGroup",
+  props: radioGroup.radioGroupProps,
+  setup(props) {
+    const ns = index.useNamespace("radio");
+    const radioGroupRef = vue.ref();
+    vue.onMounted(() => {
+      const radios = radioGroupRef.value.querySelectorAll("[type=radio]");
+      const firstLabel = radios[0];
+      if (!Array.from(radios).some((radio) => radio.checked) && firstLabel) {
+        firstLabel.tabIndex = 0;
+      }
+    });
+    vue.provide(radio.radioGroupKey, vue.reactive({
+      ...vue.toRefs(props)
+    }));
+    return {
+      ns,
+      radioGroupRef
+    };
   }
 });
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return vue.openBlock(), vue.createElementBlock("div", {
+    ref: "radioGroupRef",
+    class: vue.normalizeClass(_ctx.ns.b("group")),
+    role: "radiogroup"
+  }, [
+    vue.renderSlot(_ctx.$slots, "default")
+  ], 2);
+}
+var RadioGroup = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["render", _sfc_render], ["__file", "/Users/meng/workspace/element-ps/packages/components/radio/src/radio-group.vue"]]);
 
-exports.radioGroupProps = radioGroupProps;
+exports["default"] = RadioGroup;
 //# sourceMappingURL=radio-group.js.map

package/lib/components/radio/src/radio-group.js.map

@@ -1 +1 @@
-{"version":3,"file":"radio-group.js","sources":["../../../../../../packages/components/radio/src/radio-group.ts"],"sourcesContent":["import { buildProps } from '@element-ps/utils'\nimport { useSizeProp } from '@element-ps/hooks'\nimport { radioEmits } from './radio'\nimport type { ExtractPropTypes } from '@vue/runtime-core'\n\nexport const radioGroupProps = buildProps({\n  size: useSizeProp,\n  disabled: Boolean,\n  modelValue: {\n    type: [String, Number, Boolean],\n    default: '',\n  },\n  fill: {\n    type: String,\n    default: '',\n  },\n  textColor: {\n    type: String,\n    default: '',\n  },\n} as const)\nexport type RadioGroupProps = ExtractPropTypes<typeof radioGroupProps>\n"],"names":["buildProps","useSizeProp"],"mappings":";;;;;;;;;AAEY,MAAC,eAAe,GAAGA,gBAAU,CAAC;AAC1C,EAAE,IAAI,EAAEC,iBAAW;AACnB,EAAE,QAAQ,EAAE,OAAO;AACnB,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;AACnC,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,CAAC;;;;"}
+{"version":3,"file":"radio-group.js","sources":["../../../../../../packages/components/radio/src/radio-group.vue"],"sourcesContent":["<template>\n  <div\n    ref=\"radioGroupRef\"\n    :class=\"ns.b('group')\"\n    role=\"radiogroup\"\n  >\n    <slot />\n  </div>\n</template>\n\n<script lang=\"ts\">\nimport {\n  defineComponent,\n  onMounted,\n  provide,\n  reactive,\n  ref,\n  toRefs,\n} from 'vue'\nimport { radioGroupKey } from '@element-ps/tokens'\nimport { useNamespace } from '@element-ps/hooks'\nimport { radioGroupProps } from './radio-group'\n\nexport default defineComponent({\n  name: 'PsRadioGroup',\n  props: radioGroupProps,\n\n  setup(props) {\n    const ns = useNamespace('radio')\n    const radioGroupRef = ref<HTMLDivElement>()\n\n    onMounted(() => {\n      const radios =\n        radioGroupRef.value!.querySelectorAll<HTMLInputElement>('[type=radio]')\n      const firstLabel = radios[0]\n      if (!Array.from(radios).some((radio) => radio.checked) && firstLabel) {\n        firstLabel.tabIndex = 0\n      }\n    })\n\n    provide(\n      radioGroupKey,\n      reactive({\n        ...toRefs(props),\n      })\n    )\n\n    return {\n      ns,\n      radioGroupRef,\n    }\n  },\n})\n</script>\n"],"names":["defineComponent","radioGroupProps","useNamespace","ref","onMounted","provide","radioGroupKey","reactive","toRefs","_createElementBlock","_normalizeClass","_renderSlot"],"mappings":";;;;;;;;;;;;AAuBA,MAAK,YAAaA,mBAAa,CAAA;AAAA,EAC7B,IAAM,EAAA,cAAA;AAAA,EACN,KAAO,EAAAC,0BAAA;AAAA,EAEP,MAAM,KAAO,EAAA;AACX,IAAM,MAAA,EAAA,GAAKC,mBAAa,OAAO,CAAA,CAAA;AAC/B,IAAA,MAAM,gBAAgBC,OAAoB,EAAA,CAAA;AAE1C,IAAAC,aAAA,CAAU,MAAM;AACd,MAAA,MAAM,MACJ,GAAA,aAAA,CAAc,KAAO,CAAA,gBAAA,CAAmC,cAAc,CAAA,CAAA;AACxE,MAAA,MAAM,aAAa,MAAO,CAAA,CAAA,CAAA,CAAA;AAC1B,MAAI,IAAA,CAAC,KAAM,CAAA,IAAA,CAAK,MAAM,CAAA,CAAE,IAAK,CAAA,CAAC,KAAU,KAAA,KAAA,CAAM,OAAO,CAAA,IAAK,UAAY,EAAA;AACpE,QAAA,UAAA,CAAW,QAAW,GAAA,CAAA,CAAA;AAAA,OACxB;AAAA,KACD,CAAA,CAAA;AAED,IAAAC,WAAA,CACEC,qBACAC,YAAS,CAAA;AAAA,MAAA,GACJC,WAAO,KAAK,CAAA;AAAA,KAChB,CACH,CAAA,CAAA;AAEA,IAAO,OAAA;AAAA,MACL,EAAA;AAAA,MACA,aAAA;AAAA,KACF,CAAA;AAAA,GACF;AACF,CAAC,CAAA,CAAA;;0BAnDCC,sBAMM,CAAA,KAAA,EAAA;AAAA,IALJ,GAAI,EAAA,eAAA;AAAA,IACH,KAAA,EAAKC,kBAAE,CAAA,IAAA,CAAA,EAAA,CAAG,CAAC,CAAA,OAAA,CAAA,CAAA;AAAA,IACZ,IAAK,EAAA,YAAA;AAAA,GAAA,EAAA;IAELC,cAAQ,CAAA,IAAA,CAAA,MAAA,EAAA,SAAA,CAAA;AAAA,GAAA,EAAA,CAAA,CAAA,CAAA;;;;;;"}

package/lib/components/radio/src/radio-group2.js

@@ -2,46 +2,27 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var vue = require('vue');
-require('../../../tokens/index.js');
+require('../../../utils/index.js');
 require('../../../hooks/index.js');
-var radioGroup = require('./radio-group.js');
-var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
-var index = require('../../../hooks/use-namespace/index.js');
-var radio = require('../../../tokens/radio.js');
+var props = require('../../../utils/vue/props.js');
+var index = require('../../../hooks/use-common-props/index.js');
 
-const _sfc_main = vue.defineComponent({
-  name: "PsRadioGroup",
-  props: radioGroup.radioGroupProps,
-  setup(props) {
-    const ns = index.useNamespace("radio");
-    const radioGroupRef = vue.ref();
-    vue.onMounted(() => {
-      const radios = radioGroupRef.value.querySelectorAll("[type=radio]");
-      const firstLabel = radios[0];
-      if (!Array.from(radios).some((radio) => radio.checked) && firstLabel) {
-        firstLabel.tabIndex = 0;
-      }
-    });
-    vue.provide(radio.radioGroupKey, vue.reactive({
-      ...vue.toRefs(props)
-    }));
-    return {
-      ns,
-      radioGroupRef
-    };
+const radioGroupProps = props.buildProps({
+  size: index.useSizeProp,
+  disabled: Boolean,
+  modelValue: {
+    type: [String, Number, Boolean],
+    default: ""
+  },
+  fill: {
+    type: String,
+    default: ""
+  },
+  textColor: {
+    type: String,
+    default: ""
   }
 });
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return vue.openBlock(), vue.createElementBlock("div", {
-    ref: "radioGroupRef",
-    class: vue.normalizeClass(_ctx.ns.b("group")),
-    role: "radiogroup"
-  }, [
-    vue.renderSlot(_ctx.$slots, "default")
-  ], 2);
-}
-var RadioGroup = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["render", _sfc_render], ["__file", "/Users/meng/workspace/element-ps/packages/components/radio/src/radio-group.vue"]]);
 
-exports["default"] = RadioGroup;
+exports.radioGroupProps = radioGroupProps;
 //# sourceMappingURL=radio-group2.js.map

package/lib/components/radio/src/radio-group2.js.map

@@ -1 +1 @@
-{"version":3,"file":"radio-group2.js","sources":["../../../../../../packages/components/radio/src/radio-group.vue"],"sourcesContent":["<template>\n  <div\n    ref=\"radioGroupRef\"\n    :class=\"ns.b('group')\"\n    role=\"radiogroup\"\n  >\n    <slot />\n  </div>\n</template>\n\n<script lang=\"ts\">\nimport {\n  defineComponent,\n  onMounted,\n  provide,\n  reactive,\n  ref,\n  toRefs,\n} from 'vue'\nimport { radioGroupKey } from '@element-ps/tokens'\nimport { useNamespace } from '@element-ps/hooks'\nimport { radioGroupProps } from './radio-group'\n\nexport default defineComponent({\n  name: 'PsRadioGroup',\n  props: radioGroupProps,\n\n  setup(props) {\n    const ns = useNamespace('radio')\n    const radioGroupRef = ref<HTMLDivElement>()\n\n    onMounted(() => {\n      const radios =\n        radioGroupRef.value!.querySelectorAll<HTMLInputElement>('[type=radio]')\n      const firstLabel = radios[0]\n      if (!Array.from(radios).some((radio) => radio.checked) && firstLabel) {\n        firstLabel.tabIndex = 0\n      }\n    })\n\n    provide(\n      radioGroupKey,\n      reactive({\n        ...toRefs(props),\n      })\n    )\n\n    return {\n      ns,\n      radioGroupRef,\n    }\n  },\n})\n</script>\n"],"names":["defineComponent","radioGroupProps","useNamespace","ref","onMounted","provide","radioGroupKey","reactive","toRefs","_createElementBlock","_normalizeClass","_renderSlot"],"mappings":";;;;;;;;;;;;AAuBA,MAAK,YAAaA,mBAAa,CAAA;AAAA,EAC7B,IAAM,EAAA,cAAA;AAAA,EACN,KAAO,EAAAC,0BAAA;AAAA,EAEP,MAAM,KAAO,EAAA;AACX,IAAM,MAAA,EAAA,GAAKC,mBAAa,OAAO,CAAA,CAAA;AAC/B,IAAA,MAAM,gBAAgBC,OAAoB,EAAA,CAAA;AAE1C,IAAAC,aAAA,CAAU,MAAM;AACd,MAAA,MAAM,MACJ,GAAA,aAAA,CAAc,KAAO,CAAA,gBAAA,CAAmC,cAAc,CAAA,CAAA;AACxE,MAAA,MAAM,aAAa,MAAO,CAAA,CAAA,CAAA,CAAA;AAC1B,MAAI,IAAA,CAAC,KAAM,CAAA,IAAA,CAAK,MAAM,CAAA,CAAE,IAAK,CAAA,CAAC,KAAU,KAAA,KAAA,CAAM,OAAO,CAAA,IAAK,UAAY,EAAA;AACpE,QAAA,UAAA,CAAW,QAAW,GAAA,CAAA,CAAA;AAAA,OACxB;AAAA,KACD,CAAA,CAAA;AAED,IAAAC,WAAA,CACEC,qBACAC,YAAS,CAAA;AAAA,MAAA,GACJC,WAAO,KAAK,CAAA;AAAA,KAChB,CACH,CAAA,CAAA;AAEA,IAAO,OAAA;AAAA,MACL,EAAA;AAAA,MACA,aAAA;AAAA,KACF,CAAA;AAAA,GACF;AACF,CAAC,CAAA,CAAA;;0BAnDCC,sBAMM,CAAA,KAAA,EAAA;AAAA,IALJ,GAAI,EAAA,eAAA;AAAA,IACH,KAAA,EAAKC,kBAAE,CAAA,IAAA,CAAA,EAAA,CAAG,CAAC,CAAA,OAAA,CAAA,CAAA;AAAA,IACZ,IAAK,EAAA,YAAA;AAAA,GAAA,EAAA;IAELC,cAAQ,CAAA,IAAA,CAAA,MAAA,EAAA,SAAA,CAAA;AAAA,GAAA,EAAA,CAAA,CAAA,CAAA;;;;;;"}
+{"version":3,"file":"radio-group2.js","sources":["../../../../../../packages/components/radio/src/radio-group.ts"],"sourcesContent":["import { buildProps } from '@element-ps/utils'\nimport { useSizeProp } from '@element-ps/hooks'\nimport { radioEmits } from './radio'\nimport type { ExtractPropTypes } from '@vue/runtime-core'\n\nexport const radioGroupProps = buildProps({\n  size: useSizeProp,\n  disabled: Boolean,\n  modelValue: {\n    type: [String, Number, Boolean],\n    default: '',\n  },\n  fill: {\n    type: String,\n    default: '',\n  },\n  textColor: {\n    type: String,\n    default: '',\n  },\n} as const)\nexport type RadioGroupProps = ExtractPropTypes<typeof radioGroupProps>\n"],"names":["buildProps","useSizeProp"],"mappings":";;;;;;;;;AAEY,MAAC,eAAe,GAAGA,gBAAU,CAAC;AAC1C,EAAE,IAAI,EAAEC,iBAAW;AACnB,EAAE,QAAQ,EAAE,OAAO;AACnB,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;AACnC,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,CAAC;;;;"}

package/lib/components/radio/src/radio.js

@@ -3,73 +3,82 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
-require('../../../utils/index.js');
-require('../../../constants/index.js');
-require('../../../tokens/index.js');
 require('../../../hooks/index.js');
-var props = require('../../../utils/vue/props.js');
-var index = require('../../../hooks/use-common-props/index.js');
-var event = require('../../../constants/event.js');
-var shared = require('@vue/shared');
-var core = require('@vueuse/core');
-var radio = require('../../../tokens/radio.js');
+var radio = require('./radio2.js');
+var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
+var index = require('../../../hooks/use-namespace/index.js');
 
-const radioPropsBase = props.buildProps({
-  size: index.useSizeProp,
-  disabled: Boolean,
-  label: {
-    type: [String, Number, Boolean],
-    default: ""
+const _sfc_main = vue.defineComponent({
+  name: "PsRadio",
+  props: radio.radioProps,
+  setup(props, { emit }) {
+    const ns = index.useNamespace("radio");
+    const { radioRef, isGroup, focus, size, disabled, tabIndex, modelValue } = radio.useRadio(props, emit);
+    return {
+      ns,
+      focus,
+      isGroup,
+      modelValue,
+      tabIndex,
+      size,
+      disabled,
+      radioRef
+    };
   }
 });
-const radioProps = props.buildProps({
-  ...radioPropsBase,
-  modelValue: {
-    type: [String, Number, Boolean],
-    default: ""
-  },
-  name: {
-    type: String,
-    default: ""
-  },
-  border: Boolean
-});
-const radioEmits = {
-  [event.UPDATE_MODEL_EVENT]: (val) => shared.isString(val) || core.isNumber(val) || core.isBoolean(val),
-  change: (val) => shared.isString(val) || core.isNumber(val) || core.isBoolean(val)
-};
-const useRadio = (props, emit) => {
-  const radioRef = vue.ref();
-  const radioGroup = vue.inject(radio.radioGroupKey, void 0);
-  const isGroup = vue.computed(() => !!radioGroup);
-  const modelValue = vue.computed({
-    get() {
-      return isGroup.value ? radioGroup.modelValue : props.modelValue;
-    },
-    set(val) {
-      radioRef.value.checked = props.modelValue === props.label;
-    }
-  });
-  const size = index.useSize(vue.computed(() => radioGroup == null ? void 0 : radioGroup.size));
-  const disabled = index.useDisabled(vue.computed(() => radioGroup == null ? void 0 : radioGroup.disabled));
-  const focus = vue.ref(false);
-  const tabIndex = vue.computed(() => {
-    return disabled.value || isGroup.value && modelValue.value !== props.label ? -1 : 0;
-  });
-  return {
-    radioRef,
-    isGroup,
-    radioGroup,
-    focus,
-    size,
-    disabled,
-    tabIndex,
-    modelValue
-  };
-};
+const _hoisted_1 = ["aria-checked", "aria-disabled", "tabindex"];
+const _hoisted_2 = ["value", "name", "disabled"];
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return vue.openBlock(), vue.createElementBlock("label", {
+    class: vue.normalizeClass([
+      _ctx.ns.b(),
+      _ctx.ns.is("disabled", _ctx.disabled),
+      _ctx.ns.is("focus", _ctx.focus),
+      _ctx.ns.is("bordered", _ctx.border),
+      _ctx.ns.is("checked", _ctx.modelValue === _ctx.label),
+      _ctx.ns.m(_ctx.size)
+    ]),
+    role: "radio",
+    "aria-checked": _ctx.modelValue === _ctx.label,
+    "aria-disabled": _ctx.disabled,
+    tabindex: _ctx.tabIndex
+  }, [
+    vue.createElementVNode("span", {
+      class: vue.normalizeClass([
+        _ctx.ns.e("input"),
+        _ctx.ns.is("disabled", _ctx.disabled),
+        _ctx.ns.is("checked", _ctx.modelValue === _ctx.label)
+      ])
+    }, [
+      vue.createElementVNode("span", {
+        class: vue.normalizeClass(_ctx.ns.e("inner"))
+      }, null, 2),
+      vue.withDirectives(vue.createElementVNode("input", {
+        ref: "radioRef",
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.modelValue = $event),
+        class: vue.normalizeClass(_ctx.ns.e("original")),
+        value: _ctx.label,
+        type: "radio",
+        "aria-hidden": "true",
+        name: _ctx.name,
+        disabled: _ctx.disabled,
+        tabindex: "-1"
+      }, null, 10, _hoisted_2), [
+        [vue.vModelRadio, _ctx.modelValue]
+      ])
+    ], 2),
+    vue.createElementVNode("span", {
+      class: vue.normalizeClass(_ctx.ns.e("label")),
+      onKeydown: _cache[1] || (_cache[1] = vue.withModifiers(() => {
+      }, ["stop"]))
+    }, [
+      vue.renderSlot(_ctx.$slots, "default", {}, () => [
+        vue.createTextVNode(vue.toDisplayString(_ctx.label), 1)
+      ])
+    ], 34)
+  ], 10, _hoisted_1);
+}
+var Radio = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["render", _sfc_render], ["__file", "/Users/meng/workspace/element-ps/packages/components/radio/src/radio.vue"]]);
 
-exports.radioEmits = radioEmits;
-exports.radioProps = radioProps;
-exports.radioPropsBase = radioPropsBase;
-exports.useRadio = useRadio;
+exports["default"] = Radio;
 //# sourceMappingURL=radio.js.map

package/lib/components/radio/src/radio.js.map

@@ -1 +1 @@
-{"version":3,"file":"radio.js","sources":["../../../../../../packages/components/radio/src/radio.ts"],"sourcesContent":["import { computed, inject, ref } from 'vue'\nimport { buildProps, isBoolean, isNumber, isString } from '@element-ps/utils'\nimport { UPDATE_MODEL_EVENT } from '@element-ps/constants'\nimport { radioGroupKey } from '@element-ps/tokens'\nimport { useDisabled, useSize, useSizeProp } from '@element-ps/hooks'\nimport type { ExtractPropTypes, SetupContext } from 'vue'\n\nexport const radioPropsBase = buildProps({\n  size: useSizeProp,\n  disabled: Boolean,\n  label: {\n    type: [String, Number, Boolean],\n    default: '',\n  },\n})\nexport const radioProps = buildProps({\n  ...radioPropsBase,\n  modelValue: {\n    type: [String, Number, Boolean],\n    default: '',\n  },\n  name: {\n    type: String,\n    default: '',\n  },\n  border: Boolean,\n} as const)\nexport type RadioProps = ExtractPropTypes<typeof radioProps>\n\nexport const radioEmits = {\n  [UPDATE_MODEL_EVENT]: (val: string | number | boolean) =>\n    isString(val) || isNumber(val) || isBoolean(val),\n  change: (val: string | number | boolean) =>\n    isString(val) || isNumber(val) || isBoolean(val),\n}\nexport type RadioEmits = typeof radioEmits\n\nexport const useRadio = (\n  props: { label: RadioProps['label']; modelValue?: RadioProps['modelValue'] },\n  emit: SetupContext<RadioEmits>['emit']\n) => {\n  const radioRef = ref<HTMLInputElement>()\n  const radioGroup = inject(radioGroupKey, undefined)\n  const isGroup = computed(() => !!radioGroup)\n  const modelValue = computed<RadioProps['modelValue']>({\n    get() {\n      return isGroup.value ? radioGroup!.modelValue : props.modelValue!\n    },\n    set(val) {\n      radioRef.value!.checked = props.modelValue === props.label\n    },\n  })\n\n  const size = useSize(computed(() => radioGroup?.size))\n  const disabled = useDisabled(computed(() => radioGroup?.disabled))\n  const focus = ref(false)\n  const tabIndex = computed(() => {\n    return disabled.value || (isGroup.value && modelValue.value !== props.label)\n      ? -1\n      : 0\n  })\n\n  return {\n    radioRef,\n    isGroup,\n    radioGroup,\n    focus,\n    size,\n    disabled,\n    tabIndex,\n    modelValue,\n  }\n}\n"],"names":["buildProps","useSizeProp","UPDATE_MODEL_EVENT","isString","isNumber","isBoolean","ref","inject","radioGroupKey","computed","useSize","useDisabled"],"mappings":";;;;;;;;;;;;;;;;AAKY,MAAC,cAAc,GAAGA,gBAAU,CAAC;AACzC,EAAE,IAAI,EAAEC,iBAAW;AACnB,EAAE,QAAQ,EAAE,OAAO;AACnB,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;AACnC,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,CAAC,EAAE;AACS,MAAC,UAAU,GAAGD,gBAAU,CAAC;AACrC,EAAE,GAAG,cAAc;AACnB,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;AACnC,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,EAAE,MAAM,EAAE,OAAO;AACjB,CAAC,EAAE;AACS,MAAC,UAAU,GAAG;AAC1B,EAAE,CAACE,wBAAkB,GAAG,CAAC,GAAG,KAAKC,eAAQ,CAAC,GAAG,CAAC,IAAIC,aAAQ,CAAC,GAAG,CAAC,IAAIC,cAAS,CAAC,GAAG,CAAC;AACjF,EAAE,MAAM,EAAE,CAAC,GAAG,KAAKF,eAAQ,CAAC,GAAG,CAAC,IAAIC,aAAQ,CAAC,GAAG,CAAC,IAAIC,cAAS,CAAC,GAAG,CAAC;AACnE,EAAE;AACU,MAAC,QAAQ,GAAG,CAAC,KAAK,EAAE,IAAI,KAAK;AACzC,EAAE,MAAM,QAAQ,GAAGC,OAAG,EAAE,CAAC;AACzB,EAAE,MAAM,UAAU,GAAGC,UAAM,CAACC,mBAAa,EAAE,KAAK,CAAC,CAAC,CAAC;AACnD,EAAE,MAAM,OAAO,GAAGC,YAAQ,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;AAC/C,EAAE,MAAM,UAAU,GAAGA,YAAQ,CAAC;AAC9B,IAAI,GAAG,GAAG;AACV,MAAM,OAAO,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;AACtE,KAAK;AACL,IAAI,GAAG,CAAC,GAAG,EAAE;AACb,MAAM,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,UAAU,KAAK,KAAK,CAAC,KAAK,CAAC;AAChE,KAAK;AACL,GAAG,CAAC,CAAC;AACL,EAAE,MAAM,IAAI,GAAGC,aAAO,CAACD,YAAQ,CAAC,MAAM,UAAU,IAAI,IAAI,GAAG,KAAK,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;AACtF,EAAE,MAAM,QAAQ,GAAGE,iBAAW,CAACF,YAAQ,CAAC,MAAM,UAAU,IAAI,IAAI,GAAG,KAAK,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;AAClG,EAAE,MAAM,KAAK,GAAGH,OAAG,CAAC,KAAK,CAAC,CAAC;AAC3B,EAAE,MAAM,QAAQ,GAAGG,YAAQ,CAAC,MAAM;AAClC,IAAI,OAAO,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AACxF,GAAG,CAAC,CAAC;AACL,EAAE,OAAO;AACT,IAAI,QAAQ;AACZ,IAAI,OAAO;AACX,IAAI,UAAU;AACd,IAAI,KAAK;AACT,IAAI,IAAI;AACR,IAAI,QAAQ;AACZ,IAAI,QAAQ;AACZ,IAAI,UAAU;AACd,GAAG,CAAC;AACJ;;;;;;;"}
+{"version":3,"file":"radio.js","sources":["../../../../../../packages/components/radio/src/radio.vue"],"sourcesContent":["<template>\n  <label\n    :class=\"[\n      ns.b(),\n      ns.is('disabled', disabled),\n      ns.is('focus', focus),\n      ns.is('bordered', border),\n      ns.is('checked', modelValue === label),\n      ns.m(size),\n    ]\"\n    role=\"radio\"\n    :aria-checked=\"modelValue === label\"\n    :aria-disabled=\"disabled\"\n    :tabindex=\"tabIndex\"\n  >\n    <span\n      :class=\"[\n        ns.e('input'),\n        ns.is('disabled', disabled),\n        ns.is('checked', modelValue === label),\n      ]\"\n    >\n      <span :class=\"ns.e('inner')\" />\n      <input\n        ref=\"radioRef\"\n        v-model=\"modelValue\"\n        :class=\"ns.e('original')\"\n        :value=\"label\"\n        type=\"radio\"\n        aria-hidden=\"true\"\n        :name=\"name\"\n        :disabled=\"disabled\"\n        tabindex=\"-1\"\n      />\n    </span>\n    <span :class=\"ns.e('label')\" @keydown.stop>\n      <slot>\n        {{ label }}\n      </slot>\n    </span>\n  </label>\n</template>\n\n<script lang=\"ts\">\nimport { defineComponent } from 'vue'\nimport { useNamespace } from '@element-ps/hooks'\nimport { radioProps, useRadio } from './radio'\n\nexport default defineComponent({\n  name: 'PsRadio',\n  props: radioProps,\n\n  setup(props, { emit }) {\n    const ns = useNamespace('radio')\n    const { radioRef, isGroup, focus, size, disabled, tabIndex, modelValue } =\n      useRadio(props, emit)\n\n    return {\n      ns,\n      focus,\n      isGroup,\n      modelValue,\n      tabIndex,\n      size,\n      disabled,\n      radioRef,\n    }\n  },\n})\n</script>\n"],"names":["defineComponent","radioProps","useNamespace","useRadio","_createElementBlock","_normalizeClass","_createElementVNode","_withModifiers","_renderSlot","_createTextVNode","_toDisplayString"],"mappings":"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"}