@syncfusion/ej2-treegrid 25.2.6 → 26.1.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (102) hide show
  1. package/.eslintrc.json +3 -2
  2. package/dist/ej2-treegrid.min.js +2 -2
  3. package/dist/ej2-treegrid.umd.min.js +2 -2
  4. package/dist/ej2-treegrid.umd.min.js.map +1 -1
  5. package/dist/es6/ej2-treegrid.es2015.js +621 -462
  6. package/dist/es6/ej2-treegrid.es2015.js.map +1 -1
  7. package/dist/es6/ej2-treegrid.es5.js +922 -762
  8. package/dist/es6/ej2-treegrid.es5.js.map +1 -1
  9. package/dist/global/ej2-treegrid.min.js +2 -2
  10. package/dist/global/ej2-treegrid.min.js.map +1 -1
  11. package/dist/global/index.d.ts +1 -1
  12. package/package.json +10 -10
  13. package/src/treegrid/actions/edit.js +8 -7
  14. package/src/treegrid/actions/excel-export.js +4 -3
  15. package/src/treegrid/actions/page.js +4 -0
  16. package/src/treegrid/actions/rowdragdrop.js +13 -11
  17. package/src/treegrid/actions/selection.js +4 -1
  18. package/src/treegrid/base/constant.d.ts +2 -0
  19. package/src/treegrid/base/constant.js +2 -0
  20. package/src/treegrid/base/data.js +2 -1
  21. package/src/treegrid/base/interface.js +0 -1
  22. package/src/treegrid/base/treegrid-model.d.ts +1 -1
  23. package/src/treegrid/base/treegrid.d.ts +3 -0
  24. package/src/treegrid/base/treegrid.js +230 -62
  25. package/src/treegrid/renderer/virtual-row-model-generator.js +2 -2
  26. package/src/treegrid/renderer/virtual-tree-content-render.js +2 -1
  27. package/styles/bootstrap-dark.css +76 -48
  28. package/styles/bootstrap-dark.scss +18 -1
  29. package/styles/bootstrap.css +76 -49
  30. package/styles/bootstrap.scss +18 -1
  31. package/styles/bootstrap4.css +77 -48
  32. package/styles/bootstrap4.scss +18 -1
  33. package/styles/bootstrap5-dark.css +77 -49
  34. package/styles/bootstrap5-dark.scss +18 -1
  35. package/styles/bootstrap5.css +77 -49
  36. package/styles/bootstrap5.scss +18 -1
  37. package/styles/fabric-dark.css +74 -47
  38. package/styles/fabric-dark.scss +18 -1
  39. package/styles/fabric.css +74 -47
  40. package/styles/fabric.scss +18 -1
  41. package/styles/fluent-dark.css +77 -49
  42. package/styles/fluent-dark.scss +18 -1
  43. package/styles/fluent.css +77 -49
  44. package/styles/fluent.scss +18 -1
  45. package/styles/fluent2.css +1721 -0
  46. package/styles/fluent2.scss +18 -0
  47. package/styles/highcontrast-light.css +74 -47
  48. package/styles/highcontrast-light.scss +18 -1
  49. package/styles/highcontrast.css +74 -47
  50. package/styles/highcontrast.scss +18 -1
  51. package/styles/material-dark.css +111 -54
  52. package/styles/material-dark.scss +18 -1
  53. package/styles/material.css +125 -57
  54. package/styles/material.scss +18 -1
  55. package/styles/material3-dark.css +111 -56
  56. package/styles/material3-dark.scss +18 -1
  57. package/styles/material3.css +111 -56
  58. package/styles/material3.scss +18 -1
  59. package/styles/tailwind-dark.css +87 -51
  60. package/styles/tailwind-dark.scss +18 -1
  61. package/styles/tailwind.css +87 -51
  62. package/styles/tailwind.scss +18 -1
  63. package/styles/treegrid/_bds-definition.scss +0 -4
  64. package/styles/treegrid/_bootstrap-dark-definition.scss +0 -1
  65. package/styles/treegrid/_bootstrap-definition.scss +0 -1
  66. package/styles/treegrid/_bootstrap4-definition.scss +0 -1
  67. package/styles/treegrid/_bootstrap5-definition.scss +0 -4
  68. package/styles/treegrid/_bootstrap5.3-definition.scss +24 -0
  69. package/styles/treegrid/_fabric-dark-definition.scss +0 -1
  70. package/styles/treegrid/_fabric-definition.scss +0 -1
  71. package/styles/treegrid/_fluent-definition.scss +0 -4
  72. package/styles/treegrid/_fluent2-definition.scss +24 -0
  73. package/styles/treegrid/_fusionnew-definition.scss +0 -4
  74. package/styles/treegrid/_highcontrast-definition.scss +0 -1
  75. package/styles/treegrid/_highcontrast-light-definition.scss +0 -1
  76. package/styles/treegrid/_layout.scss +81 -85
  77. package/styles/treegrid/_material-dark-definition.scss +0 -1
  78. package/styles/treegrid/_material-definition.scss +0 -1
  79. package/styles/treegrid/_material3-definition.scss +0 -4
  80. package/styles/treegrid/_tailwind-definition.scss +0 -4
  81. package/styles/treegrid/bootstrap-dark.css +76 -48
  82. package/styles/treegrid/bootstrap.css +76 -49
  83. package/styles/treegrid/bootstrap4.css +77 -48
  84. package/styles/treegrid/bootstrap5-dark.css +77 -49
  85. package/styles/treegrid/bootstrap5.css +77 -49
  86. package/styles/treegrid/fabric-dark.css +74 -47
  87. package/styles/treegrid/fabric.css +74 -47
  88. package/styles/treegrid/fluent-dark.css +77 -49
  89. package/styles/treegrid/fluent.css +77 -49
  90. package/styles/treegrid/fluent2.css +1721 -0
  91. package/styles/treegrid/fluent2.scss +18 -0
  92. package/styles/treegrid/highcontrast-light.css +74 -47
  93. package/styles/treegrid/highcontrast.css +74 -47
  94. package/styles/treegrid/icons/_bootstrap5.3.scss +37 -0
  95. package/styles/treegrid/icons/_fluent2.scss +37 -0
  96. package/styles/treegrid/material-dark.css +111 -54
  97. package/styles/treegrid/material.css +125 -57
  98. package/styles/treegrid/material3-dark.css +111 -56
  99. package/styles/treegrid/material3.css +111 -56
  100. package/styles/treegrid/tailwind-dark.css +87 -51
  101. package/styles/treegrid/tailwind.css +87 -51
  102. package/CHANGELOG.md +0 -264
