feat: add support for JSX and strings without a slot-scope attribute #871
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "presets": ["env", "stage-2", "flow-vue"], | ||
| "plugins": ["transform-decorators-legacy", "transform-vue-jsx"], | ||
| "comments": false | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,54 +32,45 @@ function getVueTemplateCompilerHelpers (): { [name: string]: Function } { | |
| names.forEach(name => { | ||
| helpers[name] = vue._renderProxy[name] | ||
| }) | ||
| helpers.$createElement = vue._renderProxy.$createElement | ||
| return helpers | ||
| } | ||
|
|
||
| function validateEnvironment (): void { | ||
| if (vueVersion < 2.1) { | ||
| throwError(`the scopedSlots option is only supported in ` + `[email protected]+.`) | ||
| } | ||
| } | ||
|
|
||
| const scopedSlotRe = /<[^>]+ slot-scope=\"(.+)\"/ | ||
|
There was a problem hiding this comment. IMHO, I think |
||
|
|
||
| export default function createScopedSlots ( | ||
| scopedSlotsOption: ?{ [slotName: string]: string | Function } | ||
| ): { [slotName: string]: (props: Object) => VNode | Array<VNode>} { | ||
| const scopedSlots = {} | ||
| if (!scopedSlotsOption) { | ||
| return scopedSlots | ||
| } | ||
| validateEnvironment() | ||
| const helpers = getVueTemplateCompilerHelpers() | ||
| for (const s in scopedSlotsOption) { | ||
|
There was a problem hiding this comment. I think |
||
| const slot = scopedSlotsOption[s] | ||
| const isFn = typeof slot === 'function' | ||
| const renderFn = isFn | ||
| ? slot | ||
| : compileToFunctions(slot).renderFn | ||
|
|
||
| const hasSlotScopeAttr = !isFn && slot.match(scopedSlotRe) | ||
| // // $FlowIgnore | ||
| const slotScope = hasSlotScopeAttr && hasSlotScopeAttr[1] | ||
|
|
||
| scopedSlots[s] = function (props) { | ||
| if (isFn) { | ||
| return renderFn.call({ ...helpers }, props) | ||
| } else if (slotScope && !isDestructuringSlotScope(slotScope)) { | ||
| return renderFn.call({ ...helpers, [slotScope]: props }) | ||
| } else { | ||
| return renderFn.call({ ...helpers, ...props }) | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| import { | ||
| describeWithShallowAndMount, | ||
| vueVersion | ||
| } from '~resources/utils' | ||
| import ComponentWithScopedSlots from '~resources/components/component-with-scoped-slots.vue' | ||
| import { itDoNotRunIf } from 'conditional-specs' | ||
|
|
@@ -14,7 +13,7 @@ describeWithShallowAndMount('scopedSlots', mountingMethod => { | |
| }) | ||
|
|
||
| itDoNotRunIf( | ||
| vueVersion < 2.5, | ||
| 'mounts component scoped slots in render function', | ||
| () => { | ||
| const destructuringWrapper = mountingMethod( | ||
|
|
@@ -38,15 +37,15 @@ describeWithShallowAndMount('scopedSlots', mountingMethod => { | |
| const notDestructuringWrapper = mountingMethod( | ||
| { | ||
| render: function () { | ||
| return this.$scopedSlots.named({ | ||
| index: 1, | ||
| item: 'foo' | ||
| }) | ||
| } | ||
| }, | ||
| { | ||
| scopedSlots: { | ||
| named: | ||
| '<p slot-scope="props">{{props.index}},{{props.item}}</p>' | ||
| } | ||
| } | ||
|
|
@@ -56,15 +55,15 @@ describeWithShallowAndMount('scopedSlots', mountingMethod => { | |
| ) | ||
|
|
||
| itDoNotRunIf( | ||
| vueVersion < 2.5, | ||
| 'mounts component scoped slots', | ||
| () => { | ||
| const wrapper = mountingMethod(ComponentWithScopedSlots, { | ||
| slots: { default: '<span>123</span>' }, | ||
| scopedSlots: { | ||
| destructuring: | ||
| '<p slot-scope="{ index, item }">{{index}},{{item}}</p>', | ||
| list: '<template slot-scope="foo"><p>{{foo.index}},{{foo.text}}</p></template>', | ||
| single: '<p slot-scope="bar">{{bar.text}}</p>', | ||
| noProps: '<p slot-scope="baz">baz</p>' | ||
| } | ||
|
|
@@ -105,52 +104,40 @@ describeWithShallowAndMount('scopedSlots', mountingMethod => { | |
| } | ||
| ) | ||
|
|
||
| it('handles JSX', () => { | ||
| const wrapper = mountingMethod({ | ||
| template: '<div><slot name="single" :text="foo"></slot></div>', | ||
| data: () => ({ | ||
| foo: 'bar' | ||
| }) | ||
| }, { | ||
| scopedSlots: { | ||
| single ({ text }) { | ||
| return <p>{{ text }}</p> | ||
| } | ||
| } | ||
| }) | ||
| expect(wrapper.html()).to.equal('<div><p>bar</p></div>') | ||
| }) | ||
|
|
||
| it('handles no slot-scope', () => { | ||
| const wrapper = mountingMethod({ | ||
| template: '<div><slot name="single" :text="foo" :i="123"></slot></div>', | ||
| data: () => ({ | ||
| foo: 'bar' | ||
| }) | ||
| }, { | ||
| scopedSlots: { | ||
| single: '<p>{{text}},{{i}}</p>' | ||
| } | ||
| }) | ||
| expect(wrapper.html()).to.equal('<div><p>bar,123</p></div>') | ||
| }) | ||
|
|
||
| itDoNotRunIf( | ||
| vueVersion > 2.0, | ||
| 'throws exception when vue version < 2.1', | ||
| () => { | ||
| const fn = () => { | ||
| mountingMethod(ComponentWithScopedSlots, { | ||
| scopedSlots: { | ||
|
|
@@ -159,7 +146,7 @@ describeWithShallowAndMount('scopedSlots', mountingMethod => { | |
| }) | ||
| } | ||
| const message = | ||
| '[vue-test-utils]: the scopedSlots option is only supported in [email protected]+.' | ||
| expect(fn) | ||
| .to.throw() | ||
| .with.property('message', message) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the scopedSlots option is only supported in+[email protected]+.↓
the scopedSlots option is only supported in [email protected]+.