Skip to content

Commit

Permalink
fix(types): support string type for style in VNode data (vuejs#9728)
Browse files Browse the repository at this point in the history
  • Loading branch information
VitorLuizC authored and kiku-jw committed Jun 18, 2019
1 parent 1f89d36 commit 9b80313
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
2 changes: 1 addition & 1 deletion flow/vnode.js
Expand Up @@ -42,7 +42,7 @@ declare interface VNodeData {
staticClass?: string;
class?: any;
staticStyle?: { [key: string]: any };
style?: Array<Object> | Object;
style?: string | Array<Object> | Object;
normalizedStyle?: Object;
props?: { [key: string]: any };
attrs?: { [key: string]: string };
Expand Down
25 changes: 25 additions & 0 deletions types/test/vue-test.ts
Expand Up @@ -213,3 +213,28 @@ class Decorated extends Vue {

const obj = Vue.observable({ a: 1 })
obj.a++

// VNodeData style tests.
const ComponentWithStyleInVNodeData = Vue.extend({
render (h) {
const elementWithStyleAsString = h('div', {
style: 'background-color: red;'
});

const elementWithStyleAsObject = h('div', {
style: { backgroundColor: 'green' }
});

const elementWithStyleAsArrayOfObjects = h('div', {
style: [
{ backgroundColor: 'blue' }
]
});

return h('div', undefined, [
elementWithStyleAsString,
elementWithStyleAsObject,
elementWithStyleAsArrayOfObjects
]);
}
});
2 changes: 1 addition & 1 deletion types/vnode.d.ts
Expand Up @@ -48,7 +48,7 @@ export interface VNodeData {
staticClass?: string;
class?: any;
staticStyle?: { [key: string]: any };
style?: object[] | object;
style?: string | object[] | object;
props?: { [key: string]: any };
attrs?: { [key: string]: any };
domProps?: { [key: string]: any };
Expand Down

0 comments on commit 9b80313

Please sign in to comment.