@v-c/select 1.0.17 → 1.0.19-beta.1

package/dist/BaseSelect/index.js

@@ -154,7 +154,9 @@ const BaseSelect = /* @__PURE__ */ defineComponent((props, { expose, attrs }) =>
 		const isEnterKey = key === KeyCodeStr.Enter;
 		const isSpaceKey = key === KeyCodeStr.Space;
 		if (isEnterKey || isSpaceKey) {
-			if (mode.value !== "combobox") event.preventDefault();
+			const isCombobox = mode.value === "combobox";
+			const isEditable = isCombobox || !!props.showSearch;
+			if (isSpaceKey && !isEditable || isEnterKey && !isCombobox) event.preventDefault();
 			if (!mergedOpen.value) triggerOpen(true);
 		}
 		setClearLock(!!mergedSearchValue.value);

package/dist/SelectInput/Content/SingleContent.js

@@ -49,6 +49,7 @@ var SingleContent_default = /* @__PURE__ */ defineComponent((props, { expose })
 		const { prefixCls, mode, maxLength, components } = selectInputContext.value ?? {};
 		const { classNames, styles } = baseProps.value ?? {};
 		const { inputProps } = props;
+		const showHasValueCls = displayValue.value && displayValue.value.label !== null && displayValue.value.label !== void 0 && String(displayValue.value.label).trim() !== "";
 		const renderValue = !(combobox && components?.input) ? displayValue.value ? hasOptionStyle.value ? createVNode("div", {
 			"class": clsx(`${prefixCls}-content-value`, optionClassName.value),
 			"style": {
@@ -58,7 +59,7 @@ var SingleContent_default = /* @__PURE__ */ defineComponent((props, { expose })
 			"title": optionTitle.value
 		}, [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),
+			"class": clsx(`${prefixCls}-content`, showHasValueCls && `${prefixCls}-content-has-value`, mergedSearchValue.value && `${prefixCls}-content-has-search-value`, hasOptionStyle.value && `${prefixCls}-content-has-option-style`, classNames?.content),
 			"style": styles?.content,
 			"title": hasOptionStyle.value ? void 0 : optionTitle.value
 		}, [renderValue, createVNode(Input_default, mergeProps(inputProps, {

package/dist/SelectInput/Input.js

@@ -25,7 +25,8 @@ var Input_default = /* @__PURE__ */ defineComponent((props, { expose, attrs }) =
 		const { mode, onSearchSubmit } = selectInputContext.value ?? {};
 		const { key } = event;
 		const { value: nextVal } = event.currentTarget;
-		if (key === KeyCodeStr.Enter && mode === "tags" && !compositionStatusRef.value && onSearchSubmit) onSearchSubmit(nextVal);
+		const isOpen = !!baseProps.value?.open;
+		if (key === KeyCodeStr.Enter && mode === "tags" && !isOpen && !compositionStatusRef.value && onSearchSubmit) onSearchSubmit(nextVal);
 		props?.onKeyDown?.(event);
 	};
 	const handleBlur = (event) => {

package/dist/SelectInput/index.js

@@ -3,7 +3,7 @@ import { isValidateOpenKey } from "../utils/keyUtil.js";
 import Affix_default from "./Affix.js";
 import { useSelectInputProvider } from "./context.js";
 import Content_default from "./Content/index.js";
-import { computed, createVNode, defineComponent, isVNode, mergeProps, shallowRef } from "vue";
+import { cloneVNode, computed, createVNode, defineComponent, isVNode, mergeProps, shallowRef } from "vue";
 import { clsx } from "@v-c/util";
 import KeyCode from "@v-c/util/dist/KeyCode";
 import omit from "@v-c/util/dist/omit";
@@ -24,6 +24,21 @@ var DEFAULT_OMIT_PROPS = [
 	"onSelectorRemove",
 	"focused"
 ];
+function mergeVNodeProps(originProps, nextProps) {
+	const mergedProps = {
+		...originProps,
+		...nextProps
+	};
+	Object.keys(originProps).forEach((key) => {
+		const originVal = originProps[key];
+		const nextVal = nextProps[key];
+		if (typeof originVal === "function" && typeof nextVal === "function") mergedProps[key] = (...args) => {
+			nextVal(...args);
+			originVal(...args);
+		};
+	});
+	return mergedProps;
+}
 var SelectInput_default = /* @__PURE__ */ defineComponent((props, { attrs, expose, slots }) => {
 	const baseProps = useBaseProps();
 	const rootRef = shallowRef();
@@ -66,14 +81,17 @@ var SelectInput_default = /* @__PURE__ */ defineComponent((props, { attrs, expos
 		blur: () => {
 			(inputRef.value?.input || rootRef.value)?.blur?.();
 		},
-		nativeElement: rootRef
+		nativeElement: computed(() => getDOM(rootRef.value))
 	});
 	const onInternalMouseDown = (event) => {
 		if (!disabled.value) {
 			const inputDOM = getDOM(inputRef.value?.input);
 			event._ori_target = inputDOM;
-			if (inputDOM && event.target !== inputDOM && !inputDOM.contains(event.target)) event.preventDefault();
-			const shouldPreventClose = triggerOpen.value && !multiple.value && (mode.value === "combobox" || showSearch.value);
+			const isClickOnInput = inputDOM === event.target || inputDOM?.contains(event.target);
+			if (inputDOM && !isClickOnInput) event.preventDefault();
+			const shouldPreventCloseOnSingle = triggerOpen.value && !multiple.value && (mode.value === "combobox" || showSearch.value);
+			const shouldPreventCloseOnMultipleInput = triggerOpen.value && multiple.value && isClickOnInput;
+			const shouldPreventClose = shouldPreventCloseOnSingle || shouldPreventCloseOnMultipleInput;
 			if (!event._select_lazy) {
 				inputRef.value?.input?.focus();
 				if (!shouldPreventClose) toggleOpen.value?.();
@@ -98,11 +116,12 @@ var SelectInput_default = /* @__PURE__ */ defineComponent((props, { attrs, expos
 			onMousedown: props.onMouseDown
 		}, DEFAULT_OMIT_PROPS);
 		if (RootComponent) {
-			if (isVNode(RootComponent)) return createVNode(RootComponent, {
-				...domProps,
+			const mergedProps = mergeVNodeProps(RootComponent.props || {}, domProps);
+			if (isVNode(RootComponent)) return cloneVNode(RootComponent, {
+				...mergedProps,
 				ref: rootRef
 			});
-			return createVNode(RootComponent, mergeProps(domProps, { "ref": rootRef }), null);
+			return createVNode(RootComponent, mergeProps(mergedProps, { "ref": rootRef }), null);
 		}
 		return createVNode("div", mergeProps(domProps, {
 			"ref": rootRef,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@v-c/select",
   "type": "module",
-  "version": "1.0.17",
+  "version": "1.0.19-beta.1",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@v-c/overflow": "^1.0.3",
-    "@v-c/trigger": "^1.0.11",
+    "@v-c/trigger": "^1.0.12-beta.1",
     "@v-c/util": "^1.0.17",
     "@v-c/virtual-list": "^1.0.6"
   },