From e9ea4b4ee2e87ba4337e742329d53caa6df608e7 Mon Sep 17 00:00:00 2001
From: jeremywu <15975785+JeremyWuuuuu@users.noreply.github.com>
Date: Wed, 23 Jun 2021 21:08:31 +0800
Subject: [PATCH] Fix/revert changes for fixing issue (#2313)

* Revert "fix(project): fix beta 49 build issue (#2310)"

This reverts commit 7d39b37f008b1af9beb40472098c3d83afabc9bf.

* Revert "feat(hooks): feat: Encapsulate function for rendering teleport element"

This reverts commit 74ec002d23e2864f72c023c7d1eb317de96fca70.

* Revert "refactor(popper): refactor extract common props for props (#2300)"

This reverts commit 45982cff8a65a57928e21598e2234b3ecdb41be0.

Co-authored-by: jeremywuuuuu <jeremywuuuuu@no-reply.github.com>
---
 build/rollup.config.js                        |  2 +-
 packages/constants/index.ts                   |  2 -
 packages/constants/package.json               | 13 ----
 packages/constants/popper.constants.ts        |  6 --
 packages/hooks/use-teleport/index.ts          | 60 -------------------
 packages/internal/package.json                | 13 ----
 packages/popover/src/index.vue                |  8 +--
 packages/popover/src/usePopover.ts            |  7 +--
 packages/popper/index.ts                      |  2 +
 packages/popper/src/index.vue                 |  2 +-
 packages/popper/src/renderers/popper.ts       |  2 +-
 .../src/use-popper/defaults.ts}               | 45 ++++++++++----
 packages/popper/src/use-popper/index.ts       |  6 +-
 .../popper/src/use-popper/popper-options.ts   | 13 +++-
 packages/tooltip/src/index.ts                 |  2 +-
 packages/types/index.ts                       |  1 -
 packages/types/package.json                   | 13 ----
 packages/utils/global-nodes.ts                | 34 -----------
 18 files changed, 61 insertions(+), 170 deletions(-)
 delete mode 100644 packages/constants/index.ts
 delete mode 100644 packages/constants/package.json
 delete mode 100644 packages/constants/popper.constants.ts
 delete mode 100644 packages/hooks/use-teleport/index.ts
 delete mode 100644 packages/internal/package.json
 rename packages/{internal/props/use-popper-props.ts => popper/src/use-popper/defaults.ts} (76%)
 delete mode 100644 packages/types/index.ts
 delete mode 100644 packages/types/package.json
 delete mode 100644 packages/utils/global-nodes.ts

