Merge pull request #1169 from /issues/1160@v2

textarea: implement _width_available #1160
bem · Dec 5, 2014 · 29a2903 · 29a2903
2 parents e50a988 + 864aa47
commit 29a2903
Show file tree

Hide file tree

Showing 23 changed files with 58 additions and 3 deletions.
diff --git a/common.blocks/textarea/textarea.tests/gemini.bemjson.js b/common.blocks/textarea/textarea.tests/gemini.bemjson.js
@@ -113,6 +113,24 @@
             ],
             cls : 'default-label-disabled'
         },
+        {
+            block : 'test',
+            attrs : { style : 'width: 350px;' },
+            content : {
+                block : 'textarea',
+                mods : { width : 'available' }
+            },
+            cls : 'default-width-available-enabled'
+        },
+        {
+            block : 'test',
+            attrs : { style : 'width: 350px;' },
+            content : {
+                block : 'textarea',
+                mods : { width : 'available', disabled : true }
+            },
+            cls : 'default-width-available-disabled'
+        },
 
         { tag : 'hr' },
 
@@ -257,6 +275,24 @@
             ],
             cls : 'islands-label-disabled'
         },
+        {
+            block : 'test',
+            attrs : { style : 'width: 350px;' },
+            content : {
+                block : 'textarea',
+                mods : { theme : 'islands', size : 'm', width : 'available' }
+            },
+            cls : 'islands-width-available-enabled'
+        },
+        {
+            block : 'test',
+            attrs : { style : 'width: 350px;' },
+            content : {
+                block : 'textarea',
+                mods : { theme : 'islands', size : 'm', width : 'available', disabled : true }
+            },
+            cls : 'islands-width-available-disabled'
+        },
         {
             block : 'textarea',
             mods : { theme : 'islands', size : 'm' },

diff --git a/common.blocks/textarea/textarea.tests/simple.bemjson.js b/common.blocks/textarea/textarea.tests/simple.bemjson.js
@@ -36,9 +36,9 @@
             val : 'disabled',
             placeholder : 'placeholder'
         } },
-        { tag : 'p', attrs : { style : 'width: 350px;' }, content : {
+        { attrs : { style : 'width: 350px;' }, content : {
             block : 'textarea',
-            mods : { theme : 'simple', size : 'm' },
+            mods : { theme : 'simple', size : 'm', width : 'available' },
             val : 'width',
             placeholder : 'placeholder'
         } },
@@ -56,6 +56,13 @@
             val : 'disabled'
         } },
 
+        { attrs : { style : 'width: 350px;' }, content : {
+            block : 'textarea',
+            mods : { theme : 'islands', size : 'm', width : 'available' },
+            val : 'width',
+            placeholder : 'placeholder'
+        } },
+
         { tag : 'h3', content : 'size' },
         { tag : 'p', content : {
             block : 'textarea',

diff --git a/design/common.blocks/textarea/_theme/textarea_theme_islands.styl b/design/common.blocks/textarea/_theme/textarea_theme_islands.styl
@@ -128,4 +128,9 @@
             padding-left: 12px;
         }
     }
+
+    &.textarea_width_available
+    {
+      width: 100%;
+    }
 }
diff --git a/design/common.blocks/textarea/_theme/textarea_theme_simple.styl b/design/common.blocks/textarea/_theme/textarea_theme_simple.styl
@@ -51,4 +51,9 @@
             }
         }
     }
+
+    &.textarea_width_available
+    {
+        width: 100%;
+    }
 }
diff --git a/gemini/screens/textarea/default-width-available-disabled/plain/chrome-v35.png b/gemini/screens/textarea/default-width-available-disabled/plain/chrome-v35.png
diff --git a/gemini/screens/textarea/default-width-available-disabled/plain/firefox-v30.png b/gemini/screens/textarea/default-width-available-disabled/plain/firefox-v30.png
diff --git a/gemini/screens/textarea/default-width-available-enabled/click/chrome-v35.png b/gemini/screens/textarea/default-width-available-enabled/click/chrome-v35.png
diff --git a/gemini/screens/textarea/default-width-available-enabled/click/firefox-v30.png b/gemini/screens/textarea/default-width-available-enabled/click/firefox-v30.png
diff --git a/gemini/screens/textarea/default-width-available-enabled/plain/chrome-v35.png b/gemini/screens/textarea/default-width-available-enabled/plain/chrome-v35.png
diff --git a/gemini/screens/textarea/default-width-available-enabled/plain/firefox-v30.png b/gemini/screens/textarea/default-width-available-enabled/plain/firefox-v30.png
diff --git a/gemini/screens/textarea/default-width-available-enabled/text/chrome-v35.png b/gemini/screens/textarea/default-width-available-enabled/text/chrome-v35.png
diff --git a/gemini/screens/textarea/default-width-available-enabled/text/firefox-v30.png b/gemini/screens/textarea/default-width-available-enabled/text/firefox-v30.png
diff --git a/gemini/screens/textarea/islands-sizeM-enabled/click/firefox-v30.png b/gemini/screens/textarea/islands-sizeM-enabled/click/firefox-v30.png
diff --git a/gemini/screens/textarea/islands-sizeM-enabled/text/firefox-v30.png b/gemini/screens/textarea/islands-sizeM-enabled/text/firefox-v30.png
diff --git a/gemini/screens/textarea/islands-width-available-disabled/plain/chrome-v35.png b/gemini/screens/textarea/islands-width-available-disabled/plain/chrome-v35.png
diff --git a/gemini/screens/textarea/islands-width-available-disabled/plain/firefox-v30.png b/gemini/screens/textarea/islands-width-available-disabled/plain/firefox-v30.png
diff --git a/gemini/screens/textarea/islands-width-available-enabled/click/chrome-v35.png b/gemini/screens/textarea/islands-width-available-enabled/click/chrome-v35.png
diff --git a/gemini/screens/textarea/islands-width-available-enabled/click/firefox-v30.png b/gemini/screens/textarea/islands-width-available-enabled/click/firefox-v30.png
diff --git a/gemini/screens/textarea/islands-width-available-enabled/plain/chrome-v35.png b/gemini/screens/textarea/islands-width-available-enabled/plain/chrome-v35.png
diff --git a/gemini/screens/textarea/islands-width-available-enabled/plain/firefox-v30.png b/gemini/screens/textarea/islands-width-available-enabled/plain/firefox-v30.png
diff --git a/gemini/screens/textarea/islands-width-available-enabled/text/chrome-v35.png b/gemini/screens/textarea/islands-width-available-enabled/text/chrome-v35.png
diff --git a/gemini/screens/textarea/islands-width-available-enabled/text/firefox-v30.png b/gemini/screens/textarea/islands-width-available-enabled/text/firefox-v30.png
diff --git a/gemini/textarea.gemini.js b/gemini/textarea.gemini.js
@@ -11,6 +11,7 @@ gemini.suite('textarea', function(root) {
         'islands-longVal',
         'islands-longPlaceholder',
         'islands-label',
+        'islands-width-available',
         'islands-sizeS',
         'islands-sizeM',
         'islands-sizeL',
@@ -20,7 +21,8 @@ gemini.suite('textarea', function(root) {
         'default-placeholder',
         'default-longVal',
         'default-longPlaceholder',
-        'default-label'
+        'default-label',
+        'default-width-available'
     ]
         .forEach(function(test) {
             var textareaSelector = '.' + test,