@v-c/select 1.0.13 → 1.0.15

package/dist/OptionList.js

@@ -169,11 +169,14 @@ var OptionList_default = /* @__PURE__ */ defineComponent({
 				const item = memoFlattenOptions.value[index];
 				if (!item) return null;
 				const itemData = item.data || {};
-				const { value } = itemData;
+				const { value, disabled } = itemData;
 				const { group } = item;
 				const attrs = pickAttrs(itemData, true);
 				const mergedLabel = getLabel(item);
-				return item ? createVNode("div", mergeProps({ "aria-label": typeof mergedLabel === "string" && !group ? mergedLabel : void 0 }, attrs, { "key": index }, getItemAriaProps(item, index), { "aria-selected": isAriaSelected(value) }), [value]) : null;
+				return item ? createVNode("div", mergeProps({ "aria-label": typeof mergedLabel === "string" && !group ? mergedLabel : void 0 }, attrs, { "key": index }, getItemAriaProps(item, index), {
+					"aria-selected": isAriaSelected(value),
+					"aria-disabled": disabled
+				}), [value]) : null;
 			};
 			const a11yProps = {
 				role: "listbox",
@@ -234,6 +237,7 @@ var OptionList_default = /* @__PURE__ */ defineComponent({
 				if (title !== void 0) optionTitle = title;
 				return createVNode("div", mergeProps(pickAttrs(passedProps), !virtual ? getItemAriaProps(item, itemIndex) : {}, {
 					"aria-selected": virtual ? void 0 : isAriaSelected(value),
+					"aria-disabled": mergedDisabled,
 					"class": optionClassName,
 					"title": optionTitle,
 					"onMousemove": () => {

package/dist/Select.js

@@ -565,6 +565,9 @@ var Select_default = /* @__PURE__ */ defineComponent({
 			onSearch: toRef(props, "onSearch"),
 			autoClearSearchValue: toRef(props, "autoClearSearchValue")
 		}, toRef(props, "mode"));
+		const normalizedOptionFilterProps = computed(() => {
+			return searchConfig.value?.optionFilterProp;
+		});
 		const mergedFilterOption = computed(() => {
 			if (searchConfig.value.filterOption === void 0 && props.mode === "combobox") return false;
 			return searchConfig.value.filterOption;
@@ -579,7 +582,7 @@ var Select_default = /* @__PURE__ */ defineComponent({
 		};
 		const mergedSearchValue = computed(() => internalSearchValue.value || "");
 		const childrenOptionsRef = shallowRef([]);
-		const parsedOptions = useOptions(toRef(props, "options"), childrenOptionsRef, mergedFieldNames, toRef(props, "optionFilterProp"), toRef(props, "optionLabelProp"));
+		const parsedOptions = useOptions(toRef(props, "options"), childrenOptionsRef, mergedFieldNames, normalizedOptionFilterProps, toRef(props, "optionLabelProp"));
 		const valueOptions = computed(() => parsedOptions.value.valueOptions);
 		const labelOptions = computed(() => parsedOptions.value.labelOptions);
 		const mergedOptions = computed(() => parsedOptions.value.options);
@@ -654,7 +657,7 @@ var Select_default = /* @__PURE__ */ defineComponent({
 				if (!existOptions(val)) cloneOptions.push(createTagOption(val, item.label));
 			});
 			return cloneOptions;
-		}), mergedFieldNames, mergedSearchValue, mergedFilterOption, toRef(props, "optionFilterProp"));
+		}), mergedFieldNames, mergedSearchValue, mergedFilterOption, normalizedOptionFilterProps);
 		const filledSearchOptions = computed(() => {
 			if (props.mode !== "tags" || !mergedSearchValue.value || filteredOptions.value.some((item) => item[props.optionFilterProp || "value"] === mergedSearchValue.value)) return filteredOptions.value;
 			if (filteredOptions.value.some((item) => item[mergedFieldNames.value.value] === mergedSearchValue.value)) return filteredOptions.value;

package/dist/SelectInput/Content/SingleContent.js

@@ -46,17 +46,17 @@ var SingleContent_default = /* @__PURE__ */ defineComponent((props, { expose })
 	const inputRef = shallowRef();
 	expose({ input: computed(() => inputRef.value?.input) });
 	return () => {
-		const { prefixCls, mode, maxLength } = selectInputContext.value ?? {};
+		const { prefixCls, mode, maxLength, components } = selectInputContext.value ?? {};
 		const { classNames, styles } = baseProps.value ?? {};
 		const { inputProps } = props;
-		const renderValue = displayValue.value ? hasOptionStyle.value ? createVNode("div", {
+		const renderValue = !(combobox && components?.input) ? displayValue.value ? hasOptionStyle.value ? createVNode("div", {
 			"class": clsx(`${prefixCls}-content-value`, optionClassName.value),
 			"style": {
 				...mergedSearchValue.value ? { visibility: "hidden" } : {},
 				...optionStyle.value
 			},
 			"title": optionTitle.value
-		}, [displayValue.value.label]) : displayValue.value.label : createVNode(Placeholder_default, { "show": !mergedSearchValue.value }, null);
+		}, [displayValue.value?.label]) : displayValue.value?.label : createVNode(Placeholder_default, { "show": !mergedSearchValue.value }, null) : null;
 		return createVNode("div", {
 			"class": clsx(`${prefixCls}-content`, displayValue.value && `${prefixCls}-content-has-value`, mergedSearchValue.value && `${prefixCls}-content-has-search-value`, hasOptionStyle.value && `${prefixCls}-content-has-option-style`, classNames?.content),
 			"style": styles?.content,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@v-c/select",
   "type": "module",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -25,20 +25,20 @@
     "dist",
     "package.json"
   ],
-  "peerDependencies": {
-    "vue": "^3.0.0"
-  },
-  "dependencies": {
-    "@v-c/overflow": "^1.0.3",
-    "@v-c/trigger": "^1.0.11",
-    "@v-c/virtual-list": "^1.0.6",
-    "@v-c/util": "^1.0.14"
-  },
   "scripts": {
     "build": "vite build",
     "test": "vitest run",
     "prepublish": "pnpm build",
     "patch": "bumpp --release patch",
     "bump": "bumpp"
+  },
+  "peerDependencies": {
+    "vue": "^3.0.0"
+  },
+  "dependencies": {
+    "@v-c/overflow": "workspace:^",
+    "@v-c/trigger": "workspace:^",
+    "@v-c/util": "workspace:^",
+    "@v-c/virtual-list": "workspace:^"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 antdv-community
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.