@zohodesk/dot 1.7.16 → 1.7.17

package/es/dropdown/ToggleDropDown/ToggleDropDown.js

@@ -4,7 +4,7 @@ import { propTypes } from "./props/propTypes";
 import { Icon } from '@zohodesk/icons';
 import Popup from '@zohodesk/components/lib/Popup/Popup';
 import { Box, Container } from '@zohodesk/components/lib/Layout';
-import ListItem from '@zohodesk/components/lib/ListItem/ListItem';
+import ListItem from '@zohodesk/components/es/ListItem/ListItem';
 import ListItemWithIcon from '@zohodesk/components/lib/ListItem/ListItemWithIcon';
 import DropDownHeading from '@zohodesk/components/lib/DropDown/DropDownHeading';
 import TextBoxIcon from '@zohodesk/components/lib/TextBoxIcon/TextBoxIcon';
@@ -210,9 +210,11 @@ export class ToggleDropDown extends Component {
       keyName,
       isGroupDropDown,
       groupOptionsKey,
-      groupNameKey
+      groupNameKey,
+      searchFields
     } = this.props;
     searchValue = searchValue.trim().toLowerCase();
+    searchFields.push(keyName !== 'value' ? keyName : 'value');
     let result = [];
 
     if (isGroupDropDown) {
@@ -224,8 +226,15 @@ export class ToggleDropDown extends Component {
         const name = group[groupNameKey];
         const groupOptions = group[groupOptionsKey];
         const datas = groupOptions.filter(list => {
-          const value = list[keyName];
-          return value.toLowerCase().includes(searchValue);
+          return searchFields.some(key => {
+            let val = list[key];
+
+            if (val === null || val === undefined) {
+              return false;
+            } else {
+              return val.toLowerCase().includes(searchValue);
+            }
+          });
         });
 
         if (datas.length) {
@@ -243,7 +252,15 @@ export class ToggleDropDown extends Component {
           return true;
         }
 
-        return item[keyName].toLowerCase().includes(searchValue);
+        return searchFields.some(key => {
+          let val = item[key];
+
+          if (val === null || val === undefined) {
+            return false;
+          } else {
+            return val.toLowerCase().includes(searchValue);
+          }
+        });
       });
 
       if (filteredOptions.length) {
@@ -717,7 +734,8 @@ export class ToggleDropDown extends Component {
             iconClass,
             title,
             disableTitle = '',
-            isDisabled = false
+            isDisabled = false,
+            secondaryValue
           } = item;
           listIndex += 1;
           return iconName ? /*#__PURE__*/React.createElement(ListItemWithIcon, {
@@ -747,6 +765,7 @@ export class ToggleDropDown extends Component {
               ariaSelected: selectedId === item[idName],
               ariaLabel: item[keyName]
             },
+            secondaryValue: secondaryValue,
             ...ListItemWithIconProps
           }) : /*#__PURE__*/React.createElement(ListItem, {
             key: listIndex,
@@ -772,6 +791,7 @@ export class ToggleDropDown extends Component {
               ariaSelected: selectedId === item[idName],
               ariaLabel: item[keyName]
             },
+            secondaryValue: secondaryValue,
             ...ListItemProps
           });
         }));
