@zohodesk/components 1.2.62 → 1.3.0

package/lib/utils/dropDownUtils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.optionIdGrouping = exports.makeObjectConcat = exports.makeGetSelectedValueText = exports.makeGetOptionIdChange = exports.makeGetMultiSelectSelectedOptions = exports.makeGetMultiSelectFilterSuggestions = exports.makeGetIsShowClearIcon = exports.makeGetGroupSelectOptions = exports.makeGetGroupSelectFilterSuggestions = exports.makeFormatOptions = exports.getValueField = exports.getTextField = exports.getPrefixText = exports.getOptions = exports.getOptionType = exports.getImageField = exports.getIconSize = exports.getIconName = exports.filterSelectedOptions = exports.extractOptionIdFromJson = exports.extractOptionId = exports.dummyObj = exports.dummyArray = void 0;
+exports.optionIdGrouping = exports.makeObjectConcat = exports.makeGetSelectedValueText = exports.makeGetOptionIdChange = exports.makeGetMultiSelectSelectedOptions = exports.makeGetMultiSelectFilterSuggestions = exports.makeGetIsShowClearIcon = exports.makeGetGroupSelectOptions = exports.makeGetGroupSelectFilterSuggestions = exports.makeFormatOptions = exports.getValueField = exports.getTextField = exports.getSecondaryField = exports.getPrefixText = exports.getOptions = exports.getOptionType = exports.getImageField = exports.getIconSize = exports.getIconName = exports.filterSelectedOptions = exports.extractOptionIdFromJson = exports.extractOptionId = exports.dummyObj = exports.dummyArray = void 0;
 
 var _reselect = require("reselect");
 
