Skip to content

Commit

Permalink
Merge branch 'main' into 12441-table-settings-dialog-revisit
Browse files Browse the repository at this point in the history
  • Loading branch information
mikerodonnell89 authored Jan 8, 2025
2 parents 85680b5 + b908419 commit 6df31d4
Show file tree
Hide file tree
Showing 33 changed files with 189 additions and 34 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)


### Features

* **platform:** fdp table - make responsive pop-in areas navigable ([#12673](https://github.com/SAP/fundamental-ngx/issues/12673)) ([38cf776](https://github.com/SAP/fundamental-ngx/commit/38cf776b498e1b4facffeb96ddd014f05536d549)), closes [#11004](https://github.com/SAP/fundamental-ngx/issues/11004) [#11004](https://github.com/SAP/fundamental-ngx/issues/11004) [#11004](https://github.com/SAP/fundamental-ngx/issues/11004) [#11004](https://github.com/SAP/fundamental-ngx/issues/11004)





## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)


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.54.2-rc.1",
"version": "0.54.2-rc.2",
"conventionalCommits": true,
"tagVersionPrefix": "v",
"message": "chore(release): publish %v",
Expand Down
8 changes: 8 additions & 0 deletions libs/btp/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)

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





## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)

**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.54.2-rc.1",
"version": "0.54.2-rc.2",
"peerDependencies": {
"@angular/common": "ANGULAR_VER_PLACEHOLDER",
"@angular/core": "ANGULAR_VER_PLACEHOLDER",
Expand Down
8 changes: 8 additions & 0 deletions libs/cdk/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)

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





## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)

**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.54.2-rc.1",
"version": "0.54.2-rc.2",
"schematics": "./schematics/collection.json",
"description": "Fundamental Library for Angular - CDK",
"license": "Apache-2.0",
Expand Down
8 changes: 8 additions & 0 deletions libs/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)

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





## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)


