Skip to content

Commit

Permalink
Merge branch 'primefaces:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ymg2006 authored Mar 11, 2024
2 parents 07a8a97 + fd18d96 commit c98a476
Show file tree
Hide file tree
Showing 13 changed files with 169 additions and 77 deletions.
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
# Changelog
## [17.10.0](https://github.com/primefaces/primeng/tree/17.10.0) (2024-03-07)

[Full Changelog](https://github.com/primefaces/primeng/compare/17.9.0...17.10.0)

**Implemented New Features and Enhancements:**
- ColorPicker: Form elements must have labels [\#14941](https://github.com/primefaces/primeng/issues/14941)

**Fixed bugs:**
- treetable, treeselect: wrong type information in jsdoc for node events [\#14939](https://github.com/primefaces/primeng/issues/14939)
- Icons: Wrong value for PrimeIcons.SORT_ALPHA_ALT_DOWN and others [\#14965](https://github.com/primefaces/primeng/issues/14965)
- Multiselect | TypeError: option.toLocaleLowerCase is not a function [\#14960](https://github.com/primefaces/primeng/issues/14960)
- Dropdown: TypeError: this.getOptionLabel(...).toLocaleLowerCase is not a function [\#14865](https://github.com/primefaces/primeng/issues/14865)
- Tree: If user filter tree nodes and then lazy load new children (with .key prop) - nodeClick event is not emitted [\#14723](https://github.com/primefaces/primeng/issues/14723)
- Tree: Certain ARIA roles must be contained by particular parents [\#14913](https://github.com/primefaces/primeng/issues/14913)
- Tree: Node drop points are not contained in a <ul> or <ol> [\#14911](https://github.com/primefaces/primeng/issues/14911)
- Tree: ARIA attributes must conform to valid values [\#14912](https://github.com/primefaces/primeng/issues/14912)
- Scroll bar for the base page reappears after closing a secondary modal despite one modal still being open [\#14933](https://github.com/primefaces/primeng/issues/14933)
- Drag-and-Drop Functionality Disrupted by extra tag (div) in <td> Tag [\#14935](https://github.com/primefaces/primeng/issues/14935)
- Table, pFrozenColumn: Frozen columns are extremely slow and kick off many change detection cycles [\#14579](https://github.com/primefaces/primeng/issues/14579)
- Dropdown: Clicking on currently selected item no longer closes the list [\#14917](https://github.com/primefaces/primeng/issues/14917)


## [17.9.0](https://github.com/primefaces/primeng/tree/17.9.0) (2024-02-29)

[Full Changelog](https://github.com/primefaces/primeng/compare/17.8.0...17.9.0)
Expand Down Expand Up @@ -346,6 +368,19 @@
- TypeError: this.focusedItemInfo.mutate is not a function [\#14119](https://github.com/primefaces/primeng/issues/14119)
- Upgrade to Angular 17? [\#14063](https://github.com/primefaces/primeng/issues/14063)

## ![LTS](https://www.primefaces.org/wp-content/uploads/2020/01/lts-icon-24.png "PrimeNG LTS") [16.9.6-LTS](https://www.npmjs.com/package/primeng/v/16.9.6-lts) (2024-03-07)

**Implemented New Features and Enhancements:**
- ColorPicker: Form elements must have labels [\#14941](https://github.com/primefaces/primeng/issues/14941)

**Fixed bugs:**
- Tree: If user filter tree nodes and then lazy load new children (with .key prop) - nodeClick event is not emitted [\#14723](https://github.com/primefaces/primeng/issues/14723)
- Tree: Certain ARIA roles must be contained by particular parents [\#14913](https://github.com/primefaces/primeng/issues/14913)
- Tree | ARIA attributes must conform to valid values [\#14912](https://github.com/primefaces/primeng/issues/14912)
- Scroll bar for the base page reappears after closing a secondary modal despite one modal still being open [\#14933](https://github.com/primefaces/primeng/issues/14933)
- Drag-and-Drop Functionality Disrupted by extra tag [\#14935](https://github.com/primefaces/primeng/issues/14935)
- Table, pFrozenColumn: Frozen columns are extremely slow and kick off many change detection cycles [\#14579](https://github.com/primefaces/primeng/issues/14579)

## ![LTS](https://www.primefaces.org/wp-content/uploads/2020/01/lts-icon-24.png "PrimeNG LTS") [16.9.5-LTS](https://www.npmjs.com/package/primeng/v/16.9.5-lts) (2024-02-07)

**Fixed bugs:**
Expand Down Expand Up @@ -899,6 +934,13 @@
- Checkbox in p-treeNode always checked when using custom icon [\#12951](https://github.com/primefaces/primeng/issues/12951)
- ConfirmDialog: Duplicated AcceptIcons [\#13001](https://github.com/primefaces/primeng/issues/13001)

## ![LTS](https://www.primefaces.org/wp-content/uploads/2020/01/lts-icon-24.png "PrimeNG LTS") [15.4.17-LTS](https://www.npmjs.com/package/primeng/v/15.4.17-lts) (2024-03-07)

**Fixed bugs:**
- Tree: If user filter tree nodes and then lazy load new children (with .key prop) - nodeClick event is not emitted [\#14723](https://github.com/primefaces/primeng/issues/14723)
- Table, pFrozenColumn: Frozen columns are extremely slow and kick off many change detection cycles [\#14579](https://github.com/primefaces/primeng/issues/14579)


## ![LTS](https://www.primefaces.org/wp-content/uploads/2020/01/lts-icon-24.png "PrimeNG LTS") [15.4.16-LTS](https://www.npmjs.com/package/primeng/v/15.4.16-lts) (2024-02-07)

**Fixed bugs:**
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "primeng",
"version": "17.9.0",
"version": "17.10.0",
"license": "SEE LICENSE IN LICENSE.md",
"scripts": {
"ng": "ng",
Expand Down
10 changes: 5 additions & 5 deletions src/app/components/api/primeicons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,20 +193,20 @@ export class PrimeIcons {
public static readonly SLIDERS_V = 'pi pi-sliders-v';
public static readonly SORT = 'pi pi-sort';
public static readonly SORT_ALPHA_DOWN = 'pi pi-sort-alpha-down';
public static readonly SORT_ALPHA_ALT_DOWN = 'pi pi-sort-alpha-alt-down';
public static readonly SORT_ALPHA_DOWN_ALT = 'pi pi-sort-alpha-down-alt';
public static readonly SORT_ALPHA_UP = 'pi pi-sort-alpha-up';
public static readonly SORT_ALPHA_ALT_UP = 'pi pi-sort-alpha-alt-up';
public static readonly SORT_ALPHA_UP_ALT = 'pi pi-sort-alpha-up-alt';
public static readonly SORT_ALT = 'pi pi-sort-alt';
public static readonly SORT_ALT_SLASH = 'pi pi-sort-slash';
public static readonly SORT_ALT_SLASH = 'pi pi-sort-alt-slash';
public static readonly SORT_AMOUNT_DOWN = 'pi pi-sort-amount-down';
public static readonly SORT_AMOUNT_DOWN_ALT = 'pi pi-sort-amount-down-alt';
public static readonly SORT_AMOUNT_UP = 'pi pi-sort-amount-up';
public static readonly SORT_AMOUNT_UP_ALT = 'pi pi-sort-amount-up-alt';
public static readonly SORT_DOWN = 'pi pi-sort-down';
public static readonly SORT_NUMERIC_DOWN = 'pi pi-sort-numeric-down';
public static readonly SORT_NUMERIC_ALT_DOWN = 'pi pi-sort-numeric-alt-down';
public static readonly SORT_NUMERIC_DOWN_ALT = 'pi pi-sort-numeric-down-alt';
public static readonly SORT_NUMERIC_UP = 'pi pi-sort-numeric-up';
public static readonly SORT_NUMERIC_ALT_UP = 'pi pi-sort-numeric-alt-up';
public static readonly SORT_NUMERIC_UP_ALT = 'pi pi-sort-numeric-up-alt';
public static readonly SORT_UP = 'pi pi-sort-up';
public static readonly SPINNER = 'pi pi-spinner';
public static readonly STAR = 'pi pi-star';
Expand Down
6 changes: 3 additions & 3 deletions src/app/components/dropdown/dropdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -918,9 +918,9 @@ export class Dropdown implements OnInit, AfterViewInit, AfterContentInit, AfterV
!_filterBy && !this.filterFields && !this.optionValue
? this.options.filter((option) => {
if (option.label) {
return option.label.toLowerCase().indexOf(this._filterValue().toLowerCase().trim()) !== -1;
return option.label.toString().toLowerCase().indexOf(this._filterValue().toLowerCase().trim()) !== -1;
}
return option.toLowerCase().indexOf(this._filterValue().toLowerCase().trim()) !== -1;
return option.toString().toLowerCase().indexOf(this._filterValue().toLowerCase().trim()) !== -1;
})
: this.filterService.filter(options, this.searchFields(), this._filterValue().trim(), this.filterMatchMode, this.filterLocale);

Expand Down Expand Up @@ -1809,7 +1809,7 @@ export class Dropdown implements OnInit, AfterViewInit, AfterContentInit, AfterV
}

isOptionMatched(option) {
return this.isValidOption(option) && this.getOptionLabel(option).toLocaleLowerCase(this.filterLocale).startsWith(this.searchValue.toLocaleLowerCase(this.filterLocale));
return this.isValidOption(option) && this.getOptionLabel(option).toString().toLocaleLowerCase(this.filterLocale).startsWith(this.searchValue.toLocaleLowerCase(this.filterLocale));
}

onFilterInputChange(event: Event | any): void {
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/multiselect/multiselect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ export class MultiSelect implements OnInit, AfterViewInit, AfterContentInit, Aft
if (isArrayOfObjects) {
filteredOptions = this.filterService.filter(options, this.searchFields(), this._filterValue(), this.filterMatchMode, this.filterLocale);
} else {
filteredOptions = options.filter((option) => option.toLocaleLowerCase().includes(this._filterValue().toLocaleLowerCase()));
filteredOptions = options.filter((option) => option.toString().toLocaleLowerCase().includes(this._filterValue().toLocaleLowerCase()));
}

if (this.group) {
Expand Down Expand Up @@ -1392,7 +1392,7 @@ export class MultiSelect implements OnInit, AfterViewInit, AfterContentInit, Aft
}

isOptionMatched(option) {
return this.isValidOption(option) && this.getOptionLabel(option).toLocaleLowerCase(this.filterLocale).startsWith(this.searchValue.toLocaleLowerCase(this.filterLocale));
return this.isValidOption(option) && this.getOptionLabel(option).toString().toLocaleLowerCase(this.filterLocale).startsWith(this.searchValue.toLocaleLowerCase(this.filterLocale));
}

isEmpty() {
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "primeng",
"version": "17.9.0",
"version": "17.10.0",
"repository": {
"type": "git",
"url": "https://github.com/primefaces/primeng"
Expand Down
6 changes: 2 additions & 4 deletions src/app/components/tree/tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ import {
`,
encapsulation: ViewEncapsulation.None,
host: {
class: 'p-element',
class: 'p-element'
}
})
export class UITreeNode implements OnInit {
Expand Down Expand Up @@ -1247,8 +1247,7 @@ export class Tree implements OnInit, AfterContentInit, OnChanges, OnDestroy, Blo
}

if (this.hasFilteredNodes()) {
node = this.getNodeWithKey(<string>node.key, <TreeNode<any>[]>this.value) as TreeNode;

node = this.getNodeWithKey(<string>node.key, <TreeNode<any>[]>this.filteredNodes) as TreeNode;
if (!node) {
return;
}
Expand Down Expand Up @@ -1359,7 +1358,6 @@ export class Tree implements OnInit, AfterContentInit, OnChanges, OnDestroy, Blo

findIndexInSelection(node: TreeNode) {
let index: number = -1;

if (this.selectionMode && this.selection) {
if (this.isSingleSelectionMode()) {
let areNodesEqual = (this.selection.key && this.selection.key === node.key) || this.selection == node;
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/treeselect/treeselect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -415,13 +415,13 @@ export class TreeSelect implements AfterContentInit {
@Output() onFilter: EventEmitter<any> = new EventEmitter<any>();
/**
* Callback to invoke when a node is unselected.
* @param {TreeNode} node - Node instance.
* @param {TreeNodeUnSelectEvent} event - node unselect event.
* @group Emits
*/
@Output() onNodeUnselect: EventEmitter<TreeNodeUnSelectEvent> = new EventEmitter<TreeNodeUnSelectEvent>();
/**
* Callback to invoke when a node is selected.
* @param {TreeNode} node - Node instance.
* @param {TreeNodeSelectEvent} event - node select event.
* @group Emits
*/
@Output() onNodeSelect: EventEmitter<TreeNodeSelectEvent> = new EventEmitter<TreeNodeSelectEvent>();
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/treetable/treetable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ export class TreeTable implements AfterContentInit, OnInit, OnDestroy, Blockable
@Output() onFilter: EventEmitter<TreeTableFilterEvent> = new EventEmitter<TreeTableFilterEvent>();
/**
* Callback to invoke when a node is expanded.
* @param {TreeTableNode} object - Node instance.
* @param {TreeTableNodeExpandEvent} event - Node expand event.
* @group Emits
*/
@Output() onNodeExpand: EventEmitter<TreeTableNodeExpandEvent> = new EventEmitter<TreeTableNodeExpandEvent>();
Expand Down
6 changes: 3 additions & 3 deletions src/app/showcase/data/versions.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[
{
"version": "v17.9.0",
"version": "v17.10.0",
"name": "v17",
"url": "https://primeng.org"
},
{
"version": "v16.9.5-lts",
"version": "v16.9.6-lts",
"name": "v16",
"url": "https://www.primefaces.org/primeng-v16-lts/"
},
{
"version": "v15.4.16-lts",
"version": "v15.4.17-lts",
"name": "v15",
"url": "https://www.primefaces.org/primeng-v15-lts/#/"
},
Expand Down
35 changes: 25 additions & 10 deletions src/app/showcase/doc/apidoc/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -3108,6 +3108,12 @@
"optional": true,
"readonly": false,
"type": "string"
},
{
"name": "selectColor",
"optional": true,
"readonly": false,
"type": "string"
}
]
}
Expand Down Expand Up @@ -4945,6 +4951,9 @@
}
}
},
"buttongroup": {
"components": {}
},
"calendar": {
"components": {
"Calendar": {
Expand Down Expand Up @@ -7197,11 +7206,11 @@
"description": "Maximum number of entries allowed."
},
{
"name": "maxLength",
"optional": false,
"readonly": false,
"type": "number",
"description": "Maximum length of a chip."
"name": "maxLength",
"optional": false,
"readonly": false,
"type": "number",
"description": "Maximum length of a chip."
},
{
"name": "ariaLabel",
Expand Down Expand Up @@ -9008,7 +9017,7 @@
"optional": false,
"readonly": false,
"type": "string",
"default": "-1",
"default": "0",
"description": "Index of the close button in tabbing order."
},
{
Expand Down Expand Up @@ -11709,6 +11718,13 @@
}
}
},
"floatlabel": {
"components": {
"FloatLabel": {
"description": "FloatLabel appears on top of the input field when focused."
}
}
},
"focustrap": {
"components": {
"FocusTrap": {
Expand Down Expand Up @@ -13376,7 +13392,7 @@
"name": "value",
"optional": false,
"readonly": false,
"type": "string",
"type": "number",
"description": "Input value."
},
{
Expand Down Expand Up @@ -23539,8 +23555,7 @@
"name": "activeItem",
"optional": false,
"readonly": false,
"type": "MenuItem",
"description": "Defines the default active menuitem"
"type": "MenuItem"
},
{
"name": "scrollable",
Expand Down Expand Up @@ -27939,4 +27954,4 @@
}
}
}
}
}
Loading

0 comments on commit c98a476

Please sign in to comment.