@@ -66,6 +66,12 @@ var getValueField = function getValueField(props) {
 
 exports.getValueField = getValueField;
 
+var getSecondaryField = function getSecondaryField(props) {
+  return props.secondaryField || '';
+};
+
+exports.getSecondaryField = getSecondaryField;
+
 var getTextField = function getTextField(props) {
   return props.textField || '';
 };
@@ -142,21 +148,38 @@ var getListItemProps = function getListItemProps(props) {
   return props.listItemProps || '';
 };
 
+var getSearchFields = function getSearchFields(props) {
+  return props.searchFields || ['value'];
+};
+
+var isObjectContainsSearchString = function isObjectContainsSearchString() {
+  var searchFields = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var searchStr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var obj = arguments.length > 2 ? arguments[2] : undefined;
+  var matchedFields = searchFields.filter(function (element) {
+    return (0, _Common.getSearchString)(obj[element]).indexOf(searchStr) !== -1;
+  });
+  return matchedFields.length !== 0;
+};
+
+var getAllowValueFallback = function getAllowValueFallback(props) {
+  return props.allowValueFallback !== false;
+};
+
 var makeGetMultiSelectFilterSuggestions = function makeGetMultiSelectFilterSuggestions() {
-  return (0, _reselect.createSelector)([getOptions, getSelectedOptionsSel, getSearchStr, getNeedSearch, getIsStartWithSearch, getKeepSelectedOptions], function (options, selectedOptions, searchStr, needSearch, isStartsWithSearch, keepSelectedOptions) {
+  return (0, _reselect.createSelector)([getOptions, getSelectedOptionsSel, getSearchStr, getNeedSearch, getIsStartWithSearch, getKeepSelectedOptions, getSearchFields], function (options, selectedOptions, searchStr, needSearch, isStartsWithSearch, keepSelectedOptions, searchFields) {
     var suggestions = [];
     var suggestionIds = [];
     options.forEach(function (option) {
-      var id = option.id,
-          _option$value = option.value,
+      var searchString = (0, _Common.getSearchString)(searchStr);
+      var _option$value = option.value,
           value = _option$value === void 0 ? '' : _option$value;
       var valueString = (0, _Common.getSearchString)(value);
-      var searchString = (0, _Common.getSearchString)(searchStr);
-      var isMatch = needSearch ? isStartsWithSearch ? valueString.startsWith(searchString) : valueString.indexOf(searchString) !== -1 : true;
+      var isMatch = needSearch ? isStartsWithSearch ? valueString.startsWith(searchString) : isObjectContainsSearchString(searchFields, searchString, option) : true;
 
-      if (selectedOptions.indexOf(id) === -1 && isMatch || keepSelectedOptions) {
+      if (selectedOptions.indexOf(option.id) === -1 && isMatch || keepSelectedOptions) {
         suggestions.push(option);
-        suggestionIds.push(id);
+        suggestionIds.push(option.id);
       }
     });
     return {
@@ -228,7 +251,7 @@ var extractOptionIdFromJson = function extractOptionIdFromJson(id, localData) {
 exports.extractOptionIdFromJson = extractOptionIdFromJson;
 
 var makeFormatOptions = function makeFormatOptions() {
-  return (0, _reselect.createSelector)([getOptions, getValueField, getTextField, getImageField, getPrefixText, getIconName, getIconSize, getOptionType, getDisabledOptions, getListItemProps], function (options, valueField, textField, imageField, prefixText, iconName, iconSize, optionType, disabledOptions, listItemProps) {
+  return (0, _reselect.createSelector)([getOptions, getValueField, getTextField, getImageField, getPrefixText, getIconName, getIconSize, getOptionType, getDisabledOptions, getListItemProps, getAllowValueFallback, getSearchFields, getSecondaryField], function (options, valueField, textField, imageField, prefixText, iconName, iconSize, optionType, disabledOptions, listItemProps, allowValueFallback, searchFields, secondaryField) {
     var revampOptions = [];
     var remvampOptionIds = [];
     var normalizedAllOptions = {};
@@ -239,23 +262,34 @@ var makeFormatOptions = function makeFormatOptions() {
         var impValueField = option.valueField,
             impTextField = option.textField,
             impImageField = option.imageField,
+            impSecondaryField = option.secondaryField,
             impOptionType = option.optionType,
             impIconName = option.iconName,
             impIconSize = option.iconSize,
             listStyle = option.listItemProps;
         var id = _typeof(option) === 'object' ? option[impValueField || valueField] : option;
-        var value = _typeof(option) === 'object' ? option[impTextField || textField] : option;
+        var value = _typeof(option) === 'object' ? option[impTextField || textField] : allowValueFallback ? option : '';
+        var secondaryValue = _typeof(option) === 'object' ? option[impSecondaryField || secondaryField] : '';
         var photoURL = _typeof(option) === 'object' ? option[impImageField || imageField] : ''; // grouping options (group select/MultiSelect)
 
         id = !(0, _Common.getIsEmptyValue)(id) ? optionIdGrouping(id, prefixText) : '';
+        var additionalSearchFieldData = searchFields.reduce(function (value, item) {
+          if (_typeof(option) === 'object' && option.hasOwnProperty(item)) {
+            value[item] = option[item];
+          }
+
+          return value;
+        }, {});
 
         if (remvampOptionIds.indexOf(id) === -1 && !(0, _Common.getIsEmptyValue)(id) && !(0, _Common.getIsEmptyValue)(value)) {
           remvampOptionIds.push(id);
-          var optionDetails = {
+
+          var optionDetails = _objectSpread(_objectSpread({}, additionalSearchFieldData), {}, {
             id: id,
             value: value,
+            secondaryValue: secondaryValue,
             optionType: impOptionType || optionType
-          };
+          });
 
           if (imageField) {
             optionDetails.photoURL = photoURL;
@@ -297,7 +331,7 @@ var makeFormatOptions = function makeFormatOptions() {
 exports.makeFormatOptions = makeFormatOptions;
 
 var makeGetMultiSelectSelectedOptions = function makeGetMultiSelectSelectedOptions() {
-  return (0, _reselect.createSelector)([getSelectedOptionsSel, getNormalizedFormatOptions, getSelectedOptionsLength], function (selectedOptions, normalizedFormatOptions, selectedOptionsLength) {
+  return (0, _reselect.createSelector)([getSelectedOptionsSel, getNormalizedFormatOptions, getSelectedOptionsLength, getAllowValueFallback], function (selectedOptions, normalizedFormatOptions, selectedOptionsLength, allowValueFallback) {
     var output = [];
     var revampSelectedOptions = [];
     var normalizedSelectedOptions = {};
@@ -313,7 +347,8 @@ var makeGetMultiSelectSelectedOptions = function makeGetMultiSelectSelectedOptio
         revampSelectedOptions.push(id);
         output.push(normalizedFormatOptions[option]);
         normalizedSelectedOptions[id] = normalizedFormatOptions[option];
-      } else if ((0, _Common.getIsEmptyValue)(id) && !(0, _Common.getIsEmptyValue)(option) && revampSelectedOptions.indexOf(option) === -1) {
+      } else if (allowValueFallback && (0, _Common.getIsEmptyValue)(id) && !(0, _Common.getIsEmptyValue)(option) && revampSelectedOptions.indexOf(option) === -1) {
+        //fallback case
         var newObj = {
           id: option,
           value: option
@@ -412,7 +447,7 @@ var getGroupedOptions = function getGroupedOptions(props) {
 var getFormatOptions = makeFormatOptions();
 
 var makeGetGroupSelectOptions = function makeGetGroupSelectOptions() {
-  return (0, _reselect.createSelector)([getGroupedOptions], function (groupedOptions) {
+  return (0, _reselect.createSelector)([getGroupedOptions, getAllowValueFallback], function (groupedOptions, allowValueFallback) {
     var revampedGroups = [];
     var allOptionIds = [];
     var allNormalizedOptions = {}; //all group normalized options
@@ -435,7 +470,8 @@ var makeGetGroupSelectOptions = function makeGetGroupSelectOptions() {
           options: options,
           valueField: valueField,
           textField: textField,
-          prefixText: groupId
+          prefixText: groupId,
+          allowValueFallback: allowValueFallback
         }),
             allOptions = _getFormatOptions.allOptions,
             normalizedAllOptions = _getFormatOptions.normalizedAllOptions,

package/lib/v1/Radio/props/propTypes.js

@@ -39,7 +39,7 @@ var propTypes = {
     ariaChecked: _propTypes["default"].bool,
     ariaHidden: _propTypes["default"].bool,
     role: _propTypes["default"].string,
-    tabIndex: _propTypes["default"].oneOfType(_propTypes["default"].string, _propTypes["default"].number),
+    tabIndex: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number]),
     ariaLabelledby: _propTypes["default"].string,
     ariaLabel: _propTypes["default"].string,
     ariaReadonly: _propTypes["default"].bool

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/components",
-  "version": "1.2.62",
+  "version": "1.3.0",
   "main": "es/index.js",
   "module": "es/index.js",
   "private": false,
@@ -38,7 +38,7 @@
     "build:css:umd": "npm run clean &&  npm run init && react-cli build:css:umd",
     "coverage": "react-cli coverage",
     "prepare": "npm run init &&  npm run build && npm run rtl && npm run cssVariableConvert ",
-    "prepublishOnly": "node prePublish.js && npm run test && npm run download && npm run css:review && npm run review:props ",
+    "prepublishOnly": "node prePublish.js && npm run test-clean && npm run test && npm run download && npm run css:review && npm run review:props ",
     "postpublish": "node postPublish.js",
     "report": "react-cli publish:report",
     "test": "react-cli test",
@@ -68,10 +68,10 @@
     "@zohodesk-private/css-variable-migrator": "^1.0.7",
     "@zohodesk-private/node-plugins": "1.1.8",
     "@zohodesk-private/react-prop-validator": "1.2.3",
-    "@zohodesk/a11y": "2.3.1",
+    "@zohodesk/a11y": "2.3.4",
     "@zohodesk/docstool": "1.0.0-alpha-2",
     "@zohodesk/hooks": "2.0.5",
-    "@zohodesk/icons": "1.0.72",
+    "@zohodesk/icons": "1.0.75",
     "@zohodesk/svg": "1.1.22",
     "@zohodesk/utils": "1.3.14",
     "@zohodesk/variables": "1.0.0",
@@ -86,7 +86,7 @@
     "selectn": "1.1.2"
   },
   "peerDependencies": {
-    "@zohodesk/icons": "1.0.72",
+    "@zohodesk/icons": "1.0.75",
     "@zohodesk/variables": "1.0.0",
     "@zohodesk/svg": "1.1.22",
     "@zohodesk/virtualizer": "1.0.3",
@@ -94,6 +94,6 @@
     "react-sortable-hoc": "^0.8.3",
     "@zohodesk/hooks": "2.0.5",
     "@zohodesk/utils": "1.3.14",
-    "@zohodesk/a11y": "2.3.1"
+    "@zohodesk/a11y": "2.3.4"
   }
 }