Skip to content

Commit

Permalink
fix: (platform) addressed list header label issue (#3457)
Browse files Browse the repository at this point in the history
* fix to issues 3266

* fix to list issue 3423

added new line at end of the file

fix icons in button breaking because of latest 0.12

* rebase with 3400 changess
  • Loading branch information
sKudum committed Oct 1, 2020
1 parent f8703ea commit 584392f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 22 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h3>Cozy Mode</h3>
<fd-toolbar fdType="info" active="true">
<label fd-toolbar-label>({{_selectedItems.length}}) Items selected</label>
<label fd-toolbar-label>{{_selectedItems.length}} : Items selected</label>
</fd-toolbar>
<fdp-list noBorder="true" [dataSource]="_dataSource" selectionMode="multi" [(ngModel)]="_selectedItems"
(selectedItemChange)="_showItemInfo($event)" selection="true">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<fd-toolbar fdType="info" active="true">
<label fd-toolbar-label>({{_selectedItems.length}}) Items selected</label>
<label fd-toolbar-label>{{_selectedItems.length}} : Items selected</label>
</fd-toolbar>
<fdp-list selection="true" [dataSource]="_dataSource" selectionMode="multi" [(ngModel)]="_selectedItems"
(selectedItemChange)="_showItemInfo($event)" [hasByLine]="true">
Expand Down
9 changes: 0 additions & 9 deletions libs/platform/src/lib/components/list/base-list-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,6 @@ export class BaseListItem extends BaseComponent implements OnInit, AfterViewChec
this.link = value;
}

/**
* content Density of element. 'cozy' | 'compact'
*/
@Input()
set contentDensity(contentDensity: ContentDensity) {
this._contentDensity = contentDensity;
this._isCompact = contentDensity === 'compact';
}

/**Getter and setter the list of items */
@Input()
set item(item: any) {
Expand Down
20 changes: 9 additions & 11 deletions libs/platform/src/lib/components/list/list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export class ListComponent extends CollectionBaseInput implements OnInit, AfterV

/**Items to be loaded at once */
@Input()
itemSize: number;
itemSize = 0;

/**Enables lazy loadMore of data */
@Input()
Expand Down Expand Up @@ -126,15 +126,6 @@ export class ListComponent extends CollectionBaseInput implements OnInit, AfterV
}
}

/**
* content Density of element. 'cozy' | 'compact'
*/
@Input()
set contentDensity(contentDensity: ContentDensity) {
this._contentDensity = contentDensity;
this._isCompact = contentDensity === 'compact';
}

/** setter and getter for _navigated */
@Input('navigated')
get navigated(): boolean {
Expand Down Expand Up @@ -179,6 +170,14 @@ export class ListComponent extends CollectionBaseInput implements OnInit, AfterV
super.setValue(value);
}

/**
* content Density of element. 'cozy' | 'compact'
*/
set contentDensity(contentDensity: ContentDensity) {
this._contentDensity = contentDensity;
this._isCompact = contentDensity === 'compact';
}

/** @hidden */
@Output()
selectedItemChange: EventEmitter<SelectionChangeEvent> = new EventEmitter<SelectionChangeEvent>();
Expand Down Expand Up @@ -394,7 +393,6 @@ export class ListComponent extends CollectionBaseInput implements OnInit, AfterV
}
}


/** @hidden */
/**handline keyboard operations
* in template on list and list items
Expand Down

0 comments on commit 584392f

Please sign in to comment.