@@ -1 +1,18 @@
1
- @import 'treegrid/tailwind.scss';
1
+ @import 'ej2-base/styles/definition/tailwind.scss';
2
+ @import 'ej2-inputs/styles/input/tailwind-definition.scss';
3
+ @import 'ej2-inputs/styles/numerictextbox/tailwind-definition.scss';
4
+ @import 'ej2-buttons/styles/button/tailwind-definition.scss';
5
+ @import 'ej2-buttons/styles/radio-button/tailwind-definition.scss';
6
+ @import 'ej2-buttons/styles/check-box/tailwind-definition.scss';
7
+ @import 'ej2-dropdowns/styles/auto-complete/tailwind-definition.scss';
8
+ @import 'ej2-dropdowns/styles/drop-down-list/tailwind-definition.scss';
9
+ @import 'ej2-popups/styles/dialog/tailwind-definition.scss';
10
+ @import 'ej2-popups/styles/spinner/tailwind-definition.scss';
11
+ @import 'ej2-popups/styles/tooltip/tailwind-definition.scss';
12
+ @import 'ej2-calendars/styles/datepicker/tailwind-definition.scss';
13
+ @import 'ej2-calendars/styles/datetimepicker/tailwind-definition.scss';
14
+ @import 'ej2-navigations/styles/toolbar/tailwind-definition.scss';
15
+ @import 'ej2-navigations/styles/context-menu/tailwind-definition.scss';
16
+ @import 'treegrid/tailwind-definition.scss';
17
+ @import 'treegrid/icons/tailwind.scss';
18
+ @import 'treegrid/all.scss';
@@ -1,11 +1,7 @@
1
- // color
2
1
  $treegrid-right-arrow-icon-color: $icon-color !default;
