From d3a6dfef5d5d929113a239d6d4b5b5737ed35b93 Mon Sep 17 00:00:00 2001
From: sallerli1 <weskerli@163.com>
Date: Tue, 18 Jan 2022 22:01:18 +0800
Subject: [PATCH] feat(comp:select): add 'overlay' to searchable

input is now rendered within overlay when searchable is 'overlay'

fix(comp:selectable): fix selected options render when using IxOption

refactor(comp:selectable): replace slot label with selectedLabel
replace slot maxLabel with overflowedLabel
---
 .../components/select/demo/CustomLabel.vue    |  4 +--
 .../components/select/demo/Searchable.vue     | 23 +++++++++++--
 packages/components/select/docs/Index.zh.md   |  6 ++--
 .../components/select/src/content/Content.tsx | 28 +++++++++++++++-
 .../components/select/src/content/ListBox.tsx | 14 ++++----
 .../components/select/src/content/Option.tsx  |  8 ++---
 .../components/select/src/trigger/Input.tsx   |  2 +-
 .../select/src/trigger/Selector.tsx           | 32 +++++++++++++++----
 .../components/select/src/trigger/Trigger.tsx |  2 +-
 packages/components/select/src/types.ts       |  2 +-
 .../select/src/utils/renderOptionLabel.ts     | 18 +++++++++++
 packages/components/select/style/index.less   |  4 +++
 .../select/style/themes/default.variable.less |  2 ++
 13 files changed, 117 insertions(+), 28 deletions(-)
 create mode 100644 packages/components/select/src/utils/renderOptionLabel.ts

diff --git a/packages/components/select/demo/CustomLabel.vue b/packages/components/select/demo/CustomLabel.vue
index 551fadf7f..23b21fc88 100644
--- a/packages/components/select/demo/CustomLabel.vue
+++ b/packages/components/select/demo/CustomLabel.vue
@@ -1,7 +1,7 @@
 <template>
   <IxSelect v-model:value="value" :options="options" multiple :maxLabelCount="3" :multipleLimit="5" @change="onChange">
-    <template #label="option"><IxIcon :name="option.value" />{{ option.label }}</template>
-    <template #maxLabel="moreOptions">and {{ moreOptions.length }} more selected</template>
+    <template #selectedLabel="option"><IxIcon :name="option.value" />{{ option.label }}</template>
+    <template #overflowedLabel="moreOptions">and {{ moreOptions.length }} more selected</template>
   </IxSelect>
 </template>
 <script setup lang="ts">
diff --git a/packages/components/select/demo/Searchable.vue b/packages/components/select/demo/Searchable.vue
index dcefa097f..81803878a 100644
--- a/packages/components/select/demo/Searchable.vue
+++ b/packages/components/select/demo/Searchable.vue
@@ -1,10 +1,29 @@
 <template>
-  <IxSelect v-model:value="value" :options="options" searchable placeholder="Searchable" @change="onChange"> </IxSelect>
+  <IxSpace direction="vertical">
+    <IxSpace> searchable:<IxRadioGroup v-model:value="searchableValue" :options="searchableOptions" /></IxSpace>
+    <IxSelect
+      v-model:value="value"
+      :options="options"
+      :searchable="searchableValue"
+      placeholder="Searchable"
+      @change="onChange"
+    >
+    </IxSelect>
+  </IxSpace>
 </template>
 <script setup lang="ts">
+import type { RadioOption } from '@idux/components/radio'
+import type { SelectData } from '@idux/components/select'
+
 import { ref } from 'vue'
 
