primevue 4.3.7 → 4.3.9

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')">
@@ -496,10 +496,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,7 +829,7 @@ 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;
         },
@@ -878,7 +877,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));
         },
@@ -1150,7 +1149,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

@@ -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,7 +754,7 @@ 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;
     },
@@ -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);
       });
@@ -1117,7 +1116,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 +1237,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