@@ -786,7 +806,8 @@ export class ToggleDropDown extends Component {
           title,
           needDivider,
           isDisabled = false,
-          disableTitle = ''
+          disableTitle = '',
+          secondaryValue
         } = item;
 
         if (!needDivider) {
@@ -824,6 +845,7 @@ export class ToggleDropDown extends Component {
             ariaSelected: selectedId === item[idName],
             ariaLabel: item[keyName]
           },
+          secondaryValue: secondaryValue,
           ...ListItemWithIconProps
         }) : /*#__PURE__*/React.createElement(ListItem, {
           key: listIndex,
@@ -849,6 +871,7 @@ export class ToggleDropDown extends Component {
             ariaSelected: selectedId === item[idName],
             ariaLabel: item[keyName]
           },
+          secondaryValue: secondaryValue,
           ...ListItemProps
         }));
       }), isFetchingOptions && /*#__PURE__*/React.createElement(Container, {

package/es/dropdown/ToggleDropDown/props/defaultProps.js

@@ -25,5 +25,6 @@ export const defaultProps = {
   needMultiLineText: false,
   isAbsolutePositioningNeeded: true,
   isRestrictScroll: false,
-  customClass: {}
+  customClass: {},
+  searchFields: []
 };

package/es/dropdown/ToggleDropDown/props/propTypes.js

@@ -79,5 +79,6 @@ export const propTypes = {
   positionsOffset: PropTypes.object,
   targetOffset: PropTypes.object,
   from: PropTypes.string,
-  top: PropTypes.number
+  top: PropTypes.number,
+  searchFields: PropTypes.array
 };

package/lib/dropdown/ToggleDropDown/ToggleDropDown.js

@@ -19,7 +19,7 @@ var _Popup = _interopRequireDefault(require("@zohodesk/components/lib/Popup/Popu
 
 var _Layout = require("@zohodesk/components/lib/Layout");
 
-var _ListItem = _interopRequireDefault(require("@zohodesk/components/lib/ListItem/ListItem"));
+var _ListItem = _interopRequireDefault(require("@zohodesk/components/es/ListItem/ListItem"));
 
 var _ListItemWithIcon = _interopRequireDefault(require("@zohodesk/components/lib/ListItem/ListItemWithIcon"));
 
@@ -281,8 +281,10 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
           keyName = _this$props6.keyName,
           isGroupDropDown = _this$props6.isGroupDropDown,
           groupOptionsKey = _this$props6.groupOptionsKey,
-          groupNameKey = _this$props6.groupNameKey;
+          groupNameKey = _this$props6.groupNameKey,
+          searchFields = _this$props6.searchFields;
       searchValue = searchValue.trim().toLowerCase();
+      searchFields.push(keyName !== 'value' ? keyName : 'value');
       var result = [];
 
       if (isGroupDropDown) {
@@ -292,8 +294,15 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
           var name = group[groupNameKey];
           var groupOptions = group[groupOptionsKey];
           var datas = groupOptions.filter(function (list) {
-            var value = list[keyName];
-            return value.toLowerCase().includes(searchValue);
+            return searchFields.some(function (key) {
+              var val = list[key];
+
+              if (val === null || val === undefined) {
+                return false;
+              } else {
+                return val.toLowerCase().includes(searchValue);
+              }
+            });
           });
 
           if (datas.length) {
@@ -309,7 +318,15 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
             return true;
           }
 
-          return item[keyName].toLowerCase().includes(searchValue);
+          return searchFields.some(function (key) {
+            var val = item[key];
+
+            if (val === null || val === undefined) {
+              return false;
+            } else {
+              return val.toLowerCase().includes(searchValue);
+            }
+          });
         });
 
         if (filteredOptions.length) {
@@ -783,7 +800,8 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
                 _item$disableTitle = item.disableTitle,
                 disableTitle = _item$disableTitle === void 0 ? '' : _item$disableTitle,
                 _item$isDisabled = item.isDisabled,
-                isDisabled = _item$isDisabled === void 0 ? false : _item$isDisabled;
+                isDisabled = _item$isDisabled === void 0 ? false : _item$isDisabled,
+                secondaryValue = item.secondaryValue;
             listIndex += 1;
             return iconName ? /*#__PURE__*/_react["default"].createElement(_ListItemWithIcon["default"], _extends({
               key: listIndex,
@@ -811,7 +829,8 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
                 role: isSearch ? 'option' : 'menuitem',
                 ariaSelected: selectedId === item[idName],
                 ariaLabel: item[keyName]
-              }
+              },
+              secondaryValue: secondaryValue
             }, ListItemWithIconProps)) : /*#__PURE__*/_react["default"].createElement(_ListItem["default"], _extends({
               key: listIndex,
               dataId: item[keyName],
@@ -835,7 +854,8 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
                 role: isSearch ? 'option' : 'menuitem',
                 ariaSelected: selectedId === item[idName],
                 ariaLabel: item[keyName]
-              }
+              },
+              secondaryValue: secondaryValue
             }, ListItemProps));
           }));
         }), isFetchingOptions && /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
