Skip to content

Commit

Permalink
feat(runtime-core): support app.unmount(container) (#601)
Browse files Browse the repository at this point in the history
close #593
  • Loading branch information
underfin authored and yyx990803 committed Jan 16, 2020
1 parent 8ec69cb commit 04ac6c4
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 1 deletion.
20 changes: 20 additions & 0 deletions packages/runtime-core/__tests__/apiApp.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,26 @@ describe('api: createApp', () => {
expect(`already been mounted`).toHaveBeenWarned()
})

test('unmount', () => {
const Comp = {
props: {
count: {
default: 0
}
},
setup(props: { count: number }) {
return () => props.count
}
}

const root = nodeOps.createElement('div')
const app = createApp()
app.mount(Comp, root)

app.unmount(root)
expect(serializeInner(root)).toBe(``)
})

test('provide', () => {
const app = createApp()
app.provide('foo', 1)
Expand Down
5 changes: 5 additions & 0 deletions packages/runtime-core/src/apiCreateApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export interface App<HostElement = any> {
rootContainer: HostElement | string,
rootProps?: Data
): ComponentPublicInstance
unmount(rootContainer: HostElement | string): void
provide<T>(key: InjectionKey<T> | string, value: T): this
}

Expand Down Expand Up @@ -197,6 +198,10 @@ export function createAppAPI<HostNode, HostElement>(
}
},

unmount(rootContainer: HostElement) {
render(null, rootContainer)
},

provide(key, value) {
if (__DEV__ && key in context.provides) {
warn(
Expand Down
14 changes: 13 additions & 1 deletion packages/runtime-dom/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const createApp = (): App<Element> => {
})
}

const mount = app.mount
const { mount, unmount } = app
app.mount = (component, container, props): any => {
if (isString(container)) {
container = document.querySelector(container)!
Expand All @@ -52,6 +52,18 @@ export const createApp = (): App<Element> => {
return mount(component, container, props)
}

app.unmount = container => {
if (isString(container)) {
container = document.querySelector(container)!
if (!container) {
__DEV__ &&
warn(`Failed to unmount app: mount target selector returned null.`)
return
}
}
unmount(container)
}

return app
}

Expand Down

0 comments on commit 04ac6c4

Please sign in to comment.