element-plus-secondary 0.0.12 → 0.0.13

package/es/components/check-tag/src/check-tag2.mjs

@@ -1,37 +1,19 @@
-import { defineComponent, openBlock, createElementBlock, normalizeClass, unref, renderSlot } from 'vue';
+import '../../../utils/index.mjs';
 import '../../../constants/index.mjs';
-import '../../../hooks/index.mjs';
-import { checkTagProps, checkTagEmits } from './check-tag.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { buildProps } from '../../../utils/vue/props/runtime.mjs';
+import { isBoolean } from '@vueuse/core';
 import { CHANGE_EVENT } from '../../../constants/event.mjs';
 
-const __default__ = defineComponent({
-  name: "ElCheckTag"
-});
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  props: checkTagProps,
-  emits: checkTagEmits,
-  setup(__props, { emit }) {
-    const props = __props;
-    const ns = useNamespace("check-tag");
-    const handleChange = () => {
-      const checked = !props.checked;
-      emit(CHANGE_EVENT, checked);
-      emit("update:checked", checked);
-    };
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("span", {
-        class: normalizeClass([unref(ns).b(), unref(ns).is("checked", _ctx.checked)]),
-        onClick: handleChange
-      }, [
-        renderSlot(_ctx.$slots, "default")
-      ], 2);
-    };
+const checkTagProps = buildProps({
+  checked: {
+    type: Boolean,
+    default: false
   }
 });
-var CheckTag = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/st/Desktop/vue/nxx-ui/packages/components/check-tag/src/check-tag.vue"]]);
+const checkTagEmits = {
+  "update:checked": (value) => isBoolean(value),
+  [CHANGE_EVENT]: (value) => isBoolean(value)
+};
 
-export { CheckTag as default };
+export { checkTagEmits, checkTagProps };
 //# sourceMappingURL=check-tag2.mjs.map

package/es/components/check-tag/src/check-tag2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"check-tag2.mjs","sources":["../../../../../../packages/components/check-tag/src/check-tag.vue"],"sourcesContent":["<template>\n  <span :class=\"[ns.b(), ns.is('checked', checked)]\" @click=\"handleChange\">\n    <slot />\n  </span>\n</template>\n\n<script lang=\"ts\" setup>\nimport { CHANGE_EVENT } from '@element-plus/constants'\nimport { useNamespace } from '@element-plus/hooks'\nimport { checkTagEmits, checkTagProps } from './check-tag'\n\ndefineOptions({\n  name: 'ElCheckTag',\n})\nconst props = defineProps(checkTagProps)\nconst emit = defineEmits(checkTagEmits)\n\nconst ns = useNamespace('check-tag')\n\nconst handleChange = () => {\n  const checked = !props.checked\n  emit(CHANGE_EVENT, checked)\n  emit('update:checked', checked)\n}\n</script>\n"],"names":[],"mappings":";;;;;;;;mCAWc,CAAA;AAAA,EACZ,IAAM,EAAA,YAAA;AACR,CAAA,CAAA,CAAA;;;;;;;AAIA,IAAM,MAAA,EAAA,GAAK,aAAa,WAAW,CAAA,CAAA;AAEnC,IAAA,MAAM,eAAe,MAAM;AACzB,MAAM,MAAA,OAAA,GAAU,CAAC,KAAM,CAAA,OAAA,CAAA;AACvB,MAAA,IAAA,CAAK,cAAc,OAAO,CAAA,CAAA;AAC1B,MAAA,IAAA,CAAK,kBAAkB,OAAO,CAAA,CAAA;AAAA,KAChC,CAAA;;;;;;;;;;;;;;;"}
+{"version":3,"file":"check-tag2.mjs","sources":["../../../../../../packages/components/check-tag/src/check-tag.ts"],"sourcesContent":["import { buildProps, isBoolean } from '@element-plus/utils'\nimport { CHANGE_EVENT } from '@element-plus/constants'\n\nimport type CheckTag from './check-tag.vue'\nimport type { ExtractPropTypes } from 'vue'\n\nexport const checkTagProps = buildProps({\n  checked: {\n    type: Boolean,\n    default: false,\n  },\n} as const)\nexport type CheckTagProps = ExtractPropTypes<typeof checkTagProps>\n\nexport const checkTagEmits = {\n  'update:checked': (value: boolean) => isBoolean(value),\n  [CHANGE_EVENT]: (value: boolean) => isBoolean(value),\n}\nexport type CheckTagEmits = typeof checkTagEmits\n\nexport type CheckTagInstance = InstanceType<typeof CheckTag>\n"],"names":[],"mappings":";;;;;;AAEY,MAAC,aAAa,GAAG,UAAU,CAAC;AACxC,EAAE,OAAO,EAAE;AACX,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,aAAa,GAAG;AAC7B,EAAE,gBAAgB,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK,CAAC;AAC/C,EAAE,CAAC,YAAY,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK,CAAC;AAC7C;;;;"}

package/es/components/checkbox/index.mjs

@@ -1,9 +1,9 @@
 import '../../utils/index.mjs';
-import Checkbox from './src/checkbox2.mjs';
+import Checkbox from './src/checkbox.mjs';
 import CheckboxButton from './src/checkbox-button.mjs';
