Skip to content

Commit

Permalink
Merge branch 'main' into 11694-timepicker-support-pattern-symbol-b
Browse files Browse the repository at this point in the history
  • Loading branch information
dpavlenishvili authored Sep 17, 2024
2 parents d64284c + 53ec3d2 commit 2f1c8a3
Show file tree
Hide file tree
Showing 37 changed files with 867 additions and 139 deletions.
55 changes: 55 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,61 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.52.2-rc.21](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.20...v0.52.2-rc.21) (2024-09-17)


### Bug Fixes

* **core:** handle invalid date inputs gracefully ([#12433](https://github.com/SAP/fundamental-ngx/issues/12433)) ([d49bb37](https://github.com/SAP/fundamental-ngx/commit/d49bb37e3a04f2c09382561e3f2a7a81f0091d6c))





## [0.52.2-rc.20](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.19...v0.52.2-rc.20) (2024-09-17)


### Bug Fixes

* **platform:** icon-tab-bar check for selectedUid ([#12431](https://github.com/SAP/fundamental-ngx/issues/12431)) ([288bf4a](https://github.com/SAP/fundamental-ngx/commit/288bf4ad9f2213fdb018d74ceb1810fc119b8bb9))





## [0.52.2-rc.19](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.18...v0.52.2-rc.19) (2024-09-16)


### Bug Fixes

* datetime adapter passing date format, not dateTime ([#12415](https://github.com/SAP/fundamental-ngx/issues/12415)) ([47b3610](https://github.com/SAP/fundamental-ngx/commit/47b3610898aa006636499bc86a5f7db93ef5dbc7))





## [0.52.2-rc.18](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.17...v0.52.2-rc.18) (2024-09-16)


### Bug Fixes

* **platform:** fix fdp-table popover alignment ([#12303](https://github.com/SAP/fundamental-ngx/issues/12303)) ([fc0e314](https://github.com/SAP/fundamental-ngx/commit/fc0e31455fb73c832cfe8f7f3a1b89c0fca91f03)), closes [#11230](https://github.com/SAP/fundamental-ngx/issues/11230) [#11230](https://github.com/SAP/fundamental-ngx/issues/11230) [#11230](https://github.com/SAP/fundamental-ngx/issues/11230) [#11771](https://github.com/SAP/fundamental-ngx/issues/11771)





## [0.52.2-rc.17](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.16...v0.52.2-rc.17) (2024-09-13)


### Bug Fixes

* **core:** grid list keyboard support ([#12288](https://github.com/SAP/fundamental-ngx/issues/12288)) ([c0ee76f](https://github.com/SAP/fundamental-ngx/commit/c0ee76f48a0d48a9c35f26a144ee466910ae03e2))





## [0.52.2-rc.16](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.15...v0.52.2-rc.16) (2024-09-13)


Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"packages": ["libs/*"],
"version": "0.52.2-rc.16",
"version": "0.52.2-rc.21",
"conventionalCommits": true,
"tagVersionPrefix": "v",
"message": "chore(release): publish %v",
Expand Down
40 changes: 40 additions & 0 deletions libs/btp/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,46 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.52.2-rc.21](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.20...v0.52.2-rc.21) (2024-09-17)

**Note:** Version bump only for package @fundamental-ngx/btp





## [0.52.2-rc.20](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.19...v0.52.2-rc.20) (2024-09-17)

**Note:** Version bump only for package @fundamental-ngx/btp





## [0.52.2-rc.19](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.18...v0.52.2-rc.19) (2024-09-16)

**Note:** Version bump only for package @fundamental-ngx/btp





## [0.52.2-rc.18](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.17...v0.52.2-rc.18) (2024-09-16)

**Note:** Version bump only for package @fundamental-ngx/btp





## [0.52.2-rc.17](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.16...v0.52.2-rc.17) (2024-09-13)

**Note:** Version bump only for package @fundamental-ngx/btp





## [0.52.2-rc.16](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.15...v0.52.2-rc.16) (2024-09-13)

**Note:** Version bump only for package @fundamental-ngx/btp
Expand Down
2 changes: 1 addition & 1 deletion libs/btp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/btp",
"version": "0.52.2-rc.16",
"version": "0.52.2-rc.21",
"peerDependencies": {
"@angular/common": "ANGULAR_VER_PLACEHOLDER",
"@angular/core": "ANGULAR_VER_PLACEHOLDER",
Expand Down
43 changes: 43 additions & 0 deletions libs/cdk/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,49 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.52.2-rc.21](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.20...v0.52.2-rc.21) (2024-09-17)

**Note:** Version bump only for package @fundamental-ngx/cdk





## [0.52.2-rc.20](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.19...v0.52.2-rc.20) (2024-09-17)

**Note:** Version bump only for package @fundamental-ngx/cdk





## [0.52.2-rc.19](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.18...v0.52.2-rc.19) (2024-09-16)

**Note:** Version bump only for package @fundamental-ngx/cdk





## [0.52.2-rc.18](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.17...v0.52.2-rc.18) (2024-09-16)

**Note:** Version bump only for package @fundamental-ngx/cdk





## [0.52.2-rc.17](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.16...v0.52.2-rc.17) (2024-09-13)


### Bug Fixes

* **core:** grid list keyboard support ([#12288](https://github.com/SAP/fundamental-ngx/issues/12288)) ([c0ee76f](https://github.com/SAP/fundamental-ngx/commit/c0ee76f48a0d48a9c35f26a144ee466910ae03e2))





## [0.52.2-rc.16](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.15...v0.52.2-rc.16) (2024-09-13)

**Note:** Version bump only for package @fundamental-ngx/cdk
Expand Down
2 changes: 1 addition & 1 deletion libs/cdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/cdk",
"version": "0.52.2-rc.16",
"version": "0.52.2-rc.21",
"schematics": "./schematics/collection.json",
"description": "Fundamental Library for Angular - CDK",
"license": "Apache-2.0",
Expand Down
4 changes: 3 additions & 1 deletion libs/cdk/utils/functions/key-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
ENTER,
ESCAPE,
F2,
F7,
HOME,
LEFT_ARROW,
MAC_ENTER,
Expand Down Expand Up @@ -75,7 +76,8 @@ const keyMap: Map<number, string[]> = new Map([
[NUMPAD_SEVEN, ['NumPad7']],
[NUMPAD_EIGHT, ['NumPad8']],
[NUMPAD_NINE, ['NumPad9']],
[F2, ['F2']]
[F2, ['F2']],
[F7, ['F7']]
]);

export class KeyUtil {
Expand Down
52 changes: 52 additions & 0 deletions libs/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,58 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.52.2-rc.21](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.20...v0.52.2-rc.21) (2024-09-17)


### Bug Fixes

* **core:** handle invalid date inputs gracefully ([#12433](https://github.com/SAP/fundamental-ngx/issues/12433)) ([d49bb37](https://github.com/SAP/fundamental-ngx/commit/d49bb37e3a04f2c09382561e3f2a7a81f0091d6c))





## [0.52.2-rc.20](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.19...v0.52.2-rc.20) (2024-09-17)

**Note:** Version bump only for package @fundamental-ngx/core





## [0.52.2-rc.19](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.18...v0.52.2-rc.19) (2024-09-16)


### Bug Fixes

* datetime adapter passing date format, not dateTime ([#12415](https://github.com/SAP/fundamental-ngx/issues/12415)) ([47b3610](https://github.com/SAP/fundamental-ngx/commit/47b3610898aa006636499bc86a5f7db93ef5dbc7))





## [0.52.2-rc.18](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.17...v0.52.2-rc.18) (2024-09-16)


### Bug Fixes

* **platform:** fix fdp-table popover alignment ([#12303](https://github.com/SAP/fundamental-ngx/issues/12303)) ([fc0e314](https://github.com/SAP/fundamental-ngx/commit/fc0e31455fb73c832cfe8f7f3a1b89c0fca91f03)), closes [#11230](https://github.com/SAP/fundamental-ngx/issues/11230) [#11230](https://github.com/SAP/fundamental-ngx/issues/11230) [#11230](https://github.com/SAP/fundamental-ngx/issues/11230) [#11771](https://github.com/SAP/fundamental-ngx/issues/11771)





## [0.52.2-rc.17](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.16...v0.52.2-rc.17) (2024-09-13)


### Bug Fixes

* **core:** grid list keyboard support ([#12288](https://github.com/SAP/fundamental-ngx/issues/12288)) ([c0ee76f](https://github.com/SAP/fundamental-ngx/commit/c0ee76f48a0d48a9c35f26a144ee466910ae03e2))





## [0.52.2-rc.16](https://github.com/SAP/fundamental-ngx/compare/v0.52.2-rc.15...v0.52.2-rc.16) (2024-09-13)

**Note:** Version bump only for package @fundamental-ngx/core
Expand Down
16 changes: 10 additions & 6 deletions libs/core/datetime-picker/datetime-picker.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -692,12 +692,16 @@ export class DatetimePickerComponent<D>
* Method that is triggered when 'OK' button is pressed.
*/
submit(): void {
// marking date & time as not null, errors will be caught below
const currentDate = this._tempDate!;
let currentTime = this._tempTime;
// Initialize date and time values, defaulting to the current date if invalid
let currentDate = this._tempDate!;
let currentTime = this._tempTime!;

if (!currentTime) {
currentTime = this._dateTimeAdapter.today();
// Initialize date and time values, defaulting to the current date if invalid
if (!this._tempDate || !this._dateTimeAdapter.isValid(this._tempDate)) {
currentDate = this._dateTimeAdapter.today()!;
}
if (!this._tempTime || !this._dateTimeAdapter.isValid(this._tempTime)) {
currentTime = this._dateTimeAdapter.today()!;
}

try {
Expand Down Expand Up @@ -853,7 +857,7 @@ export class DatetimePickerComponent<D>

/** @hidden */
private _parseDate(date: unknown): D | null {
return this._dateTimeAdapter.parse(date, this._dateTimeFormats.parse.dateInput);
return this._dateTimeAdapter.parse(date, this._dateTimeFormats.parse.dateTimeInput);
}

/** @hidden */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div
#gridListItem
[id]="id"
tabindex="-1"
[tabindex]="tabIndex()"
class="fd-grid-list__item"
role="option"
[class.is-navigated]="isNavigated"
Expand Down
Loading

0 comments on commit 2f1c8a3

Please sign in to comment.