export module from common.ts

plantain-00 · Jul 3, 2017 · d9c4924 · d9c4924
1 parent d622ae7
commit d9c4924
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 67 deletions.
diff --git a/demo/angular/index.bundle-bbae7082c8a0c2e376d95445c04981e1.js b/demo/angular/index.bundle-bbae7082c8a0c2e376d95445c04981e1.js
diff --git a/demo/angular/index.bundle-e45881e54de943e0870c8c2727e48461.js b/demo/angular/index.bundle-e45881e54de943e0870c8c2727e48461.js
diff --git a/demo/angular/index.html b/demo/angular/index.html
@@ -12,5 +12,5 @@
 </style>
 </head><body>
 <app></app>
-<script src="./index.bundle-e45881e54de943e0870c8c2727e48461.js" crossOrigin="anonymous" integrity="sha256-QJr+0UmHeqMnbHEcHAWtstrA9vC1zO8mTApNb5j5b70="></script>
+<script src="./index.bundle-bbae7082c8a0c2e376d95445c04981e1.js" crossOrigin="anonymous" integrity="sha256-Nh5fLYUM/jhi2EV64evEuPk7GZHwpiQ/XZXMK/rX7yo="></script>
 </body></html>
diff --git a/demo/angular/index.ts b/demo/angular/index.ts
@@ -10,7 +10,6 @@ enableProdMode();
 import { Component } from "@angular/core";
 
 import { data, clearSelectionOfTree, toggle, setSelectionOfTree, setParentsSelection, move, canMove } from "../common";
