update: restructure branchy

src/branchy.component.styl

@@ -1,5 +1,5 @@
-@import '../common/styles/colors'
-@import '../common/styles/fonts'
+@import 'common/styles/colors'
+@import 'common/styles/fonts'
 
 // mixins
 node-folding(icon)

src/branchy.component.ts

@@ -1,23 +1,15 @@
 import {Input, Component, OnInit, EventEmitter, Output, ElementRef, Inject} from '@angular/core';
 import {CORE_DIRECTIVES} from '@angular/common';
 import * as _ from 'lodash';
-import {
-  TreeStatus,
-  NodeMenuItemSelectedEvent,
-  NodeMenuItemAction,
-  NodeEditableEvent,
-  NodeDraggableEvent,
-  NodeMenuAction,
-  NodeMenuEvent,
-  TreeModel,
-  FoldingType,
-  TreeEvent, NodeDraggableEventAction
-} from './types';
-import {NodeEditableDirective} from './node-editable.directive';
-import {NodeMenuComponent} from './node-menu.component';
-import {NodeDraggableService} from './node-draggable.service';
-import {NodeMenuService} from './node-menu.service';
-import {NodeDraggableDirective} from './node-draggable.directive';
+import {TreeStatus, TreeModel, FoldingType, TreeEvent, FoldingTypeCssClass} from './branchy.types';
+import {NodeEditableDirective} from './editable/node-editable.directive';
+import {NodeMenuComponent} from './menu/node-menu.component';
+import {NodeDraggableService} from './draggable/node-draggable.service';
+import {NodeMenuService} from './menu/node-menu.service';
+import {NodeDraggableDirective} from './draggable/node-draggable.directive';
+import {NodeDraggableEventAction, NodeDraggableEvent} from './draggable/draggable.types';
+import {NodeMenuEvent, NodeMenuAction, NodeMenuItemSelectedEvent, NodeMenuItemAction} from './menu/menu.types';
+import {NodeEditableEvent} from './editable/editable.type';
 
 @Component({
   selector: 'tree',
@@ -262,8 +254,6 @@ class TreeComponent implements OnInit {
   }
 }
 
-type FoldingTypeCssClass = 'node-expanded' | 'node-collapsed' | 'node-leaf';
-
 @Component({
   selector: 'branchy',
   providers: [NodeMenuService, NodeDraggableService],

src/branchy.types.ts

@@ -0,0 +1,25 @@
+export enum FoldingType {
+  Expanded,
+  Collapsed,
+  Leaf
+}
+
+export type FoldingTypeCssClass = 'node-expanded' | 'node-collapsed' | 'node-leaf';
+
+export interface TreeEvent {
+  node: TreeModel
+}
+
+export interface TreeModel {
+  value: string;
+  children?: Array<TreeModel>;
+  status?: TreeStatus,
+  foldingType?: FoldingType,
+  indexInParent?: number
+}
+
+export enum TreeStatus {
+  New,
+  Modified,
+  EditInProgress
+}

src/draggable/captured-node.ts

@@ -0,0 +1,28 @@
+import {TreeModel} from '../branchy.types';
+import {ElementRef} from '@angular/core';
+
+export class CapturedNode {
+  constructor(private anElement: ElementRef,
+              private aTree: TreeModel) {
+  }
+
+  public canBeDroppedAt(element: ElementRef): boolean {
+    return !this.sameAs(element) && !this.contains(element);
+  }
+
+  public contains(other: ElementRef): boolean {
+    return this.element.nativeElement.contains(other.nativeElement)
+  }
+
+  public sameAs(other: ElementRef): boolean {
+    return this.element === other;
+  }
+
+  get element(): ElementRef {
+    return this.anElement;
+  }
+
+  get tree(): TreeModel {
+    return this.aTree;
+  }
+}

src/draggable/draggable.types.ts

@@ -0,0 +1,12 @@
+import {ElementRef} from '@angular/core';
+import {CapturedNode} from './captured-node';
+
+export enum NodeDraggableEventAction {
+  Remove
+}
+
+export interface NodeDraggableEvent {
+  captured: CapturedNode;
+  target: ElementRef;
+  action?: NodeDraggableEventAction;
+}

src/node-draggable.directive.ts → src/draggable/node-draggable.directive.ts

@@ -1,6 +1,8 @@
 import {Directive, ElementRef, Input, Inject, Renderer, OnDestroy} from '@angular/core';
-import {TreeModel, CapturedNode, NodeDraggableEvent} from './types';
+import {TreeModel} from '../branchy.types';
 import {NodeDraggableService} from './node-draggable.service';
+import {CapturedNode} from './captured-node';
+import {NodeDraggableEvent} from './draggable.types';
 
 @Directive({
   selector: '[nodeDraggable]'

src/node-draggable.service.ts → src/draggable/node-draggable.service.ts

@@ -1,6 +1,7 @@
 import {Injectable} from '@angular/core';
-import {NodeDraggableEvent, CapturedNode} from './types';
 import {Subject} from 'rxjs/Rx';
+import {CapturedNode} from './captured-node';
+import {NodeDraggableEvent} from './draggable.types';
 
 @Injectable()
 export class NodeDraggableService {

src/editable/editable.type.ts

@@ -0,0 +1,6 @@
+export type NodeEditableEventType = 'blur' | 'keyup';
+
+export interface NodeEditableEvent {
+  value: string,
+  type: NodeEditableEventType
+}

src/node-editable.directive.ts → src/editable/node-editable.directive.ts

@@ -9,7 +9,7 @@ import {
   Inject,
   Renderer
 } from '@angular/core';
-import {NodeEditableEvent} from './types';
+import {NodeEditableEvent} from './editable.type';
 
 @Directive({
   selector: '[nodeEditable]'

src/menu/menu.types.ts

@@ -0,0 +1,23 @@
+export enum MouseButtons {
+  Left = 1,
+}
+
+export enum NodeMenuItemAction {
+  NewFolder,
+  NewTag,
+  Rename,
+  Remove
+}
+
+export enum NodeMenuAction {
+  Close
+}
+
+export interface NodeMenuEvent {
+  sender: HTMLElement;
+  action: NodeMenuAction;
+}
+
+export interface NodeMenuItemSelectedEvent {
+  nodeMenuItemAction: NodeMenuItemAction
+}

src/node-menu.component.ts → src/menu/node-menu.component.ts

@@ -1,7 +1,7 @@
 import {Component, EventEmitter, Output, Renderer, Inject, OnDestroy, OnInit} from '@angular/core';
 import {CORE_DIRECTIVES} from '@angular/common';
-import {MouseButtons, NodeMenuItemAction, NodeMenuItemSelectedEvent, NodeMenuAction, NodeMenuEvent} from './types';
 import {NodeMenuService} from './node-menu.service';
+import {NodeMenuItemSelectedEvent, NodeMenuItemAction, MouseButtons, NodeMenuEvent, NodeMenuAction} from './menu.types';
 
 @Component({
   selector: 'node-menu',

src/node-menu.service.ts → src/menu/node-menu.service.ts

@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {Subject} from 'rxjs/Rx';
-import {NodeMenuEvent} from './types';
+import {NodeMenuEvent} from './menu.types';
 
 @Injectable()
 export class NodeMenuService {