From c82d5137f662aff53f57f357bba997919d131e4a Mon Sep 17 00:00:00 2001
From: Huy Dang <hqdang97@gmail.com>
Date: Wed, 11 Jul 2018 14:32:45 -0600
Subject: [PATCH 1/3] added Glamour and remove Radium in Listbox

---
 src/components/accessibility/Listbox.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/accessibility/Listbox.js b/src/components/accessibility/Listbox.js
index 620a48017..d196277dc 100644
--- a/src/components/accessibility/Listbox.js
+++ b/src/components/accessibility/Listbox.js
@@ -1,8 +1,8 @@
 const React = require('react');
 const PropTypes = require('prop-types');
-const Radium = require('radium');
 const keycode = require('keycode');
 const _findIndex = require('lodash/findIndex');
+const { css } = require('glamor');
 
 /**
  * Listbox
@@ -109,7 +109,7 @@ class Listbox extends React.Component {
         className='mx-listbox'
         ref={ref => this.component = ref}
         role='listbox'
-        style={this.props.style}
+        style={css(...this.props.style)}
       >
         {React.Children.map(this.props.children, (child, index) =>
           React.cloneElement(child, {
@@ -144,4 +144,4 @@ Option.propTypes = {
   label: PropTypes.string.isRequired
 };
 
-module.exports = { Listbox, Option: Radium(Option) };
+module.exports = { Listbox, Option };

From 1086495c6dc1623fbb79d78d486c43f6ac7904f9 Mon Sep 17 00:00:00 2001
From: Huy Dang <hqdang97@gmail.com>
Date: Thu, 12 Jul 2018 09:34:32 -0600
Subject: [PATCH 2/3] fix it to className from style

---
 src/components/accessibility/Listbox.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/accessibility/Listbox.js b/src/components/accessibility/Listbox.js
index d196277dc..6a040abe1 100644
--- a/src/components/accessibility/Listbox.js
+++ b/src/components/accessibility/Listbox.js
@@ -106,10 +106,9 @@ class Listbox extends React.Component {
     return (
       <div
         aria-label={this.props['aria-label']}
-        className='mx-listbox'
+        className={'mx-listbox' + css({ ...this.props.style })}
         ref={ref => this.component = ref}
         role='listbox'
-        style={css(...this.props.style)}
       >
         {React.Children.map(this.props.children, (child, index) =>
           React.cloneElement(child, {

From 07aadc885f76d5891f8216d912125f57a25f3243 Mon Sep 17 00:00:00 2001
From: Huy Dang <hqdang97@gmail.com>
Date: Mon, 16 Jul 2018 09:40:51 -0600
Subject: [PATCH 3/3] remove spread operator

---
 src/components/accessibility/Listbox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/accessibility/Listbox.js b/src/components/accessibility/Listbox.js
index 6a040abe1..f22cc08b6 100644
--- a/src/components/accessibility/Listbox.js
+++ b/src/components/accessibility/Listbox.js
@@ -106,7 +106,7 @@ class Listbox extends React.Component {
     return (
       <div
         aria-label={this.props['aria-label']}
-        className={'mx-listbox' + css({ ...this.props.style })}
+        className={`mx-listbox ${css(this.props.style)}`}
         ref={ref => this.component = ref}
         role='listbox'
       >