Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/renderless/src/picker/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import userPopper from '../common/deps/vue-popper'
import { DATEPICKER } from '../common'
import { formatDate, parseDate, isDateObject, getWeekNumber } from '../common/deps/date-util'
import { extend } from '../common/object'
import { isFunction } from '../common/type'
import globalTimezone from './timezone'

const iso8601Reg = /^\d{4}-\d{2}-\d{2}(.)\d{2}:\d{2}:\d{2}(.+)$/
Expand Down Expand Up @@ -704,11 +705,15 @@ export const handleKeydown =
}

export const hidePicker =
({ state }) =>
({ state, doDestroy }) =>
() => {
if (state.picker) {
state.picker.resetView && state.picker.resetView()
state.pickerVisible = state.picker.visible = state.picker.state.visible = false

if (isFunction(doDestroy)) {
doDestroy()
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/renderless/src/picker/vue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ const initState = ({ api, reactive, vm, computed, props, utils, parent }) => {
const initApi = ({ api, props, hooks, state, vnode, others, utils }) => {
const { t, emit, dispatch, nextTick, vm } = vnode
const { TimePanel, TimeRangePanel } = others
const { destroyPopper, popperElm, updatePopper } = initPopper({ props, hooks, vnode })
const { destroyPopper, popperElm, updatePopper, doDestroy } = initPopper({ props, hooks, vnode })

state.popperElm = popperElm
state.picker = null

Object.assign(api, {
destroyPopper,
emitDbTime: emitDbTime({ emit, state, t }),
hidePicker: hidePicker({ state }),
hidePicker: hidePicker({ state, doDestroy }),
handleSelectChange: ({ tz, date }) => emit('select-change', { tz, date }),
getPanel: getPanel(others),
handleFocus: handleFocus({ emit, vm, state }),
Expand Down