From 5aad611d4c7299bf2ca7a6c2773501effc8b80ee Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Wed, 17 May 2023 22:53:02 +0800
Subject: [PATCH] fix: picker support v-show

---
 components/vc-picker/Picker.tsx      |  82 ++++++------
 components/vc-picker/RangePicker.tsx | 180 ++++++++++++++-------------
 components/vc-trigger/Trigger.tsx    |   2 +-
 components/vc-trigger/context.ts     |  17 ---
 4 files changed, 142 insertions(+), 139 deletions(-)

diff --git a/components/vc-picker/Picker.tsx b/components/vc-picker/Picker.tsx
index 19cb3a0a0..c26099885 100644
--- a/components/vc-picker/Picker.tsx
+++ b/components/vc-picker/Picker.tsx
@@ -589,47 +589,57 @@ function Picker<DateType>() {
 
         const popupPlacement = direction === 'rtl' ? 'bottomRight' : 'bottomLeft';
         return (
-          <PickerTrigger
-            visible={mergedOpen.value}
-            popupStyle={popupStyle}
-            prefixCls={prefixCls}
-            dropdownClassName={dropdownClassName}
-            dropdownAlign={dropdownAlign}
-            getPopupContainer={getPopupContainer}
-            transitionName={transitionName}
-            popupPlacement={popupPlacement}
-            direction={direction}
-            v-slots={{
-              popupElement: () => panel,
-            }}
+          <div
+            ref={containerRef}
+            class={classNames(prefixCls, attrs.class, {
+              [`${prefixCls}-disabled`]: disabled,
+              [`${prefixCls}-focused`]: focused.value,
+              [`${prefixCls}-rtl`]: direction === 'rtl',
+            })}
+            style={attrs.style as CSSProperties}
+            onMousedown={onMousedown}
+            onMouseup={onInternalMouseup}
+            onMouseenter={onMouseenter}
+            onMouseleave={onMouseleave}
+            onContextmenu={onContextmenu}
+            onClick={onClick}
           >
             <div
-              ref={containerRef}
-              class={classNames(prefixCls, attrs.class, {
-                [`${prefixCls}-disabled`]: disabled,
-                [`${prefixCls}-focused`]: focused.value,
-                [`${prefixCls}-rtl`]: direction === 'rtl',
+              class={classNames(`${prefixCls}-input`, {
+                [`${prefixCls}-input-placeholder`]: !!hoverValue.value,
               })}
-              style={attrs.style as CSSProperties}
-              onMousedown={onMousedown}
-              onMouseup={onInternalMouseup}
-              onMouseenter={onMouseenter}
-              onMouseleave={onMouseleave}
-              onContextmenu={onContextmenu}
-              onClick={onClick}
+              ref={inputDivRef}
+            >
+              {inputNode}
+              {suffixNode}
+              {clearNode}
+            </div>
+            <PickerTrigger
+              visible={mergedOpen.value}
+              popupStyle={popupStyle}
+              prefixCls={prefixCls}
+              dropdownClassName={dropdownClassName}
+              dropdownAlign={dropdownAlign}
+              getPopupContainer={getPopupContainer}
+              transitionName={transitionName}
+              popupPlacement={popupPlacement}
+              direction={direction}
+              v-slots={{
+                popupElement: () => panel,
+              }}
             >
               <div
-                class={classNames(`${prefixCls}-input`, {
-                  [`${prefixCls}-input-placeholder`]: !!hoverValue.value,
-                })}
-                ref={inputDivRef}
-              >
-                {inputNode}
-                {suffixNode}
-                {clearNode}
-              </div>
-            </div>
-          </PickerTrigger>
+                style={{
+                  pointerEvents: 'none',
+                  position: 'absolute',
+                  top: 0,
+                  bottom: 0,
+                  left: 0,
+                  right: 0,
+                }}
+              ></div>
+            </PickerTrigger>
+          </div>
         );
       };
     },
diff --git a/components/vc-picker/RangePicker.tsx b/components/vc-picker/RangePicker.tsx
index a4fb4d364..7f0db8889 100644
--- a/components/vc-picker/RangePicker.tsx
+++ b/components/vc-picker/RangePicker.tsx
@@ -1205,99 +1205,109 @@ function RangerPicker<DateType>() {
         // ============================ Return =============================
 
         return (
-          <PickerTrigger
-            visible={mergedOpen.value}
-            popupStyle={popupStyle}
-            prefixCls={prefixCls}
-            dropdownClassName={dropdownClassName}
-            dropdownAlign={dropdownAlign}
-            getPopupContainer={getPopupContainer}
-            transitionName={transitionName}
-            range
-            direction={direction}
-            v-slots={{
-              popupElement: () => rangePanel,
-            }}
+          <div
+            ref={containerRef}
+            class={classNames(prefixCls, `${prefixCls}-range`, attrs.class, {
+              [`${prefixCls}-disabled`]: mergedDisabled.value[0] && mergedDisabled.value[1],
+              [`${prefixCls}-focused`]:
+                mergedActivePickerIndex.value === 0 ? startFocused.value : endFocused.value,
+              [`${prefixCls}-rtl`]: direction === 'rtl',
+            })}
+            style={attrs.style}
+            onClick={onPickerClick}
+            onMouseenter={onMouseenter}
+            onMouseleave={onMouseleave}
+            onMousedown={onPickerMousedown}
+            onMouseup={onMouseup}
+            {...getDataOrAriaProps(props)}
           >
             <div
-              ref={containerRef}
-              class={classNames(prefixCls, `${prefixCls}-range`, attrs.class, {
-                [`${prefixCls}-disabled`]: mergedDisabled.value[0] && mergedDisabled.value[1],
-                [`${prefixCls}-focused`]:
-                  mergedActivePickerIndex.value === 0 ? startFocused.value : endFocused.value,
-                [`${prefixCls}-rtl`]: direction === 'rtl',
+              class={classNames(`${prefixCls}-input`, {
+                [`${prefixCls}-input-active`]: mergedActivePickerIndex.value === 0,
+                [`${prefixCls}-input-placeholder`]: !!startHoverValue.value,
               })}
-              style={attrs.style}
-              onClick={onPickerClick}
-              onMouseenter={onMouseenter}
-              onMouseleave={onMouseleave}
-              onMousedown={onPickerMousedown}
-              onMouseup={onMouseup}
-              {...getDataOrAriaProps(props)}
+              ref={startInputDivRef}
+            >
+              <input
+                id={id}
+                disabled={mergedDisabled.value[0]}
+                readonly={
+                  inputReadOnly || typeof formatList.value[0] === 'function' || !startTyping.value
+                }
+                value={startHoverValue.value || startText.value}
+                onInput={(e: ChangeEvent) => {
+                  triggerStartTextChange(e.target.value);
+                }}
+                autofocus={autofocus}
+                placeholder={getValue(placeholder, 0) || ''}
+                ref={startInputRef}
+                {...startInputProps.value}
+                {...inputSharedProps}
+                autocomplete={autocomplete}
+              />
+            </div>
+            <div class={`${prefixCls}-range-separator`} ref={separatorRef}>
+              {separator}
+            </div>
+            <div
+              class={classNames(`${prefixCls}-input`, {
+                [`${prefixCls}-input-active`]: mergedActivePickerIndex.value === 1,
+                [`${prefixCls}-input-placeholder`]: !!endHoverValue.value,
+              })}
+              ref={endInputDivRef}
+            >
+              <input
+                disabled={mergedDisabled.value[1]}
+                readonly={
+                  inputReadOnly || typeof formatList.value[0] === 'function' || !endTyping.value
+                }
+                value={endHoverValue.value || endText.value}
+                onInput={(e: ChangeEvent) => {
+                  triggerEndTextChange(e.target.value);
+                }}
+                placeholder={getValue(placeholder, 1) || ''}
+                ref={endInputRef}
+                {...endInputProps.value}
+                {...inputSharedProps}
+                autocomplete={autocomplete}
+              />
+            </div>
+            <div
+              class={`${prefixCls}-active-bar`}
+              style={{
+                ...activeBarPositionStyle,
+                width: `${activeBarWidth}px`,
+                position: 'absolute',
+              }}
+            />
+            {suffixNode}
+            {clearNode}
+            <PickerTrigger
+              visible={mergedOpen.value}
+              popupStyle={popupStyle}
+              prefixCls={prefixCls}
+              dropdownClassName={dropdownClassName}
+              dropdownAlign={dropdownAlign}
+              getPopupContainer={getPopupContainer}
+              transitionName={transitionName}
+              range
+              direction={direction}
+              v-slots={{
+                popupElement: () => rangePanel,
+              }}
             >
               <div
-                class={classNames(`${prefixCls}-input`, {
-                  [`${prefixCls}-input-active`]: mergedActivePickerIndex.value === 0,
-                  [`${prefixCls}-input-placeholder`]: !!startHoverValue.value,
-                })}
-                ref={startInputDivRef}
-              >
-                <input
-                  id={id}
-                  disabled={mergedDisabled.value[0]}
-                  readonly={
-                    inputReadOnly || typeof formatList.value[0] === 'function' || !startTyping.value
-                  }
-                  value={startHoverValue.value || startText.value}
-                  onInput={(e: ChangeEvent) => {
-                    triggerStartTextChange(e.target.value);
-                  }}
-                  autofocus={autofocus}
-                  placeholder={getValue(placeholder, 0) || ''}
-                  ref={startInputRef}
-                  {...startInputProps.value}
-                  {...inputSharedProps}
-                  autocomplete={autocomplete}
-                />
-              </div>
-              <div class={`${prefixCls}-range-separator`} ref={separatorRef}>
-                {separator}
-              </div>
-              <div
-                class={classNames(`${prefixCls}-input`, {
-                  [`${prefixCls}-input-active`]: mergedActivePickerIndex.value === 1,
-                  [`${prefixCls}-input-placeholder`]: !!endHoverValue.value,
-                })}
-                ref={endInputDivRef}
-              >
-                <input
-                  disabled={mergedDisabled.value[1]}
-                  readonly={
-                    inputReadOnly || typeof formatList.value[0] === 'function' || !endTyping.value
-                  }
-                  value={endHoverValue.value || endText.value}
-                  onInput={(e: ChangeEvent) => {
-                    triggerEndTextChange(e.target.value);
-                  }}
-                  placeholder={getValue(placeholder, 1) || ''}
-                  ref={endInputRef}
-                  {...endInputProps.value}
-                  {...inputSharedProps}
-                  autocomplete={autocomplete}
-                />
-              </div>
-              <div
-                class={`${prefixCls}-active-bar`}
                 style={{
-                  ...activeBarPositionStyle,
-                  width: `${activeBarWidth}px`,
+                  pointerEvents: 'none',
                   position: 'absolute',
+                  top: 0,
+                  bottom: 0,
+                  left: 0,
+                  right: 0,
                 }}
-              />
-              {suffixNode}
-              {clearNode}
-            </div>
-          </PickerTrigger>
+              ></div>
+            </PickerTrigger>
+          </div>
         );
       };
     },
diff --git a/components/vc-trigger/Trigger.tsx b/components/vc-trigger/Trigger.tsx
index 5adcd89e0..dfd689c73 100644
--- a/components/vc-trigger/Trigger.tsx
+++ b/components/vc-trigger/Trigger.tsx
@@ -701,8 +701,8 @@ export default defineComponent({
     );
     return (
       <>
-        {portal}
         {trigger}
+        {portal}
       </>
     );
   },
diff --git a/components/vc-trigger/context.ts b/components/vc-trigger/context.ts
index 7e69b6143..186b7eb76 100644
--- a/components/vc-trigger/context.ts
+++ b/components/vc-trigger/context.ts
@@ -1,22 +1,5 @@
 import type { InjectionKey, Ref } from 'vue';
 import { computed, inject, provide } from 'vue';
-export interface TriggerContextProps {
-  setPortal: (val?: any) => void;
-  popPortal: boolean; // 将 portal 上传至父级元素渲染，不用考虑响应式
-}
-const TriggerContextKey: InjectionKey<TriggerContextProps> = Symbol('TriggerContextKey');
-export const useProviderTrigger = () => {
-  let portal = null;
-  provide(TriggerContextKey, {
-    setPortal(val) {
-      portal = val;
-    },
-    popPortal: true,
-  });
-  return () => {
-    return portal;
-  };
-};
 
 export interface PortalContextProps {
   shouldRender: Ref<boolean>;