primevue 4.2.5 → 4.3.0

package/treeselect/TreeSelect.vue

@@ -132,7 +132,7 @@
 import { absolutePosition, addStyle, find, findSingle, focus, getFirstFocusableElement, getFocusableElements, getLastFocusableElement, getOuterWidth, isTouchDevice, relativePosition } from '@primeuix/utils/dom';
 import { isEmpty, isNotEmpty } from '@primeuix/utils/object';
 import { ZIndex } from '@primeuix/utils/zindex';
-import { ConnectedOverlayScrollHandler, UniqueComponentId } from '@primevue/core/utils';
+import { ConnectedOverlayScrollHandler } from '@primevue/core/utils';
 import ChevronDownIcon from '@primevue/icons/chevrondown';
 import TimesIcon from '@primevue/icons/times';
 import Chip from 'primevue/chip';
@@ -152,16 +152,12 @@ export default {
     },
     data() {
         return {
-            id: this.$attrs.id,
             focused: false,
             overlayVisible: false,
             d_expandedKeys: this.expandedKeys || {}
         };
     },
     watch: {
-        '$attrs.id': function (newValue) {
-            this.id = newValue || UniqueComponentId();
-        },
         modelValue: {
             handler: function () {
                 if (!this.selfChange) {
@@ -200,7 +196,6 @@ export default {
         }
     },
     mounted() {
-        this.id = this.id || UniqueComponentId();
         this.updateTreeState();
     },
     methods: {
@@ -393,12 +388,12 @@ export default {
                     this.selfClick = false;
                 };
 
-                document.addEventListener('click', this.outsideClickListener);
+                document.addEventListener('click', this.outsideClickListener, true);
             }
         },
         unbindOutsideClickListener() {
             if (this.outsideClickListener) {
-                document.removeEventListener('click', this.outsideClickListener);
+                document.removeEventListener('click', this.outsideClickListener, true);
                 this.outsideClickListener = null;
             }
         },
@@ -452,22 +447,11 @@ export default {
         onOverlayKeydown(event) {
             if (event.code === 'Escape') this.hide();
         },
-        findSelectedNodes(node, keys, selectedNodes) {
-            if (node) {
-                if (this.isSelected(node, keys)) {
-                    selectedNodes.push(node);
-                    delete keys[node.key];
-                }
+        fillNodeMap(node, nodeMap) {
+            nodeMap[node.key] = node;
 
-                if (Object.keys(keys).length && node.children) {
-                    for (let childNode of node.children) {
-                        this.findSelectedNodes(childNode, keys, selectedNodes);
-                    }
-                }
-            } else {
-                for (let childNode of this.options) {
-                    this.findSelectedNodes(childNode, keys, selectedNodes);
-                }
+            if (node.children?.length) {
+                node.children.forEach((children) => this.fillNodeMap(children, nodeMap));
             }
         },
         isSelected(node, keys) {
@@ -520,13 +504,24 @@ export default {
         }
     },
     computed: {
+        nodeMap() {
+            const nodeMap = {};
+
+            this.options?.forEach((node) => this.fillNodeMap(node, nodeMap));
+
+            return nodeMap;
+        },
         selectedNodes() {
             let selectedNodes = [];
 
             if (this.d_value && this.options) {
-                let keys = { ...this.d_value };
+                Object.keys(this.d_value).forEach((key) => {
+                    const node = this.nodeMap[key];
 
-                this.findSelectedNodes(null, keys, selectedNodes);
+                    if (this.isSelected(node, this.d_value)) {
+                        selectedNodes.push(node);
+                    }
+                });
             }
 
             return selectedNodes;
@@ -560,7 +555,7 @@ export default {
             return !this.options || this.options.length === 0;
         },
         listId() {
-            return this.id + '_list';
+            return this.$id + '_list';
         },
         hasFluid() {
             return isEmpty(this.fluid) ? !!this.$pcFluid : this.fluid;

package/treeselect/index.d.ts

@@ -303,9 +303,9 @@ export interface TreeSelectProps {
     disabled?: boolean | undefined;
     /**
      * Specifies the input variant of the component.
-     * @defaultValue outlined
+     * @defaultValue null
      */
-    variant?: 'outlined' | 'filled' | undefined;
+    variant?: 'outlined' | 'filled' | undefined | null;
     /**
      * Index of the element in tabbing order.
      */

package/treeselect/index.mjs

@@ -1,7 +1,7 @@
-import { focus, getFirstFocusableElement, getLastFocusableElement, find, getFocusableElements, addStyle, relativePosition, getOuterWidth, absolutePosition, isTouchDevice, findSingle } from '@primeuix/utils/dom';
+import { findSingle, isTouchDevice, relativePosition, getOuterWidth, absolutePosition, getFocusableElements, addStyle, focus, find, getLastFocusableElement, getFirstFocusableElement } from '@primeuix/utils/dom';
 import { isNotEmpty, isEmpty } from '@primeuix/utils/object';
 import { ZIndex } from '@primeuix/utils/zindex';
-import { UniqueComponentId, ConnectedOverlayScrollHandler } from '@primevue/core/utils';
+import { ConnectedOverlayScrollHandler } from '@primevue/core/utils';
 import ChevronDownIcon from '@primevue/icons/chevrondown';
 import TimesIcon from '@primevue/icons/times';
 import Chip from 'primevue/chip';
@@ -11,7 +11,7 @@ import Ripple from 'primevue/ripple';
 import Tree from 'primevue/tree';
 import BaseInput from '@primevue/core/baseinput';
 import TreeSelectStyle from 'primevue/treeselect/style';
-import { resolveComponent, openBlock, createElementBlock, mergeProps, createElementVNode, renderSlot, Fragment, createTextVNode, toDisplayString, renderList, createVNode, normalizeClass, createCommentVNode, createBlock, resolveDynamicComponent, withCtx, Transition, withModifiers, createSlots } from 'vue';
+import { resolveComponent, createElementBlock, openBlock, mergeProps, createElementVNode, renderSlot, createCommentVNode, createVNode, Fragment, createTextVNode, toDisplayString, renderList, normalizeClass, createBlock, resolveDynamicComponent, withCtx, Transition, withModifiers, createSlots } from 'vue';
 
 var script$1 = {
   name: 'BaseTreeSelect',
@@ -145,12 +145,12 @@ var script$1 = {
 };
 
 function _typeof$1(o) { "@babel/helpers - typeof"; return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof$1(o); }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: true } : { done: false, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = true, u = false; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = true, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty$1(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty$1(e, r, t) { return (r = _toPropertyKey$1(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), true).forEach(function (r) { _defineProperty$1(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty$1(e, r, t) { return (r = _toPropertyKey$1(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: true, configurable: true, writable: true }) : e[r] = t, e; }
 function _toPropertyKey$1(t) { var i = _toPrimitive$1(t, "string"); return "symbol" == _typeof$1(i) ? i : i + ""; }
-function _toPrimitive$1(t, r) { if ("object" != _typeof$1(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof$1(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _toPrimitive$1(t, r) { if ("object" != _typeof$1(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r); if ("object" != _typeof$1(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -169,16 +169,12 @@ var script = {
   },
   data: function data() {
     return {
-      id: this.$attrs.id,
       focused: false,
       overlayVisible: false,
       d_expandedKeys: this.expandedKeys || {}
     };
   },
   watch: {
-    '$attrs.id': function $attrsId(newValue) {
-      this.id = newValue || UniqueComponentId();
-    },
     modelValue: {
       handler: function handler() {
         if (!this.selfChange) {
@@ -214,7 +210,6 @@ var script = {
     }
   },
   mounted: function mounted() {
-    this.id = this.id || UniqueComponentId();
     this.updateTreeState();
   },
   methods: {
@@ -392,12 +387,12 @@ var script = {
           }
           _this2.selfClick = false;
         };
-        document.addEventListener('click', this.outsideClickListener);
+        document.addEventListener('click', this.outsideClickListener, true);
       }
     },
     unbindOutsideClickListener: function unbindOutsideClickListener() {
       if (this.outsideClickListener) {
-        document.removeEventListener('click', this.outsideClickListener);
+        document.removeEventListener('click', this.outsideClickListener, true);
         this.outsideClickListener = null;
       }
     },
@@ -450,39 +445,14 @@ var script = {
     onOverlayKeydown: function onOverlayKeydown(event) {
       if (event.code === 'Escape') this.hide();
     },
-    findSelectedNodes: function findSelectedNodes(node, keys, selectedNodes) {
-      if (node) {
-        if (this.isSelected(node, keys)) {
-          selectedNodes.push(node);
-          delete keys[node.key];
-        }
-        if (Object.keys(keys).length && node.children) {
-          var _iterator = _createForOfIteratorHelper(node.children),
-            _step;
-          try {
-            for (_iterator.s(); !(_step = _iterator.n()).done;) {
-              var childNode = _step.value;
-              this.findSelectedNodes(childNode, keys, selectedNodes);
-            }
-          } catch (err) {
-            _iterator.e(err);
-          } finally {
-            _iterator.f();
-          }
-        }
-      } else {
-        var _iterator2 = _createForOfIteratorHelper(this.options),
-          _step2;
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var _childNode = _step2.value;
-            this.findSelectedNodes(_childNode, keys, selectedNodes);
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
+    fillNodeMap: function fillNodeMap(node, nodeMap) {
+      var _node$children,
+        _this5 = this;
+      nodeMap[node.key] = node;
+      if ((_node$children = node.children) !== null && _node$children !== void 0 && _node$children.length) {
+        node.children.forEach(function (children) {
+          return _this5.fillNodeMap(children, nodeMap);
+        });
       }
     },
     isSelected: function isSelected(node, keys) {
@@ -501,48 +471,48 @@ var script = {
           delete keys[node.key];
         }
         if (Object.keys(keys).length && node.children) {
-          var _iterator3 = _createForOfIteratorHelper(node.children),
-            _step3;
+          var _iterator = _createForOfIteratorHelper(node.children),
+            _step;
           try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var childNode = _step3.value;
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var childNode = _step.value;
               path.push(node.key);
               this.updateTreeBranchState(childNode, path, keys);
             }
           } catch (err) {
-            _iterator3.e(err);
+            _iterator.e(err);
           } finally {
-            _iterator3.f();
+            _iterator.f();
           }
         }
       } else {
-        var _iterator4 = _createForOfIteratorHelper(this.options),
-          _step4;
+        var _iterator2 = _createForOfIteratorHelper(this.options),
+          _step2;
         try {
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            var _childNode2 = _step4.value;
-            this.updateTreeBranchState(_childNode2, [], keys);
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var _childNode = _step2.value;
+            this.updateTreeBranchState(_childNode, [], keys);
           }
         } catch (err) {
-          _iterator4.e(err);
+          _iterator2.e(err);
         } finally {
-          _iterator4.f();
+          _iterator2.f();
         }
       }
     },
     expandPath: function expandPath(path) {
       if (path.length > 0) {
-        var _iterator5 = _createForOfIteratorHelper(path),
-          _step5;
+        var _iterator3 = _createForOfIteratorHelper(path),
+          _step3;
         try {
-          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-            var key = _step5.value;
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var key = _step3.value;
             this.d_expandedKeys[key] = true;
           }
         } catch (err) {
-          _iterator5.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator5.f();
+          _iterator3.f();
         }
         this.d_expandedKeys = _objectSpread$1({}, this.d_expandedKeys);
         this.$emit('update:expandedKeys', this.d_expandedKeys);
@@ -561,11 +531,25 @@ var script = {
     }
   },
   computed: {
+    nodeMap: function nodeMap() {
+      var _this$options,
+        _this6 = this;
+      var nodeMap = {};
+      (_this$options = this.options) === null || _this$options === void 0 || _this$options.forEach(function (node) {
+        return _this6.fillNodeMap(node, nodeMap);
+      });
+      return nodeMap;
+    },
     selectedNodes: function selectedNodes() {
+      var _this7 = this;
       var selectedNodes = [];
       if (this.d_value && this.options) {
-        var keys = _objectSpread$1({}, this.d_value);
-        this.findSelectedNodes(null, keys, selectedNodes);
+        Object.keys(this.d_value).forEach(function (key) {
+          var node = _this7.nodeMap[key];
+          if (_this7.isSelected(node, _this7.d_value)) {
+            selectedNodes.push(node);
+          }
+        });
       }
       return selectedNodes;
     },
@@ -598,7 +582,7 @@ var script = {
       return !this.options || this.options.length === 0;
     },
     listId: function listId() {
-      return this.id + '_list';
+      return this.$id + '_list';
     },
     hasFluid: function hasFluid() {
       return isEmpty(this.fluid) ? !!this.$pcFluid : this.fluid;
@@ -621,10 +605,10 @@ var script = {
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: true, configurable: true, writable: true }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var _hoisted_1 = ["id", "disabled", "tabindex", "aria-labelledby", "aria-label", "aria-expanded", "aria-controls"];
 var _hoisted_2 = {
   key: 0