🌐 AI搜索 & 代理 主页
Skip to content

feat(b-form-datepicker): add button-content optionally scoped slot for icon #4795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmorehouse merged 16 commits into from
Feb 23, 2020
Merged

feat(b-form-datepicker): add button-content optionally scoped slot for icon #4795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
76f7ad5
feat(b-form-datepicker): add button-content scoped slot
andrewvasilchuk Feb 19, 2020
6656ad4
Merge branch 'dev' into dev
tmorehouse Feb 19, 2020
05afa66
Update form-datepicker.js
tmorehouse Feb 19, 2020
13caa86
Update form-datepicker.js
tmorehouse Feb 19, 2020
765ed79
Update package.json
tmorehouse Feb 19, 2020
85cf8a2
Update form-datepicker.spec.js
tmorehouse Feb 19, 2020
df2df19
lint
tmorehouse Feb 19, 2020
f01a7b1
Merge branch 'dev' into dev
tmorehouse Feb 20, 2020
53bc68e
Merge branch 'dev' into dev
jacobmllr95 Feb 20, 2020
96ad862
Update form-datepicker.js
jacobmllr95 Feb 20, 2020
9e7a8d6
Merge branch 'dev' into dev
jacobmllr95 Feb 20, 2020
f8eedce
Merge branch 'dev' into dev
tmorehouse Feb 21, 2020
c578b80
Merge branch 'dev' into dev
tmorehouse Feb 22, 2020
a2d800e
Merge branch 'dev' into dev
tmorehouse Feb 23, 2020
a6be3d3
Merge branch 'dev' into dev
tmorehouse Feb 23, 2020
77ef71b
Merge branch 'dev' into dev
tmorehouse Feb 23, 2020
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
10 changes: 8 additions & 2 deletions src/components/form-datepicker/form-datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { getComponentConfig } from '../../utils/config'
import { createDate, formatYMD, parseYMD } from '../../utils/date'
import dropdownMixin from '../../mixins/dropdown'
import idMixin from '../../mixins/id'
import normalizeSlotMixin from '../../mixins/normalize-slot'
import { BButton } from '../button/button'
import { BCalendar } from '../calendar/calendar'
import { BIconCalendar, BIconCalendarFill } from '../../icons/icons'
Expand Down Expand Up @@ -215,7 +216,7 @@ export const BFormDatepicker = /*#__PURE__*/ Vue.extend({
BHover: VBHover
},
// The mixins order determines the order of appearance in the props reference section
mixins: [idMixin, propsMixin, dropdownMixin],
mixins: [idMixin, normalizeSlotMixin, propsMixin, dropdownMixin],
model: {
prop: 'value',
event: 'input'
Expand Down Expand Up @@ -383,8 +384,13 @@ export const BFormDatepicker = /*#__PURE__*/ Vue.extend({
const idMenu = this.safeId('_dialog_')
const idWrapper = this.safeId('_b-form-date_')

const btnScope = { isHovered, hasFocus, state, opened: visible }
const defaultButtonFn = scope => {
const data = { props: { scale: 1.25 }, attrs: { 'aria-hidden': 'true' } }
return h(scope.isHovered || scope.hasFocus ? BIconCalendarFill : BIconCalendar, data)
}
let $button = h('div', { attrs: { 'aria-hidden': 'true' } }, [
h(isHovered || hasFocus ? BIconCalendarFill : BIconCalendar, { props: { scale: 1.25 } })
this.normalizeSlot('button-content', btnScope) || defaultButtonFn(btnScope)
Copy link
Member

@tmorehouse tmorehouse Feb 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only issue with using || instead of a ternary, is that if the slot returns '' it will render the default icon.

Copy link
Member

@jacobmllr95 jacobmllr95 Feb 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tmorehouse Hmm, haven't thought about that.

Copy link
Member

@tmorehouse tmorehouse Feb 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can always leave as-is for now, and people have issues we can use the hasNormalizedSlot check.

])
$button = h(
'button',
Expand Down
27 changes: 27 additions & 0 deletions src/components/form-datepicker/form-datepicker.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,4 +511,31 @@ describe('form-date', () => {

wrapper.destroy()
})

it('`button-content` static slot works', async () => {
const wrapper = mount(BFormDatepicker, {
attachToDocument: true,
propsData: {
id: 'test-button-slot',
value: '2020-01-15'
},
slots: {
'button-content': 'foobar'
}
})

expect(wrapper.isVueInstance()).toBe(true)
expect(wrapper.is('div')).toBe(true)
await waitNT(wrapper.vm)
await waitRAF()
await waitNT(wrapper.vm)
await waitRAF()

const $toggle = wrapper.find('button#test-button-slot')

expect($toggle.exists()).toBe(true)
expect($toggle.text()).toEqual('foobar')

wrapper.destroy()
})
})
29 changes: 29 additions & 0 deletions src/components/form-datepicker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,35 @@
}
]
}
],
"slots": [
{
"name": "button-content",
"version": "2.6.0",
"description": "Content to place in the datepicker's icon button",
"scope": [
{
"prop": "isHovered",
"type": "Boolean",
"description": "`true` if the component is hovered"
},
{
"prop": "hasFocus",
"type": "Boolean",
"description": "`true` if the datepicker icon button has focus"
},
{
"prop": "state",
"type": "Boolean",
"description": "The value of the `state` prop. `true` (valid), `false` (invalid), or `null`"
},
{
"prop": "open",
"type": "Boolean",
"description": "The visibility state of the popup. `true` if the popup is visible and `false` if not"
}
]
}
]
}
]
Expand Down