Skip to content

Commit

Permalink
Merge branch 'master' into expandedRowKeys-is-getting-set-to-a-boolean
Browse files Browse the repository at this point in the history
  • Loading branch information
cetincakiroglu authored Apr 18, 2024
2 parents 3889817 + 41890a4 commit 9413507
Show file tree
Hide file tree
Showing 8 changed files with 11,207 additions and 6 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/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/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"
}
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
11,201 changes: 11,200 additions & 1 deletion src/assets/showcase/data/icons.json

Large diffs are not rendered by default.

0 comments on commit 9413507

Please sign in to comment.