primevue 4.3.8 → 4.4.0

package/multiselect/MultiSelect.vue

@@ -34,7 +34,7 @@
                             <span>{{ label }}</span>
                         </template>
                         <template v-else>
-                            <span v-for="item of d_value" :key="getLabelByValue(item)" :class="cx('chipItem')" v-bind="ptm('chipItem')">
+                            <span v-for="(item, idx) of d_value" :key="`chip-${optionValue ? item : getLabelByValue(item)}_${idx}`" :class="cx('chipItem')" v-bind="ptm('chipItem')">
                                 <slot name="chip" :value="item" :removeCallback="(event) => removeOption(event, item)">
                                     <!-- TODO: removetokenicon and removeTokenIcon  deprecated since v4.0. Use chipicon slot and chipIcon prop-->
                                     <Chip :class="cx('pcChip')" :label="getLabelByValue(item)" :removeIcon="chipIcon || removeTokenIcon" removable :unstyled="unstyled" @remove="removeOption($event, item)" :pt="ptm('pcChip')">
@@ -331,8 +331,9 @@ export default {
             return this.optionDisabled ? resolveFieldData(option, this.optionDisabled) : false;
         },
         isOptionGroup(option) {
-            return this.optionGroupLabel && option.optionGroup && option.group;
+            return !!(this.optionGroupLabel && option.optionGroup && option.group);
         },
+
         getOptionGroupLabel(optionGroup) {
             return resolveFieldData(optionGroup, this.optionGroupLabel);
         },
