breaking: remove "flex" prop to avoid warnings emitted by autoprefixer (

#11)
trendmicro-frontend · Mar 28, 2018 · a264f4d · a264f4d
1 parent 2bd0eef
commit a264f4d
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -266,7 +266,6 @@ rootCloseEvent | One of:<br/>'click'<br/>'mousedown' | | Which event when fired
 Name | Type | Default | Description 
 :--- | :--- | :------ | :----------
 componentClass | element | div | A custom element for this component.
-flex | boolean | false | Whether to use the flexbox layout.
 open | boolean | false | Whether or not the dropdown is visible.
 pullRight | boolean | false | Align the menu to the right side of the dropdown toggle.
 onClose | function(event) | | A callback fired when the dropdown menu closes.

diff --git a/dist/react-dropdown.css b/dist/react-dropdown.css
diff --git a/dist/react-dropdown.min.css b/dist/react-dropdown.min.css
diff --git a/docs/bundle.js b/docs/bundle.js
diff --git a/docs/index.html b/docs/index.html
@@ -11,5 +11,5 @@
 </head>
 <body>
 <div id="container"></div>
-<script type="text/javascript" src="bundle.js?af74ce99b2d7e80e612a"></script></body>
+<script type="text/javascript" src="bundle.js?34f7587a0d3a7e3e8dc8"></script></body>
 </html>
diff --git a/examples/DropdownMenuWrapper.jsx b/examples/DropdownMenuWrapper.jsx
@@ -10,11 +10,10 @@ export default () => (
             <Dropdown
                 open
                 onToggle={() => {}}
-                style={{ width: '100%' }}
             >
                 <Dropdown.Toggle title="Custom range" />
-                <Dropdown.MenuWrapper flex>
-                    <Dropdown.Menu style={{ flex: '1 0 0' }}>
+                <Dropdown.MenuWrapper style={{ whiteSpace: 'nowrap' }}>
+                    <Dropdown.Menu>
                         <MenuItem eventKey="1d">
                             Last 24 hours
                         </MenuItem>
@@ -33,11 +32,10 @@ export default () => (
                     </Dropdown.Menu>
                     <div
                         style={{
-                            flex: '0 0 auto',
                             display: 'inline-block',
                             padding: 12,
                             borderLeft: '1px solid #ddd',
-                            height: 200
+                            width: 400
                         }}
                     >
                         <p>Specify a date/time range.</p>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trendmicro/react-dropdown",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "React Dropdown component",
   "main": "lib/index.js",
   "files": [

diff --git a/src/DropdownMenuWrapper.jsx b/src/DropdownMenuWrapper.jsx
@@ -18,8 +18,6 @@ class DropdownMenuWrapper extends PureComponent {
             PropTypes.func
         ]),
 
-        flex: PropTypes.bool,
-
         // Dropdown
         open: PropTypes.bool,
         pullRight: PropTypes.bool,
@@ -34,8 +32,6 @@ class DropdownMenuWrapper extends PureComponent {
     static defaultProps = {
         componentClass: 'div',
 
-        flex: false,
-
         // Dropdown
         open: false,
         pullRight: false
@@ -76,7 +72,6 @@ class DropdownMenuWrapper extends PureComponent {
         const {
             componentType, // eslint-disable-line
             componentClass: Component,
-            flex,
             open,
             pullRight,
             onClose,
@@ -96,8 +91,7 @@ class DropdownMenuWrapper extends PureComponent {
                 <Component
                     {...props}
                     className={cx(className, {
-                        [styles.dropdownMenuWrapper]: true,
-                        [styles.flex]: !!flex
+                        [styles.dropdownMenuWrapper]: true
                     })}
                 >
                     {React.Children.map(children, child => {

diff --git a/src/dropdown-menu-wrapper.styl b/src/dropdown-menu-wrapper.styl
@@ -11,16 +11,13 @@
 
 .dropdown-menu-wrapper > .dropdown-menu {
     position: static;
+    vertical-align: top;
 }
 
 .dropdown.open > .dropdown-menu-wrapper {
     display: block;
 }
 
-.dropdown.open > .dropdown-menu-wrapper.flex {
-    display: flex;
-}
-
 .dropdown.open > .dropdown-menu-wrapper > .dropdown-menu {
     display: inline-block;
     border: 0;

diff --git a/src/dropdown-menu.styl b/src/dropdown-menu.styl
@@ -4,7 +4,6 @@
     left: 0;
     z-index: 1000;
     display: none;
-    float: left;
     min-width: 0;
     padding: 8px 0;
     margin: 0;