Skip to content

Commit c40d862

Browse files
July release
1 parent 85b9355 commit c40d862

37 files changed

+4643
-4115
lines changed

CommandBar/CommandBar/ControlManifest.Input.xml

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<property-set name="ItemIconOnly" display-name-key="IconOnly" of-type="TwoOptions" usage="bound" required="false" />
2323
<property-set name="ItemOverflow" display-name-key="Overflow" of-type="TwoOptions" usage="bound" required="false" />
2424
<property-set name="ItemFarItem" display-name-key="FarItem" of-type="TwoOptions" usage="bound" required="false" />
25+
<property-set name="ItemHeader" display-name-key="ItemHeader" of-type="TwoOptions" usage="bound" required="false" />
26+
<property-set name="ItemTopDivider" display-name-key="ItemTopDivider" of-type="TwoOptions" usage="bound" required="false" />
27+
<property-set name="ItemDivider" display-name-key="ItemDivider" of-type="TwoOptions" usage="bound" required="false" />
2528
<property-set name="ItemParentKey" display-name-key="ParentKey" of-type="SingleLine.Text" usage="bound" required="false" />
2629
</data-set>
2730

CommandBar/CommandBar/ManifestConstants.ts

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ export const enum ItemColumns {
1515
Visible = 'ItemVisible',
1616
Checked = 'ItemChecked',
1717
Split = 'ItemSplit',
18+
ItemHeader = 'ItemHeader',
19+
ItemTopDivider = 'ItemTopDivider',
20+
ItemDivider = 'ItemDivider',
1821
}
1922

2023
export const enum InputEvents {

CommandBar/CommandBar/__tests__/__snapshots__/commandbar-lifecycle.test.tsx.snap

+24
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,20 @@ exports[`CommandBar renders 1`] = `
2020
"ItemKey": "commandOpen",
2121
},
2222
},
23+
"divider": undefined,
2324
"enabled": true,
2425
"farItem": undefined,
2526
"iconColor": "blue",
2627
"iconName": "Open",
2728
"iconOnly": false,
2829
"id": "1",
30+
"isHeader": undefined,
2931
"key": "commandOpen",
3032
"name": "Open",
3133
"overflow": undefined,
3234
"parentItemKey": undefined,
3335
"split": undefined,
36+
"topDivider": undefined,
3437
"visible": undefined,
3538
},
3639
Object {
@@ -47,17 +50,20 @@ exports[`CommandBar renders 1`] = `
4750
"ItemKey": "commandNew",
4851
},
4952
},
53+
"divider": undefined,
5054
"enabled": false,
5155
"farItem": undefined,
5256
"iconColor": "blue",
5357
"iconName": "New",
5458
"iconOnly": true,
5559
"id": "2",
60+
"isHeader": undefined,
5661
"key": "commandNew",
5762
"name": "New",
5863
"overflow": undefined,
5964
"parentItemKey": undefined,
6065
"split": undefined,
66+
"topDivider": undefined,
6167
"visible": undefined,
6268
},
6369
Object {
@@ -75,17 +81,20 @@ exports[`CommandBar renders 1`] = `
7581
"ItemKey": "commandSave",
7682
},
7783
},
84+
"divider": undefined,
7885
"enabled": false,
7986
"farItem": true,
8087
"iconColor": "green",
8188
"iconName": "Save",
8289
"iconOnly": true,
8390
"id": "3",
91+
"isHeader": undefined,
8492
"key": "commandSave",
8593
"name": "Save",
8694
"overflow": undefined,
8795
"parentItemKey": undefined,
8896
"split": undefined,
97+
"topDivider": undefined,
8998
"visible": undefined,
9099
},
91100
]
@@ -154,17 +163,20 @@ exports[`CommandBar renders subitems and shows the flyout menu 1`] = `
154163
"ItemKey": "commandOpen",
155164
},
156165
},
166+
"divider": undefined,
157167
"enabled": true,
158168
"farItem": undefined,
159169
"iconColor": "blue",
160170
"iconName": "Open",
161171
"iconOnly": false,
162172
"id": "1",
173+
"isHeader": undefined,
163174
"key": "commandOpen",
164175
"name": "Open",
165176
"overflow": undefined,
166177
"parentItemKey": undefined,
167178
"split": undefined,
179+
"topDivider": undefined,
168180
"visible": undefined,
169181
},
170182
Object {
@@ -181,17 +193,20 @@ exports[`CommandBar renders subitems and shows the flyout menu 1`] = `
181193
"ItemKey": "commandNew",
182194
},
183195
},
196+
"divider": undefined,
184197
"enabled": false,
185198
"farItem": undefined,
186199
"iconColor": "blue",
187200
"iconName": "New",
188201
"iconOnly": true,
189202
"id": "2",
203+
"isHeader": undefined,
190204
"key": "commandNew",
191205
"name": "New",
192206
"overflow": undefined,
193207
"parentItemKey": undefined,
194208
"split": undefined,
209+
"topDivider": undefined,
195210
"visible": undefined,
196211
},
197212
Object {
@@ -209,17 +224,20 @@ exports[`CommandBar renders subitems and shows the flyout menu 1`] = `
209224
"ItemKey": "commandSave",
210225
},
211226
},
227+
"divider": undefined,
212228
"enabled": false,
213229
"farItem": true,
214230
"iconColor": "green",
215231
"iconName": "Save",
216232
"iconOnly": true,
217233
"id": "3",
234+
"isHeader": undefined,
218235
"key": "commandSave",
219236
"name": "Save",
220237
"overflow": undefined,
221238
"parentItemKey": undefined,
222239
"split": undefined,
240+
"topDivider": undefined,
223241
"visible": undefined,
224242
},
225243
Object {
@@ -234,17 +252,20 @@ exports[`CommandBar renders subitems and shows the flyout menu 1`] = `
234252
"ItemParentKey": "commandOpen",
235253
},
236254
},
255+
"divider": undefined,
237256
"enabled": undefined,
238257
"farItem": undefined,
239258
"iconColor": undefined,
240259
"iconName": "New",
241260
"iconOnly": undefined,
242261
"id": "5",
262+
"isHeader": undefined,
243263
"key": "sub1",
244264
"name": "Sub 1",
245265
"overflow": undefined,
246266
"parentItemKey": "commandOpen",
247267
"split": undefined,
268+
"topDivider": undefined,
248269
"visible": undefined,
249270
},
250271
Object {
@@ -259,17 +280,20 @@ exports[`CommandBar renders subitems and shows the flyout menu 1`] = `
259280
"ItemParentKey": "commandOpen",
260281
},
261282
},
283+
"divider": undefined,
262284
"enabled": undefined,
263285
"farItem": undefined,
264286
"iconColor": undefined,
265287
"iconName": "Save",
266288
"iconOnly": undefined,
267289
"id": "6",
290+
"isHeader": undefined,
268291
"key": "sub2",
269292
"name": "Sub 2",
270293
"overflow": undefined,
271294
"parentItemKey": "commandOpen",
272295
"split": undefined,
296+
"topDivider": undefined,
273297
"visible": undefined,
274298
},
275299
]