3
2
  $treegrid-right-arrow-hover-color: $icon-color-hover !default;
4
3
  $childborder-color: $primary !default;
5
4
  $error-elem-color: $danger !default;
6
-
7
- // Layout
8
-
9
5
  $error-elem-content: '\e77e' !default;
10
6
  $treegrid-right-arrow-icon-font-size: $text-lg !default;
11
7
  $treegrid-right-arrow-icon-padding: 0 !default;
@@ -1,4 +1,3 @@
1
- //default
2
1
  $treegrid-right-arrow-icon: '\e22f' !default;
3
2
  $treegrid-toolbar-expand-icon: '\e558' !default;
4
3
  $treegrid-toolbar-collapse-icon: '\e557' !default;
@@ -1,4 +1,3 @@
1
- //default
2
1
  $treegrid-right-arrow-icon: '\e22f' !default;
3
2
  $treegrid-toolbar-expand-icon: '\e558' !default;
4
3
  $treegrid-toolbar-collapse-icon: '\e557' !default;
@@ -1,4 +1,3 @@
1
- //default
2
1
  $treegrid-right-arrow-icon: '\e70b' !default;
3
2
  $treegrid-toolbar-expand-icon: '\e7db' !default;
4
3
  $treegrid-toolbar-collapse-icon: '\e7dc' !default;
@@ -1,11 +1,7 @@
1
- // color
2
1
  $treegrid-right-arrow-icon-color: $icon-color !default;
3
2
  $treegrid-right-arrow-hover-color: $icon-color-hover !default;
4
3
  $childborder-color: $primary !default;
5
4
  $error-elem-color: $danger !default;
6
-
7
- // Layout
8
-
9
5
  $error-elem-content: '\e839' !default;
10
6
  $treegrid-right-arrow-icon-font-size: $text-lg !default;
11
7
  $treegrid-right-arrow-icon-padding: 0 !default;
@@ -0,0 +1,24 @@
1
+ $treegrid-right-arrow-icon-color: $icon-color !default;
2
+ $treegrid-right-arrow-hover-color: $icon-color-hover !default;
3
+ $childborder-color: $primary !default;
4
+ $error-elem-color: $danger !default;
5
+ $error-elem-content: '\e839' !default;
6
+ $treegrid-right-arrow-icon-font-size: $text-lg !default;
7
+ $treegrid-right-arrow-icon-padding: 0 !default;
8
+ $treegrid-right-arrow-icon-vertical-align: unset;
9
+ $treegrid-right-arrow-icon-height: 18px !default;
10
+ $treegrid-right-arrow-icon-width: 16px !default;
11
+ $treegrid-bigger-icon-size: 22px !default;
12
+ $treegrid-smaller-icon-size: 16px !default;
13
+ $treegrid-bigger-icon-font-size: $font-icon-22 !default;
14
+ $treegrid-frame-bigger-icon-height: 18px !default;
15
+ $treegrid-frame-bigger-icon-width: 18px !default;
16
+ $treegrid-frame-icon-height: 16px !default;
17
+ $treegrid-frame-icon-width: 16px !default;
18
+ $treegrid-content-right-padding: 21px !default;
19
+ $treegrid-rowdrag-childborder-border: 2px solid #4f46e5;
20
+ $treegrid-rowdd-topbottom-border: 2px solid #4f46e5 !default;
21
+ $treegrid-rowdd-boxshadow: $primary !default;
22
+ $treegrid-rowdd-childborder-width: 2px 0 0 !default;
23
+ $treegrid-lastrowdd-childborder-width: 2px 0 !default;
24
+ $treegrid-rtl-rowdd-childborder-width: 2px 0 2px 0 !default;
@@ -1,4 +1,3 @@
1
- //default
2
1
  $treegrid-right-arrow-icon: '\e22e' !default;
