Merge pull request #21 from qjon/develop

qjon · web-flow · commit 9fffc34737a5 · 2018-06-06T08:32:47.000+02:00
v3.0.2
diff --git a/README.md b/README.md
@@ -260,6 +260,10 @@ At the end do not forget to add this effects to your app.
  
 ## Changes
 
+### v3.0.2
+* small fixes with interfaces
+* fix export CSS styles
+
 ### v3.0.1
 * change the way of injecting NodeService provider
 * save in store: tree root nodes list, tree configuration  and selected node
diff --git a/config/package.json b/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rign/angular2-tree",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "license": "MIT",
   "angular-cli": {},
   "scripts": {
diff --git a/demo/src/index.html b/demo/src/index.html
@@ -10,7 +10,7 @@
 </head>
 <body>
 <div class="container">
-  <h1>Angular2 - Tree v3.0.1</h1>
+  <h1>Angular2 - Tree v3.0.2</h1>
 
   <app-root>Loading...</app-root>
 </div>
diff --git a/e2e/app.e2e-spec.ts b/e2e/app.e2e-spec.ts
@@ -17,7 +17,7 @@ describe('e2e App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getTitle()).toEqual('Angular2 - Tree v3.0.1');
+    expect(page.getTitle()).toEqual('Angular2 - Tree v3.0.2');
   });
 
   describe('add node', () => {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rign/angular2-tree",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "license": "MIT",
   "angular-cli": {},
   "scripts": {
diff --git a/src/item/item.component.less b/src/item/item.component.less
@@ -1,5 +0,0 @@
-.drop-allowed {
-  .tree-item-name {
-    background-color: rgba(255, 0, 0, 0.3);
-  }
-}
diff --git a/src/parents-list/parents-list.component.html b/src/parents-list/parents-list.component.html
@@ -1,4 +1,4 @@
-<ul class="parents-list">
+<ul class="ri-tree-parents-list">
   <li class="fa fa-home" (click)="selectNode(null, false)"></li>
   <li *ngFor="let node of parents$ | async; last as isLast" (click)="selectNode(node, isLast)">{{node.name}}
   </li>
diff --git a/src/parents-list/parents-list.component.less b/src/parents-list/parents-list.component.less
@@ -1,4 +1,4 @@
-.parents-list {
+.ri-tree-parents-list {
   list-style-type: none;
   margin: 0;
   padding: 0;
diff --git a/src/store/ITreeState.ts b/src/store/ITreeState.ts
@@ -29,7 +29,7 @@ export interface ITreeActionPayload {
   id?: string | null;
   node?: IOuterNode;
   nodes?: IOuterNode[];
-  oldNode?: IOuterNode;
+  oldNode?: any;
   source?: IOuterNode;
   target?: IOuterNode;
   sourceOfDroppedData?: string;
diff --git a/src/styles.less b/src/styles.less
@@ -1 +1,2 @@
-@import 'tree.component.less';
+@import './tree.component.less';
+@import './parents-list/parents-list.component.less';
diff --git a/src/tree.component.less b/src/tree.component.less
@@ -32,6 +32,12 @@
   .tree-item {
     padding: 2px 0;
 
+    &.drop-allowed {
+      .tree-item-name {
+        background-color: rgba(255, 0, 0, 0.3);
+      }
+    }
+
     &.tree-item-selected {
       > .tree-item-name {
         padding: 0 1px;
diff --git a/src/tree.module.ts b/src/tree.module.ts
@@ -20,7 +20,7 @@ import {treeReducer} from './store/treeReducer';
 import {TreeModelGeneratorService} from './service/treeModelGenerator.service';
 import {TreeActionsDispatcherService} from './store/treeActionsDispatcher.service';
 import {ParentsListComponent} from './parents-list/parents-list.component';
-import {NODE_SERVICE, NodeService} from './service/node.service';
+import {INodeService, NODE_SERVICE, NodeService} from './service/node.service';
 
 @NgModule({
   imports: [
@@ -60,7 +60,7 @@ import {NODE_SERVICE, NodeService} from './service/node.service';
 })
 export class TreeModule {
 
-  public static forRoot(nodeService: Type<NodeService>): ModuleWithProviders {
+  public static forRoot(nodeService: Type<INodeService>): ModuleWithProviders {
     return {
       ngModule: TreeModule,
       providers: [
@@ -75,7 +75,7 @@ export class TreeModule {
     }
   }
 
-  public static forFeature(nodeService: Type<NodeService>): ModuleWithProviders {
+  public static forFeature(nodeService: Type<INodeService>): ModuleWithProviders {
     return {
       ngModule: TreeModule,
       providers: [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@rign/angular2-tree",`
`3`		`- "version": "3.0.0",`
	`3`	`+ "version": "3.0.2",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"angular-cli": {},`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@rign/angular2-tree",`
`3`		`- "version": "3.0.1",`
	`3`	`+ "version": "3.0.2",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"angular-cli": {},`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<ul class="parents-list">`
	`1`	`+<ul class="ri-tree-parents-list">`
`2`	`2`	`<li class="fa fa-home" (click)="selectNode(null, false)"></li>`
`3`	`3`	`<li *ngFor="let node of parents$ \| async; last as isLast" (click)="selectNode(node, isLast)">{{node.name}}`
`4`	`4`	`</li>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.parents-list {`
	`1`	`+.ri-tree-parents-list {`
`2`	`2`	`list-style-type: none;`
`3`	`3`	`margin: 0;`
`4`	`4`	`padding: 0;`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-@import 'tree.component.less';`
	`1`	`+@import './tree.component.less';`
	`2`	`+@import './parents-list/parents-list.component.less';`