-import CheckboxGroup from './src/checkbox-group.mjs';
-export { checkboxGroupEmits, checkboxGroupProps } from './src/checkbox-group2.mjs';
-export { checkboxEmits, checkboxProps } from './src/checkbox.mjs';
+import CheckboxGroup from './src/checkbox-group2.mjs';
+export { checkboxGroupEmits, checkboxGroupProps } from './src/checkbox-group.mjs';
+export { checkboxEmits, checkboxProps } from './src/checkbox2.mjs';
 import { withInstall, withNoopInstall } from '../../utils/vue/install.mjs';
 
 const ElCheckbox = withInstall(Checkbox, {

package/es/components/checkbox/src/checkbox-button.mjs

@@ -2,7 +2,7 @@ import { defineComponent, useSlots, inject, computed, openBlock, createElementBl
 import '../../../hooks/index.mjs';
 import '../../../tokens/index.mjs';
 import './composables/index.mjs';
-import { checkboxProps, checkboxEmits } from './checkbox.mjs';
+import { checkboxProps, checkboxEmits } from './checkbox2.mjs';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
 import { useCheckbox } from './composables/use-checkbox.mjs';
 import { checkboxGroupContextKey } from '../../../tokens/checkbox.mjs';

package/es/components/checkbox/src/checkbox-group.mjs

@@ -1,80 +1,36 @@
-import { defineComponent, nextTick, computed, provide, toRefs, watch, openBlock, createBlock, resolveDynamicComponent, unref, normalizeClass, withCtx, renderSlot } from 'vue';
-import { pick } from 'lodash-unified';
 import '../../../constants/index.mjs';
-import '../../../utils/index.mjs';
 import '../../../hooks/index.mjs';
-import '../../../tokens/index.mjs';
-import { checkboxGroupProps, checkboxGroupEmits } from './checkbox-group2.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
-import { useFormItem, useFormItemInputId } from '../../../hooks/use-form-item/index.mjs';
+import '../../../utils/index.mjs';
+import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
+import { useSizeProp } from '../../../hooks/use-common-props/index.mjs';
 import { UPDATE_MODEL_EVENT } from '../../../constants/event.mjs';
-import { checkboxGroupContextKey } from '../../../tokens/checkbox.mjs';
-import { debugWarn } from '../../../utils/error.mjs';
+import { isArray } from '@vue/shared';
 
-const __default__ = defineComponent({
-  name: "ElCheckboxGroup"
-});
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  props: checkboxGroupProps,
-  emits: checkboxGroupEmits,
-  setup(__props, { emit }) {
-    const props = __props;
-    const ns = useNamespace("checkbox");
-    const { formItem } = useFormItem();
-    const { inputId: groupId, isLabeledByFormItem } = useFormItemInputId(props, {
-      formItemContext: formItem
-    });
-    const changeEvent = async (value) => {
-      emit(UPDATE_MODEL_EVENT, value);
-      await nextTick();
-      emit("change", value);
-    };
-    const modelValue = computed({
-      get() {
-        return props.modelValue;
-      },
-      set(val) {
-        changeEvent(val);
-      }
-    });
-    provide(checkboxGroupContextKey, {
-      ...pick(toRefs(props), [
-        "size",
-        "min",
-        "max",
-        "disabled",
-        "validateEvent",
-        "fill",
-        "textColor"
-      ]),
-      modelValue,
-      changeEvent
-    });
-    watch(() => props.modelValue, () => {
-      if (props.validateEvent) {
-        formItem == null ? void 0 : formItem.validate("change").catch((err) => debugWarn(err));
-      }
-    });
-    return (_ctx, _cache) => {
-      var _a;
-      return openBlock(), createBlock(resolveDynamicComponent(_ctx.tag), {
-        id: unref(groupId),
-        class: normalizeClass(unref(ns).b("group")),
-        role: "group",
-        "aria-label": !unref(isLabeledByFormItem) ? _ctx.label || "checkbox-group" : void 0,
-        "aria-labelledby": unref(isLabeledByFormItem) ? (_a = unref(formItem)) == null ? void 0 : _a.labelId : void 0
-      }, {
-        default: withCtx(() => [
-          renderSlot(_ctx.$slots, "default")
-        ]),
-        _: 3
-      }, 8, ["id", "class", "aria-label", "aria-labelledby"]);
-    };
+const checkboxGroupProps = buildProps({
+  modelValue: {
+    type: definePropType(Array),
+    default: () => []
+  },
+  disabled: Boolean,
+  min: Number,
+  max: Number,
+  size: useSizeProp,
+  label: String,
+  fill: String,
+  textColor: String,
+  tag: {
+    type: String,
+    default: "div"
+  },
+  validateEvent: {
+    type: Boolean,
+    default: true
   }
 });
-var CheckboxGroup = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/st/Desktop/vue/nxx-ui/packages/components/checkbox/src/checkbox-group.vue"]]);
+const checkboxGroupEmits = {
+  [UPDATE_MODEL_EVENT]: (val) => isArray(val),
+  change: (val) => isArray(val)
+};
 
-export { CheckboxGroup as default };
+export { checkboxGroupEmits, checkboxGroupProps };
 //# sourceMappingURL=checkbox-group.mjs.map

package/es/components/checkbox/src/checkbox-group.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"checkbox-group.mjs","sources":["../../../../../../packages/components/checkbox/src/checkbox-group.vue"],"sourcesContent":["<template>\n  <component\n    :is=\"tag\"\n    :id=\"groupId\"\n    :class=\"ns.b('group')\"\n    role=\"group\"\n    :aria-label=\"!isLabeledByFormItem ? label || 'checkbox-group' : undefined\"\n    :aria-labelledby=\"isLabeledByFormItem ? formItem?.labelId : undefined\"\n  >\n    <slot />\n  </component>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, nextTick, provide, toRefs, watch } from 'vue'\nimport { pick } from 'lodash-unified'\nimport { UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport { debugWarn } from '@element-plus/utils'\nimport {\n  useFormItem,\n  useFormItemInputId,\n  useNamespace,\n} from '@element-plus/hooks'\nimport { checkboxGroupContextKey } from '@element-plus/tokens'\nimport { checkboxGroupEmits, checkboxGroupProps } from './checkbox-group'\n\nimport type { CheckboxValueType } from './checkbox'\n\ndefineOptions({\n  name: 'ElCheckboxGroup',\n})\n\nconst props = defineProps(checkboxGroupProps)\nconst emit = defineEmits(checkboxGroupEmits)\nconst ns = useNamespace('checkbox')\n\nconst { formItem } = useFormItem()\nconst { inputId: groupId, isLabeledByFormItem } = useFormItemInputId(props, {\n  formItemContext: formItem,\n})\n\nconst changeEvent = async (value: CheckboxValueType[]) => {\n  emit(UPDATE_MODEL_EVENT, value)\n  await nextTick()\n  emit('change', value)\n}\n\nconst modelValue = computed({\n  get() {\n    return props.modelValue\n  },\n  set(val: CheckboxValueType[]) {\n    changeEvent(val)\n  },\n})\n\nprovide(checkboxGroupContextKey, {\n  ...pick(toRefs(props), [\n    'size',\n    'min',\n    'max',\n    'disabled',\n    'validateEvent',\n    'fill',\n    'textColor',\n  ]),\n  modelValue,\n  changeEvent,\n})\n\nwatch(\n  () => props.modelValue,\n  () => {\n    if (props.validateEvent) {\n      formItem?.validate('change').catch((err) => debugWarn(err))\n    }\n  }\n)\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;mCA4Bc,CAAA;AAAA,EACZ,IAAM,EAAA,iBAAA;AACR,CAAA,CAAA,CAAA;;;;;;;AAIA,IAAM,MAAA,EAAA,GAAK,aAAa,UAAU,CAAA,CAAA;AAElC,IAAM,MAAA,EAAE,aAAa,WAAY,EAAA,CAAA;AACjC,IAAA,MAAM,EAAE,OAAA,EAAS,OAAS,EAAA,mBAAA,EAAA,GAAwB,mBAAmB,KAAO,EAAA;AAAA,MAC1E,eAAiB,EAAA,QAAA;AAAA,KAClB,CAAA,CAAA;AAED,IAAM,MAAA,WAAA,GAAc,OAAO,KAA+B,KAAA;AACxD,MAAA,IAAA,CAAK,oBAAoB,KAAK,CAAA,CAAA;AAC9B,MAAA,MAAM,QAAS,EAAA,CAAA;AACf,MAAA,IAAA,CAAK,UAAU,KAAK,CAAA,CAAA;AAAA,KACtB,CAAA;AAEA,IAAA,MAAM,aAAa,QAAS,CAAA;AAAA,MAC1B,GAAM,GAAA;AACJ,QAAA,OAAO,KAAM,CAAA,UAAA,CAAA;AAAA,OACf;AAAA,MACA,IAAI,GAA0B,EAAA;AAC5B,QAAA,WAAA,CAAY,GAAG,CAAA,CAAA;AAAA,OACjB;AAAA,KACD,CAAA,CAAA;AAED,IAAA,OAAA,CAAQ,uBAAyB,EAAA;AAAA,MAC/B,GAAG,IAAA,CAAK,MAAO,CAAA,KAAK,CAAG,EAAA;AAAA,QACrB,MAAA;AAAA,QACA,KAAA;AAAA,QACA,KAAA;AAAA,QACA,UAAA;AAAA,QACA,eAAA;AAAA,QACA,MAAA;AAAA,QACA,WAAA;AAAA,OACD,CAAA;AAAA,MACD,UAAA;AAAA,MACA,WAAA;AAAA,KACD,CAAA,CAAA;AAED,IACE,KAAA,CAAA,MAAM,KAAM,CAAA,UAAA,EACZ,MAAM;AACJ,MAAA,IAAI,MAAM,aAAe,EAAA;AACvB,QAAU,QAAA,IAAA,IAAA,GAAS,SAAU,QAAO,CAAQ,QAAA,CAAA,QAAU,OAAI,CAAA,CAAA,GAAA,KAAA,SAAA,CAAA,GAAA,CAAA,CAAA,CAAA;AAAA,OAC5D;AAAA,KAEJ,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"checkbox-group.mjs","sources":["../../../../../../packages/components/checkbox/src/checkbox-group.ts"],"sourcesContent":["import { UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport { useSizeProp } from '@element-plus/hooks'\nimport { buildProps, definePropType, isArray } from '@element-plus/utils'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type checkboxGroup from './checkbox-group.vue'\nimport type { CheckboxValueType } from './checkbox'\n\nexport const checkboxGroupProps = buildProps({\n  modelValue: {\n    type: definePropType<Array<string | number>>(Array),\n    default: () => [],\n  },\n  disabled: Boolean,\n  min: Number,\n  max: Number,\n  size: useSizeProp,\n  label: String,\n  fill: String,\n  textColor: String,\n  tag: {\n    type: String,\n    default: 'div',\n  },\n  validateEvent: {\n    type: Boolean,\n    default: true,\n  },\n} as const)\n\nexport const checkboxGroupEmits = {\n  [UPDATE_MODEL_EVENT]: (val: CheckboxValueType[]) => isArray(val),\n  change: (val: CheckboxValueType[]) => isArray(val),\n}\n\nexport type CheckboxGroupProps = ExtractPropTypes<typeof checkboxGroupProps>\nexport type CheckboxGroupEmits = typeof checkboxGroupEmits\nexport type CheckboxGroupInstance = InstanceType<typeof checkboxGroup>\n"],"names":[],"mappings":";;;;;;;;AAGY,MAAC,kBAAkB,GAAG,UAAU,CAAC;AAC7C,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC;AAC/B,IAAI,OAAO,EAAE,MAAM,EAAE;AACrB,GAAG;AACH,EAAE,QAAQ,EAAE,OAAO;AACnB,EAAE,GAAG,EAAE,MAAM;AACb,EAAE,GAAG,EAAE,MAAM;AACb,EAAE,IAAI,EAAE,WAAW;AACnB,EAAE,KAAK,EAAE,MAAM;AACf,EAAE,IAAI,EAAE,MAAM;AACd,EAAE,SAAS,EAAE,MAAM;AACnB,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,aAAa,EAAE;AACjB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,kBAAkB,GAAG;AAClC,EAAE,CAAC,kBAAkB,GAAG,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC;AAC7C,EAAE,MAAM,EAAE,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC;AAC/B;;;;"}

package/es/components/checkbox/src/checkbox-group2.mjs

@@ -1,36 +1,80 @@
+import { defineComponent, nextTick, computed, provide, toRefs, watch, openBlock, createBlock, resolveDynamicComponent, unref, normalizeClass, withCtx, renderSlot } from 'vue';
+import { pick } from 'lodash-unified';
 import '../../../constants/index.mjs';
-import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
-import { useSizeProp } from '../../../hooks/use-common-props/index.mjs';
+import '../../../hooks/index.mjs';
+import '../../../tokens/index.mjs';
+import { checkboxGroupProps, checkboxGroupEmits } from './checkbox-group.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { useFormItem, useFormItemInputId } from '../../../hooks/use-form-item/index.mjs';
 import { UPDATE_MODEL_EVENT } from '../../../constants/event.mjs';
-import { isArray } from '@vue/shared';
+import { checkboxGroupContextKey } from '../../../tokens/checkbox.mjs';
+import { debugWarn } from '../../../utils/error.mjs';
 
-const checkboxGroupProps = buildProps({
-  modelValue: {
-    type: definePropType(Array),
-    default: () => []
-  },
-  disabled: Boolean,
-  min: Number,
-  max: Number,
-  size: useSizeProp,
-  label: String,
-  fill: String,
-  textColor: String,
-  tag: {
-    type: String,
-    default: "div"
-  },
-  validateEvent: {
-    type: Boolean,
-    default: true
+const __default__ = defineComponent({
+  name: "ElCheckboxGroup"
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: checkboxGroupProps,
+  emits: checkboxGroupEmits,
+  setup(__props, { emit }) {
+    const props = __props;
+    const ns = useNamespace("checkbox");
+    const { formItem } = useFormItem();
+    const { inputId: groupId, isLabeledByFormItem } = useFormItemInputId(props, {
+      formItemContext: formItem
+    });
+    const changeEvent = async (value) => {
+      emit(UPDATE_MODEL_EVENT, value);
+      await nextTick();
+      emit("change", value);
+    };
+    const modelValue = computed({
+      get() {
+        return props.modelValue;
+      },
+      set(val) {
+        changeEvent(val);
+      }
+    });
+    provide(checkboxGroupContextKey, {
+      ...pick(toRefs(props), [
+        "size",
+        "min",
+        "max",
+        "disabled",
+        "validateEvent",
+        "fill",
+        "textColor"
+      ]),
+      modelValue,
+      changeEvent
+    });
+    watch(() => props.modelValue, () => {
+      if (props.validateEvent) {
+        formItem == null ? void 0 : formItem.validate("change").catch((err) => debugWarn(err));
+      }
+    });
+    return (_ctx, _cache) => {
+      var _a;
+      return openBlock(), createBlock(resolveDynamicComponent(_ctx.tag), {
+        id: unref(groupId),
+        class: normalizeClass(unref(ns).b("group")),
+        role: "group",
+        "aria-label": !unref(isLabeledByFormItem) ? _ctx.label || "checkbox-group" : void 0,
+        "aria-labelledby": unref(isLabeledByFormItem) ? (_a = unref(formItem)) == null ? void 0 : _a.labelId : void 0
+      }, {
+        default: withCtx(() => [
+          renderSlot(_ctx.$slots, "default")
+        ]),
+        _: 3
+      }, 8, ["id", "class", "aria-label", "aria-labelledby"]);
+    };
   }
 });
-const checkboxGroupEmits = {
-  [UPDATE_MODEL_EVENT]: (val) => isArray(val),
-  change: (val) => isArray(val)
-};
+var CheckboxGroup = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/st/Desktop/vue/nxx-ui/packages/components/checkbox/src/checkbox-group.vue"]]);
 
-export { checkboxGroupEmits, checkboxGroupProps };
+export { CheckboxGroup as default };
 //# sourceMappingURL=checkbox-group2.mjs.map

package/es/components/checkbox/src/checkbox-group2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"checkbox-group2.mjs","sources":["../../../../../../packages/components/checkbox/src/checkbox-group.ts"],"sourcesContent":["import { UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport { useSizeProp } from '@element-plus/hooks'\nimport { buildProps, definePropType, isArray } from '@element-plus/utils'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type checkboxGroup from './checkbox-group.vue'\nimport type { CheckboxValueType } from './checkbox'\n\nexport const checkboxGroupProps = buildProps({\n  modelValue: {\n    type: definePropType<Array<string | number>>(Array),\n    default: () => [],\n  },\n  disabled: Boolean,\n  min: Number,\n  max: Number,\n  size: useSizeProp,\n  label: String,\n  fill: String,\n  textColor: String,\n  tag: {\n    type: String,\n    default: 'div',\n  },\n  validateEvent: {\n    type: Boolean,\n    default: true,\n  },\n} as const)\n\nexport const checkboxGroupEmits = {\n  [UPDATE_MODEL_EVENT]: (val: CheckboxValueType[]) => isArray(val),\n  change: (val: CheckboxValueType[]) => isArray(val),\n}\n\nexport type CheckboxGroupProps = ExtractPropTypes<typeof checkboxGroupProps>\nexport type CheckboxGroupEmits = typeof checkboxGroupEmits\nexport type CheckboxGroupInstance = InstanceType<typeof checkboxGroup>\n"],"names":[],"mappings":";;;;;;;;AAGY,MAAC,kBAAkB,GAAG,UAAU,CAAC;AAC7C,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC;AAC/B,IAAI,OAAO,EAAE,MAAM,EAAE;AACrB,GAAG;AACH,EAAE,QAAQ,EAAE,OAAO;AACnB,EAAE,GAAG,EAAE,MAAM;AACb,EAAE,GAAG,EAAE,MAAM;AACb,EAAE,IAAI,EAAE,WAAW;AACnB,EAAE,KAAK,EAAE,MAAM;AACf,EAAE,IAAI,EAAE,MAAM;AACd,EAAE,SAAS,EAAE,MAAM;AACnB,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,aAAa,EAAE;AACjB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,kBAAkB,GAAG;AAClC,EAAE,CAAC,kBAAkB,GAAG,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC;AAC7C,EAAE,MAAM,EAAE,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC;AAC/B;;;;"}
+{"version":3,"file":"checkbox-group2.mjs","sources":["../../../../../../packages/components/checkbox/src/checkbox-group.vue"],"sourcesContent":["<template>\n  <component\n    :is=\"tag\"\n    :id=\"groupId\"\n    :class=\"ns.b('group')\"\n    role=\"group\"\n    :aria-label=\"!isLabeledByFormItem ? label || 'checkbox-group' : undefined\"\n    :aria-labelledby=\"isLabeledByFormItem ? formItem?.labelId : undefined\"\n  >\n    <slot />\n  </component>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, nextTick, provide, toRefs, watch } from 'vue'\nimport { pick } from 'lodash-unified'\nimport { UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport { debugWarn } from '@element-plus/utils'\nimport {\n  useFormItem,\n  useFormItemInputId,\n  useNamespace,\n} from '@element-plus/hooks'\nimport { checkboxGroupContextKey } from '@element-plus/tokens'\nimport { checkboxGroupEmits, checkboxGroupProps } from './checkbox-group'\n\nimport type { CheckboxValueType } from './checkbox'\n\ndefineOptions({\n  name: 'ElCheckboxGroup',\n})\n\nconst props = defineProps(checkboxGroupProps)\nconst emit = defineEmits(checkboxGroupEmits)\nconst ns = useNamespace('checkbox')\n\nconst { formItem } = useFormItem()\nconst { inputId: groupId, isLabeledByFormItem } = useFormItemInputId(props, {\n  formItemContext: formItem,\n})\n\nconst changeEvent = async (value: CheckboxValueType[]) => {\n  emit(UPDATE_MODEL_EVENT, value)\n  await nextTick()\n  emit('change', value)\n}\n\nconst modelValue = computed({\n  get() {\n    return props.modelValue\n  },\n  set(val: CheckboxValueType[]) {\n    changeEvent(val)\n  },\n})\n\nprovide(checkboxGroupContextKey, {\n  ...pick(toRefs(props), [\n    'size',\n    'min',\n    'max',\n    'disabled',\n    'validateEvent',\n    'fill',\n    'textColor',\n  ]),\n  modelValue,\n  changeEvent,\n})\n\nwatch(\n  () => props.modelValue,\n  () => {\n    if (props.validateEvent) {\n      formItem?.validate('change').catch((err) => debugWarn(err))\n    }\n  }\n)\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;mCA4Bc,CAAA;AAAA,EACZ,IAAM,EAAA,iBAAA;AACR,CAAA,CAAA,CAAA;;;;;;;AAIA,IAAM,MAAA,EAAA,GAAK,aAAa,UAAU,CAAA,CAAA;AAElC,IAAM,MAAA,EAAE,aAAa,WAAY,EAAA,CAAA;AACjC,IAAA,MAAM,EAAE,OAAA,EAAS,OAAS,EAAA,mBAAA,EAAA,GAAwB,mBAAmB,KAAO,EAAA;AAAA,MAC1E,eAAiB,EAAA,QAAA;AAAA,KAClB,CAAA,CAAA;AAED,IAAM,MAAA,WAAA,GAAc,OAAO,KAA+B,KAAA;AACxD,MAAA,IAAA,CAAK,oBAAoB,KAAK,CAAA,CAAA;AAC9B,MAAA,MAAM,QAAS,EAAA,CAAA;AACf,MAAA,IAAA,CAAK,UAAU,KAAK,CAAA,CAAA;AAAA,KACtB,CAAA;AAEA,IAAA,MAAM,aAAa,QAAS,CAAA;AAAA,MAC1B,GAAM,GAAA;AACJ,QAAA,OAAO,KAAM,CAAA,UAAA,CAAA;AAAA,OACf;AAAA,MACA,IAAI,GAA0B,EAAA;AAC5B,QAAA,WAAA,CAAY,GAAG,CAAA,CAAA;AAAA,OACjB;AAAA,KACD,CAAA,CAAA;AAED,IAAA,OAAA,CAAQ,uBAAyB,EAAA;AAAA,MAC/B,GAAG,IAAA,CAAK,MAAO,CAAA,KAAK,CAAG,EAAA;AAAA,QACrB,MAAA;AAAA,QACA,KAAA;AAAA,QACA,KAAA;AAAA,QACA,UAAA;AAAA,QACA,eAAA;AAAA,QACA,MAAA;AAAA,QACA,WAAA;AAAA,OACD,CAAA;AAAA,MACD,UAAA;AAAA,MACA,WAAA;AAAA,KACD,CAAA,CAAA;AAED,IACE,KAAA,CAAA,MAAM,KAAM,CAAA,UAAA,EACZ,MAAM;AACJ,MAAA,IAAI,MAAM,aAAe,EAAA;AACvB,QAAU,QAAA,IAAA,IAAA,GAAS,SAAU,QAAO,CAAQ,QAAA,CAAA,QAAU,OAAI,CAAA,CAAA,GAAA,KAAA,SAAA,CAAA,GAAA,CAAA,CAAA,CAAA;AAAA,OAC5D;AAAA,KAEJ,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/checkbox/src/checkbox.mjs

@@ -1,54 +1,121 @@
-import '../../../constants/index.mjs';
+import { defineComponent, useSlots, inject, computed, openBlock, createBlock, resolveDynamicComponent, unref, normalizeClass, withCtx, createElementVNode, withDirectives, createElementBlock, isRef, vModelCheckbox, normalizeStyle, renderSlot, Fragment, createTextVNode, toDisplayString, createCommentVNode } from 'vue';
 import '../../../hooks/index.mjs';
-import '../../../utils/index.mjs';
-import { useSizeProp } from '../../../hooks/use-common-props/index.mjs';
-import { UPDATE_MODEL_EVENT } from '../../../constants/event.mjs';
-import { isString } from '@vue/shared';
-import { isNumber, isBoolean } from '@vueuse/core';
+import { checkboxProps, checkboxEmits } from './checkbox2.mjs';
+import './composables/index.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useCheckbox } from './composables/use-checkbox.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
 
-const checkboxProps = {
-  modelValue: {
-    type: [Number, String, Boolean],
-    default: void 0
-  },
-  label: {
-    type: [String, Boolean, Number, Object]
-  },
-  indeterminate: Boolean,
-  disabled: Boolean,
-  checked: Boolean,
-  name: {
-    type: String,
-    default: void 0
-  },
-  trueLabel: {
-    type: [String, Number],
-    default: void 0
-  },
-  falseLabel: {
-    type: [String, Number],
-    default: void 0
-  },
-  id: {
-    type: String,
-    default: void 0
-  },
-  controls: {
-    type: String,
-    default: void 0
-  },
-  border: Boolean,
-  size: useSizeProp,
-  tabindex: [String, Number],
-  validateEvent: {
-    type: Boolean,
-    default: true
+const _hoisted_1 = ["tabindex", "role", "aria-checked"];
+const _hoisted_2 = ["id", "aria-hidden", "name", "tabindex", "disabled", "true-value", "false-value"];
+const _hoisted_3 = ["id", "aria-hidden", "disabled", "value", "name", "tabindex"];
+const __default__ = defineComponent({
+  name: "ElCheckbox"
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: checkboxProps,
+  emits: checkboxEmits,
+  setup(__props) {
+    const props = __props;
+    const slots = useSlots();
+    const {
+      inputId,
+      isLabeledByFormItem,
+      isChecked,
+      isDisabled,
+      isFocused,
+      checkboxSize,
+      hasOwnLabel,
+      model,
+      handleChange,
+      onClickRoot
+    } = useCheckbox(props, slots);
+    const customStyle = inject("$custom-style-filter", {});
+    const normalStyle = computed(() => {
+      return customStyle.text ? { color: customStyle.text } : {};
+    });
+    const ns = useNamespace("checkbox");
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(resolveDynamicComponent(!unref(hasOwnLabel) && unref(isLabeledByFormItem) ? "span" : "label"), {
+        class: normalizeClass([
+          unref(ns).b(),
+          unref(ns).m(unref(checkboxSize)),
+          unref(ns).is("disabled", unref(isDisabled)),
+          unref(ns).is("bordered", _ctx.border),
+          unref(ns).is("checked", unref(isChecked))
+        ]),
+        "aria-controls": _ctx.indeterminate ? _ctx.controls : null,
+        onClick: unref(onClickRoot)
+      }, {
+        default: withCtx(() => [
+          createElementVNode("span", {
+            class: normalizeClass([
+              unref(ns).e("input"),
+              unref(ns).is("disabled", unref(isDisabled)),
+              unref(ns).is("checked", unref(isChecked)),
+              unref(ns).is("indeterminate", _ctx.indeterminate),
+              unref(ns).is("focus", unref(isFocused))
+            ]),
+            tabindex: _ctx.indeterminate ? 0 : void 0,
+            role: _ctx.indeterminate ? "checkbox" : void 0,
+            "aria-checked": _ctx.indeterminate ? "mixed" : void 0
+          }, [
+            _ctx.trueLabel || _ctx.falseLabel ? withDirectives((openBlock(), createElementBlock("input", {
+              key: 0,
+              id: unref(inputId),
+              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(model) ? model.value = $event : null),
+              class: normalizeClass(unref(ns).e("original")),
+              type: "checkbox",
+              "aria-hidden": _ctx.indeterminate ? "true" : "false",
+              name: _ctx.name,
+              tabindex: _ctx.tabindex,
+              disabled: unref(isDisabled),
+              "true-value": _ctx.trueLabel,
+              "false-value": _ctx.falseLabel,
+              onChange: _cache[1] || (_cache[1] = (...args) => unref(handleChange) && unref(handleChange)(...args)),
+              onFocus: _cache[2] || (_cache[2] = ($event) => isFocused.value = true),
+              onBlur: _cache[3] || (_cache[3] = ($event) => isFocused.value = false)
+            }, null, 42, _hoisted_2)), [
+              [vModelCheckbox, unref(model)]
+            ]) : withDirectives((openBlock(), createElementBlock("input", {
+              key: 1,
+              id: unref(inputId),
+              "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => isRef(model) ? model.value = $event : null),
+              class: normalizeClass(unref(ns).e("original")),
+              type: "checkbox",
+              "aria-hidden": _ctx.indeterminate ? "true" : "false",
+              disabled: unref(isDisabled),
+              value: _ctx.label,
+              name: _ctx.name,
+              tabindex: _ctx.tabindex,
+              onChange: _cache[5] || (_cache[5] = (...args) => unref(handleChange) && unref(handleChange)(...args)),
+              onFocus: _cache[6] || (_cache[6] = ($event) => isFocused.value = true),
+              onBlur: _cache[7] || (_cache[7] = ($event) => isFocused.value = false)
+            }, null, 42, _hoisted_3)), [
+              [vModelCheckbox, unref(model)]
+            ]),
+            createElementVNode("span", {
+              class: normalizeClass(unref(ns).e("inner"))
+            }, null, 2)
+          ], 10, _hoisted_1),
+          unref(hasOwnLabel) ? (openBlock(), createElementBlock("span", {
+            key: 0,
+            style: normalizeStyle(unref(normalStyle)),
+            class: normalizeClass(unref(ns).e("label"))
+          }, [
+            renderSlot(_ctx.$slots, "default"),
+            !_ctx.$slots.default ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+              createTextVNode(toDisplayString(_ctx.label), 1)
+            ], 64)) : createCommentVNode("v-if", true)
+          ], 6)) : createCommentVNode("v-if", true)
+        ]),
+        _: 3
+      }, 8, ["class", "aria-controls", "onClick"]);
+    };
   }
-};
-const checkboxEmits = {
-  [UPDATE_MODEL_EVENT]: (val) => isString(val) || isNumber(val) || isBoolean(val),
-  change: (val) => isString(val) || isNumber(val) || isBoolean(val)
-};
+});
+var Checkbox = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/st/Desktop/vue/nxx-ui/packages/components/checkbox/src/checkbox.vue"]]);
 
-export { checkboxEmits, checkboxProps };
+export { Checkbox as default };
 //# sourceMappingURL=checkbox.mjs.map

package/es/components/checkbox/src/checkbox.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"checkbox.mjs","sources":["../../../../../../packages/components/checkbox/src/checkbox.ts"],"sourcesContent":["import { UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport { useSizeProp } from '@element-plus/hooks'\nimport { isBoolean, isNumber, isString } from '@element-plus/utils'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type Checkbox from './checkbox.vue'\n\nexport type CheckboxValueType = string | number | boolean\n\nexport const checkboxProps = {\n  modelValue: {\n    type: [Number, String, Boolean],\n    default: undefined,\n  },\n  label: {\n    type: [String, Boolean, Number, Object],\n  },\n  indeterminate: Boolean,\n  disabled: Boolean,\n  checked: Boolean,\n  name: {\n    type: String,\n    default: undefined,\n  },\n  trueLabel: {\n    type: [String, Number],\n    default: undefined,\n  },\n  falseLabel: {\n    type: [String, Number],\n    default: undefined,\n  },\n  id: {\n    type: String,\n    default: undefined,\n  },\n  controls: {\n    type: String,\n    default: undefined,\n  },\n  border: Boolean,\n  size: useSizeProp,\n  tabindex: [String, Number],\n  validateEvent: {\n    type: Boolean,\n    default: true,\n  },\n}\n\nexport const checkboxEmits = {\n  [UPDATE_MODEL_EVENT]: (val: CheckboxValueType) =>\n    isString(val) || isNumber(val) || isBoolean(val),\n  change: (val: CheckboxValueType) =>\n    isString(val) || isNumber(val) || isBoolean(val),\n}\n\nexport type CheckboxProps = ExtractPropTypes<typeof checkboxProps>\nexport type CheckboxEmits = typeof checkboxEmits\nexport type CheckboxInstance = InstanceType<typeof Checkbox>\n"],"names":[],"mappings":";;;;;;;;AAGY,MAAC,aAAa,GAAG;AAC7B,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;AACnC,IAAI,OAAO,EAAE,KAAK,CAAC;AACnB,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC;AAC3C,GAAG;AACH,EAAE,aAAa,EAAE,OAAO;AACxB,EAAE,QAAQ,EAAE,OAAO;AACnB,EAAE,OAAO,EAAE,OAAO;AAClB,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,KAAK,CAAC;AACnB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,IAAI,OAAO,EAAE,KAAK,CAAC;AACnB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,IAAI,OAAO,EAAE,KAAK,CAAC;AACnB,GAAG;AACH,EAAE,EAAE,EAAE;AACN,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,KAAK,CAAC;AACnB,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,KAAK,CAAC;AACnB,GAAG;AACH,EAAE,MAAM,EAAE,OAAO;AACjB,EAAE,IAAI,EAAE,WAAW;AACnB,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC5B,EAAE,aAAa,EAAE;AACjB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE;AACU,MAAC,aAAa,GAAG;AAC7B,EAAE,CAAC,kBAAkB,GAAG,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC;AACjF,EAAE,MAAM,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC;AACnE;;;;"}
+{"version":3,"file":"checkbox.mjs","sources":["../../../../../../packages/components/checkbox/src/checkbox.vue"],"sourcesContent":["<template>\n  <component\n    :is=\"!hasOwnLabel && isLabeledByFormItem ? 'span' : 'label'\"\n    :class=\"[\n      ns.b(),\n      ns.m(checkboxSize),\n      ns.is('disabled', isDisabled),\n      ns.is('bordered', border),\n      ns.is('checked', isChecked),\n    ]\"\n    :aria-controls=\"indeterminate ? controls : null\"\n    @click=\"onClickRoot\"\n  >\n    <span\n      :class=\"[\n        ns.e('input'),\n        ns.is('disabled', isDisabled),\n        ns.is('checked', isChecked),\n        ns.is('indeterminate', indeterminate),\n        ns.is('focus', isFocused),\n      ]\"\n      :tabindex=\"indeterminate ? 0 : undefined\"\n      :role=\"indeterminate ? 'checkbox' : undefined\"\n      :aria-checked=\"indeterminate ? 'mixed' : undefined\"\n    >\n      <input\n        v-if=\"trueLabel || falseLabel\"\n        :id=\"inputId\"\n        v-model=\"model\"\n        :class=\"ns.e('original')\"\n        type=\"checkbox\"\n        :aria-hidden=\"indeterminate ? 'true' : 'false'\"\n        :name=\"name\"\n        :tabindex=\"tabindex\"\n        :disabled=\"isDisabled\"\n        :true-value=\"trueLabel\"\n        :false-value=\"falseLabel\"\n        @change=\"handleChange\"\n        @focus=\"isFocused = true\"\n        @blur=\"isFocused = false\"\n      />\n      <input\n        v-else\n        :id=\"inputId\"\n        v-model=\"model\"\n        :class=\"ns.e('original')\"\n        type=\"checkbox\"\n        :aria-hidden=\"indeterminate ? 'true' : 'false'\"\n        :disabled=\"isDisabled\"\n        :value=\"label\"\n        :name=\"name\"\n        :tabindex=\"tabindex\"\n        @change=\"handleChange\"\n        @focus=\"isFocused = true\"\n        @blur=\"isFocused = false\"\n      />\n      <span :class=\"ns.e('inner')\" />\n    </span>\n    <span v-if=\"hasOwnLabel\" :style=\"normalStyle\" :class=\"ns.e('label')\">\n      <slot />\n      <template v-if=\"!$slots.default\">{{ label }}</template>\n    </span>\n  </component>\n</template>\n\n<script lang=\"ts\" setup>\nimport { useSlots, inject, computed } from 'vue'\nimport type { CSSProperties } from 'vue'\nimport { useNamespace } from '@element-plus/hooks'\nimport { checkboxEmits, checkboxProps } from './checkbox'\nimport { useCheckbox } from './composables'\n\ndefineOptions({\n  name: 'ElCheckbox',\n})\n\nconst props = defineProps(checkboxProps)\ndefineEmits(checkboxEmits)\nconst slots = useSlots()\n\nconst {\n  inputId,\n  isLabeledByFormItem,\n  isChecked,\n  isDisabled,\n  isFocused,\n  checkboxSize,\n  hasOwnLabel,\n  model,\n  handleChange,\n  onClickRoot,\n} = useCheckbox(props, slots)\n\nconst customStyle = inject('$custom-style-filter', {}) as {\n  text: string\n      }\n\nconst normalStyle = computed<CSSProperties>(() => {\n  return customStyle.text ? { color: customStyle.text } : {}\n})\n\nconst ns = useNamespace('checkbox')\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;mCAwEc,CAAA;AAAA,EACZ,IAAM,EAAA,YAAA;AACR,CAAA,CAAA,CAAA;;;;;;;AAIA,IAAA,MAAM,QAAQ,QAAS,EAAA,CAAA;AAEvB,IAAM,MAAA;AAAA,MACJ,OAAA;AAAA,MACA,mBAAA;AAAA,MACA,SAAA;AAAA,MACA,UAAA;AAAA,MACA,SAAA;AAAA,MACA,YAAA;AAAA,MACA,WAAA;AAAA,MACA,KAAA;AAAA,MACA,YAAA;AAAA,MACA,WAAA;AAAA,KACE,GAAA,WAAA,CAAY,OAAO,KAAK,CAAA,CAAA;AAE5B,IAAA,MAAM,WAAc,GAAA,MAAA,CAAO,sBAAwB,EAAA,EAAE,CAAA,CAAA;AAIrD,IAAM,MAAA,WAAA,GAAc,SAAwB,MAAM;AAChD,MAAA,OAAO,YAAY,IAAO,GAAA,EAAE,OAAO,WAAY,CAAA,IAAA,KAAS,EAAC,CAAA;AAAA,KAC1D,CAAA,CAAA;AAED,IAAM,MAAA,EAAA,GAAK,aAAa,UAAU,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}