Expand Down
19 changes: 14 additions & 5 deletions libs/core/combobox/combobox.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ describe('ComboboxComponent', () => {

it('should handle wrong input entry on dropdown mode', () => {
jest.spyOn(component, 'onChange');
component.communicateByObject = true;
component.displayFn = (item: any): string => {
if (item) {
return item.displayedValue;
Expand All @@ -91,6 +90,20 @@ describe('ComboboxComponent', () => {
expect(component.onChange).toHaveBeenCalledWith('otherDisplayedValue');
});

it('should not call onChange when using wrong input entry on dropdown mode with communicateByObject', () => {
jest.spyOn(component, 'onChange');
component.communicateByObject = true;
component.displayFn = (item: any): string => {
if (item) {
return item.displayedValue;
} else {
return '';
}
};
component.inputText = 'otherDisplayedValue';
expect(component.onChange).not.toHaveBeenCalled();
});

it('should handle write value from outside on dropdown mode', () => {
component.communicateByObject = true;
component.displayFn = (item: any): string => item.displayedValue;
Expand Down Expand Up @@ -342,8 +355,6 @@ describe('ComboboxComponent', () => {

component.displayFn = (product: Product): string => product?.name ?? '';

component.communicateByObject = true;

component.dropdownValues = allProducts;

component.groupFn = (products: Product[]) => {
Expand All @@ -369,8 +380,6 @@ describe('ComboboxComponent', () => {

component.displayFn = (product: Product): string => product?.name ?? '';

component.communicateByObject = true;

component.dropdownValues = allProducts;

component.groupFn = (products: Product[]) => {
Expand Down
5 changes: 4 additions & 1 deletion libs/core/combobox/combobox.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,10 @@ export class ComboboxComponent<T = any>
} else if (values.length === 0) {
this.setValue(this.inputText);
}
this.onChange(this.getValue());
const thisValue = this.getValue();
if (typeof thisValue === 'object') {
this.onChange(thisValue);
}
} else {
this.onChange(this.inputText);
}
Expand Down
25 changes: 16 additions & 9 deletions libs/core/list/list-item/list-item.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ export class ListItemComponent<T = any> extends ListFocusItem<T> implements Afte
@Input()
id: Nullable<string> = 'fd-list-item-' + ++listItemUniqueId;

/** Whether to prevent built-in click event logic on the list item.
* Helpful when using lists with checkboxes or radio buttons when the list item should be clickable, but should not select/deselect the list item. */
@Input()
preventClick = false;

/** @hidden Implementation of KeyboardSupportItemInterface | TODO Revisit KeyboardSupportItemInterface*/
@Output()
keyDown: EventEmitter<KeyboardEvent> = new EventEmitter<KeyboardEvent>();
Expand Down Expand Up @@ -229,16 +234,18 @@ export class ListItemComponent<T = any> extends ListFocusItem<T> implements Afte
/** Handler for mouse events */
@HostListener('click', ['$event'])
onClick(event: MouseEvent): void {
this._clicked$.next(event);
if (this.checkbox && !this.link) {
if (!this.checkbox.elementRef.nativeElement.contains(event.target as Node)) {
// clicking on the checkbox is not suppressed
// so we should only process clicks if clicked on the list-item, not checkbox itself
this.checkbox.nextValue();
if (!this.preventClick) {
this._clicked$.next(event);
if (this.checkbox && !this.link) {
if (!this.checkbox.elementRef.nativeElement.contains(event.target as Node)) {
// clicking on the checkbox is not suppressed
// so we should only process clicks if clicked on the list-item, not checkbox itself
this.checkbox.nextValue();
}
}
if (this.radio && !this.link) {
this.radio.labelClicked(event, false);
}
}
if (this.radio && !this.link) {
this.radio.labelClicked(event, false);
}
}

Expand Down
2 changes: 1 addition & 1 deletion libs/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/core",
"version": "0.54.2-rc.1",
"version": "0.54.2-rc.2",
"schematics": "./schematics/collection.json",
"ng-update": {
"migrations": "./schematics/migrations.json"
Expand Down
8 changes: 8 additions & 0 deletions libs/cx/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)

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





## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)

**Note:** Version bump only for package @fundamental-ngx/cx
Expand Down
2 changes: 1 addition & 1 deletion libs/cx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/cx",
"version": "0.54.2-rc.1",
"version": "0.54.2-rc.2",
"schematics": "./schematics/collection.json",
"description": "Fundamental Library for Angular - cx",
"license": "Apache-2.0",
Expand Down
8 changes: 8 additions & 0 deletions libs/datetime-adapter/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)

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





## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)

**Note:** Version bump only for package @fundamental-ngx/datetime-adapter
Expand Down
2 changes: 1 addition & 1 deletion libs/datetime-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/datetime-adapter",
"version": "0.54.2-rc.1",
"version": "0.54.2-rc.2",
"description": "Datetime adapter for SAP Fundamentals, based on Day.js package",
"license": "Apache-2.0",
"homepage": "https://sap.github.io/fundamental-ngx/home",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,18 @@ export class SettingsGeneratorCustomControlExampleComponent {
this._formGeneratorService.addComponent(PlatformFormGeneratorCustomSliderElementComponent, ['slider']);
this.schema = {
appearance: 'sidebar',
sidebarWidth: '20rem',
sidebarWidth: {
minWidth: '20rem',
width: '20rem',
maxWidth: '20rem',
wrapSidebarTitle: true,
wrapSidebarDescription: true
},
items: [
{
title: 'First list item',
title: 'First list item with long title text that wraps rather than truncates at certain screen sizes due to custom properties in the sidebar configuration',
description:
'This is an example of a description with long text that wraps rather than truncates due to custom properties in the sidebar width configuration',
id: 'sliderExample',
thumbnail: {
icon: {
Expand All @@ -111,7 +119,8 @@ export class SettingsGeneratorCustomControlExampleComponent {
showTicksLabels: true
}
}
]
],
wrapSectionTitle: true
}
]
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
<button fd-button label="Full width" value="100%"></button>
</fd-segmented-button>
<fdp-table
(rowNavigate)="handleNavigate()"
#table
[style.width]="tableWidth"
[dataSource]="source"
[trackBy]="trackBy"
[rowNavigatable]="true"
selectionMode="multiple"
[rowsActivable]="true"
emptyTableMessage="No data found"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ export class PlatformTableResponsiveColumnsExampleComponent implements AfterView
this.tableWidth = value;
this._cdr.detectChanges();
}

handleNavigate(): void {
alert('Navigation event');
}
}

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

## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)

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





## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)

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

## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)

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





## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)

**Note:** Version bump only for package @fundamental-ngx/moment-adapter
Expand Down
2 changes: 1 addition & 1 deletion libs/moment-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/moment-adapter",
"version": "0.54.2-rc.1",
"version": "0.54.2-rc.2",
"description": "Datetime adapter for SAP Fundamentals, based on Moment.js package",
"license": "Apache-2.0",
"homepage": "https://sap.github.io/fundamental-ngx/home",
Expand Down
8 changes: 8 additions & 0 deletions libs/nx-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)

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





## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)

**Note:** Version bump only for package @fundamental-ngx/nx-plugin
Expand Down
2 changes: 1 addition & 1 deletion libs/nx-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/nx-plugin",
"version": "0.54.2-rc.1",
"version": "0.54.2-rc.2",
"main": "src/index.js",
"generators": "./generators.json",
"executors": "./executors.json",
Expand Down
11 changes: 11 additions & 0 deletions libs/platform/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)


### Features

* **platform:** fdp table - make responsive pop-in areas navigable ([#12673](https://github.com/SAP/fundamental-ngx/issues/12673)) ([38cf776](https://github.com/SAP/fundamental-ngx/commit/38cf776b498e1b4facffeb96ddd014f05536d549)), closes [#11004](https://github.com/SAP/fundamental-ngx/issues/11004) [#11004](https://github.com/SAP/fundamental-ngx/issues/11004) [#11004](https://github.com/SAP/fundamental-ngx/issues/11004) [#11004](https://github.com/SAP/fundamental-ngx/issues/11004)





## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)

**Note:** Version bump only for package @fundamental-ngx/platform
Expand Down
2 changes: 1 addition & 1 deletion libs/platform/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/platform",
"version": "0.54.2-rc.1",
"version": "0.54.2-rc.2",
"schematics": "./schematics/collection.json",
"description": "Fundamental Library for Angular - platform",
"license": "Apache-2.0",
Expand Down
Loading

0 comments on commit 6df31d4

Please sign in to comment.