3
2
  $treegrid-toolbar-expand-icon: '\e555' !default;
4
3
  $treegrid-toolbar-collapse-icon: '\e559' !default;
@@ -1,4 +1,3 @@
1
- //default
2
1
  $treegrid-right-arrow-icon: '\e22e' !default;
3
2
  $treegrid-toolbar-expand-icon: '\e555' !default;
4
3
  $treegrid-toolbar-collapse-icon: '\e559' !default;
@@ -1,11 +1,7 @@
1
- // color
2
1
  $treegrid-right-arrow-icon-color: $icon-color !default;
3
2
  $treegrid-right-arrow-hover-color: $icon-color-hover !default;
4
3
  $childborder-color: $primary !default;
5
4
  $error-elem-color: $danger !default;
6
-
7
- // Layout
8
-
9
5
  $error-elem-content: '\e839' !default;
10
6
  $treegrid-right-arrow-icon-font-size: $text-lg !default;
11
7
  $treegrid-right-arrow-icon-padding: 0 !default;
@@ -0,0 +1,24 @@
1
+ $treegrid-right-arrow-icon-color: $icon-color !default;
2
+ $treegrid-right-arrow-hover-color: $icon-color-hover !default;
3
+ $childborder-color: $primary !default;
4
+ $error-elem-color: $danger !default;
5
+ $error-elem-content: '\e839' !default;
6
+ $treegrid-right-arrow-icon-font-size: 16px !default;
7
+ $treegrid-right-arrow-icon-padding: 0 !default;
8
+ $treegrid-right-arrow-icon-vertical-align: unset;
9
+ $treegrid-right-arrow-icon-height: 16px !default;
10
+ $treegrid-right-arrow-icon-width: 16px !default;
11
+ $treegrid-bigger-icon-size: 20px !default;
12
+ $treegrid-smaller-icon-size: 16px !default;
13
+ $treegrid-bigger-icon-font-size: 20px !default;
14
+ $treegrid-frame-bigger-icon-height: 18px !default;
15
+ $treegrid-frame-bigger-icon-width: 18px !default;
16
+ $treegrid-frame-icon-height: 16px !default;
17
+ $treegrid-frame-icon-width: 16px !default;
18
+ $treegrid-content-right-padding: 21px !default;
19
+ $treegrid-rowdrag-childborder-border: 2px dashed $primary !default;
20
+ $treegrid-rowdd-topbottom-border: 2px solid $primary !default;
21
+ $treegrid-rowdd-boxshadow: $primary !default;
22
+ $treegrid-rowdd-childborder-width: 2px 0 0 !default;
23
+ $treegrid-lastrowdd-childborder-width: 2px 0 !default;
24
+ $treegrid-rtl-rowdd-childborder-width: 2px 0 2px 0 !default;
@@ -1,11 +1,7 @@
1
- // color
2
1
  $treegrid-right-arrow-icon-color: $icon-color !default;
3
2
  $treegrid-right-arrow-hover-color: $icon-color-hover !default;
4
3
  $childborder-color: $primary !default;
5
4
  $error-elem-color: $danger !default;
6
-
7
- // Layout
8
-
9
5
  $error-elem-content: '\e839' !default;
10
6
  $treegrid-right-arrow-icon-font-size: 18px !default;
11
7
  $treegrid-right-arrow-icon-padding: 0 !default;
@@ -1,4 +1,3 @@
1
- //default
2
1
  $treegrid-right-arrow-icon: '\e22e' !default;
3
2
  $treegrid-toolbar-expand-icon: '\e555' !default;
4
3
  $treegrid-toolbar-collapse-icon: '\e559' !default;
@@ -1,4 +1,3 @@
1
- //default
2
1
  $treegrid-right-arrow-icon: '\e22e' !default;
3
2
  $treegrid-toolbar-expand-icon: '\e555' !default;
4
3
  $treegrid-toolbar-collapse-icon: '\e559' !default;
