Merge branch 'dev-252' into 'master'

Add devices buttons focusable #252 See merge request !94
metasfresh · Feb 13, 2017 · f4820a1 · f4820a1
2 parents 99d0f88 + 3b6eb6e
commit f4820a1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/src/assets/css/focus.css b/src/assets/css/focus.css
@@ -20,4 +20,5 @@
 .btn:focus,
 button:focus {
     outline: 0;
+    border: 1px solid $brand-font-color;
 }
diff --git a/src/components/app/SelectionAttributes.js b/src/components/app/SelectionAttributes.js
@@ -59,15 +59,6 @@ class SelectionAttributes extends Component {
             });
     }
 
-    moveToDevice = (e) => {
-        switch(e.key) {
-            case "Shift":
-                e.preventDefault();
-                //TO DO
-            break;
-        }
-    }
-
     getTabId = (item) => {
         return item && item[0].readonly ? -1 : 1;
 
@@ -84,8 +75,6 @@ class SelectionAttributes extends Component {
             DLWrapperHandleChange, DLWrapperHandlePatch, entity, setClickOutsideLock
         } = this.props;
 
-        const lastItem = DLWrapperLayout.length-1;
-
         return (
             <div>
                 <div className="attributes-selector-header">

diff --git a/src/components/widget/Devices/Device.js b/src/components/widget/Devices/Device.js
@@ -41,6 +41,7 @@ class Device extends Component {
 
     render() {
         const {value, index, isMore} = this.state;
+        const {tabIndex} = this.props;
 
         if(!!value){
             return (
@@ -49,6 +50,7 @@ class Device extends Component {
                         (isMore ? "btn-flagged ": "")
                     }
                     onClick={this.handleClick}
+                    tabIndex={tabIndex}
                 >
                     {isMore && <span className="btn-flag">{index + 1}</span>}
                     {value}

diff --git a/src/components/widget/Devices/DevicesWidget.js b/src/components/widget/Devices/DevicesWidget.js
@@ -8,7 +8,7 @@ class DevicesWidget extends Component {
     }
 
     render() {
-        const {devices, handleChange} = this.props;
+        const {devices, handleChange, tabIndex} = this.props;
         const isMore = devices.length > 1;
 
         return (
@@ -20,6 +20,7 @@ class DevicesWidget extends Component {
                         index={index}
                         handleChange={handleChange}
                         isMore={isMore}
+                        tabIndex={tabIndex}
                     />
                 )}
             </div>

diff --git a/src/components/widget/RawWidget.js b/src/components/widget/RawWidget.js
@@ -583,6 +583,7 @@ class RawWidget extends Component {
             tabIndex, handlePatch
         } = this.props;
 
+
         if(widgetData[0].displayed && widgetData[0].displayed === true){
             return (
                 <div className={
@@ -612,6 +613,7 @@ class RawWidget extends Component {
                         {fields[0].devices && !widgetData[0].readonly &&
                             <DevicesWidget
                                 devices={fields[0].devices}
+                                tabIndex={1}
                                 handleChange={(value) =>
                                     handlePatch && handlePatch(fields[0].field, value)
                                 }