Skip to content

Commit adc447e

Browse files
committed
Use specific lodash imports
1 parent eaa94b2 commit adc447e

File tree

6 files changed

+36
-15
lines changed

6 files changed

+36
-15
lines changed

lib/components/tree.component.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ import { TreeDraggedElement } from '../models/tree-dragged-element.model';
88
import { TreeOptions } from '../models/tree-options.model';
99
import { TreeViewportComponent } from './tree-viewport.component';
1010

11-
import * as _ from 'lodash';
12-
13-
const { includes, pick } = _;
11+
import includes from 'lodash/includes';
12+
import pick from 'lodash/pick';
1413

1514
@Component({
1615
selector: 'Tree, tree-root',

lib/models/tree-node.model.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import { TreeOptions } from './tree-options.model';
44
import { ITreeNode } from '../defs/api';
55
import { TREE_EVENTS } from '../constants/events';
66

7-
import * as _ from 'lodash';
8-
const { first, last, some, every } = _;
7+
import first from 'lodash/first';
8+
import last from 'lodash/last';
9+
import some from 'lodash/some';
10+
import every from 'lodash/every';
911

1012
export class TreeNode implements ITreeNode {
1113
@computed get isHidden() { return this.treeModel.isHidden(this); };

lib/models/tree-options.model.ts

+9-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import { TreeModel } from './tree.model';
33
import { KEYS } from '../constants/keys';
44
import { ITreeOptions } from '../defs/api';
55

6-
import * as _ from 'lodash';
6+
import defaultsDeep from 'lodash/defaultsDeep';
7+
import get from 'lodash/get';
8+
import omit from 'lodash/omit';
9+
import isNumber from 'lodash/isNumber';
710

811
export interface IActionHandler {
912
(tree: TreeModel, node: TreeNode, $event: any, ...rest);
@@ -91,10 +94,10 @@ export class TreeOptions {
9194
actionMapping: IActionMapping;
9295

9396
constructor(private options: ITreeOptions = {}) {
94-
this.actionMapping = _.defaultsDeep({}, this.options.actionMapping, defaultActionMapping);
97+
this.actionMapping = defaultsDeep({}, this.options.actionMapping, defaultActionMapping);
9598
if (options.rtl) {
96-
this.actionMapping.keys[KEYS.RIGHT] = <IActionHandler>_.get(options, ['actionMapping', 'keys', KEYS.RIGHT]) || TREE_ACTIONS.DRILL_UP;
97-
this.actionMapping.keys[KEYS.LEFT] = <IActionHandler>_.get(options, ['actionMapping', 'keys', KEYS.LEFT]) || TREE_ACTIONS.DRILL_DOWN;
99+
this.actionMapping.keys[KEYS.RIGHT] = <IActionHandler>get(options, ['actionMapping', 'keys', KEYS.RIGHT]) || TREE_ACTIONS.DRILL_UP;
100+
this.actionMapping.keys[KEYS.LEFT] = <IActionHandler>get(options, ['actionMapping', 'keys', KEYS.LEFT]) || TREE_ACTIONS.DRILL_DOWN;
98101
}
99102
}
100103

@@ -103,7 +106,7 @@ export class TreeOptions {
103106
return this.options.getNodeClone(node);
104107
}
105108

106-
return _.omit(Object.assign({}, node.data), ['id']);
109+
return omit(Object.assign({}, node.data), ['id']);
107110
}
108111

109112
allowDrop(element, to, $event?): boolean {
@@ -143,6 +146,6 @@ export class TreeOptions {
143146
}
144147

145148
get dropSlotHeight(): number {
146-
return _.isNumber(this.options.dropSlotHeight) ? this.options.dropSlotHeight : 2;
149+
return isNumber(this.options.dropSlotHeight) ? this.options.dropSlotHeight : 2;
147150
}
148151
}

lib/models/tree.model.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ import { TreeVirtualScroll } from './tree-virtual-scroll.model';
66
import { ITreeModel, IDType, IDTypeDictionary } from '../defs/api';
77
import { TREE_EVENTS } from '../constants/events';
88

9-
import * as _ from 'lodash';
10-
11-
const { first, last, compact, find, includes, isString, isFunction } = _;
9+
import first from 'lodash/first';
10+
import last from 'lodash/last';
11+
import compact from 'lodash/compact';
12+
import find from 'lodash/find';
13+
import isString from 'lodash/isString';
14+
import isFunction from 'lodash/isFunction';
1215

1316
@Injectable()
1417
export class TreeModel implements ITreeModel {

rollup.config.js

+14-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,20 @@ export default {
1414
external: [
1515
'@angular/core',
1616
'@angular/common',
17-
'lodash',
17+
'lodash/compact',
18+
'lodash/defaultsDeep',
19+
'lodash/every',
20+
'lodash/find',
21+
'lodash/first',
22+
'lodash/get',
23+
'lodash/includes',
24+
'lodash/isFunction',
25+
'lodash/isNumber',
26+
'lodash/isString',
27+
'lodash/last',
28+
'lodash/omit',
29+
'lodash/pick',
30+
'lodash/some',
1831
'mobx',
1932
'mobx-angular'
2033
],

tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"moduleResolution": "node",
55
"target": "es5",
66
"outDir": "dist/",
7+
"allowSyntheticDefaultImports": true,
78
"emitDecoratorMetadata": true,
89
"experimentalDecorators": true,
910
"inlineSourceMap": true,

0 commit comments

Comments
 (0)