Merge pull request #118 from webdev-dev/master

 Filter update

Author: culturedbarbarian

lib/Filters/renderFilterItem.js

@@ -36,7 +36,11 @@ var renderSelectFilter = exports.renderSelectFilter = function renderSelectFilte
         items.map(function (item, idx) {
             return _react2.default.createElement(
                 'option',
-                { key: idx, value: idx === 0 ? item.value || '' : item.value || item, className: capitalize ? 'text-capitalize' : '' },
+                {
+                    key: idx,
+                    value: idx === 0 ? item.value || '' : item.value || item,
+                    className: capitalize ? 'text-capitalize' : ''
+                },
                 item.label || item
             );
         })
@@ -59,12 +63,14 @@ var renderDateFilter = exports.renderDateFilter = function renderDateFilter(_ref
 var renderTextFilter = exports.renderTextFilter = function renderTextFilter(_ref3) {
     var name = _ref3.name,
         category = _ref3.category,
-        onHandleChange = _ref3.onHandleChange;
+        onHandleChange = _ref3.onHandleChange,
+        placeholder = _ref3.placeholder;
     return _react2.default.createElement(_index.FormControl, {
         type: 'text',
         name: name,
         id: name,
         value: category && category[name] || '',
-        onChange: onHandleChange
+        onChange: onHandleChange,
+        placeholder: placeholder || ''
     });
 };

lib/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.WFUIDropdown = exports.Description = exports.PanelFilter = exports.CascadingPane = exports.ModalDialog = exports.Card = exports.FilterFields = exports.FilterItem = exports.Filters = exports.ReactMarkdown = exports.CollapsibleFilter = exports.Search = exports.FormFields = exports.LoadingComponent = exports.TimezonePicker = exports.Dropzone = exports.NotificationSystem = exports.DisqusFeed = exports.GroupsDrawer = exports.Drawer = exports.UserDrawer = exports.DashboardBox = exports.DraggableWithContext = exports.Draggable = exports.PasswordValidator = exports.FilteredTableV2 = exports.FilteredTable = exports.TwitterFeed = exports.Spinner = exports.FilteredList = undefined;
+exports.WFUIDropdown = exports.Description = exports.PanelFilter = exports.CascadingPane = exports.ModalDialog = exports.Card = exports.FilterFields = exports.FilterItem = exports.Filters = exports.ReactMarkdown = exports.CollapsibleFilter = exports.Search = exports.FormFields = exports.LoadingComponent = exports.TimezonePicker = exports.Dropzone = exports.NotificationSystem = exports.DisqusFeed = exports.GroupsDrawer = exports.Drawer = exports.UserDrawer = exports.DashboardCard = exports.DashboardBox = exports.DraggableWithContext = exports.Draggable = exports.PasswordValidator = exports.FilteredIsotope = exports.FilteredTableV2 = exports.FilteredTable = exports.TwitterFeed = exports.Spinner = exports.FilteredList = undefined;
 
 var _reactBootstrap = require('react-bootstrap');
 
@@ -53,6 +53,10 @@ var _FilteredTable3 = require('./FilteredTable/2/FilteredTable');
 
 var _FilteredTable4 = _interopRequireDefault(_FilteredTable3);
 
+var _FilteredIsotope = require('./FilteredIsotope/FilteredIsotope');
+
+var _FilteredIsotope2 = _interopRequireDefault(_FilteredIsotope);
+
 var _PasswordValidator = require('./PasswordValidator/PasswordValidator');
 
 var _PasswordValidator2 = _interopRequireDefault(_PasswordValidator);
@@ -65,6 +69,10 @@ var _DashboardBox = require('./DashboardBox/DashboardBox');
 
 var _DashboardBox2 = _interopRequireDefault(_DashboardBox);
 
+var _DashboardCard = require('./DashboardCard/DashboardCard');
+
+var _DashboardCard2 = _interopRequireDefault(_DashboardCard);
+
 var _UserDrawer = require('./UserDrawer/UserDrawer');
 
 var _UserDrawer2 = _interopRequireDefault(_UserDrawer);
@@ -146,10 +154,12 @@ exports.Spinner = _Spinner2.default;
 exports.TwitterFeed = _TwitterFeed2.default;
 exports.FilteredTable = _FilteredTable2.default;
 exports.FilteredTableV2 = _FilteredTable4.default;
+exports.FilteredIsotope = _FilteredIsotope2.default;
 exports.PasswordValidator = _PasswordValidator2.default;
 exports.Draggable = _Draggable2.default;
 exports.DraggableWithContext = DraggableWithContext;
 exports.DashboardBox = _DashboardBox2.default;
+exports.DashboardCard = _DashboardCard2.default;
 exports.UserDrawer = _UserDrawer2.default;
 exports.Drawer = _Drawer2.default;
 exports.GroupsDrawer = _GroupsDrawer2.default;

src/Filters/renderFilterItem.jsx

@@ -14,11 +14,15 @@ export const renderSelectFilter = ({ name, category, onHandleChange, items, capi
         value={(category && category[name]) || ''}
         selected={(category && category[name]) || ''}
     >
-        {
-            items.map((item, idx) => (
-                <option key={idx} value={idx === 0 ? (item.value || '') : (item.value || item)} className={capitalize ? 'text-capitalize' : ''}>{item.label || item}</option>
-            ))
-        }
+        {items.map((item, idx) => (
+            <option
+                key={idx}
+                value={idx === 0 ? item.value || '' : item.value || item}
+                className={capitalize ? 'text-capitalize' : ''}
+            >
+                {item.label || item}
+            </option>
+        ))}
     </FormControl>
 );
 
@@ -32,12 +36,13 @@ export const renderDateFilter = ({ name, category, onHandleChange }) => (
     />
 );
 
-export const renderTextFilter = ({ name, category, onHandleChange }) => (
+export const renderTextFilter = ({ name, category, onHandleChange, placeholder }) => (
     <FormControl
         type="text"
         name={name}
         id={name}
         value={(category && category[name]) || ''}
         onChange={onHandleChange}
+        placeholder={placeholder || ''}
     />
 );

src/index.js

@@ -7,9 +7,11 @@ import Spinner from './Spinner/Spinner';
 import TwitterFeed from './TwitterFeed/TwitterFeed';
 import FilteredTable from './FilteredTable/1/FilteredTable';
 import FilteredTableV2 from './FilteredTable/2/FilteredTable';
+import FilteredIsotope from './FilteredIsotope/FilteredIsotope';
 import PasswordValidator from './PasswordValidator/PasswordValidator';
 import Draggable, { withContext } from './Draggable/Draggable';
 import DashboardBox from './DashboardBox/DashboardBox';
+import DashboardCard from './DashboardCard/DashboardCard';
 import UserDrawer from './UserDrawer/UserDrawer';
 import Drawer from './Drawer/Drawer';
 import GroupsDrawer from './GroupsDrawer/GroupsDrawer';
@@ -40,10 +42,12 @@ export {
     TwitterFeed,
     FilteredTable,
     FilteredTableV2,
+    FilteredIsotope,
     PasswordValidator,
     Draggable,
     DraggableWithContext,
     DashboardBox,
+    DashboardCard,
     UserDrawer,
     Drawer,
     GroupsDrawer,