Browse Source

Add flex-basis

pull/1710/head
David Polak 8 years ago
parent
commit
c3b5f8f174
  1. 1
      src/editor/config/config.js
  2. 8
      src/style_manager/model/PropertyFactory.js
  3. 13
      test/specs/style_manager/model/Models.js

1
src/editor/config/config.js

@ -233,6 +233,7 @@ module.exports = {
'align-items', 'align-items',
'align-content', 'align-content',
'order', 'order',
'flex-basis',
'flex-grow', 'flex-grow',
'flex-shrink', 'flex-shrink',
'align-self' 'align-self'

8
src/style_manager/model/PropertyFactory.js

@ -40,6 +40,7 @@ module.exports = () => ({
case 'height': case 'height':
case 'max-height': case 'max-height':
case 'min-height': case 'min-height':
case 'flex-basis':
obj.fixedValues = ['initial', 'inherit', 'auto']; obj.fixedValues = ['initial', 'inherit', 'auto'];
break; break;
case 'font-size': case 'font-size':
@ -137,6 +138,7 @@ module.exports = () => ({
case 'order': case 'order':
case 'flex-grow': case 'flex-grow':
case 'flex-shrink': case 'flex-shrink':
case 'flex-basis':
obj.type = 'integer'; obj.type = 'integer';
break; break;
case 'margin': case 'margin':
@ -246,6 +248,7 @@ module.exports = () => ({
case 'height': case 'height':
case 'background-size': case 'background-size':
case 'cursor': case 'cursor':
case 'flex-basis':
obj.defaults = 'auto'; obj.defaults = 'auto';
break; break;
case 'font-family': case 'font-family':
@ -316,6 +319,7 @@ module.exports = () => ({
obj.requires = { display: ['flex'] }; obj.requires = { display: ['flex'] };
break; break;
case 'order': case 'order':
case 'flex-basis':
case 'flex-grow': case 'flex-grow':
case 'flex-shrink': case 'flex-shrink':
case 'align-self': case 'align-self':
@ -347,6 +351,9 @@ module.exports = () => ({
case 'width': case 'width':
obj.units = ['px', '%', 'vw']; obj.units = ['px', '%', 'vw'];
break; break;
case 'flex-basis':
obj.units = ['px', '%', 'vw', 'vh'];
break;
case 'text-shadow-v': case 'text-shadow-v':
case 'text-shadow-h': case 'text-shadow-h':
case 'text-shadow-blur': case 'text-shadow-blur':
@ -405,6 +412,7 @@ module.exports = () => ({
case 'box-shadow-blur': case 'box-shadow-blur':
case 'transition-duration': case 'transition-duration':
case 'perspective': case 'perspective':
case 'flex-basis':
obj.min = 0; obj.min = 0;
break; break;
} }

13
test/specs/style_manager/model/Models.js

@ -541,6 +541,19 @@ module.exports = {
expect(obj.build('max-width')).toEqual([res]); expect(obj.build('max-width')).toEqual([res]);
}); });
test('Build flex-basis', () => {
var res = {
type: 'integer',
units: ['px', '%', 'vw', 'vh'],
defaults: 'auto',
fixedValues: ['initial', 'inherit', 'auto'],
requiresParent: { display: ['flex'] },
min: 0
};
res.property = 'flex-basis';
expect(obj.build('flex-basis')).toEqual([res]);
});
test('Build height family', () => { test('Build height family', () => {
var res = { var res = {
type: 'integer', type: 'integer',

Loading…
Cancel
Save