diff --git a/build/rollup.config.js b/build/rollup.config.js
index dc61ca19c9..ede36781d4 100644
--- a/build/rollup.config.js
+++ b/build/rollup.config.js
@@ -20,7 +20,7 @@ const inputs = getPackagesSync()
   .map(pkg => pkg.name)
   .filter(name =>
     name.includes('@element-plus') &&
-    !name.includes('utils') && !name.includes('internal'),
+    !name.includes('utils'),
   )
 
 export default inputs.map(name => ({
diff --git a/packages/constants/index.ts b/packages/constants/index.ts
deleted file mode 100644
index bfeb7f3a54..0000000000
--- a/packages/constants/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './popper.constants'
-
diff --git a/packages/constants/package.json b/packages/constants/package.json
deleted file mode 100644
index 87476f2fab..0000000000
--- a/packages/constants/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "@element-plus/constants",
-    "description": "Stores all commonly used constants",
-    "version": "0.0.0",
-    "license": "MIT",
-    "peerDependencies": {
-      "vue": "3.1.1"
-    },
-    "devDependencies": {
-      "@vue/test-utils": "^2.0.0-beta.3"
-    }
-  }
-  
\ No newline at end of file
diff --git a/packages/constants/popper.constants.ts b/packages/constants/popper.constants.ts
deleted file mode 100644
index ac318fcc5a..0000000000
--- a/packages/constants/popper.constants.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const DARK_EFFECT = 'dark'
-export const LIGHT_EFFECT = 'light'
-
-export const DEFAULT_TRIGGER = 'hover'
-export const DEFAULT_FALLBACK_PLACEMENTS = []
-
diff --git a/packages/hooks/use-teleport/index.ts b/packages/hooks/use-teleport/index.ts
deleted file mode 100644
index 8720000528..0000000000
--- a/packages/hooks/use-teleport/index.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { h, ref, Teleport, getCurrentInstance, onMounted } from 'vue'
-import { NOOP } from '@vue/shared'
-import isServer from '@element-plus/utils/isServer'
-import { createGlobalNode, removeGlobalNode } from '@element-plus/utils/global-nodes'
-
-import type { VNode } from 'vue'
-
-export default (contentRenderer: () => VNode, appendToBody: boolean) => {
-  const vm = getCurrentInstance()
-
-  const isTeleportVisible = ref(false)
-
-  if (isServer) {
-    return {
-      isTeleportVisible,
-      showTeleport: NOOP,
-      hideTeleport: NOOP,
-      renderTeleport: NOOP,
-    }
-  }
-
-  const target = (vm.proxy.$props as { target: string; }).target
-  let $el: HTMLElement = null
-
-  const showTeleport = () => {
-
-    isTeleportVisible.value = true
-    $el = createGlobalNode()
-  }
-
-  const hideTeleport = () => {
-
-    isTeleportVisible.value = true
-    removeGlobalNode($el)
-    $el = null
-  }
-
-  const renderTeleport = () => {
-    return appendToBody !== true
-      ? contentRenderer()
-      : isTeleportVisible.value === true
-        ? [
-          h(
-            Teleport,
-            { to: target },
-            contentRenderer(),
-          ),
-        ]
-        : void 0
-  }
-
-  onMounted(hideTeleport)
-
-  return {
-    isTeleportVisible,
-    showTeleport,
-    hideTeleport,
-    renderTeleport,
-  }
-}
diff --git a/packages/internal/package.json b/packages/internal/package.json
deleted file mode 100644
index 543425f289..0000000000
--- a/packages/internal/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "@element-plus/internal",
-    "description": "Stores all internal objects",
-    "version": "0.0.0",
-    "license": "MIT",
-    "peerDependencies": {
-      "vue": "3.1.1"
-    },
-    "devDependencies": {
-      "@vue/test-utils": "^2.0.0-beta.3"
-    }
-  }
-  
\ No newline at end of file
diff --git a/packages/popover/src/index.vue b/packages/popover/src/index.vue
index b6646e2ac5..709679f59d 100644
--- a/packages/popover/src/index.vue
+++ b/packages/popover/src/index.vue
@@ -1,17 +1,15 @@
 <script lang="ts">
 import { defineComponent, Fragment, createTextVNode, renderSlot, toDisplayString, createCommentVNode, withDirectives, Teleport, h } from 'vue'
 import ElPopper from '@element-plus/popper'
+import { defaultProps, Effect } from '@element-plus/popper'
 import { renderPopper, renderTrigger, renderArrow } from '@element-plus/popper'
 import { ClickOutside } from '@element-plus/directives'
 import { warn } from '@element-plus/utils/error'
 import { renderIf, PatchFlags } from '@element-plus/utils/vnode'
-import { LIGHT_EFFECT } from '../../constants/popper.constants'
-import defaultProps from '../../internal/props/use-popper-props'
-
 import usePopover, { SHOW_EVENT, HIDE_EVENT } from './usePopover'
 
 import type { PropType } from 'vue'
-import type { TriggerType } from '../../internal/props/use-popper-props'
+import type { TriggerType } from '@element-plus/popper'
 
 const emits = ['update:visible', 'after-enter', 'after-leave', SHOW_EVENT, HIDE_EVENT]
 const NAME = 'ElPopover'
@@ -91,7 +89,7 @@ export default defineComponent({
     ].join(' ')
 
     let popover = renderPopper({
-      effect: LIGHT_EFFECT,
+      effect: Effect.LIGHT,
       name: transition,
       popperClass: kls,
       popperStyle: popperStyle,
diff --git a/packages/popover/src/usePopover.ts b/packages/popover/src/usePopover.ts
index 4059c0613a..0ec53e124e 100644
--- a/packages/popover/src/usePopover.ts
+++ b/packages/popover/src/usePopover.ts
@@ -1,11 +1,10 @@
+import type { SetupContext } from 'vue'
 import { computed, ref, watch } from 'vue'
 import { isString } from '@element-plus/utils/util'
+import type { IPopperOptions } from '@element-plus/popper'
 import { usePopper } from '@element-plus/popper'
 import PopupManager from '@element-plus/utils/popup-manager'
-
-import type { SetupContext } from 'vue'
-import type { EmitType } from '@element-plus/popper/src/use-popper'
-import type { IPopperOptions } from '../../internal/props/use-popper-props'
+import { EmitType } from '@element-plus/popper/src/use-popper'
 
 export interface IUsePopover extends IPopperOptions {
   width: number | string
diff --git a/packages/popper/index.ts b/packages/popper/index.ts
index efda333aa0..4d45212cfd 100644
--- a/packages/popper/index.ts
+++ b/packages/popper/index.ts
@@ -10,6 +10,8 @@ const _Popper: SFCWithInstall<typeof Popper> = Popper
 
 export default _Popper
 
+export { default as defaultProps, Effect } from './src/use-popper/defaults'
 export type { Placement, Options } from '@popperjs/core'
+export type { TriggerType, IPopperOptions, PopperInstance } from './src/use-popper/defaults'
 export { default as usePopper } from './src/use-popper/index'
 export * from './src/renderers/index'
diff --git a/packages/popper/src/index.vue b/packages/popper/src/index.vue
index bdeb2c5042..076c0cf7a6 100644
--- a/packages/popper/src/index.vue
+++ b/packages/popper/src/index.vue
@@ -16,7 +16,7 @@ import {
 import throwError from '@element-plus/utils/error'
 
 import usePopper from './use-popper/index'
-import defaultProps from '../../internal/props/use-popper-props'
+import defaultProps from './use-popper/defaults'
 
 import { renderPopper, renderTrigger, renderArrow } from './renderers'
 import { ClickOutside } from '@element-plus/directives'
diff --git a/packages/popper/src/renderers/popper.ts b/packages/popper/src/renderers/popper.ts
index b1f310375f..7a5b005abe 100644
--- a/packages/popper/src/renderers/popper.ts
+++ b/packages/popper/src/renderers/popper.ts
@@ -3,7 +3,7 @@ import { NOOP } from '@vue/shared'
 import { stop } from '@element-plus/utils/dom'
 
 import type { VNode, Ref } from 'vue'
-import type { Effect } from '../../../internal/props/use-popper-props'
+import type { Effect } from '../use-popper/defaults'
 
 interface IRenderPopperProps {
   effect: Effect
diff --git a/packages/internal/props/use-popper-props.ts b/packages/popper/src/use-popper/defaults.ts
similarity index 76%
rename from packages/internal/props/use-popper-props.ts
rename to packages/popper/src/use-popper/defaults.ts
index d0892a5176..c494412262 100644
--- a/packages/internal/props/use-popper-props.ts
+++ b/packages/popper/src/use-popper/defaults.ts
@@ -1,11 +1,12 @@
-
-import { DEFAULT_TRIGGER, DEFAULT_FALLBACK_PLACEMENTS } from '../../constants/popper.constants'
-
-import type { PropType, ExtractPropTypes } from 'vue'
+import type { PropType  } from 'vue'
 import type { Placement, PositioningStrategy, Instance as PopperInstance, Options } from '@popperjs/core'
 
-export type Effect = 'light' | 'dark'
+export enum Effect {
+  DARK = 'dark',
+  LIGHT = 'light'
+}
 
+export type RefElement = Nullable<HTMLElement>
 export type Offset = [number, number] | number
 
 export type { Placement, PositioningStrategy, PopperInstance, Options }
@@ -14,7 +15,33 @@ export type TriggerType = 'click' | 'hover' | 'focus' | 'manual'
 
 export type Trigger = TriggerType | TriggerType[]
 
-const defaultProps = {
+export type IPopperOptions = {
+  arrowOffset: number
+  autoClose: number
+  boundariesPadding: number
+  class: string
+  cutoff: boolean
+  disabled: boolean
+  enterable: boolean
+  hideAfter: number
+  manualMode: boolean
+  offset: number
+  placement: Placement
+  popperOptions: Options
+  showAfter: number
+  showArrow: boolean
+  strategy: PositioningStrategy
+  trigger: Trigger
+  visible: boolean
+  stopPopperMouseEvent: boolean
+  gpuAcceleration: boolean
+  fallbackPlacements: Array<Placement>
+}
+
+export const DEFAULT_TRIGGER = 'hover'
+const DEFAULT_FALLBACK_PLACEMENTS = []
+
+export default {
   // the arrow size is an equailateral triangle with 10px side length, the 3rd side length ~ 14.1px
   // adding a offset to the ceil of 4.1 should be 5 this resolves the problem of arrow overflowing out of popper.
   arrowOffset: {
@@ -56,7 +83,7 @@ const defaultProps = {
   },
   effect: {
     type: String as PropType<Effect>,
-    default: 'dark',
+    default: Effect.DARK,
   },
   enterable: {
     type: Boolean,
@@ -124,7 +151,3 @@ const defaultProps = {
     default: DEFAULT_FALLBACK_PLACEMENTS,
   },
 }
-
-export type IPopperOptions = ExtractPropTypes<typeof defaultProps>
-
-export default defaultProps
diff --git a/packages/popper/src/use-popper/index.ts b/packages/popper/src/use-popper/index.ts
index 045ef617b5..07a7939744 100644
--- a/packages/popper/src/use-popper/index.ts
+++ b/packages/popper/src/use-popper/index.ts
@@ -14,12 +14,12 @@ import PopupManager from '@element-plus/utils/popup-manager'
 import usePopperOptions from './popper-options'
 
 import type { ComponentPublicInstance, SetupContext, Ref } from 'vue'
-import type { RefElement } from '@element-plus/types'
 import type {
   IPopperOptions,
   TriggerType,
   PopperInstance,
-} from '../../../internal/props/use-popper-props'
+  RefElement,
+} from './defaults'
 
 export type ElementType = ComponentPublicInstance | HTMLElement
 export type EmitType = 'update:visible' | 'after-enter' | 'after-leave' | 'before-enter' | 'before-leave'
@@ -294,3 +294,5 @@ export default function(
     visibility,
   }
 }
+
+export * from './defaults'
diff --git a/packages/popper/src/use-popper/popper-options.ts b/packages/popper/src/use-popper/popper-options.ts
index 8cd73ea510..2c17f2696f 100644
--- a/packages/popper/src/use-popper/popper-options.ts
+++ b/packages/popper/src/use-popper/popper-options.ts
@@ -2,13 +2,22 @@ import { computed } from 'vue'
 import buildModifiers from './build-modifiers'
 
 import type { Ref } from 'vue'
-import type { IPopperOptions } from '../../../internal/props/use-popper-props'
+import type { Options, Placement } from '@popperjs/core'
+
+interface IUsePopperProps {
+  popperOptions: Options
+  arrowOffset: number
+  offset: number
+  placement: Placement
+  gpuAcceleration: boolean
+  fallbackPlacements: Array<Placement>
+}
 
 interface IUsePopperState {
   arrow: Ref<HTMLElement>
 }
 
-export default function usePopperOptions(props: IPopperOptions, state: IUsePopperState) {
+export default function usePopperOptions(props: IUsePopperProps, state: IUsePopperState) {
   return computed(() => {
     return {
       placement: props.placement,
diff --git a/packages/tooltip/src/index.ts b/packages/tooltip/src/index.ts
index 4661b422cf..a3ac1179a3 100644
--- a/packages/tooltip/src/index.ts
+++ b/packages/tooltip/src/index.ts
@@ -2,7 +2,7 @@ import { defineComponent, h, ref, cloneVNode } from 'vue'
 import ElPopper from '@element-plus/popper'
 import { UPDATE_MODEL_EVENT } from '@element-plus/utils/constants'
 import throwError from '@element-plus/utils/error'
-import defaultProps from '../../internal/props/use-popper-props'
+import { defaultProps } from '@element-plus/popper'
 import { getFirstValidNode } from '@element-plus/utils/vnode'
 
 /**
diff --git a/packages/types/index.ts b/packages/types/index.ts
deleted file mode 100644
index 6d0077ca2c..0000000000
--- a/packages/types/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type RefElement = Nullable<HTMLElement>
diff --git a/packages/types/package.json b/packages/types/package.json
deleted file mode 100644
index e76419f33d..0000000000
--- a/packages/types/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "@element-plus/types",
-    "description": "Stores all common type",
-    "version": "0.0.0",
-    "license": "MIT",
-    "peerDependencies": {
-      "vue": "3.1.1"
-    },
-    "devDependencies": {
-      "@vue/test-utils": "^2.0.0-beta.3"
-    }
-  }
-  
\ No newline at end of file
diff --git a/packages/utils/global-nodes.ts b/packages/utils/global-nodes.ts
deleted file mode 100644
index e409d3546b..0000000000
--- a/packages/utils/global-nodes.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import isServer from './isServer'
-
-const globalNodes = []
-let target = isServer ? void 0 : document.body
-
-export function createGlobalNode(id?: string) {
-  const el = document.createElement('div')
-
-  if (id !== void 0) {
-    el.id = id
-  }
-
-  target.appendChild(el)
-  globalNodes.push(el)
-
-  return el
-}
-
-export function removeGlobalNode(el: HTMLElement) {
-  globalNodes.splice(globalNodes.indexOf(el), 1)
-  el.remove()
-}
-
-export function changeGlobalNodesTarget(el: HTMLElement) {
-  if (el !== target) {
-    target = el
-
-    globalNodes.forEach(el => {
-      if (el.contains(target) === false) {
-        target.appendChild(el)
-      }
-    })
-  }
-}