Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
cetincakiroglu authored Apr 18, 2024
2 parents dc1b795 + 96e657c commit 7f1571e
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 19 deletions.
1 change: 1 addition & 0 deletions CHANGELOG_ARCHIVE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- FileUpload - long filename [\#10275](https://github.com/primefaces/primeng/issues/10275)
- Sidebar wrong animation and close button display [\#10261](https://github.com/primefaces/primeng/issues/10261)


## ![LTS](https://www.primefaces.org/wp-content/uploads/2020/01/lts-icon-24.png "PrimeNG LTS") [10.1.4-LTS](https://www.npmjs.com/package/primeng-lts/v/10.1.4) (2021-10-18)
- float-label chips problem [\#10725](https://github.com/primefaces/primeng/issues/10725)
- pButton Directive throws error when label is set when async pipe [\#10719](https://github.com/primefaces/primeng/issues/10719)
Expand Down
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,6 @@
}
},
"cli": {
"analytics": false
"analytics": false
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"type": "git",
"url": "https://github.com/primefaces/primeng.git"
},
"type": "module",
"devDependencies": {
"@angular-devkit/build-angular": "^17.3.1",
"@angular-eslint/eslint-plugin": "17.3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/autocomplete/autocomplete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1497,7 +1497,7 @@ export class AutoComplete implements AfterViewChecked, AfterContentInit, OnDestr
this.focusedOptionIndex.set(index);
this.scrollInView();

if (this.selectOnFocus || this.autoHighlight) {
if (this.selectOnFocus) {
this.onOptionSelect(event, this.visibleOptions()[index], false);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/dataview/dataview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export class DataView implements OnInit, AfterContentInit, OnDestroy, BlockableU
* Function to optimize the dom operations by delegating to ngForTrackBy, default algorithm checks for object identity.
* @group Props
*/
@Input({ transform: numberAttribute }) trackBy: Function = (index: number, item: any) => item;
@Input() trackBy: Function = (index: number, item: any) => item;
/**
* Comma separated list of fields in the object graph to search against.
* @group Props
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/dropdown/dropdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ export class DropdownItem {
</div>
</ng-template>
</div>
<div class="p-dropdown-items-wrapper" [style.max-height]="virtualScroll ? 'auto' : scrollHeight || 'auto'">
<div class="p-dropdown-items-wrapper" [style.max-height]="virtualScroll ? 'auto' : scrollHeight || 'auto'" role="section">
<p-scroller
*ngIf="virtualScroll"
#scroller
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/orderlist/orderlist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ export class OrderList implements AfterViewChecked, AfterContentInit {
* Function to optimize the dom operations by delegating to ngForTrackBy, default algorithm checks for object identity.
* @group Props
*/
@Input({ transform: numberAttribute }) trackBy: Function = (index: number, item: any) => item;
@Input() trackBy: Function = (index: number, item: any) => item;

/**
* A list of values that are currently selected.
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/picklist/picklist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ export class PickList implements AfterViewChecked, AfterContentInit {
* Function to optimize the dom operations by delegating to ngForTrackBy, default algorithm checks for object identity. Use sourceTrackBy or targetTrackBy in case different algorithms are needed per list.
* @group Props
*/
@Input({ transform: numberAttribute }) trackBy: Function = (index: number, item: any) => item;
@Input() trackBy: Function = (index: number, item: any) => item;
/**
* Function to optimize the dom operations by delegating to ngForTrackBy in source list, default algorithm checks for object identity.
* @group Props
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/slidemenu/slidemenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ export class SlideMenuSub {

@Input() easing: string = 'ease-out';

@Input() effectDuration: any;
@Input({ transform: numberAttribute }) effectDuration: number;

@Input({ transform: booleanAttribute }) autoDisplay: boolean | undefined;

Expand Down Expand Up @@ -406,7 +406,7 @@ export class SlideMenu implements OnInit, AfterContentInit, OnDestroy {
* Duration of the sliding animation in milliseconds.
* @group Props
*/
@Input({ transform: numberAttribute }) effectDuration: any = 250;
@Input({ transform: numberAttribute }) effectDuration: number = 250;
/**
* Easing animation to use for sliding.
* @group Props
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/table/table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -484,12 +484,12 @@ export class Table implements OnInit, AfterViewInit, AfterContentInit, Blockable
* Defines if the row is selectable.
* @group Props
*/
@Input({ transform: booleanAttribute }) rowSelectable: boolean | undefined | any;
@Input() rowSelectable: (row: { data: any; index: number }) => boolean | undefined;
/**
* Function to optimize the dom operations by delegating to ngForTrackBy, default algorithm checks for object identity.
* @group Props
*/
@Input({ transform: numberAttribute }) rowTrackBy: Function = (index: number, item: any) => item;
@Input() rowTrackBy: Function = (index: number, item: any) => item;
/**
* Defines if data is loaded and interacted with in lazy manner.
* @group Props
Expand Down Expand Up @@ -539,12 +539,12 @@ export class Table implements OnInit, AfterViewInit, AfterContentInit, Blockable
* Map instance to keep the expanded rows where key of the map is the data key of the row.
* @group Props
*/
@Input({ transform: booleanAttribute }) expandedRowKeys: { [s: string]: boolean } = {};
@Input() expandedRowKeys: { [s: string]: boolean } = {};
/**
* Map instance to keep the rows being edited where key of the map is the data key of the row.
* @group Props
*/
@Input({ transform: booleanAttribute }) editingRowKeys: { [s: string]: boolean } = {};
@Input() editingRowKeys: { [s: string]: boolean } = {};
/**
* Whether multiple rows can be expanded at any time. Valid values are "multiple" and "single".
* @group Props
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/tree/tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,7 @@ export class Tree implements OnInit, AfterContentInit, OnChanges, OnDestroy, Blo
* Function to optimize the node list rendering, default algorithm checks for object identity.
* @group Props
*/
@Input({ transform: numberAttribute }) trackBy: Function = (index: number, item: any) => item;
@Input() trackBy: Function = (index: number, item: any) => item;
/**
* Height of the node.
* @group Props
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 @@ -502,7 +502,7 @@ export class TreeTable implements AfterContentInit, OnInit, OnDestroy, Blockable
* Function to optimize the dom operations by delegating to ngForTrackBy, default algorithm checks for object identity.
* @group Props
*/
@Input({ transform: numberAttribute }) rowTrackBy: Function = (index: number, item: any) => item;
@Input() rowTrackBy: Function = (index: number, item: any) => item;
/**
* An array of FilterMetadata objects to provide external filters.
* @group Props
Expand Down
2 changes: 1 addition & 1 deletion src/app/showcase/data/news.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"id": 63,
"content": "Introducing the new Aura theme",
"linkText": "Learn More",
"linkHref": "http://localhost:4200/theming"
"linkHref": "https://primeng.org/theming"
}
6 changes: 3 additions & 3 deletions src/app/showcase/doc/apidoc/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -20810,7 +20810,7 @@
"name": "effectDuration",
"optional": false,
"readonly": false,
"type": "any",
"type": "number",
"default": "250",
"description": "Duration of the sliding animation in milliseconds."
},
Expand Down Expand Up @@ -22643,7 +22643,7 @@
"name": "rowSelectable",
"optional": false,
"readonly": false,
"type": "any",
"type": "(row: { data: any; index: number }) => boolean",
"description": "Defines if the row is selectable."
},
{
Expand Down Expand Up @@ -28773,4 +28773,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/app/showcase/doc/theming/scalingdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Code } from '../../domain/code';
<app-docsectiontext>
<p>
PrimeNG utilizes rem units to make sure the components blend in with the rest of your UI perfectly. This also enables scaling, for example changing the size of the components is easy as configuring the font size of your document. Code
below sets the scale of the components based on 16px. If you reqire bigger or smaller components, just change this variable and components will scale accordingly.
below sets the scale of the components based on 16px. If you require bigger or smaller components, just change this variable and components will scale accordingly.
</p>
</app-docsectiontext>
<app-code [code]="code" [hideToggleCode]="true"></app-code>
Expand Down

0 comments on commit 7f1571e

Please sign in to comment.