@@ -850,7 +870,8 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
               _item$isDisabled2 = item.isDisabled,
               isDisabled = _item$isDisabled2 === void 0 ? false : _item$isDisabled2,
               _item$disableTitle2 = item.disableTitle,
-              disableTitle = _item$disableTitle2 === void 0 ? '' : _item$disableTitle2;
+              disableTitle = _item$disableTitle2 === void 0 ? '' : _item$disableTitle2,
+              secondaryValue = item.secondaryValue;
 
           if (!needDivider) {
             listIndex += 1;
@@ -886,7 +907,8 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
               role: isSearch ? 'option' : 'menuitem',
               ariaSelected: selectedId === item[idName],
               ariaLabel: item[keyName]
-            }
+            },
+            secondaryValue: secondaryValue
           }, ListItemWithIconProps)) : /*#__PURE__*/_react["default"].createElement(_ListItem["default"], _extends({
             key: listIndex,
             dataId: item[keyName],
@@ -910,7 +932,8 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
               role: isSearch ? 'option' : 'menuitem',
               ariaSelected: selectedId === item[idName],
               ariaLabel: item[keyName]
-            }
+            },
+            secondaryValue: secondaryValue
           }, ListItemProps)));
         }), isFetchingOptions && /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
           isCover: false,

package/lib/dropdown/ToggleDropDown/props/defaultProps.js

@@ -31,6 +31,7 @@ var defaultProps = {
   needMultiLineText: false,
   isAbsolutePositioningNeeded: true,
   isRestrictScroll: false,
-  customClass: {}
+  customClass: {},
+  searchFields: []
 };
 exports.defaultProps = defaultProps;

package/lib/dropdown/ToggleDropDown/props/propTypes.js

@@ -89,6 +89,7 @@ var propTypes = {
   positionsOffset: _propTypes["default"].object,
   targetOffset: _propTypes["default"].object,
   from: _propTypes["default"].string,
-  top: _propTypes["default"].number
+  top: _propTypes["default"].number,
+  searchFields: _propTypes["default"].array
 };
 exports.propTypes = propTypes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/dot",
-  "version": "1.7.16",
+  "version": "1.7.17",
   "main": "lib/index",
   "module": "es/index.js",
   "private": false,
@@ -39,7 +39,7 @@
     "docs": "npm run css:review && review:props && react-cli docs",
     "prepublishOnly": "node prePublish.js && npm run download && npm run test && npm run css:review  && npm run review:props",
     "postpublish": "node postPublish.js",
-    "test-clean": "react-cli clean coverage && react-cli clean ./unittest",
+    "test-clean": "react-cli clean ./coverage && react-cli clean ./unittest react-cli clean ./es && react-cli clean ./lib &&  react-cli clean ./package-lock.json &&  react-cli clean ./result.json",
     "download": "react-cli clean ./node_modules ./package-lock.json  && npm install",
     "expublish": "npm publish --tag experimental-version",
     "css:lineheight:validate": "node ./node_modules/@zohodesk-private/node-plugins/es/lineheight_automation/lineHeightErrorCheck.js ./src/",
@@ -63,9 +63,9 @@
     "@zohodesk-private/node-plugins": "1.1.8",
     "@zohodesk-private/react-prop-validator": "1.2.3",
     "@zohodesk/a11y": "2.3.4",
-    "@zohodesk/components": "1.4.0",
+    "@zohodesk/components": "1.4.3",
     "@zohodesk/hooks": "2.0.5",
-    "@zohodesk/icons": "1.0.78",
+    "@zohodesk/icons": "1.0.79",
     "@zohodesk/layout": "^3.1.0",
     "@zohodesk/svg": "1.1.22",
     "@zohodesk/utils": "1.3.14",
@@ -77,8 +77,8 @@
   "peerDependencies": {
     "velocity-react": "1.4.3",
     "@zohodesk/variables": "1.0.0",
-    "@zohodesk/components": "1.4.0",
-    "@zohodesk/icons": "1.0.78",
+    "@zohodesk/components": "1.4.3",
+    "@zohodesk/icons": "1.0.79",
     "@zohodesk/svg": "1.1.22",
     "@zohodesk/virtualizer": "1.0.3",
     "react-sortable-hoc": "^0.8.3",