@@ -1,3 +1,34 @@
1
+ @mixin rowcell-container {
2
+ overflow: hidden;
3
+ text-overflow: ellipsis;
4
+ }
5
+ @mixin grid-wrap {
6
+ display: inline-block;
7
+ white-space: normal;
8
+ word-wrap: break-word;
9
+ }
10
+ @mixin display-align {
11
+ display: inline-block;
12
+ vertical-align: middle;
13
+ }
14
+ @mixin drop-bottom-child {
15
+ box-shadow: 0 1px 0 0 $childborder-color;
16
+ position: relative;
17
+ z-index: 1;
18
+ }
19
+ @mixin childborder {
20
+ border-bottom: $treegrid-rowdrag-childborder-border;
21
+ border-top: $treegrid-rowdrag-childborder-border;
22
+ box-shadow: 0 0 0 0 $treegrid-rowdd-boxshadow;
23
+ }
24
+ @mixin dropbottom {
25
+ border-bottom: $treegrid-rowdd-topbottom-border;
26
+ box-shadow: 0 0 0 0 $treegrid-rowdd-boxshadow;
27
+ }
28
+ @mixin droptop {
29
+ border-top: $treegrid-rowdd-topbottom-border;
30
+ box-shadow: 0 0 0 0 $treegrid-rowdd-boxshadow;
31
+ }
1
32
  @include export-module('tree-layout') {
2
33
  .e-bigger {
3
34
  .e-treegrid {
@@ -12,11 +43,6 @@
12
43
  padding-left: 2px;
13
44
  }
14
45
 
15
- .e-hierarchycheckbox .e-frame {
16
- height: $treegrid-frame-bigger-icon-height;
17
- width: $treegrid-frame-bigger-icon-width;
18
- }
19
-
20
46
  .e-hierarchycheckbox .e-frame {
21
47
  @if $skin-name == 'bootstrap' or $skin-name == 'boostrap-dark' or $skin-name == 'fabric-dark' or $skin-name == 'fabric' or $skin-name == 'highcontrast' or $skin-name == 'FluentUI' or $theme-name == 'fluentui-dark' {
22
48
  font-size: 12px;
@@ -37,22 +63,30 @@
37
63
  font-weight: bold;
38
64
  }
39
65
  }
66
+
67
+ .e-gridcontent .e-rowcell{
68
+ @if $skin-name == 'fluent2' or $skin-name == 'fluent2-dark'{
69
+ line-height: 19px;
70
+ }
71
+ }
40
72
  }
41
73
  }
42
74
 
