Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(item-reorder): add side support #11642

Merged
merged 14 commits into from
Jun 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/item/item-reorder-gesture.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export class ItemReorderGesture {
}

private itemForCoord(coord: PointerCoordinates): HTMLElement {
const sideOffset = this.plt.isRTL ? 100 : -100;
const sideOffset = this.reorderList._isStart === this.plt.isRTL ? -100 : 100;
const x = this.offset.x + sideOffset;
const y = coord.y;
const element = this.plt.getElementFromPoint(x, y);
Expand Down Expand Up @@ -167,6 +167,7 @@ const SCROLL_JUMP = 10;
const ITEM_REORDER_ACTIVE = 'reorder-active';

export interface ItemReorderGestureDelegate {
_isStart: boolean;
getNativeElement: () => any;
_reorderPrepare: () => void;
_scrollContent: (scrollPosition: number) => number;
Expand Down
11 changes: 9 additions & 2 deletions src/components/item/item-reorder.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
@import "../../themes/ionic.globals";

$reorder-initial-transform: 160% !default;

// Item reorder
// --------------------------------------------------

ion-reorder {
@include transform(translate3d(160%, 0, 0));
@include transform(translate3d($reorder-initial-transform, 0, 0));

display: none;

Expand All @@ -18,13 +20,18 @@ ion-reorder {
font-size: 1.7em;
opacity: .25;


transition: transform 140ms ease-in;

pointer-events: all;
touch-action: manipulation;
}

.reorder-side-start ion-reorder {
@include transform(translate3d(-$reorder-initial-transform, 0, 0));

order: -1;
}

ion-reorder ion-icon {
pointer-events: none;
}
Expand Down
10 changes: 10 additions & 0 deletions src/components/item/item-reorder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,14 @@ export class ReorderIndexes {
host: {
'[class.reorder-enabled]': '_enableReorder',
'[class.reorder-visible]': '_visibleReorder',
'[class.reorder-side-start]': '_isStart'
}
})
export class ItemReorder implements ItemReorderGestureDelegate {

_enableReorder: boolean = false;
_visibleReorder: boolean = false;
_isStart: boolean = false;
_reorderGesture: ItemReorderGesture;
_lastToIndex: number = -1;
_element: HTMLElement;
Expand All @@ -158,6 +160,14 @@ export class ItemReorder implements ItemReorderGestureDelegate {
*/
@Output() ionItemReorder: EventEmitter<ReorderIndexes> = new EventEmitter<ReorderIndexes>();

/**
* @input {string} Which side of the view the ion-reorder should be placed. Default `"end"`.
*/
@Input('side')
set side(side: 'start' | 'end') {
this._isStart = side === 'start';
}

constructor(
private _plt: Platform,
private _dom: DomController,
Expand Down
36 changes: 21 additions & 15 deletions src/components/item/test/reorder/pages/root-page/root-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,30 @@

<ion-list [reorder]="isReordering" (ionItemReorder)="reorder($event)">
<button ion-item *ngFor="let item of items" (click)="clickedButton(item)"
[style.background]="'rgb('+(255-item*4)+','+(255-item*4)+','+(255-item*4)+')'"
[style.min-height]="item*2+35+'px'">
[style.background]="'rgb('+(255-item*4)+','+(255-item*4)+','+(255-item*4)+')'"
[style.min-height]="item*2+35+'px'">
{{item}}
</button>
</ion-list>

<ion-list [reorder]="isReordering" (ionItemReorder)="$event.applyTo(items)">
<ion-item-sliding *ngFor="let item of items">
<button ion-item (click)="clickedButton(item)">
<h2>Sliding item {{item}}</h2>
</button>
<ion-item-options side="right" icon-start>
<button ion-button color='danger'>
<ion-icon name="trash"></ion-icon>
Remove
</button>
</ion-item-options>
</ion-item-sliding>
</ion-list>
<div *ngFor="let side of ['start', 'end']">
<ion-list>
<ion-list-header>{{side}}</ion-list-header>
<ion-item-group [reorder]="isReordering" (ionItemReorder)="$event.applyTo(items)" [side]="side">
<ion-item-sliding *ngFor="let item of items">
<button ion-item (click)="clickedButton(item)">
<h2>Sliding item {{item}}</h2>
<div item-end>right</div>
</button>
<ion-item-options side="right" icon-start>
<button ion-button color='danger'>
<ion-icon name="trash"></ion-icon>
Remove
</button>
</ion-item-options>
</ion-item-sliding>
</ion-item-group>
</ion-list>
</div>

</ion-content>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export class RootPage {
isReordering: boolean = false;

constructor() {
let nu = 9;
let nu = 5;
for (let i = 0; i < nu; i++) {
this.items.push(i);
}
Expand Down