primevue 3.31.0 → 3.32.1

package/dataview/DataView.d.ts

@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PaginatorPassThroughOptionType } from '../paginator';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { ClassComponent, GlobalComponentConstructor, PTOptions } from '../ts-helpers';
 
 export declare type DataViewPassThroughOptionType = DataViewPassThroughAttributes | ((options: DataViewPassThroughMethodOptions) => DataViewPassThroughAttributes | string) | string | null | undefined;
 
@@ -51,40 +51,40 @@ export interface DataViewPageEvent {
  */
 export interface DataViewPassThroughOptions {
     /**
-     * Uses to pass attributes to the root's DOM element.
+     * Used to pass attributes to the root's DOM element.
      */
     root?: DataViewPassThroughOptionType;
     /**
-     * Uses to pass attributes to the header's DOM element.
+     * Used to pass attributes to the header's DOM element.
      */
     header?: DataViewPassThroughOptionType;
     /**
-     * Uses to pass attributes to the Paginator component.
+     * Used to pass attributes to the Paginator component.
      * @see {@link PaginatorPassThroughOptionType}
      */
     paginator?: PaginatorPassThroughOptionType;
     /**
-     * Uses to pass attributes to the content's DOM element.
+     * Used to pass attributes to the content's DOM element.
      */
     content?: DataViewPassThroughOptionType;
     /**
-     * Uses to pass attributes to the grid's DOM element.
+     * Used to pass attributes to the grid's DOM element.
      */
     grid?: DataViewPassThroughOptionType;
     /**
-     * Uses to pass attributes to the column's DOM element.
+     * Used to pass attributes to the column's DOM element.
      */
     column?: DataViewPassThroughOptionType;
     /**
-     * Uses to pass attributes to the empty message's DOM element.
+     * Used to pass attributes to the empty message's DOM element.
      */
     emptyMessage?: DataViewPassThroughOptionType;
     /**
-     * Uses to pass attributes to the footer's DOM element.
+     * Used to pass attributes to the footer's DOM element.
      */
     footer?: DataViewPassThroughOptionType;
     /**
-     * Uses to manage all lifecycle hooks
+     * Used to manage all lifecycle hooks
      * @see {@link BaseComponent.ComponentHooks}
      */
     hooks?: ComponentHooks;
@@ -209,10 +209,10 @@ export interface DataViewProps {
      */
     dataKey: string | undefined;
     /**
-     * Uses to pass attributes to DOM elements inside the component.
+     * Used to pass attributes to DOM elements inside the component.
      * @type {DataViewPassThroughOptions}
      */
-    pt?: DataViewPassThroughOptions;
+    pt?: PTOptions<DataViewPassThroughOptions>;
     /**
      * When enabled, it removes component related styles in the core.
      * @defaultValue false

package/dataview/DataView.vue

@@ -110,6 +110,7 @@ export default {
         sort() {
             if (this.value) {
                 const value = [...this.value];
+                const comparer = new Intl.Collator(undefined, { numeric: true }).compare;
 
                 value.sort((data1, data2) => {
                     let value1 = ObjectUtils.resolveFieldData(data1, this.sortField);
@@ -119,7 +120,7 @@ export default {
                     if (value1 == null && value2 != null) result = -1;
                     else if (value1 != null && value2 == null) result = 1;
                     else if (value1 == null && value2 == null) result = 0;
-                    else if (typeof value1 === 'string' && typeof value2 === 'string') result = value1.localeCompare(value2, undefined, { numeric: true });
+                    else if (typeof value1 === 'string' && typeof value2 === 'string') result = comparer(value1, value2);
                     else result = value1 < value2 ? -1 : value1 > value2 ? 1 : 0;
 
                     return this.sortOrder * result;

package/dataview/dataview.cjs.js

@@ -153,13 +153,14 @@ var script = {
       var _this = this;
       if (this.value) {
         var value = _toConsumableArray(this.value);
+        var comparer = new Intl.Collator(undefined, {
+          numeric: true
+        }).compare;
         value.sort(function (data1, data2) {
           var value1 = utils.ObjectUtils.resolveFieldData(data1, _this.sortField);
           var value2 = utils.ObjectUtils.resolveFieldData(data2, _this.sortField);
           var result = null;
-          if (value1 == null && value2 != null) result = -1;else if (value1 != null && value2 == null) result = 1;else if (value1 == null && value2 == null) result = 0;else if (typeof value1 === 'string' && typeof value2 === 'string') result = value1.localeCompare(value2, undefined, {
-            numeric: true
-          });else result = value1 < value2 ? -1 : value1 > value2 ? 1 : 0;
+          if (value1 == null && value2 != null) result = -1;else if (value1 != null && value2 == null) result = 1;else if (value1 == null && value2 == null) result = 0;else if (typeof value1 === 'string' && typeof value2 === 'string') result = comparer(value1, value2);else result = value1 < value2 ? -1 : value1 > value2 ? 1 : 0;
           return _this.sortOrder * result;
         });
         return value;

package/dataview/dataview.cjs.min.js

@@ -1 +1 @@
-"use strict";var t=require("primevue/paginator"),e=require("primevue/utils"),r=require("primevue/basecomponent"),o=require("vue");function a(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=a(t);function i(){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 s(t,e){if(t){if("string"==typeof t)return u(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?u(t,e):void 0}}function l(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}function p(t){if(Array.isArray(t))return u(t)}function u(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,o=new Array(e);r<e;r++)o[r]=t[r];return o}var d={name:"DataView",extends:{name:"BaseDataView",extends:a(r).default,props:{value:{type:Array,default:null},layout:{type:String,default:"list"},rows:{type:Number,default:0},first:{type:Number,default:0},totalRecords:{type:Number,default:0},paginator:{type:Boolean,default:!1},paginatorPosition:{type:String,default:"bottom"},alwaysShowPaginator:{type:Boolean,default:!0},paginatorTemplate:{type:String,default:"FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink RowsPerPageDropdown"},pageLinkSize:{type:Number,default:5},rowsPerPageOptions:{type:Array,default:null},currentPageReportTemplate:{type:String,default:"({currentPage} of {totalPages})"},sortField:{type:[String,Function],default:null},sortOrder:{type:Number,default:null},lazy:{type:Boolean,default:!1},dataKey:{type:String,default:null}},css:{classes:{root:function(t){var e=t.props;return["p-dataview p-component",{"p-dataview-list":"list"===e.layout,"p-dataview-grid":"grid"===e.layout}]},header:"p-dataview-header",paginator:function(t){var e=t.instance;return e.paginatorTop?"p-paginator-top":e.paginatorBottom?"p-paginator-bottom":""},content:"p-dataview-content",grid:"p-grid p-nogutter grid grid-nogutter",column:"p-col col",emptyMessage:"p-dataview-emptymessage",footer:"p-dataview-footer"}},provide:function(){return{$parentInstance:this}}},emits:["update:first","update:rows","page"],data:function(){return{d_first:this.first,d_rows:this.rows}},watch:{first:function(t){this.d_first=t},rows:function(t){this.d_rows=t},sortField:function(){this.resetPage()},sortOrder:function(){this.resetPage()}},methods:{getKey:function(t,r){return this.dataKey?e.ObjectUtils.resolveFieldData(t,this.dataKey):r},onPage:function(t){this.d_first=t.first,this.d_rows=t.rows,this.$emit("update:first",this.d_first),this.$emit("update:rows",this.d_rows),this.$emit("page",t)},sort:function(){var t,r=this;if(this.value){var o=p(t=this.value)||l(t)||s(t)||i();return o.sort((function(t,o){var a=e.ObjectUtils.resolveFieldData(t,r.sortField),n=e.ObjectUtils.resolveFieldData(o,r.sortField),i=null;return i=null==a&&null!=n?-1:null!=a&&null==n?1:null==a&&null==n?0:"string"==typeof a&&"string"==typeof n?a.localeCompare(n,void 0,{numeric:!0}):a<n?-1:a>n?1:0,r.sortOrder*i})),o}return null},resetPage:function(){this.d_first=0,this.$emit("update:first",this.d_first)}},computed:{getTotalRecords:function(){return this.totalRecords?this.totalRecords:this.value?this.value.length:0},empty:function(){return!this.value||0===this.value.length},paginatorTop:function(){return this.paginator&&("bottom"!==this.paginatorPosition||"both"===this.paginatorPosition)},paginatorBottom:function(){return this.paginator&&("top"!==this.paginatorPosition||"both"===this.paginatorPosition)},items:function(){if(this.value&&this.value.length){var t=this.value;if(t&&t.length&&this.sortField&&(t=this.sort()),this.paginator){var e=this.lazy?0:this.d_first;return t.slice(e,e+this.d_rows)}return t}return null}},components:{DVPaginator:n.default}};d.render=function(t,e,r,a,n,i){var s=o.resolveComponent("DVPaginator");return o.openBlock(),o.createElementBlock("div",o.mergeProps({class:t.cx("root")},t.ptm("root"),{"data-pc-name":"dataview"}),[t.$slots.header?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:0,class:t.cx("header")},t.ptm("header")),[o.renderSlot(t.$slots,"header")],16)):o.createCommentVNode("",!0),i.paginatorTop?(o.openBlock(),o.createBlock(s,{key:1,rows:n.d_rows,first:n.d_first,totalRecords:i.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:o.normalizeClass(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[0]||(e[0]=function(t){return i.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},o.createSlots({_:2},[t.$slots.paginatorstart?{name:"start",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):o.createCommentVNode("",!0),o.createElementVNode("div",o.mergeProps({class:t.cx("content")},t.ptm("content")),[o.createElementVNode("div",o.mergeProps({class:t.cx("grid")},t.ptm("grid")),[(o.openBlock(!0),o.createElementBlock(o.Fragment,null,o.renderList(i.items,(function(e,r){return o.openBlock(),o.createElementBlock(o.Fragment,{key:i.getKey(e,r)},[t.$slots.list&&"list"===t.layout?o.renderSlot(t.$slots,"list",{key:0,data:e,index:r}):o.createCommentVNode("",!0),t.$slots.grid&&"grid"===t.layout?o.renderSlot(t.$slots,"grid",{key:1,data:e,index:r}):o.createCommentVNode("",!0)],64)})),128)),i.empty?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:0,class:t.cx("column")},t.ptm("column")),[o.createElementVNode("div",o.mergeProps({class:t.cx("emptyMessage")},t.ptm("emptyMessage")),[o.renderSlot(t.$slots,"empty")],16)],16)):o.createCommentVNode("",!0)],16)],16),i.paginatorBottom?(o.openBlock(),o.createBlock(s,{key:2,rows:n.d_rows,first:n.d_first,totalRecords:i.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:o.normalizeClass(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[1]||(e[1]=function(t){return i.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},o.createSlots({_:2},[t.$slots.paginatorstart?{name:"start",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):o.createCommentVNode("",!0),t.$slots.footer?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:3,class:t.cx("footer")},t.ptm("footer")),[o.renderSlot(t.$slots,"footer")],16)):o.createCommentVNode("",!0)],16)},module.exports=d;
+"use strict";var t=require("primevue/paginator"),e=require("primevue/utils"),r=require("primevue/basecomponent"),o=require("vue");function a(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=a(t);function i(){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 s(t,e){if(t){if("string"==typeof t)return u(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?u(t,e):void 0}}function l(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}function p(t){if(Array.isArray(t))return u(t)}function u(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,o=new Array(e);r<e;r++)o[r]=t[r];return o}var d={name:"DataView",extends:{name:"BaseDataView",extends:a(r).default,props:{value:{type:Array,default:null},layout:{type:String,default:"list"},rows:{type:Number,default:0},first:{type:Number,default:0},totalRecords:{type:Number,default:0},paginator:{type:Boolean,default:!1},paginatorPosition:{type:String,default:"bottom"},alwaysShowPaginator:{type:Boolean,default:!0},paginatorTemplate:{type:String,default:"FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink RowsPerPageDropdown"},pageLinkSize:{type:Number,default:5},rowsPerPageOptions:{type:Array,default:null},currentPageReportTemplate:{type:String,default:"({currentPage} of {totalPages})"},sortField:{type:[String,Function],default:null},sortOrder:{type:Number,default:null},lazy:{type:Boolean,default:!1},dataKey:{type:String,default:null}},css:{classes:{root:function(t){var e=t.props;return["p-dataview p-component",{"p-dataview-list":"list"===e.layout,"p-dataview-grid":"grid"===e.layout}]},header:"p-dataview-header",paginator:function(t){var e=t.instance;return e.paginatorTop?"p-paginator-top":e.paginatorBottom?"p-paginator-bottom":""},content:"p-dataview-content",grid:"p-grid p-nogutter grid grid-nogutter",column:"p-col col",emptyMessage:"p-dataview-emptymessage",footer:"p-dataview-footer"}},provide:function(){return{$parentInstance:this}}},emits:["update:first","update:rows","page"],data:function(){return{d_first:this.first,d_rows:this.rows}},watch:{first:function(t){this.d_first=t},rows:function(t){this.d_rows=t},sortField:function(){this.resetPage()},sortOrder:function(){this.resetPage()}},methods:{getKey:function(t,r){return this.dataKey?e.ObjectUtils.resolveFieldData(t,this.dataKey):r},onPage:function(t){this.d_first=t.first,this.d_rows=t.rows,this.$emit("update:first",this.d_first),this.$emit("update:rows",this.d_rows),this.$emit("page",t)},sort:function(){var t,r=this;if(this.value){var o=p(t=this.value)||l(t)||s(t)||i(),a=new Intl.Collator(void 0,{numeric:!0}).compare;return o.sort((function(t,o){var n=e.ObjectUtils.resolveFieldData(t,r.sortField),i=e.ObjectUtils.resolveFieldData(o,r.sortField),s=null;return s=null==n&&null!=i?-1:null!=n&&null==i?1:null==n&&null==i?0:"string"==typeof n&&"string"==typeof i?a(n,i):n<i?-1:n>i?1:0,r.sortOrder*s})),o}return null},resetPage:function(){this.d_first=0,this.$emit("update:first",this.d_first)}},computed:{getTotalRecords:function(){return this.totalRecords?this.totalRecords:this.value?this.value.length:0},empty:function(){return!this.value||0===this.value.length},paginatorTop:function(){return this.paginator&&("bottom"!==this.paginatorPosition||"both"===this.paginatorPosition)},paginatorBottom:function(){return this.paginator&&("top"!==this.paginatorPosition||"both"===this.paginatorPosition)},items:function(){if(this.value&&this.value.length){var t=this.value;if(t&&t.length&&this.sortField&&(t=this.sort()),this.paginator){var e=this.lazy?0:this.d_first;return t.slice(e,e+this.d_rows)}return t}return null}},components:{DVPaginator:n.default}};d.render=function(t,e,r,a,n,i){var s=o.resolveComponent("DVPaginator");return o.openBlock(),o.createElementBlock("div",o.mergeProps({class:t.cx("root")},t.ptm("root"),{"data-pc-name":"dataview"}),[t.$slots.header?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:0,class:t.cx("header")},t.ptm("header")),[o.renderSlot(t.$slots,"header")],16)):o.createCommentVNode("",!0),i.paginatorTop?(o.openBlock(),o.createBlock(s,{key:1,rows:n.d_rows,first:n.d_first,totalRecords:i.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:o.normalizeClass(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[0]||(e[0]=function(t){return i.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},o.createSlots({_:2},[t.$slots.paginatorstart?{name:"start",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):o.createCommentVNode("",!0),o.createElementVNode("div",o.mergeProps({class:t.cx("content")},t.ptm("content")),[o.createElementVNode("div",o.mergeProps({class:t.cx("grid")},t.ptm("grid")),[(o.openBlock(!0),o.createElementBlock(o.Fragment,null,o.renderList(i.items,(function(e,r){return o.openBlock(),o.createElementBlock(o.Fragment,{key:i.getKey(e,r)},[t.$slots.list&&"list"===t.layout?o.renderSlot(t.$slots,"list",{key:0,data:e,index:r}):o.createCommentVNode("",!0),t.$slots.grid&&"grid"===t.layout?o.renderSlot(t.$slots,"grid",{key:1,data:e,index:r}):o.createCommentVNode("",!0)],64)})),128)),i.empty?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:0,class:t.cx("column")},t.ptm("column")),[o.createElementVNode("div",o.mergeProps({class:t.cx("emptyMessage")},t.ptm("emptyMessage")),[o.renderSlot(t.$slots,"empty")],16)],16)):o.createCommentVNode("",!0)],16)],16),i.paginatorBottom?(o.openBlock(),o.createBlock(s,{key:2,rows:n.d_rows,first:n.d_first,totalRecords:i.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:o.normalizeClass(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[1]||(e[1]=function(t){return i.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},o.createSlots({_:2},[t.$slots.paginatorstart?{name:"start",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):o.createCommentVNode("",!0),t.$slots.footer?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:3,class:t.cx("footer")},t.ptm("footer")),[o.renderSlot(t.$slots,"footer")],16)):o.createCommentVNode("",!0)],16)},module.exports=d;

package/dataview/dataview.esm.js

@@ -146,13 +146,14 @@ var script = {
       var _this = this;
       if (this.value) {
         var value = _toConsumableArray(this.value);
+        var comparer = new Intl.Collator(undefined, {
+          numeric: true
+        }).compare;
         value.sort(function (data1, data2) {
           var value1 = ObjectUtils.resolveFieldData(data1, _this.sortField);
           var value2 = ObjectUtils.resolveFieldData(data2, _this.sortField);
           var result = null;
-          if (value1 == null && value2 != null) result = -1;else if (value1 != null && value2 == null) result = 1;else if (value1 == null && value2 == null) result = 0;else if (typeof value1 === 'string' && typeof value2 === 'string') result = value1.localeCompare(value2, undefined, {
-            numeric: true
-          });else result = value1 < value2 ? -1 : value1 > value2 ? 1 : 0;
+          if (value1 == null && value2 != null) result = -1;else if (value1 != null && value2 == null) result = 1;else if (value1 == null && value2 == null) result = 0;else if (typeof value1 === 'string' && typeof value2 === 'string') result = comparer(value1, value2);else result = value1 < value2 ? -1 : value1 > value2 ? 1 : 0;
           return _this.sortOrder * result;
         });
         return value;

package/dataview/dataview.esm.min.js

@@ -1 +1 @@
-import t from"primevue/paginator";import{ObjectUtils as e}from"primevue/utils";import r from"primevue/basecomponent";import{resolveComponent as a,openBlock as o,createElementBlock as n,mergeProps as i,renderSlot as s,createCommentVNode as l,createBlock as p,normalizeClass as u,createSlots as d,withCtx as g,createElementVNode as c,Fragment as f,renderList as m}from"vue";function y(){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 h(t,e){if(t){if("string"==typeof t)return P(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?P(t,e):void 0}}function w(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}function v(t){if(Array.isArray(t))return P(t)}function P(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,a=new Array(e);r<e;r++)a[r]=t[r];return a}var S={name:"DataView",extends:{name:"BaseDataView",extends:r,props:{value:{type:Array,default:null},layout:{type:String,default:"list"},rows:{type:Number,default:0},first:{type:Number,default:0},totalRecords:{type:Number,default:0},paginator:{type:Boolean,default:!1},paginatorPosition:{type:String,default:"bottom"},alwaysShowPaginator:{type:Boolean,default:!0},paginatorTemplate:{type:String,default:"FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink RowsPerPageDropdown"},pageLinkSize:{type:Number,default:5},rowsPerPageOptions:{type:Array,default:null},currentPageReportTemplate:{type:String,default:"({currentPage} of {totalPages})"},sortField:{type:[String,Function],default:null},sortOrder:{type:Number,default:null},lazy:{type:Boolean,default:!1},dataKey:{type:String,default:null}},css:{classes:{root:function(t){var e=t.props;return["p-dataview p-component",{"p-dataview-list":"list"===e.layout,"p-dataview-grid":"grid"===e.layout}]},header:"p-dataview-header",paginator:function(t){var e=t.instance;return e.paginatorTop?"p-paginator-top":e.paginatorBottom?"p-paginator-bottom":""},content:"p-dataview-content",grid:"p-grid p-nogutter grid grid-nogutter",column:"p-col col",emptyMessage:"p-dataview-emptymessage",footer:"p-dataview-footer"}},provide:function(){return{$parentInstance:this}}},emits:["update:first","update:rows","page"],data:function(){return{d_first:this.first,d_rows:this.rows}},watch:{first:function(t){this.d_first=t},rows:function(t){this.d_rows=t},sortField:function(){this.resetPage()},sortOrder:function(){this.resetPage()}},methods:{getKey:function(t,r){return this.dataKey?e.resolveFieldData(t,this.dataKey):r},onPage:function(t){this.d_first=t.first,this.d_rows=t.rows,this.$emit("update:first",this.d_first),this.$emit("update:rows",this.d_rows),this.$emit("page",t)},sort:function(){var t,r=this;if(this.value){var a=v(t=this.value)||w(t)||h(t)||y();return a.sort((function(t,a){var o=e.resolveFieldData(t,r.sortField),n=e.resolveFieldData(a,r.sortField),i=null;return i=null==o&&null!=n?-1:null!=o&&null==n?1:null==o&&null==n?0:"string"==typeof o&&"string"==typeof n?o.localeCompare(n,void 0,{numeric:!0}):o<n?-1:o>n?1:0,r.sortOrder*i})),a}return null},resetPage:function(){this.d_first=0,this.$emit("update:first",this.d_first)}},computed:{getTotalRecords:function(){return this.totalRecords?this.totalRecords:this.value?this.value.length:0},empty:function(){return!this.value||0===this.value.length},paginatorTop:function(){return this.paginator&&("bottom"!==this.paginatorPosition||"both"===this.paginatorPosition)},paginatorBottom:function(){return this.paginator&&("top"!==this.paginatorPosition||"both"===this.paginatorPosition)},items:function(){if(this.value&&this.value.length){var t=this.value;if(t&&t.length&&this.sortField&&(t=this.sort()),this.paginator){var e=this.lazy?0:this.d_first;return t.slice(e,e+this.d_rows)}return t}return null}},components:{DVPaginator:t}};S.render=function(t,e,r,y,h,w){var v=a("DVPaginator");return o(),n("div",i({class:t.cx("root")},t.ptm("root"),{"data-pc-name":"dataview"}),[t.$slots.header?(o(),n("div",i({key:0,class:t.cx("header")},t.ptm("header")),[s(t.$slots,"header")],16)):l("",!0),w.paginatorTop?(o(),p(v,{key:1,rows:h.d_rows,first:h.d_first,totalRecords:w.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:u(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[0]||(e[0]=function(t){return w.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},d({_:2},[t.$slots.paginatorstart?{name:"start",fn:g((function(){return[s(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:g((function(){return[s(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):l("",!0),c("div",i({class:t.cx("content")},t.ptm("content")),[c("div",i({class:t.cx("grid")},t.ptm("grid")),[(o(!0),n(f,null,m(w.items,(function(e,r){return o(),n(f,{key:w.getKey(e,r)},[t.$slots.list&&"list"===t.layout?s(t.$slots,"list",{key:0,data:e,index:r}):l("",!0),t.$slots.grid&&"grid"===t.layout?s(t.$slots,"grid",{key:1,data:e,index:r}):l("",!0)],64)})),128)),w.empty?(o(),n("div",i({key:0,class:t.cx("column")},t.ptm("column")),[c("div",i({class:t.cx("emptyMessage")},t.ptm("emptyMessage")),[s(t.$slots,"empty")],16)],16)):l("",!0)],16)],16),w.paginatorBottom?(o(),p(v,{key:2,rows:h.d_rows,first:h.d_first,totalRecords:w.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:u(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[1]||(e[1]=function(t){return w.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},d({_:2},[t.$slots.paginatorstart?{name:"start",fn:g((function(){return[s(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:g((function(){return[s(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):l("",!0),t.$slots.footer?(o(),n("div",i({key:3,class:t.cx("footer")},t.ptm("footer")),[s(t.$slots,"footer")],16)):l("",!0)],16)};export{S as default};
+import t from"primevue/paginator";import{ObjectUtils as e}from"primevue/utils";import r from"primevue/basecomponent";import{resolveComponent as a,openBlock as o,createElementBlock as n,mergeProps as i,renderSlot as s,createCommentVNode as l,createBlock as p,normalizeClass as u,createSlots as d,withCtx as g,createElementVNode as c,Fragment as f,renderList as m}from"vue";function y(){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 h(t,e){if(t){if("string"==typeof t)return P(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?P(t,e):void 0}}function w(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}function v(t){if(Array.isArray(t))return P(t)}function P(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,a=new Array(e);r<e;r++)a[r]=t[r];return a}var S={name:"DataView",extends:{name:"BaseDataView",extends:r,props:{value:{type:Array,default:null},layout:{type:String,default:"list"},rows:{type:Number,default:0},first:{type:Number,default:0},totalRecords:{type:Number,default:0},paginator:{type:Boolean,default:!1},paginatorPosition:{type:String,default:"bottom"},alwaysShowPaginator:{type:Boolean,default:!0},paginatorTemplate:{type:String,default:"FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink RowsPerPageDropdown"},pageLinkSize:{type:Number,default:5},rowsPerPageOptions:{type:Array,default:null},currentPageReportTemplate:{type:String,default:"({currentPage} of {totalPages})"},sortField:{type:[String,Function],default:null},sortOrder:{type:Number,default:null},lazy:{type:Boolean,default:!1},dataKey:{type:String,default:null}},css:{classes:{root:function(t){var e=t.props;return["p-dataview p-component",{"p-dataview-list":"list"===e.layout,"p-dataview-grid":"grid"===e.layout}]},header:"p-dataview-header",paginator:function(t){var e=t.instance;return e.paginatorTop?"p-paginator-top":e.paginatorBottom?"p-paginator-bottom":""},content:"p-dataview-content",grid:"p-grid p-nogutter grid grid-nogutter",column:"p-col col",emptyMessage:"p-dataview-emptymessage",footer:"p-dataview-footer"}},provide:function(){return{$parentInstance:this}}},emits:["update:first","update:rows","page"],data:function(){return{d_first:this.first,d_rows:this.rows}},watch:{first:function(t){this.d_first=t},rows:function(t){this.d_rows=t},sortField:function(){this.resetPage()},sortOrder:function(){this.resetPage()}},methods:{getKey:function(t,r){return this.dataKey?e.resolveFieldData(t,this.dataKey):r},onPage:function(t){this.d_first=t.first,this.d_rows=t.rows,this.$emit("update:first",this.d_first),this.$emit("update:rows",this.d_rows),this.$emit("page",t)},sort:function(){var t,r=this;if(this.value){var a=v(t=this.value)||w(t)||h(t)||y(),o=new Intl.Collator(void 0,{numeric:!0}).compare;return a.sort((function(t,a){var n=e.resolveFieldData(t,r.sortField),i=e.resolveFieldData(a,r.sortField),s=null;return s=null==n&&null!=i?-1:null!=n&&null==i?1:null==n&&null==i?0:"string"==typeof n&&"string"==typeof i?o(n,i):n<i?-1:n>i?1:0,r.sortOrder*s})),a}return null},resetPage:function(){this.d_first=0,this.$emit("update:first",this.d_first)}},computed:{getTotalRecords:function(){return this.totalRecords?this.totalRecords:this.value?this.value.length:0},empty:function(){return!this.value||0===this.value.length},paginatorTop:function(){return this.paginator&&("bottom"!==this.paginatorPosition||"both"===this.paginatorPosition)},paginatorBottom:function(){return this.paginator&&("top"!==this.paginatorPosition||"both"===this.paginatorPosition)},items:function(){if(this.value&&this.value.length){var t=this.value;if(t&&t.length&&this.sortField&&(t=this.sort()),this.paginator){var e=this.lazy?0:this.d_first;return t.slice(e,e+this.d_rows)}return t}return null}},components:{DVPaginator:t}};S.render=function(t,e,r,y,h,w){var v=a("DVPaginator");return o(),n("div",i({class:t.cx("root")},t.ptm("root"),{"data-pc-name":"dataview"}),[t.$slots.header?(o(),n("div",i({key:0,class:t.cx("header")},t.ptm("header")),[s(t.$slots,"header")],16)):l("",!0),w.paginatorTop?(o(),p(v,{key:1,rows:h.d_rows,first:h.d_first,totalRecords:w.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:u(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[0]||(e[0]=function(t){return w.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},d({_:2},[t.$slots.paginatorstart?{name:"start",fn:g((function(){return[s(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:g((function(){return[s(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):l("",!0),c("div",i({class:t.cx("content")},t.ptm("content")),[c("div",i({class:t.cx("grid")},t.ptm("grid")),[(o(!0),n(f,null,m(w.items,(function(e,r){return o(),n(f,{key:w.getKey(e,r)},[t.$slots.list&&"list"===t.layout?s(t.$slots,"list",{key:0,data:e,index:r}):l("",!0),t.$slots.grid&&"grid"===t.layout?s(t.$slots,"grid",{key:1,data:e,index:r}):l("",!0)],64)})),128)),w.empty?(o(),n("div",i({key:0,class:t.cx("column")},t.ptm("column")),[c("div",i({class:t.cx("emptyMessage")},t.ptm("emptyMessage")),[s(t.$slots,"empty")],16)],16)):l("",!0)],16)],16),w.paginatorBottom?(o(),p(v,{key:2,rows:h.d_rows,first:h.d_first,totalRecords:w.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:u(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[1]||(e[1]=function(t){return w.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},d({_:2},[t.$slots.paginatorstart?{name:"start",fn:g((function(){return[s(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:g((function(){return[s(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):l("",!0),t.$slots.footer?(o(),n("div",i({key:3,class:t.cx("footer")},t.ptm("footer")),[s(t.$slots,"footer")],16)):l("",!0)],16)};export{S as default};

package/dataview/dataview.js

@@ -150,13 +150,14 @@ this.primevue.dataview = (function (Paginator, utils, BaseComponent, vue) {
           var _this = this;
           if (this.value) {
             var value = _toConsumableArray(this.value);
+            var comparer = new Intl.Collator(undefined, {
+              numeric: true
+            }).compare;
             value.sort(function (data1, data2) {
               var value1 = utils.ObjectUtils.resolveFieldData(data1, _this.sortField);
               var value2 = utils.ObjectUtils.resolveFieldData(data2, _this.sortField);
               var result = null;
-              if (value1 == null && value2 != null) result = -1;else if (value1 != null && value2 == null) result = 1;else if (value1 == null && value2 == null) result = 0;else if (typeof value1 === 'string' && typeof value2 === 'string') result = value1.localeCompare(value2, undefined, {
-                numeric: true
-              });else result = value1 < value2 ? -1 : value1 > value2 ? 1 : 0;
+              if (value1 == null && value2 != null) result = -1;else if (value1 != null && value2 == null) result = 1;else if (value1 == null && value2 == null) result = 0;else if (typeof value1 === 'string' && typeof value2 === 'string') result = comparer(value1, value2);else result = value1 < value2 ? -1 : value1 > value2 ? 1 : 0;
               return _this.sortOrder * result;
             });
             return value;

package/dataview/dataview.min.js

@@ -1 +1 @@
-this.primevue=this.primevue||{},this.primevue.dataview=function(t,e,r,o){"use strict";function a(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=a(t);function i(){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 s(t,e){if(t){if("string"==typeof t)return u(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?u(t,e):void 0}}function l(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}function p(t){if(Array.isArray(t))return u(t)}function u(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,o=new Array(e);r<e;r++)o[r]=t[r];return o}var d={name:"DataView",extends:{name:"BaseDataView",extends:a(r).default,props:{value:{type:Array,default:null},layout:{type:String,default:"list"},rows:{type:Number,default:0},first:{type:Number,default:0},totalRecords:{type:Number,default:0},paginator:{type:Boolean,default:!1},paginatorPosition:{type:String,default:"bottom"},alwaysShowPaginator:{type:Boolean,default:!0},paginatorTemplate:{type:String,default:"FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink RowsPerPageDropdown"},pageLinkSize:{type:Number,default:5},rowsPerPageOptions:{type:Array,default:null},currentPageReportTemplate:{type:String,default:"({currentPage} of {totalPages})"},sortField:{type:[String,Function],default:null},sortOrder:{type:Number,default:null},lazy:{type:Boolean,default:!1},dataKey:{type:String,default:null}},css:{classes:{root:function(t){var e=t.props;return["p-dataview p-component",{"p-dataview-list":"list"===e.layout,"p-dataview-grid":"grid"===e.layout}]},header:"p-dataview-header",paginator:function(t){var e=t.instance;return e.paginatorTop?"p-paginator-top":e.paginatorBottom?"p-paginator-bottom":""},content:"p-dataview-content",grid:"p-grid p-nogutter grid grid-nogutter",column:"p-col col",emptyMessage:"p-dataview-emptymessage",footer:"p-dataview-footer"}},provide:function(){return{$parentInstance:this}}},emits:["update:first","update:rows","page"],data:function(){return{d_first:this.first,d_rows:this.rows}},watch:{first:function(t){this.d_first=t},rows:function(t){this.d_rows=t},sortField:function(){this.resetPage()},sortOrder:function(){this.resetPage()}},methods:{getKey:function(t,r){return this.dataKey?e.ObjectUtils.resolveFieldData(t,this.dataKey):r},onPage:function(t){this.d_first=t.first,this.d_rows=t.rows,this.$emit("update:first",this.d_first),this.$emit("update:rows",this.d_rows),this.$emit("page",t)},sort:function(){var t,r=this;if(this.value){var o=p(t=this.value)||l(t)||s(t)||i();return o.sort((function(t,o){var a=e.ObjectUtils.resolveFieldData(t,r.sortField),n=e.ObjectUtils.resolveFieldData(o,r.sortField),i=null;return i=null==a&&null!=n?-1:null!=a&&null==n?1:null==a&&null==n?0:"string"==typeof a&&"string"==typeof n?a.localeCompare(n,void 0,{numeric:!0}):a<n?-1:a>n?1:0,r.sortOrder*i})),o}return null},resetPage:function(){this.d_first=0,this.$emit("update:first",this.d_first)}},computed:{getTotalRecords:function(){return this.totalRecords?this.totalRecords:this.value?this.value.length:0},empty:function(){return!this.value||0===this.value.length},paginatorTop:function(){return this.paginator&&("bottom"!==this.paginatorPosition||"both"===this.paginatorPosition)},paginatorBottom:function(){return this.paginator&&("top"!==this.paginatorPosition||"both"===this.paginatorPosition)},items:function(){if(this.value&&this.value.length){var t=this.value;if(t&&t.length&&this.sortField&&(t=this.sort()),this.paginator){var e=this.lazy?0:this.d_first;return t.slice(e,e+this.d_rows)}return t}return null}},components:{DVPaginator:n.default}};return d.render=function(t,e,r,a,n,i){var s=o.resolveComponent("DVPaginator");return o.openBlock(),o.createElementBlock("div",o.mergeProps({class:t.cx("root")},t.ptm("root"),{"data-pc-name":"dataview"}),[t.$slots.header?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:0,class:t.cx("header")},t.ptm("header")),[o.renderSlot(t.$slots,"header")],16)):o.createCommentVNode("",!0),i.paginatorTop?(o.openBlock(),o.createBlock(s,{key:1,rows:n.d_rows,first:n.d_first,totalRecords:i.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:o.normalizeClass(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[0]||(e[0]=function(t){return i.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},o.createSlots({_:2},[t.$slots.paginatorstart?{name:"start",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):o.createCommentVNode("",!0),o.createElementVNode("div",o.mergeProps({class:t.cx("content")},t.ptm("content")),[o.createElementVNode("div",o.mergeProps({class:t.cx("grid")},t.ptm("grid")),[(o.openBlock(!0),o.createElementBlock(o.Fragment,null,o.renderList(i.items,(function(e,r){return o.openBlock(),o.createElementBlock(o.Fragment,{key:i.getKey(e,r)},[t.$slots.list&&"list"===t.layout?o.renderSlot(t.$slots,"list",{key:0,data:e,index:r}):o.createCommentVNode("",!0),t.$slots.grid&&"grid"===t.layout?o.renderSlot(t.$slots,"grid",{key:1,data:e,index:r}):o.createCommentVNode("",!0)],64)})),128)),i.empty?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:0,class:t.cx("column")},t.ptm("column")),[o.createElementVNode("div",o.mergeProps({class:t.cx("emptyMessage")},t.ptm("emptyMessage")),[o.renderSlot(t.$slots,"empty")],16)],16)):o.createCommentVNode("",!0)],16)],16),i.paginatorBottom?(o.openBlock(),o.createBlock(s,{key:2,rows:n.d_rows,first:n.d_first,totalRecords:i.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:o.normalizeClass(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[1]||(e[1]=function(t){return i.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},o.createSlots({_:2},[t.$slots.paginatorstart?{name:"start",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):o.createCommentVNode("",!0),t.$slots.footer?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:3,class:t.cx("footer")},t.ptm("footer")),[o.renderSlot(t.$slots,"footer")],16)):o.createCommentVNode("",!0)],16)},d}(primevue.paginator,primevue.utils,primevue.basecomponent,Vue);
+this.primevue=this.primevue||{},this.primevue.dataview=function(t,e,r,o){"use strict";function a(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=a(t);function i(){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 s(t,e){if(t){if("string"==typeof t)return u(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?u(t,e):void 0}}function l(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}function p(t){if(Array.isArray(t))return u(t)}function u(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,o=new Array(e);r<e;r++)o[r]=t[r];return o}var d={name:"DataView",extends:{name:"BaseDataView",extends:a(r).default,props:{value:{type:Array,default:null},layout:{type:String,default:"list"},rows:{type:Number,default:0},first:{type:Number,default:0},totalRecords:{type:Number,default:0},paginator:{type:Boolean,default:!1},paginatorPosition:{type:String,default:"bottom"},alwaysShowPaginator:{type:Boolean,default:!0},paginatorTemplate:{type:String,default:"FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink RowsPerPageDropdown"},pageLinkSize:{type:Number,default:5},rowsPerPageOptions:{type:Array,default:null},currentPageReportTemplate:{type:String,default:"({currentPage} of {totalPages})"},sortField:{type:[String,Function],default:null},sortOrder:{type:Number,default:null},lazy:{type:Boolean,default:!1},dataKey:{type:String,default:null}},css:{classes:{root:function(t){var e=t.props;return["p-dataview p-component",{"p-dataview-list":"list"===e.layout,"p-dataview-grid":"grid"===e.layout}]},header:"p-dataview-header",paginator:function(t){var e=t.instance;return e.paginatorTop?"p-paginator-top":e.paginatorBottom?"p-paginator-bottom":""},content:"p-dataview-content",grid:"p-grid p-nogutter grid grid-nogutter",column:"p-col col",emptyMessage:"p-dataview-emptymessage",footer:"p-dataview-footer"}},provide:function(){return{$parentInstance:this}}},emits:["update:first","update:rows","page"],data:function(){return{d_first:this.first,d_rows:this.rows}},watch:{first:function(t){this.d_first=t},rows:function(t){this.d_rows=t},sortField:function(){this.resetPage()},sortOrder:function(){this.resetPage()}},methods:{getKey:function(t,r){return this.dataKey?e.ObjectUtils.resolveFieldData(t,this.dataKey):r},onPage:function(t){this.d_first=t.first,this.d_rows=t.rows,this.$emit("update:first",this.d_first),this.$emit("update:rows",this.d_rows),this.$emit("page",t)},sort:function(){var t,r=this;if(this.value){var o=p(t=this.value)||l(t)||s(t)||i(),a=new Intl.Collator(void 0,{numeric:!0}).compare;return o.sort((function(t,o){var n=e.ObjectUtils.resolveFieldData(t,r.sortField),i=e.ObjectUtils.resolveFieldData(o,r.sortField),s=null;return s=null==n&&null!=i?-1:null!=n&&null==i?1:null==n&&null==i?0:"string"==typeof n&&"string"==typeof i?a(n,i):n<i?-1:n>i?1:0,r.sortOrder*s})),o}return null},resetPage:function(){this.d_first=0,this.$emit("update:first",this.d_first)}},computed:{getTotalRecords:function(){return this.totalRecords?this.totalRecords:this.value?this.value.length:0},empty:function(){return!this.value||0===this.value.length},paginatorTop:function(){return this.paginator&&("bottom"!==this.paginatorPosition||"both"===this.paginatorPosition)},paginatorBottom:function(){return this.paginator&&("top"!==this.paginatorPosition||"both"===this.paginatorPosition)},items:function(){if(this.value&&this.value.length){var t=this.value;if(t&&t.length&&this.sortField&&(t=this.sort()),this.paginator){var e=this.lazy?0:this.d_first;return t.slice(e,e+this.d_rows)}return t}return null}},components:{DVPaginator:n.default}};return d.render=function(t,e,r,a,n,i){var s=o.resolveComponent("DVPaginator");return o.openBlock(),o.createElementBlock("div",o.mergeProps({class:t.cx("root")},t.ptm("root"),{"data-pc-name":"dataview"}),[t.$slots.header?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:0,class:t.cx("header")},t.ptm("header")),[o.renderSlot(t.$slots,"header")],16)):o.createCommentVNode("",!0),i.paginatorTop?(o.openBlock(),o.createBlock(s,{key:1,rows:n.d_rows,first:n.d_first,totalRecords:i.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:o.normalizeClass(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[0]||(e[0]=function(t){return i.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},o.createSlots({_:2},[t.$slots.paginatorstart?{name:"start",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):o.createCommentVNode("",!0),o.createElementVNode("div",o.mergeProps({class:t.cx("content")},t.ptm("content")),[o.createElementVNode("div",o.mergeProps({class:t.cx("grid")},t.ptm("grid")),[(o.openBlock(!0),o.createElementBlock(o.Fragment,null,o.renderList(i.items,(function(e,r){return o.openBlock(),o.createElementBlock(o.Fragment,{key:i.getKey(e,r)},[t.$slots.list&&"list"===t.layout?o.renderSlot(t.$slots,"list",{key:0,data:e,index:r}):o.createCommentVNode("",!0),t.$slots.grid&&"grid"===t.layout?o.renderSlot(t.$slots,"grid",{key:1,data:e,index:r}):o.createCommentVNode("",!0)],64)})),128)),i.empty?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:0,class:t.cx("column")},t.ptm("column")),[o.createElementVNode("div",o.mergeProps({class:t.cx("emptyMessage")},t.ptm("emptyMessage")),[o.renderSlot(t.$slots,"empty")],16)],16)):o.createCommentVNode("",!0)],16)],16),i.paginatorBottom?(o.openBlock(),o.createBlock(s,{key:2,rows:n.d_rows,first:n.d_first,totalRecords:i.getTotalRecords,pageLinkSize:t.pageLinkSize,template:t.paginatorTemplate,rowsPerPageOptions:t.rowsPerPageOptions,currentPageReportTemplate:t.currentPageReportTemplate,class:o.normalizeClass(t.cx("paginator")),alwaysShow:t.alwaysShowPaginator,onPage:e[1]||(e[1]=function(t){return i.onPage(t)}),unstyled:t.unstyled,pt:t.ptm("paginator")},o.createSlots({_:2},[t.$slots.paginatorstart?{name:"start",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorstart")]})),key:"0"}:void 0,t.$slots.paginatorend?{name:"end",fn:o.withCtx((function(){return[o.renderSlot(t.$slots,"paginatorend")]})),key:"1"}:void 0]),1032,["rows","first","totalRecords","pageLinkSize","template","rowsPerPageOptions","currentPageReportTemplate","class","alwaysShow","unstyled","pt"])):o.createCommentVNode("",!0),t.$slots.footer?(o.openBlock(),o.createElementBlock("div",o.mergeProps({key:3,class:t.cx("footer")},t.ptm("footer")),[o.renderSlot(t.$slots,"footer")],16)):o.createCommentVNode("",!0)],16)},d}(primevue.paginator,primevue.utils,primevue.basecomponent,Vue);

package/dataviewlayoutoptions/DataViewLayoutOptions.d.ts

@@ -9,7 +9,7 @@
  */
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { ClassComponent, GlobalComponentConstructor, PTOptions } from '../ts-helpers';
 
 export declare type DataViewLayoutOptionsPassThroughOptionType =
     | DataViewLayoutOptionsPassThroughAttributes
@@ -33,27 +33,27 @@ export interface DataViewLayoutOptionsPassThroughMethodOptions {
  */
 export interface DataViewLayoutOptionsPassThroughOptions {
     /**
-     * Uses to pass attributes to the root's DOM element.
+     * Used to pass attributes to the root's DOM element.
      */
     root?: DataViewLayoutOptionsPassThroughOptionType;
     /**
-     * Uses to pass attributes to the list button's DOM element.
+     * Used to pass attributes to the list button's DOM element.
      */
     listButton?: DataViewLayoutOptionsPassThroughOptionType;
     /**
-     * Uses to pass attributes to the list icon's DOM element.
+     * Used to pass attributes to the list icon's DOM element.
      */
     listIcon?: DataViewLayoutOptionsPassThroughOptionType;
     /**
-     * Uses to pass attributes to the grid button's DOM element.
+     * Used to pass attributes to the grid button's DOM element.
      */
     gridButton?: DataViewLayoutOptionsPassThroughOptionType;
     /**
-     * Uses to pass attributes to the grid icon's DOM element.
+     * Used to pass attributes to the grid icon's DOM element.
      */
     gridIcon?: DataViewLayoutOptionsPassThroughOptionType;
     /**
-     * Uses to manage all lifecycle hooks
+     * Used to manage all lifecycle hooks
      * @see {@link BaseComponent.ComponentHooks}
      */
     hooks?: ComponentHooks;
@@ -91,10 +91,10 @@ export interface DataViewLayoutOptionsProps {
      */
     modelValue?: string | undefined;
     /**
-     * Uses to pass attributes to DOM elements inside the component.
+     * Used to pass attributes to DOM elements inside the component.
      * @type {DataViewLayoutOptionsPassThroughOptions}
      */
-    pt?: DataViewLayoutOptionsPassThroughOptions;
+    pt?: PTOptions<DataViewLayoutOptionsPassThroughOptions>;
     /**
      * When enabled, it removes component related styles in the core.
      * @defaultValue false

package/deferredcontent/DeferredContent.d.ts

@@ -9,7 +9,7 @@
  */
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { ClassComponent, GlobalComponentConstructor, PTOptions } from '../ts-helpers';
 
 export declare type DeferredContentPassThroughOptionType = DeferredContentPassThroughAttributes | ((options: DeferredContentPassThroughMethodOptions) => DeferredContentPassThroughAttributes | string) | string | null | undefined;
 
@@ -28,11 +28,11 @@ export interface DeferredContentPassThroughMethodOptions {
  */
 export interface DeferredContentPassThroughOptions {
     /**
-     * Uses to pass attributes to the root's DOM element.
+     * Used to pass attributes to the root's DOM element.
      */
     root?: DeferredContentPassThroughOptionType;
     /**
-     * Uses to manage all lifecycle hooks
+     * Used to manage all lifecycle hooks
      * @see {@link BaseComponent.ComponentHooks}
      */
     hooks?: ComponentHooks;
@@ -61,10 +61,10 @@ export interface DeferredContentState {
  */
 export interface DeferredContentProps {
     /**
-     * Uses to pass attributes to DOM elements inside the component.
+     * Used to pass attributes to DOM elements inside the component.
      * @type {DeferredContentPassThroughOptions}
      */
-    pt?: DeferredContentPassThroughOptions;
+    pt?: PTOptions<DeferredContentPassThroughOptions>;
     /**
      * When enabled, it removes component related styles in the core.
      * @defaultValue false

package/dialog/BaseDialog.vue

@@ -3,16 +3,11 @@ import BaseComponent from 'primevue/basecomponent';
 import { useStyle } from 'primevue/usestyle';
 
 const styles = `
-.p-dialog-mask {
-    pointer-events: none;
-}
-
 .p-dialog-mask.p-component-overlay {
     pointer-events: auto;
 }
 
 .p-dialog {
-    pointer-events: auto;
     max-height: 90%;
     transform: scale(1);
 }
@@ -152,11 +147,12 @@ const inlineStyles = {
         display: 'flex',
         justifyContent: position === 'left' || position === 'topleft' || position === 'bottomleft' ? 'flex-start' : position === 'right' || position === 'topright' || position === 'bottomright' ? 'flex-end' : 'center',
         alignItems: position === 'top' || position === 'topleft' || position === 'topright' ? 'flex-start' : position === 'bottom' || position === 'bottomleft' || position === 'bottomright' ? 'flex-end' : 'center',
-        pointerEvents: !modal && 'none'
+        pointerEvents: modal ? 'auto' : 'none'
     }),
     root: {
         display: 'flex',
-        flexDirection: 'column'
+        flexDirection: 'column',
+        pointerEvents: 'auto'
     }
 };
 

package/dialog/Dialog.d.ts

@@ -7,12 +7,14 @@
  * @module dialog
  *
  */
-import { HTMLAttributes, VNode } from 'vue';
+import { HTMLAttributes, TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { ClassComponent, GlobalComponentConstructor, PTOptions } from '../ts-helpers';
 
 export declare type DialogPassThroughOptionType = DialogPassThroughAttributes | ((options: DialogPassThroughMethodOptions) => DialogPassThroughAttributes | string) | string | null | undefined;
 
+export declare type DialogPassThroughTransitionType = TransitionProps | ((options: DialogPassThroughMethodOptions) => TransitionProps) | undefined;
+
 /**
  * Custom passthrough(pt) option method.
  */
@@ -28,54 +30,58 @@ export interface DialogPassThroughMethodOptions {
  */
 export interface DialogPassThroughOptions {
     /**
-     * Uses to pass attributes to the root's DOM element.
+     * Used to pass attributes to the root's DOM element.
      */
     root?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the header's DOM element.
+     * Used to pass attributes to the header's DOM element.
      */
     header?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the header title's DOM element.
+     * Used to pass attributes to the header title's DOM element.
      */
     headerTitle?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the header icons' DOM element.
+     * Used to pass attributes to the header icons' DOM element.
      */
     headerIcons?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the maximizable button's DOM element.
+     * Used to pass attributes to the maximizable button's DOM element.
      */
     maximizableButton?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the maximizable icon's DOM element.
+     * Used to pass attributes to the maximizable icon's DOM element.
      */
     maximizableIcon?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the close button's component.
+     * Used to pass attributes to the close button's component.
      */
     closeButton?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the close button icon's component.
+     * Used to pass attributes to the close button icon's component.
      */
     closeButtonIcon?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the content's DOM element.
+     * Used to pass attributes to the content's DOM element.
      */
     content?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the footer's DOM element.
+     * Used to pass attributes to the footer's DOM element.
      */
     footer?: DialogPassThroughOptionType;
     /**
-     * Uses to pass attributes to the mask's DOM element.
+     * Used to pass attributes to the mask's DOM element.
      */
     mask?: DialogPassThroughOptionType;
     /**
-     * Uses to manage all lifecycle hooks
+     * Used to manage all lifecycle hooks
      * @see {@link BaseComponent.ComponentHooks}
      */
     hooks?: ComponentHooks;
+    /**
+     * Used to control Vue Transition API.
+     */
+    transition?: DialogPassThroughTransitionType;
 }
 
 /**
@@ -154,7 +160,7 @@ export interface DialogProps {
      */
     contentClass?: any;
     /**
-     * Uses to pass all properties of the HTMLDivElement to the overlay panel inside the component.
+     * Used to pass all properties of the HTMLDivElement to the overlay panel inside the component.
      */
     contentProps?: HTMLAttributes | undefined;
     /**
@@ -251,10 +257,10 @@ export interface DialogProps {
      */
     minimizeIcon?: string | undefined;
     /**
-     * Uses to pass attributes to DOM elements inside the component.
+     * Used to pass attributes to DOM elements inside the component.
      * @type {DialogPassThroughOptions}
      */
-    pt?: DialogPassThroughOptions;
+    pt?: PTOptions<DialogPassThroughOptions>;
     /**
      * When enabled, it removes component related styles in the core.
      * @defaultValue false

package/dialog/Dialog.vue

@@ -1,7 +1,7 @@
 <template>
     <Portal :appendTo="appendTo">
         <div v-if="containerVisible" :ref="maskRef" :class="cx('mask')" :style="sx('mask', true, { position, modal })" @click="onMaskClick" v-bind="ptm('mask')">
-            <transition name="p-dialog" @before-enter="onBeforeEnter" @enter="onEnter" @before-leave="onBeforeLeave" @leave="onLeave" @after-leave="onAfterLeave" appear>
+            <transition name="p-dialog" @before-enter="onBeforeEnter" @enter="onEnter" @before-leave="onBeforeLeave" @leave="onLeave" @after-leave="onAfterLeave" appear v-bind="ptm('transition')">
                 <div v-if="visible" :ref="containerRef" v-focustrap="{ disabled: !modal }" :class="cx('root')" :style="sx('root')" role="dialog" :aria-labelledby="ariaLabelledById" :aria-modal="modal" v-bind="{ ...$attrs, ...ptm('root') }">
                     <div v-if="showHeader" :ref="headerContainerRef" :class="cx('header')" @mousedown="initDrag" v-bind="ptm('header')">
                         <slot name="header">
@@ -163,7 +163,7 @@ export default {
         },
         focus() {
             const findFocusableElement = (container) => {
-                return container.querySelector('[autofocus]');
+                return container && container.querySelector('[autofocus]');
             };
 
             let focusTarget = this.$slots.footer && findFocusableElement(this.footerContainer);
@@ -259,6 +259,7 @@ export default {
             if (!this.styleElement && !this.isUnstyled) {
                 this.styleElement = document.createElement('style');
                 this.styleElement.type = 'text/css';
+                DomHandler.setAttribute(this.styleElement, 'nonce', this.$primevue?.config?.csp?.nonce);
                 document.head.appendChild(this.styleElement);
 
                 let innerHTML = '';
@@ -322,24 +323,27 @@ export default {
                     let leftPos = offset.left + deltaX;
                     let topPos = offset.top + deltaY;
                     let viewport = DomHandler.getViewport();
+                    let getComputedStyle = getComputedStyle(this.container);
+                    let marginLeft = parseFloat(getComputedStyle.marginLeft);
+                    let marginTop = parseFloat(getComputedStyle.marginTop);
 
                     this.container.style.position = 'fixed';
 
                     if (this.keepInViewport) {
                         if (leftPos >= this.minX && leftPos + width < viewport.width) {
                             this.lastPageX = event.pageX;
-                            this.container.style.left = leftPos + 'px';
+                            this.container.style.left = leftPos - marginLeft + 'px';
                         }
 
                         if (topPos >= this.minY && topPos + height < viewport.height) {
                             this.lastPageY = event.pageY;
-                            this.container.style.top = topPos + 'px';
+                            this.container.style.top = topPos - marginTop + 'px';
                         }
                     } else {
                         this.lastPageX = event.pageX;
-                        this.container.style.left = leftPos + 'px';
+                        this.container.style.left = leftPos - marginLeft + 'px';
                         this.lastPageY = event.pageY;
-                        this.container.style.top = topPos + 'px';
+                        this.container.style.top = topPos - marginTop + 'px';
                     }
                 }
             };