@@ -496,10 +497,9 @@ export default {
 
             let selected = this.isSelected(option);
             let value = null;
-            const _value = this.getOptionValue(option) !== '' ? this.getOptionValue(option) : this.getOptionLabel(option);
 
-            if (selected) value = this.d_value.filter((val) => !equals(val, _value, this.equalityKey));
-            else value = [...(this.d_value || []), _value];
+            if (selected) value = this.d_value.filter((val) => !equals(val, this.getOptionValue(option), this.equalityKey));
+            else value = [...(this.d_value || []), this.getOptionValue(option)];
 
             this.updateModel(event, value);
             index !== -1 && (this.focusedOptionIndex = index);
@@ -830,9 +830,9 @@ export default {
         },
         getLabelByValue(value) {
             const options = this.optionGroupLabel ? this.flatOptions(this.options) : this.options || [];
-            const matchedOption = options.find((option) => !this.isOptionGroup(option) && equals(this.getOptionValue(option) !== '' ? this.getOptionValue(option) : this.getOptionLabel(option), value, this.equalityKey));
+            const matchedOption = options.find((option) => !this.isOptionGroup(option) && equals(this.getOptionValue(option), value, this.equalityKey));
 
-            return matchedOption ? this.getOptionLabel(matchedOption) : null;
+            return this.getOptionLabel(matchedOption);
         },
         getSelectedItemsLabel() {
             let pattern = /{(.*?)}/;
@@ -878,7 +878,7 @@ export default {
             return equals(value1, value2, this.equalityKey);
         },
         isSelected(option) {
-            const optionValue = this.getOptionValue(option) !== '' ? this.getOptionValue(option) : this.getOptionLabel(option);
+            const optionValue = this.getOptionValue(option);
 
             return (this.d_value || []).some((value) => this.isEquals(value, optionValue));
         },
@@ -1021,11 +1021,14 @@ export default {
         },
         flatOptions(options) {
             return (options || []).reduce((result, option, index) => {
-                result.push({ optionGroup: option, group: true, index });
-
                 const optionGroupChildren = this.getOptionGroupChildren(option);
 
-                optionGroupChildren && optionGroupChildren.forEach((o) => result.push(o));
+                if (optionGroupChildren && Array.isArray(optionGroupChildren)) {
+                    result.push({ optionGroup: option, group: true, index });
+                    optionGroupChildren.forEach((o) => result.push(o));
+                } else {
+                    result.push(option);
+                }
 
                 return result;
             }, []);
@@ -1150,7 +1153,7 @@ export default {
             return isEmpty(this.fluid) ? !!this.$pcFluid : this.fluid;
         },
         isClearIconVisible() {
-            return this.showClear && this.d_value && this.d_value.length && this.d_value != null && isNotEmpty(this.options);
+            return this.showClear && this.d_value && this.d_value.length && this.d_value != null && isNotEmpty(this.options) && !this.disabled && !this.loading;
         },
         containerDataP() {
             return cn({

package/multiselect/index.mjs

@@ -300,7 +300,7 @@ var script = {
       return this.optionDisabled ? resolveFieldData(option, this.optionDisabled) : false;
     },
     isOptionGroup: function isOptionGroup(option) {
-      return this.optionGroupLabel && option.optionGroup && option.group;
+      return !!(this.optionGroupLabel && option.optionGroup && option.group);
     },
     getOptionGroupLabel: function getOptionGroupLabel(optionGroup) {
       return resolveFieldData(optionGroup, this.optionGroupLabel);
@@ -449,10 +449,9 @@ var script = {
       }
       var selected = this.isSelected(option);
       var value = null;
-      var _value = this.getOptionValue(option) !== '' ? this.getOptionValue(option) : this.getOptionLabel(option);
       if (selected) value = this.d_value.filter(function (val) {
-        return !equals(val, _value, _this4.equalityKey);
-      });else value = [].concat(_toConsumableArray(this.d_value || []), [_value]);
+        return !equals(val, _this4.getOptionValue(option), _this4.equalityKey);
+      });else value = [].concat(_toConsumableArray(this.d_value || []), [this.getOptionValue(option)]);
       this.updateModel(event, value);
       index !== -1 && (this.focusedOptionIndex = index);
       isFocus && focus(this.$refs.focusInput);
@@ -755,9 +754,9 @@ var script = {
       var _this9 = this;
       var options = this.optionGroupLabel ? this.flatOptions(this.options) : this.options || [];
       var matchedOption = options.find(function (option) {
-        return !_this9.isOptionGroup(option) && equals(_this9.getOptionValue(option) !== '' ? _this9.getOptionValue(option) : _this9.getOptionLabel(option), value, _this9.equalityKey);
+        return !_this9.isOptionGroup(option) && equals(_this9.getOptionValue(option), value, _this9.equalityKey);
       });
-      return matchedOption ? this.getOptionLabel(matchedOption) : null;
+      return this.getOptionLabel(matchedOption);
     },
     getSelectedItemsLabel: function getSelectedItemsLabel() {
       var pattern = /{(.*?)}/;
@@ -812,7 +811,7 @@ var script = {
     },
     isSelected: function isSelected(option) {
       var _this10 = this;
-      var optionValue = this.getOptionValue(option) !== '' ? this.getOptionValue(option) : this.getOptionLabel(option);
+      var optionValue = this.getOptionValue(option);
       return (this.d_value || []).some(function (value) {
         return _this10.isEquals(value, optionValue);
       });
@@ -987,15 +986,19 @@ var script = {
     flatOptions: function flatOptions(options) {
       var _this22 = this;
       return (options || []).reduce(function (result, option, index) {
-        result.push({
-          optionGroup: option,
-          group: true,
-          index: index
-        });
         var optionGroupChildren = _this22.getOptionGroupChildren(option);
-        optionGroupChildren && optionGroupChildren.forEach(function (o) {
-          return result.push(o);
-        });
+        if (optionGroupChildren && Array.isArray(optionGroupChildren)) {
+          result.push({
+            optionGroup: option,
+            group: true,
+            index: index
+          });
+          optionGroupChildren.forEach(function (o) {
+            return result.push(o);
+          });
+        } else {
+          result.push(option);
+        }
         return result;
       }, []);
     },
@@ -1117,7 +1120,7 @@ var script = {
       return isEmpty(this.fluid) ? !!this.$pcFluid : this.fluid;
     },
     isClearIconVisible: function isClearIconVisible() {
-      return this.showClear && this.d_value && this.d_value.length && this.d_value != null && isNotEmpty(this.options);
+      return this.showClear && this.d_value && this.d_value.length && this.d_value != null && isNotEmpty(this.options) && !this.disabled && !this.loading;
     },
     containerDataP: function containerDataP() {
       return cn(_defineProperty$1({
@@ -1238,9 +1241,9 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
       key: 1
     }, [$options.chipSelectedItems ? (openBlock(), createElementBlock("span", _hoisted_4, toDisplayString($options.label), 1)) : (openBlock(true), createElementBlock(Fragment, {
       key: 1
-    }, renderList(_ctx.d_value, function (item) {
+    }, renderList(_ctx.d_value, function (item, idx) {
       return openBlock(), createElementBlock("span", mergeProps({
-        key: $options.getLabelByValue(item),
+        key: "chip-".concat(_ctx.optionValue ? item : $options.getLabelByValue(item), "_").concat(idx),
         "class": _ctx.cx('chipItem')
       }, {
         ref_for: true