-import { SelectData } from '@idux/components/select'
+const searchableValue = ref(true)
+
+const searchableOptions: RadioOption[] = [
+  { label: 'true', value: true },
+  { label: 'overlay', value: 'overlay' },
+  { label: 'false', value: false },
+]
 
 const options: SelectData[] = [
   { key: 1, label: 'Tom', value: 'tom' },
diff --git a/packages/components/select/docs/Index.zh.md b/packages/components/select/docs/Index.zh.md
index 8dbab9907..a979a5376 100644
--- a/packages/components/select/docs/Index.zh.md
+++ b/packages/components/select/docs/Index.zh.md
@@ -34,7 +34,7 @@ order: 0
 | `overlayRender` | 自定义下拉菜单内容的渲染  | `(children:VNode[]) => VNodeTypes` | - | - | - |
 | `placeholder` | 选择框默认文本 | `string \| #placeholder` | - | - | - |
 | `readonly` | 只读模式 | `boolean` | - | - | - |
-| `searchable` | 是否可搜索 | `boolean` | `false` | - | - |
+| `searchable` | 是否可搜索 | `boolean \| 'overlay'` | `false` | - | 当为 `true` 时搜索功能集成在选择器上，当为 `overlay` 时，搜索功能集成在悬浮层上 |
 | `searchFilter` | 根据搜索的文本进行筛选 | `boolean \| SelectFilterFn` | `true` | - | 为 `true` 时使用默认的搜索规则, 如果使用远程搜索，应该设置为 `false` |
 | `size` | 设置选择器大小 | `'sm' \| 'md' \| 'lg'` | `md` | ✅ | - |
 | `suffix` | 设置后缀图标 | `string \| #suffix` | `down` | ✅ | - |
@@ -83,8 +83,8 @@ export type SelectFilterFn = (searchValue: string, data: SelectData) => boolean
 | 名称 | 说明 | 参数类型 | 备注 |
 |  -- | -- | -- | -- |
 |  `default` | 选项内容 | - | - |
-|  `label` | 自定义选中的标签 | `data: SelectOption` |  |
-|  `maxLabel` | 自定义超出最多显示多少个标签的内容 | `data: SelectOption[]` | 参数为超出的数组 |
+|  `selectedLabel` | 自定义选中的标签 | `data: SelectOption` |  |
+|  `overflowedLabel` | 自定义超出最多显示多少个标签的内容 | `data: SelectOption[]` | 参数为超出的数组 |
 |  `optionLabel` | 自定义选项的文本 | `data: SelectOption` | - |
 |  `optionGroupLabel` | 自定义选项组的文本 | `data: SelectOptionGroup` | - |
 
diff --git a/packages/components/select/src/content/Content.tsx b/packages/components/select/src/content/Content.tsx
index 1b1b330c7..686aa9f10 100644
--- a/packages/components/select/src/content/Content.tsx
+++ b/packages/components/select/src/content/Content.tsx
@@ -12,6 +12,7 @@ import { defineComponent, inject, onMounted } from 'vue'
 import { CdkVirtualScroll, VirtualItemRenderFn } from '@idux/cdk/scroll'
 import { callEmit } from '@idux/cdk/utils'
 import { ɵEmpty } from '@idux/components/_private/empty'
+import { ɵInput } from '@idux/components/_private/input'
 
 import { selectToken } from '../token'
 import ListBox from './ListBox'
@@ -20,7 +21,17 @@ import OptionGroup from './OptionGroup'
 
 export default defineComponent({
   setup() {
-    const { props, slots, flattedOptions, virtualScrollRef, scrollToActivated } = inject(selectToken)!
+    const {
+      props,
+      slots,
+      mergedPrefixCls,
+      flattedOptions,
+      virtualScrollRef,
+      scrollToActivated,
+      inputValue,
+      handleInput,
+      handleClear,
+    } = inject(selectToken)!
 
     onMounted(() => scrollToActivated())
 
@@ -64,6 +75,21 @@ export default defineComponent({
         children.push(<ɵEmpty v-slots={slots} empty={props.empty} />)
       }
 
+      if (props.searchable === 'overlay') {
+        children.unshift(
+          <div class={`${mergedPrefixCls.value}-overlay-search-wrapper`}>
+            <ɵInput
+              clearable
+              size="sm"
+              suffix="search"
+              value={inputValue.value}
+              onInput={handleInput}
+              onClear={handleClear}
+            />
+          </div>,
+        )
+      }
+
       return overlayRender ? overlayRender(children) : <div>{children}</div>
     }
   },
diff --git a/packages/components/select/src/content/ListBox.tsx b/packages/components/select/src/content/ListBox.tsx
index 073634721..91ea38a84 100644
--- a/packages/components/select/src/content/ListBox.tsx
+++ b/packages/components/select/src/content/ListBox.tsx
@@ -10,26 +10,28 @@
 import type { MergedOption } from '../composables/useOptions'
 import type { FunctionalComponent } from 'vue'
 
-import { inject } from 'vue'
+import { type Slots, inject } from 'vue'
 
 import { selectToken } from '../token'
+import { renderOptionLabel } from '../utils/renderOptionLabel'
 
 const defaultStyle = { height: 0, width: 0, overflow: 'hidden' }
 
 const ListBox: FunctionalComponent = () => {
-  const { props, selectedValue, mergedOptions, activeIndex, activeOption } = inject(selectToken)!
+  const { props, slots, selectedValue, mergedOptions, activeIndex, activeOption } = inject(selectToken)!
   const currSelectedValue = selectedValue.value
   const { compareWith } = props
   return (
     <div role="listbox" style={defaultStyle}>
-      {renderOption(mergedOptions.value[activeIndex.value - 1], currSelectedValue, compareWith)}
-      {renderOption(activeOption.value, currSelectedValue, compareWith)}
-      {renderOption(mergedOptions.value[activeIndex.value + 1], currSelectedValue, compareWith)}
+      {renderOption(slots, mergedOptions.value[activeIndex.value - 1], currSelectedValue, compareWith)}
+      {renderOption(slots, activeOption.value, currSelectedValue, compareWith)}
+      {renderOption(slots, mergedOptions.value[activeIndex.value + 1], currSelectedValue, compareWith)}
     </div>
   )
 }
 
 const renderOption = (
+  slots: Slots,
   option: MergedOption | undefined,
   selectedValue: any,
   compareWith: (o1: any, o2: any) => boolean,
@@ -41,7 +43,7 @@ const renderOption = (
   const selected = compareWith(selectedValue, value)
   return (
     <div key={key} role="option" aria-label={label} aria-selected={selected}>
-      {rawOption.slots?.default?.(rawOption) ?? label}
+      {renderOptionLabel(slots, rawOption, label)}
     </div>
   )
 }
diff --git a/packages/components/select/src/content/Option.tsx b/packages/components/select/src/content/Option.tsx
index cff5deac6..058307992 100644
--- a/packages/components/select/src/content/Option.tsx
+++ b/packages/components/select/src/content/Option.tsx
@@ -7,12 +7,11 @@
 
 import { computed, defineComponent, inject } from 'vue'
 
-import { isString } from 'lodash-es'
-
 import { IxCheckbox } from '@idux/components/checkbox'
 
 import { selectToken } from '../token'
 import { optionProps } from '../types'
+import { renderOptionLabel } from '../utils/renderOptionLabel'
 
 export default defineComponent({
   props: optionProps,
@@ -61,8 +60,7 @@ export default defineComponent({
       const { multiple } = selectProps
       const selected = isSelected.value
       const prefixCls = `${mergedPrefixCls.value}-option`
-      const labelRender = rawOption.customLabel ?? 'optionLabel'
-      const labelSlot = isString(labelRender) ? slots[labelRender] : labelRender
+
       return (
         <div
           class={classes.value}
@@ -73,7 +71,7 @@ export default defineComponent({
           aria-selected={selected}
         >
           {multiple && <IxCheckbox checked={isSelected.value} disabled={disabled} />}
-          <span class={`${prefixCls}-label`}>{labelSlot ? labelSlot(rawOption) : label}</span>
+          <span class={`${prefixCls}-label`}>{renderOptionLabel(slots, rawOption, label)}</span>
         </div>
       )
     }
diff --git a/packages/components/select/src/trigger/Input.tsx b/packages/components/select/src/trigger/Input.tsx
index 7ab5a64e7..ad6e6dd1f 100644
--- a/packages/components/select/src/trigger/Input.tsx
+++ b/packages/components/select/src/trigger/Input.tsx
@@ -28,7 +28,7 @@ export default defineComponent({
 
     const innerStyle = computed(() => {
       const { allowInput, searchable } = props
-      const isOpacity = allowInput || searchable
+      const isOpacity = allowInput || searchable === true
       return { opacity: isOpacity ? undefined : 0 }
     })
 
diff --git a/packages/components/select/src/trigger/Selector.tsx b/packages/components/select/src/trigger/Selector.tsx
index 0a8dab925..d831b2983 100644
--- a/packages/components/select/src/trigger/Selector.tsx
+++ b/packages/components/select/src/trigger/Selector.tsx
@@ -6,14 +6,16 @@
  */
 
 import type { MergedOption } from '../composables/useOptions'
-import type { VNodeTypes } from 'vue'
+import type { VNodeChild } from 'vue'
 
 import { computed, defineComponent, inject } from 'vue'
 
+import { Logger } from '@idux/cdk/utils'
 import { IxIcon } from '@idux/components/icon'
 
 import { selectToken } from '../token'
 import { selectorProps } from '../types'
+import { renderOptionLabel } from '../utils/renderOptionLabel'
 import Input from './Input'
 import Item from './Item'
 
@@ -47,11 +49,20 @@ export default defineComponent({
     })
 
     const showItems = computed(() => {
-      return selectProps.multiple || (selectedValue.value.length > 0 && !isComposing.value && !inputValue.value)
+      return (
+        selectProps.multiple ||
+        (selectedValue.value.length > 0 &&
+          !isComposing.value &&
+          (!inputValue.value || selectProps.searchable === 'overlay'))
+      )
     })
 
     const showPlaceholder = computed(() => {
-      return selectedValue.value.length === 0 && !isComposing.value && !inputValue.value
+      return (
+        selectedValue.value.length === 0 &&
+        !isComposing.value &&
+        (!inputValue.value || selectProps.searchable === 'overlay')
+      )
     })
 
     return () => {
@@ -74,12 +85,21 @@ export default defineComponent({
           handleItemRemove,
           title: label,
         }
-        let labelNode: VNodeTypes | undefined
+        let labelNode: VNodeChild | undefined
         if (isMax) {
-          labelNode = slots.maxLabel?.(item.value) ?? label
+          if (__DEV__ && slots.maxLabel) {
+            Logger.warn('components/select', 'slot `maxLabel` is deprecated, please use slot `overflowedLabel` instead')
+          }
+          const overflowedLabelSlot = slots.overflowedLabel ?? slots.maxLabel
+          labelNode = overflowedLabelSlot?.(item.value) ?? label
         } else {
-          labelNode = slots.label?.(item.rawOption) ?? rawOption.slots?.default?.() ?? label
+          if (__DEV__ && slots.label) {
+            Logger.warn('components/select', 'slots `label` is deprecated, please use slots `selectedLabel` instead')
+          }
+          const selectedLabelSlot = slots.label ?? slots.selectedLabel
+          labelNode = selectedLabelSlot ? selectedLabelSlot(rawOption) : renderOptionLabel(slots, rawOption, label)
         }
+
         return <Item {...itemProps}>{labelNode}</Item>
       })
 
diff --git a/packages/components/select/src/trigger/Trigger.tsx b/packages/components/select/src/trigger/Trigger.tsx
index 6b59b0a50..9bec7207e 100644
--- a/packages/components/select/src/trigger/Trigger.tsx
+++ b/packages/components/select/src/trigger/Trigger.tsx
@@ -50,7 +50,7 @@ export default defineComponent({
       if (suffix) {
         return suffix
       }
-      return props.searchable && isFocused.value ? 'search' : config.suffix
+      return props.searchable === true && isFocused.value ? 'search' : config.suffix
     })
 
     const classes = computed(() => {
diff --git a/packages/components/select/src/types.ts b/packages/components/select/src/types.ts
index 3c87945ae..084023257 100644
--- a/packages/components/select/src/types.ts
+++ b/packages/components/select/src/types.ts
@@ -41,7 +41,7 @@ export const selectProps = {
   overlayRender: IxPropTypes.func<(children: VNode[]) => VNodeTypes>(),
   placeholder: IxPropTypes.string,
   readonly: IxPropTypes.bool.def(false),
-  searchable: IxPropTypes.bool.def(false),
+  searchable: IxPropTypes.oneOfType([Boolean, IxPropTypes.oneOf(['overlay'])]).def(false),
   searchFilter: IxPropTypes.oneOfType([Boolean, IxPropTypes.func<SelectFilterFn>()]).def(true),
   size: IxPropTypes.oneOf<FormSize>(['sm', 'md', 'lg']),
   suffix: IxPropTypes.string,
diff --git a/packages/components/select/src/utils/renderOptionLabel.ts b/packages/components/select/src/utils/renderOptionLabel.ts
new file mode 100644
index 000000000..30304ce54
--- /dev/null
+++ b/packages/components/select/src/utils/renderOptionLabel.ts
@@ -0,0 +1,18 @@
+/**
+ * @license
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE
+ */
+
+import type { SelectOptionProps } from '../types'
+import type { Slots, VNodeChild } from 'vue'
+
+import { isString } from 'lodash-es'
+
+export function renderOptionLabel(slots: Slots, rawOption: SelectOptionProps, label?: string): VNodeChild {
+  const labelRender = rawOption.customLabel ?? 'optionLabel'
+  const labelSlot = isString(labelRender) ? slots[labelRender] : labelRender
+
+  return labelSlot?.(rawOption) ?? label
+}
diff --git a/packages/components/select/style/index.less b/packages/components/select/style/index.less
index 45539b2bd..07a1e6d06 100644
--- a/packages/components/select/style/index.less
+++ b/packages/components/select/style/index.less
@@ -115,6 +115,10 @@
     .@{select-option-prefix}-group:not(:first-child) {
       border-top: @select-option-group-border;
     }
+
+    &-search-wrapper {
+      padding: @select-overlay-input-padding;
+    }
   }
 }
 
diff --git a/packages/components/select/style/themes/default.variable.less b/packages/components/select/style/themes/default.variable.less
index 2744697dc..edd3bf994 100644
--- a/packages/components/select/style/themes/default.variable.less
+++ b/packages/components/select/style/themes/default.variable.less
@@ -50,6 +50,8 @@
 @select-option-container-border-radius: @border-radius-sm;
 @select-option-container-box-shadow: @shadow-bottom-md;
 
+@select-overlay-input-padding: 0 @spacing-md @spacing-sm;
+
 @select-icon-font-size: @font-size-sm;
 @select-icon-margin-right: @spacing-xs;
 @select-icon-color: @select-placeholder-color;