From c3b5f8f174c248d0dca195c4dd9d565a26e83d16 Mon Sep 17 00:00:00 2001
From: David Polak <git@davidpolak.cz>
Date: Mon, 7 Jan 2019 16:19:25 +0100
Subject: [PATCH] Add flex-basis

---
 src/editor/config/config.js                |  1 +
 src/style_manager/model/PropertyFactory.js |  8 ++++++++
 test/specs/style_manager/model/Models.js   | 13 +++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/src/editor/config/config.js b/src/editor/config/config.js
index aa2751546..c49da707f 100644
--- a/src/editor/config/config.js
+++ b/src/editor/config/config.js
@@ -233,6 +233,7 @@ module.exports = {
           'align-items',
           'align-content',
           'order',
+          'flex-basis',
           'flex-grow',
           'flex-shrink',
           'align-self'
diff --git a/src/style_manager/model/PropertyFactory.js b/src/style_manager/model/PropertyFactory.js
index 8f9314db8..854c338ef 100644
--- a/src/style_manager/model/PropertyFactory.js
+++ b/src/style_manager/model/PropertyFactory.js
@@ -40,6 +40,7 @@ module.exports = () => ({
         case 'height':
         case 'max-height':
         case 'min-height':
+        case 'flex-basis':
           obj.fixedValues = ['initial', 'inherit', 'auto'];
           break;
         case 'font-size':
@@ -137,6 +138,7 @@ module.exports = () => ({
         case 'order':
         case 'flex-grow':
         case 'flex-shrink':
+        case 'flex-basis':
           obj.type = 'integer';
           break;
         case 'margin':
@@ -246,6 +248,7 @@ module.exports = () => ({
         case 'height':
         case 'background-size':
         case 'cursor':
+        case 'flex-basis':
           obj.defaults = 'auto';
           break;
         case 'font-family':
@@ -316,6 +319,7 @@ module.exports = () => ({
           obj.requires = { display: ['flex'] };
           break;
         case 'order':
+        case 'flex-basis':
         case 'flex-grow':
         case 'flex-shrink':
         case 'align-self':
@@ -347,6 +351,9 @@ module.exports = () => ({
         case 'width':
           obj.units = ['px', '%', 'vw'];
           break;
+        case 'flex-basis':
+          obj.units = ['px', '%', 'vw', 'vh'];
+          break;
         case 'text-shadow-v':
         case 'text-shadow-h':
         case 'text-shadow-blur':
@@ -405,6 +412,7 @@ module.exports = () => ({
         case 'box-shadow-blur':
         case 'transition-duration':
         case 'perspective':
+        case 'flex-basis':
           obj.min = 0;
           break;
       }
diff --git a/test/specs/style_manager/model/Models.js b/test/specs/style_manager/model/Models.js
index b4ec6ce86..9b82f584f 100644
--- a/test/specs/style_manager/model/Models.js
+++ b/test/specs/style_manager/model/Models.js
@@ -541,6 +541,19 @@ module.exports = {
         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', () => {
         var res = {
           type: 'integer',