-import * as common from "../../dist/common";
 
 @Component({
     selector: "app",
@@ -73,10 +72,10 @@ export class MainComponent {
     data6 = JSON.parse(JSON.stringify(data));
     data7 = JSON.parse(JSON.stringify(data));
     dropAllowed = canMove;
-    ontoggle(eventData: common.EventData) {
+    ontoggle(eventData: EventData) {
         toggle(eventData);
     }
-    onchange(eventData: common.EventData) {
+    onchange(eventData: EventData) {
         this.selectedId = eventData.data.state.selected ? null : eventData.data.value.id;
         if (!eventData.data.state.selected) {
             for (const child of this.data) {
@@ -85,44 +84,44 @@ export class MainComponent {
         }
         eventData.data.state.selected = !eventData.data.state.selected;
     }
-    ontoggle2(eventData: common.EventData) {
+    ontoggle2(eventData: EventData) {
         toggle(eventData);
     }
-    onchange2(eventData: common.EventData) {
+    onchange2(eventData: EventData) {
         setSelectionOfTree(eventData.data, !eventData.data.state.selected);
         setParentsSelection(this.data2, eventData.path);
     }
-    ontoggle3(eventData: common.EventData) {
+    ontoggle3(eventData: EventData) {
         toggle(eventData);
     }
-    drop3(dropData: common.DropData) {
+    drop3(dropData: DropData) {
         move(dropData, this.data3);
     }
-    ontoggle4(eventData: common.EventData) {
+    ontoggle4(eventData: EventData) {
         toggle(eventData);
     }
-    ontoggle5(eventData: common.EventData) {
+    ontoggle5(eventData: EventData) {
         toggle(eventData);
     }
-    ontoggle6(eventData: common.EventData) {
+    ontoggle6(eventData: EventData) {
         toggle(eventData);
     }
-    ontoggle7(eventData: common.EventData) {
+    ontoggle7(eventData: EventData) {
         toggle(eventData);
     }
-    onchange7(eventData: common.EventData) {
+    onchange7(eventData: EventData) {
         setSelectionOfTree(eventData.data, !eventData.data.state.selected);
         setParentsSelection(this.data7, eventData.path);
     }
-    drop7(dropData: common.DropData) {
+    drop7(dropData: DropData) {
         move(dropData, this.data7);
     }
 }
 
 import { NgModule } from "@angular/core";
 import { BrowserModule } from "@angular/platform-browser";
 import { FormsModule } from "@angular/forms";
-import { NodeComponent, TreeComponent } from "../../dist/angular";
+import { NodeComponent, TreeComponent, EventData, DropData } from "../../dist/angular";
 
 @NgModule({
     imports: [BrowserModule, FormsModule],

diff --git a/demo/react/index.bundle-6f4d205ee054e0d0d8c723e43937f21e.js b/demo/react/index.bundle-6f4d205ee054e0d0d8c723e43937f21e.js
diff --git a/demo/react/index.bundle-95aa3b884a520a57352e0eb711e82719.js b/demo/react/index.bundle-95aa3b884a520a57352e0eb711e82719.js
diff --git a/demo/react/index.html b/demo/react/index.html
@@ -12,5 +12,5 @@
 </style>
 </head><body>
 <div id="container"></div>
-<script src="./index.bundle-6f4d205ee054e0d0d8c723e43937f21e.js" crossOrigin="anonymous" integrity="sha256-9iR6mDNYhPvWW8fzkn7S+qz34mb4fXYJAb80JL02whk="></script>
+<script src="./index.bundle-95aa3b884a520a57352e0eb711e82719.js" crossOrigin="anonymous" integrity="sha256-CxvSPhfh8xck8DCJfAw5I75n4X/9QPzT+awNzgMMnVk="></script>
 </body></html>
diff --git a/demo/react/index.tsx b/demo/react/index.tsx
@@ -1,11 +1,10 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import { Tree } from "../../dist/react";
+import { Tree, ContextMenuData, getNodeFromPath, EventData, DropData, TreeData } from "../../dist/react";
 import { data, clearSelectionOfTree, toggle, setSelectionOfTree, setParentsSelection, move, canMove, setContextMenu } from "../common";
-import * as common from "../../dist/common";
 
-const DeleteButton: React.StatelessComponent<{ data: common.ContextMenuData }> = props => <button onClick={e => {
-    const parent = common.getNodeFromPath(props.data.root, props.data.path.slice(0, props.data.path.length - 1));
+const DeleteButton: React.StatelessComponent<{ data: ContextMenuData }> = props => <button onClick={e => {
+    const parent = getNodeFromPath(props.data.root, props.data.path.slice(0, props.data.path.length - 1));
     const children = parent && parent.children ? parent.children : props.data.root;
     const index = props.data.path[props.data.path.length - 1];
     children.splice(index, 1);
@@ -17,7 +16,7 @@ for (const tree of data8) {
     setContextMenu(tree, DeleteButton);
 }
 
-class Main extends React.Component<{}, { data: common.TreeData[], selectedId: number | null, data2: common.TreeData[] }> {
+class Main extends React.Component<{}, { data: TreeData[], selectedId: number | null, data2: TreeData[] }> {
     data = data;
     selectedId: number | null = null;
     data2 = JSON.parse(JSON.stringify(data));
@@ -36,68 +35,68 @@ class Main extends React.Component<{}, { data: common.TreeData[], selectedId: nu
                 <br />
                 default:
                 <Tree data={this.data}
-                    toggle={(eventData: common.EventData) => this.toggle(eventData)}
-                    change={(eventData: common.EventData) => this.change(eventData)}>
+                    toggle={(eventData: EventData) => this.toggle(eventData)}
+                    change={(eventData: EventData) => this.change(eventData)}>
                 </Tree>
                 selected id: {this.selectedId}
                 <hr />
                 checkbox:
                 <Tree data={this.data2}
                     checkbox={true}
-                    toggle={(eventData: common.EventData) => this.toggle2(eventData)}
-                    change={(eventData: common.EventData) => this.change2(eventData)}>
+                    toggle={(eventData: EventData) => this.toggle2(eventData)}
+                    change={(eventData: EventData) => this.change2(eventData)}>
                 </Tree>
                 <hr />
                 draggable:
                 <Tree data={this.data3}
                     draggable={true}
                     dropAllowed={this.dropAllowed}
-                    toggle={(eventData: common.EventData) => this.toggle3(eventData)}
-                    drop={(dropData: common.DropData) => this.drop3(dropData)}>
+                    toggle={(eventData: EventData) => this.toggle3(eventData)}
+                    drop={(dropData: DropData) => this.drop3(dropData)}>
                 </Tree>
                 <hr />
                 no dots:
                 <Tree data={this.data4}
                     nodots={true}
-                    toggle={(eventData: common.EventData) => this.toggle4(eventData)}>
+                    toggle={(eventData: EventData) => this.toggle4(eventData)}>
                 </Tree>
                 <hr />
                 large:
                 <Tree data={this.data5}
                     size="large"
-                    toggle={(eventData: common.EventData) => this.toggle5(eventData)}>
+                    toggle={(eventData: EventData) => this.toggle5(eventData)}>
                 </Tree>
                 <hr />
                 small:
                 <Tree data={this.data6}
                     size="small"
-                    toggle={(eventData: common.EventData) => this.toggle6(eventData)}>
+                    toggle={(eventData: EventData) => this.toggle6(eventData)}>
                 </Tree>
                 <hr />
                 dark theme:
                 <Tree data={this.data7}
                     theme="dark"
                     checkbox={true}
                     draggable={true}
-                    toggle={(eventData: common.EventData) => this.toggle7(eventData)}
-                    change={(eventData: common.EventData) => this.change7(eventData)}
-                    drop={(dropData: common.DropData) => this.drop7(dropData)}>
+                    toggle={(eventData: EventData) => this.toggle7(eventData)}
+                    change={(eventData: EventData) => this.change7(eventData)}
+                    drop={(dropData: DropData) => this.drop7(dropData)}>
                 </Tree>
                 <hr />
                 contextmenu:
                 <Tree data={this.data8}
-                    toggle={(eventData: common.EventData) => this.toggle8(eventData)}>
+                    toggle={(eventData: EventData) => this.toggle8(eventData)}>
                 </Tree>
             </div>
         );
     }
 
-    toggle(eventData: common.EventData) {
+    toggle(eventData: EventData) {
         toggle(eventData, () => {
             this.setState({ data: this.data });
         });
     }
-    change(eventData: common.EventData) {
+    change(eventData: EventData) {
         this.selectedId = eventData.data.state!.selected ? null : eventData.data.value.id;
         this.setState({ selectedId: this.selectedId });
         if (!eventData.data.state.selected) {
@@ -108,53 +107,53 @@ class Main extends React.Component<{}, { data: common.TreeData[], selectedId: nu
         eventData.data.state.selected = !eventData.data.state.selected;
         this.setState({ data: this.data });
     }
-    toggle2(eventData: common.EventData) {
+    toggle2(eventData: EventData) {
         toggle(eventData, () => {
             this.setState({ data: this.data2 });
         });
     }
-    change2(eventData: common.EventData) {
+    change2(eventData: EventData) {
         setSelectionOfTree(eventData.data, !eventData.data.state.selected);
         setParentsSelection(this.data2, eventData.path);
         this.setState({ data: this.data2 });
     }
-    toggle3(eventData: common.EventData) {
+    toggle3(eventData: EventData) {
         toggle(eventData, () => {
             this.setState({ data: this.data3 });
         });
     }
-    drop3(dropData: common.DropData) {
+    drop3(dropData: DropData) {
         move(dropData, this.data3);
     }
-    toggle4(eventData: common.EventData) {
+    toggle4(eventData: EventData) {
         toggle(eventData, () => {
             this.setState({ data: this.data4 });
         });
     }
-    toggle5(eventData: common.EventData) {
+    toggle5(eventData: EventData) {
         toggle(eventData, () => {
             this.setState({ data: this.data5 });
         });
     }
-    toggle6(eventData: common.EventData) {
+    toggle6(eventData: EventData) {
         toggle(eventData, () => {
             this.setState({ data: this.data6 });
         });
     }
-    toggle7(eventData: common.EventData) {
+    toggle7(eventData: EventData) {
         toggle(eventData, () => {
             this.setState({ data: this.data7 });
         });
     }
-    change7(eventData: common.EventData) {
+    change7(eventData: EventData) {
         setSelectionOfTree(eventData.data, !eventData.data.state.selected);
         setParentsSelection(this.data7, eventData.path);
         this.setState({ data: this.data7 });
     }
-    drop7(dropData: common.DropData) {
+    drop7(dropData: DropData) {
         move(dropData, this.data7);
     }
-    toggle8(eventData: common.EventData) {
+    toggle8(eventData: EventData) {
         toggle(eventData);
     }
 }

diff --git a/...undle-8f562fa229e572ee1a679029b788f085.js → ...undle-a08e486c78610fe2ca70e370c54f790a.js b/...undle-8f562fa229e572ee1a679029b788f085.js → ...undle-a08e486c78610fe2ca70e370c54f790a.js
diff --git a/demo/vue/index.html b/demo/vue/index.html
@@ -12,5 +12,5 @@
 </style>
 </head><body>
 <div id="container"></div>
-<script src="./index.bundle-8f562fa229e572ee1a679029b788f085.js" crossOrigin="anonymous" integrity="sha256-8UbEfGl5HlaCn8Wsse2kkZhZlt0czTVR7BbiTlDJJGw="></script>
+<script src="./index.bundle-a08e486c78610fe2ca70e370c54f790a.js" crossOrigin="anonymous" integrity="sha256-yp+9j4esyrnPjeQL7dx8QMqVPmD4+T9gv9sY0jCsSS0="></script>
 </body></html>
diff --git a/demo/vue/index.ts b/demo/vue/index.ts
@@ -2,16 +2,16 @@ import Vue from "vue";
 import Component from "vue-class-component";
 import "../../dist/vue";
 import { data, clearSelectionOfTree, toggle, setSelectionOfTree, setParentsSelection, move, canMove, setContextMenu } from "../common";
-import * as common from "../../dist/common";
+import { ContextMenuData, getNodeFromPath, EventData, DropData } from "../../dist/vue";
 
 @Component({
     template: `<button @click="click()">delete</button>`,
     props: ["data"],
 })
 class DeleteButton extends Vue {
-    data: common.ContextMenuData;
+    data: ContextMenuData;
     click() {
-        const parent = common.getNodeFromPath(this.data.root, this.data.path.slice(0, this.data.path.length - 1));
+        const parent = getNodeFromPath(this.data.root, this.data.path.slice(0, this.data.path.length - 1));
         const children = parent && parent.children ? parent.children : this.data.root;
         const index = this.data.path[this.data.path.length - 1];
         children.splice(index, 1);
@@ -90,10 +90,10 @@ class App extends Vue {
     data8 = data8;
     dropAllowed = canMove;
 
-    toggle(eventData: common.EventData) {
+    toggle(eventData: EventData) {
         toggle(eventData);
     }
-    change(eventData: common.EventData) {
+    change(eventData: EventData) {
         this.selectedId = eventData.data.state.selected ? null : eventData.data.value.id;
         if (!eventData.data.state.selected) {
             for (const child of this.data) {
@@ -102,39 +102,39 @@ class App extends Vue {
         }
         eventData.data.state.selected = !eventData.data.state.selected;
     }
-    toggle2(eventData: common.EventData) {
+    toggle2(eventData: EventData) {
         toggle(eventData);
     }
-    change2(eventData: common.EventData) {
+    change2(eventData: EventData) {
         setSelectionOfTree(eventData.data, !eventData.data.state.selected);
         setParentsSelection(this.data2, eventData.path);
     }
-    toggle3(eventData: common.EventData) {
+    toggle3(eventData: EventData) {
         toggle(eventData);
     }
-    drop3(dropData: common.DropData) {
+    drop3(dropData: DropData) {
         move(dropData, this.data3);
     }
-    toggle4(eventData: common.EventData) {
+    toggle4(eventData: EventData) {
         toggle(eventData);
     }
-    toggle5(eventData: common.EventData) {
+    toggle5(eventData: EventData) {
         toggle(eventData);
     }
-    toggle6(eventData: common.EventData) {
+    toggle6(eventData: EventData) {
         toggle(eventData);
     }
-    toggle7(eventData: common.EventData) {
+    toggle7(eventData: EventData) {
         toggle(eventData);
     }
-    change7(eventData: common.EventData) {
+    change7(eventData: EventData) {
         setSelectionOfTree(eventData.data, !eventData.data.state.selected);
         setParentsSelection(this.data7, eventData.path);
     }
-    drop7(dropData: common.DropData) {
+    drop7(dropData: DropData) {
         move(dropData, this.data7);
     }
-    toggle8(eventData: common.EventData) {
+    toggle8(eventData: EventData) {
         toggle(eventData);
     }
 }

diff --git a/src/angular.ts b/src/angular.ts
@@ -1,5 +1,6 @@
 import { Component, Input, Output, EventEmitter } from "@angular/core";
 import * as common from "./common";
+export * from "./common";
 import { angularNodeTemplateHtml, angularTreeTemplateHtml } from "./angular-variables";
 
 @Component({

diff --git a/src/react.tsx b/src/react.tsx
@@ -1,5 +1,6 @@
 import * as React from "react";
 import * as common from "./common";
+export * from "./common";
 
 class Node extends React.PureComponent<{
     data: common.TreeData;

diff --git a/src/vue.ts b/src/vue.ts
@@ -1,6 +1,7 @@
 import Vue from "vue";
 import Component from "vue-class-component";
 import * as common from "./common";
+export * from "./common";
 import { vueNodeTemplateHtml, vueTreeTemplateHtml } from "./vue-variables";
 
 @Component({