CommandBar/CommandBar/__tests__/__snapshots__/datasetmapping.test.ts.snap

+28
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,20 @@ Array [
2424
"ItemKey": "commandOpen",
2525
},
2626
},
27+
"divider": undefined,
2728
"enabled": true,
2829
"farItem": undefined,
2930
"iconColor": "blue",
3031
"iconName": "Open",
3132
"iconOnly": false,
3233
"id": "1",
34+
"isHeader": undefined,
3335
"key": "commandOpen",
3436
"name": "Open",
3537
"overflow": undefined,
3638
"parentItemKey": undefined,
3739
"split": undefined,
40+
"topDivider": undefined,
3841
"visible": undefined,
3942
},
4043
"disabled": false,
@@ -47,6 +50,7 @@ Array [
4750
},
4851
},
4952
},
53+
"itemType": 0,
5054
"key": "commandOpen",
5155
"onClick": [MockFunction],
5256
"split": undefined,
@@ -75,17 +79,20 @@ Array [
7579
"ItemKey": "commandNew",
7680
},
7781
},
82+
"divider": undefined,
7883
"enabled": false,
7984
"farItem": undefined,
8085
"iconColor": "blue",
8186
"iconName": "New",
8287
"iconOnly": true,
8388
"id": "2",
89+
"isHeader": undefined,
8490
"key": "commandNew",
8591
"name": "New",
8692
"overflow": undefined,
8793
"parentItemKey": undefined,
8894
"split": undefined,
95+
"topDivider": undefined,
8996
"visible": undefined,
9097
},
9198
"disabled": true,
@@ -98,6 +105,7 @@ Array [
98105
},
99106
},
100107
},
108+
"itemType": 0,
101109
"key": "commandNew",
102110
"onClick": [MockFunction],
103111
"split": undefined,
@@ -126,17 +134,20 @@ Array [
126134
"ItemParentKey": "commandNew",
127135
},
128136
},
137+
"divider": undefined,
129138
"enabled": false,
130139
"farItem": undefined,
131140
"iconColor": "blue",
132141
"iconName": "New",
133142
"iconOnly": true,
134143
"id": "5",
144+
"isHeader": undefined,
135145
"key": "commandNewFrom",
136146
"name": "NewFrom",
137147
"overflow": undefined,
138148
"parentItemKey": "commandNew",
139149
"split": undefined,
150+
"topDivider": undefined,
140151
"visible": undefined,
141152
},
142153
"disabled": true,
@@ -149,6 +160,7 @@ Array [
149160
},
150161
},
151162
},
163+
"itemType": 0,
152164
"key": "commandNewFrom",
153165
"onClick": [MockFunction],
154166
"split": undefined,
@@ -177,17 +189,20 @@ Array [
177189
"ItemParentKey": "commandNewFrom",
178190
},
179191
},
192+
"divider": undefined,
180193
"enabled": false,
181194
"farItem": undefined,
182195
"iconColor": "blue",
183196
"iconName": "New",
184197
"iconOnly": true,
185198
"id": "7",
199+
"isHeader": undefined,
186200
"key": "commandNewFromSub1",
187201
"name": "NewFromSub1",
188202
"overflow": undefined,
189203
"parentItemKey": "commandNewFrom",
190204
"split": undefined,
205+
"topDivider": undefined,
191206
"visible": undefined,
192207
},
193208
"disabled": true,
@@ -200,6 +215,7 @@ Array [
200215
},
201216
},
202217
},
218+
"itemType": 0,
203219
"key": "commandNewFromSub1",
204220
"onClick": [MockFunction],
205221
"split": undefined,
@@ -229,17 +245,20 @@ Array [
229245
"ItemParentKey": "commandNewFrom",
230246
},
231247
},
248+
"divider": undefined,
232249
"enabled": false,
233250
"farItem": undefined,
234251
"iconColor": "blue",
235252
"iconName": "New",
236253
"iconOnly": true,
237254
"id": "8",
255+
"isHeader": undefined,
238256
"key": "commandNewFromSub2",
239257
"name": "NewFromSub2",
240258
"overflow": undefined,
241259
"parentItemKey": "commandNewFrom",
242260
"split": undefined,
261+
"topDivider": undefined,
243262
"visible": undefined,
244263
},
245264
"disabled": true,
@@ -252,6 +271,7 @@ Array [
252271
},
253272
},
254273
},
274+
"itemType": 0,
255275
"key": "commandNewFromSub2",
256276
"onClick": [MockFunction],
257277
"split": undefined,
@@ -289,17 +309,20 @@ Array [
289309
"ItemKey": "commandSave",
290310
},
291311
},
312+
"divider": undefined,
292313
"enabled": false,
293314
"farItem": true,
294315
"iconColor": "green",
295316
"iconName": "Save",
296317
"iconOnly": true,
297318
"id": "3",
319+
"isHeader": undefined,
298320
"key": "commandSave",
299321
"name": "Save",
300322
"overflow": undefined,
301323
"parentItemKey": undefined,
302324
"split": undefined,
325+
"topDivider": undefined,
303326
"visible": undefined,
304327
},
305328
"disabled": true,
@@ -312,6 +335,7 @@ Array [
312335
},
313336
},
314337
},
338+
"itemType": 0,
315339
"key": "commandSave",
316340
"onClick": [MockFunction],
317341
"split": undefined,
@@ -341,17 +365,20 @@ Array [
341365
"ItemParentKey": "commandSave",
342366
},
343367
},
368+
"divider": undefined,
344369
"enabled": false,
345370
"farItem": true,
346371
"iconColor": "green",
347372
"iconName": "Save",
348373
"iconOnly": true,
349374
"id": "6",
375+
"isHeader": undefined,
350376
"key": "commandSaveAndClose",
351377
"name": "SaveAndClose",
352378
"overflow": undefined,
353379
"parentItemKey": "commandSave",
354380
"split": undefined,
381+
"topDivider": undefined,
355382
"visible": undefined,
356383
},
357384
"disabled": true,
@@ -364,6 +391,7 @@ Array [
364391
},
365392
},
366393
},
394+
"itemType": 0,
367395
"key": "commandSaveAndClose",
368396
"onClick": [MockFunction],
369397
"split": undefined,

0 commit comments

Comments
 (0)