43
75
  .e-treegrid {
44
-
45
76
  .e-icons.e-none::before {
46
77
  content: '';
47
78
  }
48
79
 
49
80
  .e-gridheader {
50
-
51
81
  .e-headercell .e-css.e-hierarchycheckbox {
52
82
  height: 20px;
53
83
  @if $skin-name == 'FluentUI' or $theme-name == 'fluentui-dark' {
54
84
  padding-top: 0;
55
85
  }
86
+ @if $skin-name == 'fluent2' or $skin-name == 'fluent2-dark'{
87
+ position: relative;
88
+ bottom: 8px;
89
+ }
56
90
  vertical-align: middle;
57
91
  }
58
92
  }
@@ -66,13 +100,11 @@
66
100
  .e-rowcell:not(.e-gridclip) {
67
101
  .e-treecolumn-container {
68
102
  display: block;
69
- overflow: hidden;
70
- text-overflow: ellipsis;
103
+ @include rowcell-container;
71
104
 
72
105
  span.e-treecell {
73
106
  display: inline;
74
- overflow: hidden;
75
- text-overflow: ellipsis;
107
+ @include rowcell-container;
76
108
  }
77
109
  }
78
110
  }
@@ -115,8 +147,7 @@
115
147
 
116
148
  .e-treecheckbox-container {
117
149
  display: block;
118
- overflow: hidden;
119
- text-overflow: ellipsis;
150
+ @include rowcell-container;
120
151
 
121
152
  :not(.e-treecheckbox) {
122
153
  white-space: nowrap;
@@ -124,22 +155,22 @@
124
155
  }
125
156
 
126
157
  .e-treecheckbox {
127
- overflow: hidden;
128
- text-overflow: ellipsis;
158
+ @include rowcell-container;
129
159
  vertical-align: middle;
130
160
  }
131
161
 
132
162
  .e-treecolumn-container {
133
163
  span {
134
- display: inline-block;
135
- vertical-align: middle;
164
+ @include display-align;
136
165
  }
137
166
  }
167
+
138
168
  .e-cloneproperties .e-treecolumn-container {
139
169
  span {
140
170
  vertical-align: text-top;
141
171
  }
142
172
  }
173
+
143
174
  .e-hierarchycheckbox .e-frame {
144
175
  @if $skin-name == 'bootstrap' or $skin-name == 'boostrap-dark' or $skin-name == 'fabric-dark' or $skin-name == 'fabric' or $skin-name == 'highcontrast' or $skin-name == 'FluentUI' or $theme-name == 'fluentui-dark' {
145
176
  font-size: 10px;
@@ -177,7 +208,7 @@
177
208
 
178
209
  .e-treecell {
179
210
  display: table-cell;
180
- @if $skin-name == 'bootstrap5' or $skin-name == 'boostrap5-dark' or $skin-name == 'FluentUI' or $theme-name == 'fluentui-dark' {
211
+ @if $skin-name == 'bootstrap5' or $skin-name == 'boostrap5-dark' or $skin-name == 'FluentUI' or $theme-name == 'fluentui-dark' or $theme-name == 'fluent2' {
181
212
  line-height: 19px;
182
213
  }
183
214
  @else {
@@ -186,24 +217,17 @@
186
217
  }
187
218
 
188
219
  .e-grid {
189
- &.e-wrap .e-rowcell .e-treecolumn-container {
220
+ &.e-wrap .e-rowcell .e-treecolumn-container,
221
+ &.e-wrap .e-rowcell .e-treecheckbox-container {
190
222
  white-space: nowrap;
191
223
  }
192
224
 
193
225
  &.e-wrap .e-rowcell .e-treecolumn-container .e-treecell {
194
- display: inline-block;
195
- white-space: normal;
196
- word-wrap: break-word;
197
- }
198
-
199
- &.e-wrap .e-rowcell .e-treecheckbox-container {
200
- white-space: nowrap;
226
+ @include grid-wrap;
201
227
  }
202
228
 
203
229
  &.e-wrap .e-rowcell .e-treecheckbox-container .e-treecheckbox {
204
- display: inline-block;
205
- white-space: normal;
206
- word-wrap: break-word;
230
+ @include grid-wrap;
207
231
  }
208
232
  }
209
233
 
@@ -229,9 +253,8 @@
229
253
  }
230
254
 
231
255
  .e-icons.e-errorelem {
232
- display: inline-block;
233
256
  padding-left: 10px;
234
- vertical-align: middle;
257
+ @include display-align;
235
258
  }
236
259
 
237
260
  .e-errorelem::before {
@@ -244,9 +267,7 @@
244
267
  td.e-childborder {
245
268
  border-color: $childborder-color;
246
269
  border-width: $treegrid-rowdd-childborder-width;
247
- box-shadow: 0 1px 0 0 $childborder-color;
248
- position: relative;
249
- z-index: 1;
270
+ @include drop-bottom-child;
250
271
  }
251
272
 
252
273
  td.e-rowcell.e-childborder.e-dragborder,
@@ -262,12 +283,11 @@
262
283
 
263
284
  td.e-childborder:first-child {
264
285
  border-left: $treegrid-rowdrag-childborder-border;
265
- box-shadow: 0 1px 0 0 $childborder-color;
266
- position: relative;
267
- z-index: 1;
286
+ @include drop-bottom-child;
268
287
  }
269
288
 
270
- td.e-rowcell.e-childborder:last-child {
289
+ td.e-rowcell.e-childborder:last-child,
290
+ td.e-lastrowcell.e-childborder:last-child {
271
291
  border-right: $treegrid-rowdrag-childborder-border;
272
292
  }
273
293
 
@@ -275,10 +295,6 @@
275
295
  border-width: $treegrid-lastrowdd-childborder-width;
276
296
  }
277
297
 
278
- td.e-lastrowcell.e-childborder:last-child {
279
- border-right: $treegrid-rowdrag-childborder-border;
280
- }
281
-
282
298
  td.e-lastrowcell.e-childborder:first-child {
283
299
  border-left: $treegrid-rowdrag-childborder-border;
284
300
  }
@@ -286,9 +302,7 @@
286
302
  td.e-dropbottom:first-child,
287
303
  td.e-rowcell.e-dropbottom,
288
304
  td.e-dropbottom {
289
- box-shadow: 0 1px 0 0 $childborder-color;
290
- position: relative;
291
- z-index: 1;
305
+ @include drop-bottom-child;
292
306
  }
293
307
 
294
308
  td.e-droptop:first-child,
@@ -314,11 +328,9 @@
314
328
  }
315
329
  }
316
330
 
317
- .e-gridheader .e-firstrow-dragborder {
318
- height: 0;
319
- }
320
-
321
- .e-droptop .e-lastrow-dragborder {
331
+ .e-gridheader .e-firstrow-dragborder,
332
+ .e-droptop .e-lastrow-dragborder,
333
+ .e-gridheader .e-firstrow-dragborder tr:first-child.e-dropbottom {
322
334
  height: 0;
323
335
  }
324
336
 
@@ -326,10 +338,6 @@
326
338
  position: relative;
327
339
  }
328
340
 
329
- .e-gridheader .e-firstrow-dragborder tr:first-child.e-dropbottom {
330
- height: 0;
331
- }
332
-
333
341
  .e-gridheader .e-firstrow-border,
334
342
  .e-gridcontent .e-lastrow-border {
335
343
  background-color: $childborder-color;
@@ -340,13 +348,17 @@
340
348
  z-index: 1;
341
349
  }
342
350
 
351
+ .e-gridcontent .e-rowcell{
352
+ @if $skin-name == 'fluent2' or $skin-name == 'fluent2-dark'{
353
+ line-height: 17px;
354
+ }
355
+ }
356
+
343
357
  .e-grid .e-gridcontent {
344
358
  tr.e-row:first-child {
345
359
  td.e-rowcell.e-childborder,
346
360
  td.e-rowdragdrop.e-childborder {
347
- border-bottom: $treegrid-rowdrag-childborder-border;
348
- border-top: $treegrid-rowdrag-childborder-border;
349
- box-shadow: 0 0 0 0 $treegrid-rowdd-boxshadow;
361
+ @include childborder;
350
362
  }
351
363
 
352
364
  td.e-rowcell.e-droptop,
@@ -357,45 +369,38 @@
357
369
 
358
370
  td.e-rowcell {
359
371
  &.e-childborder {
360
- border-bottom: $treegrid-rowdrag-childborder-border;
361
- border-top: $treegrid-rowdrag-childborder-border;
362
- box-shadow: 0 0 0 0 $treegrid-rowdd-boxshadow;
372
+ @include childborder;
363
373
  }
364
374
  }
365
375
 
366
376
  td.e-rowdragdrop {
367
377
  &.e-childborder {
368
- border-bottom: $treegrid-rowdrag-childborder-border;
369
- border-top: $treegrid-rowdrag-childborder-border;
370
- box-shadow: 0 0 0 0 $treegrid-rowdd-boxshadow;
378
+ @include childborder;
371
379
  }
372
380
  }
373
381
 
374
382
  td.e-rowcell {
375
383
  &.e-dropbottom {
376
- border-bottom: $treegrid-rowdd-topbottom-border;
377
- box-shadow: 0 0 0 0 $treegrid-rowdd-boxshadow;
384
+ @include dropbottom;
378
385
  }
379
386
  &.e-droptop {
380
- border-top: $treegrid-rowdd-topbottom-border;
381
- box-shadow: 0 0 0 0 $treegrid-rowdd-boxshadow;
387
+ @include droptop;
382
388
  }
383
389
  }
384
-
390
+
385
391
  td.e-rowdragdrop {
386
392
  &.e-dropbottom {
387
- border-bottom: $treegrid-rowdd-topbottom-border;
388
- box-shadow: 0 0 0 0 $treegrid-rowdd-boxshadow;
393
+ @include dropbottom;
389
394
  }
390
395
  &.e-droptop {
391
- border-top: $treegrid-rowdd-topbottom-border;
392
- box-shadow: 0 0 0 0 $treegrid-rowdd-boxshadow;
396
+ @include droptop;
393
397
  }
394
398
  }
395
399
  }
396
400
 
397
401
  .e-grid.e-rtl {
398
- .e-gridheader .e-firstrow-dragborder {
402
+ .e-gridheader .e-firstrow-dragborder,
403
+ .e-droptop .e-lastrow-dragborder {
399
404
  height: 0;
400
405
  }
401
406
 
@@ -415,12 +420,11 @@
415
420
 
416
421
  td.e-childborder:first-child {
417
422
  border-right: $treegrid-rowdrag-childborder-border;
418
- box-shadow: 0 1px 0 0 $childborder-color;
419
- position: relative;
420
- z-index: 1;
423
+ @include drop-bottom-child;
421
424
  }
422
425
 
423
- td.e-rowcell.e-childborder:last-child {
426
+ td.e-rowcell.e-childborder:last-child,
427
+ td.e-lastrowcell.e-childborder:first-child {
424
428
  border-left: $treegrid-rowdrag-childborder-border;
425
429
  }
426
430
 
@@ -432,10 +436,6 @@
432
436
  border-right: $treegrid-rowdrag-childborder-border;
433
437
  }
434
438
 
435
- td.e-lastrowcell.e-childborder:first-child {
436
- border-left: $treegrid-rowdrag-childborder-border;
437
- }
438
-
439
439
  td.e-droptop:first-child,
440
440
  td.e-rowcell.e-droptop {
441
441
  border-top-color: $childborder-color;
@@ -445,10 +445,6 @@
445
445
  td.e-lastrowcell.e-dropbottom {
446
446
  border-bottom-color: $childborder-color;
447
447
  }
448
-
449
- .e-droptop .e-lastrow-dragborder {
450
- height: 0;
451
- }
452
448
  }
453
449
  }
454
450
  }
@@ -1,4 +1,3 @@
1
- //default
2
1
  $treegrid-right-arrow-icon: '\e848' !default;
3
2
  $treegrid-toolbar-expand-icon: '\e556' !default;
4
3
  $treegrid-toolbar-collapse-icon: '\e554' !default;
@@ -1,4 +1,3 @@
1
- //default
2
1
  $treegrid-right-arrow-icon: '\e848' !default;
3
2
  $treegrid-toolbar-expand-icon: '\e556' !default;
4
3
  $treegrid-toolbar-collapse-icon: '\e554' !default;
@@ -1,11 +1,7 @@
1
- // color
2
1
  $treegrid-right-arrow-icon-color: rgba($icon-color) !default;
3
2
  $treegrid-right-arrow-hover-color: rgba($icon-color-hover) !default;
4
3
  $childborder-color: rgba($primary) !default;
5
4
  $error-elem-color: rgba($danger) !default;
6
-
7
- // Layout
8
-
9
5
  $error-elem-content: '\e839' !default;
10
6
  $treegrid-right-arrow-icon-font-size: 18px !default;
11
7
  $treegrid-right-arrow-icon-padding: 0 !default;
@@ -1,11 +1,7 @@
1
- // color
2
1
  $treegrid-right-arrow-icon-color: $icon-color !default;
3
2
  $treegrid-right-arrow-hover-color: $icon-color-hover !default;
4
3
  $childborder-color: $primary !default;
5
4
  $error-elem-color: $danger !default;
6
-
7
- // Layout
8
-
9
5
  $error-elem-content: '\e77e' !default;
10
6
  $treegrid-right-arrow-icon-font-size: $text-lg !default;
11
7
  $treegrid-right-arrow-icon-padding: 0 !default;