theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

types: remove intersection of props interface on this

Browse Source
This commit is contained in:
Evan You 2019-03-01 14:06:19 -05:00
parent f00097127a
commit c335939dcf
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/runtime-core/src/component.ts
View File

@ -72,7 +72,7 @@ export interface LifecycleMethods {
export interface ComponentClass extends ComponentClassOptions { export interface ComponentClass extends ComponentClassOptions {
options?: ComponentOptions options?: ComponentOptions
new <P = {}, D = {}>(): Component<P, D> & D & P new <P = {}, D = {}>(): Component<P, D>
} }
export interface FunctionalComponent<P = {}> { export interface FunctionalComponent<P = {}> {
@ -84,9 +84,9 @@ export interface FunctionalComponent<P = {}> {
export type ComponentType = ComponentClass | FunctionalComponent export type ComponentType = ComponentClass | FunctionalComponent
// Internal type that represents a mounted instance. // Internal type that represents a mounted instance.
// It extends InternalComponent with mounted instance properties. // It extends ComponentImplementation with mounted instance properties.
export interface ComponentInstance<P = {}, D = {}> export interface ComponentInstance<P = {}, D = {}>
extends InternalComponent, extends ComponentImplementation,
Partial<APIMethods<P, D>>, Partial<APIMethods<P, D>>,
Partial<LifecycleMethods> { Partial<LifecycleMethods> {
constructor: ComponentClass constructor: ComponentClass
@ -107,7 +107,7 @@ export interface ComponentInstance<P = {}, D = {}>
} }
// actual implementation of the component // actual implementation of the component
class InternalComponent implements PublicInstanceMethods { class ComponentImplementation implements PublicInstanceMethods {
get $el(): any { get $el(): any {
const el = this.$vnode && this.$vnode.el const el = this.$vnode && this.$vnode.el
return typeof el === 'function' ? (el as any)() : el return typeof el === 'function' ? (el as any)() : el
@ -125,6 +125,7 @@ class InternalComponent implements PublicInstanceMethods {
$options: ComponentOptions | null = null $options: ComponentOptions | null = null
$refs: Record<string, ComponentInstance | RenderNode> = {} $refs: Record<string, ComponentInstance | RenderNode> = {}
$proxy: any = null $proxy: any = null
$self: any
_rawData: Data | null = null _rawData: Data | null = null
_computedGetters: Record<string, ComputedGetter> | null = null _computedGetters: Record<string, ComputedGetter> | null = null
@ -190,7 +191,7 @@ class InternalComponent implements PublicInstanceMethods {
// legacy event emitter interface exposed on component instances // legacy event emitter interface exposed on component instances
if (__COMPAT__) { if (__COMPAT__) {
const p = InternalComponent.prototype as any const p = ComponentImplementation.prototype as any
;['on', 'off', 'once'].forEach(key => { ;['on', 'off', 'once'].forEach(key => {
p['$' + key] = function(...args: any[]) { p['$' + key] = function(...args: any[]) {
this._eventEmitter[key](...args) this._eventEmitter[key](...args)
@ -206,5 +207,5 @@ if (__COMPAT__) {
} }
// the exported Component has the implementation details of the actual // the exported Component has the implementation details of the actual
// InternalComponent class but with proper type inference of ComponentClass. // ComponentImplementation class but with proper type inference of ComponentClass.
export const Component = InternalComponent as ComponentClass export const Component = ComponentImplementation as ComponentClass