Skip to content

Commit

Permalink
Merge pull request #9 from microsoft/vNext
Browse files Browse the repository at this point in the history 
July release
  • Loading branch information
@Ramakrishnan24689
Ramakrishnan24689 authored Jul 20, 2022
2 parents 85b9355 + c40d862 commit 979aab3
Show file tree
Hide file tree
Showing 37 changed files with 4,643 additions and 4,115 deletions.
3 changes: 3 additions & 0 deletions CommandBar/CommandBar/ControlManifest.Input.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
<property-set name="ItemIconOnly" display-name-key="IconOnly" of-type="TwoOptions" usage="bound" required="false" />
<property-set name="ItemOverflow" display-name-key="Overflow" of-type="TwoOptions" usage="bound" required="false" />
<property-set name="ItemFarItem" display-name-key="FarItem" of-type="TwoOptions" usage="bound" required="false" />
<property-set name="ItemHeader" display-name-key="ItemHeader" of-type="TwoOptions" usage="bound" required="false" />
<property-set name="ItemTopDivider" display-name-key="ItemTopDivider" of-type="TwoOptions" usage="bound" required="false" />
<property-set name="ItemDivider" display-name-key="ItemDivider" of-type="TwoOptions" usage="bound" required="false" />
<property-set name="ItemParentKey" display-name-key="ParentKey" of-type="SingleLine.Text" usage="bound" required="false" />
</data-set>

Expand Down
3 changes: 3 additions & 0 deletions CommandBar/CommandBar/ManifestConstants.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ export const enum ItemColumns {
Visible = 'ItemVisible',
Checked = 'ItemChecked',
Split = 'ItemSplit',
ItemHeader = 'ItemHeader',
ItemTopDivider = 'ItemTopDivider',
ItemDivider = 'ItemDivider',
}

export const enum InputEvents {
Expand Down
24 changes: 24 additions & 0 deletions CommandBar/CommandBar/__tests__/__snapshots__/commandbar-lifecycle.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,20 @@ exports[`CommandBar renders 1`] = `
"ItemKey": "commandOpen",
},
},
"divider": undefined,
"enabled": true,
"farItem": undefined,
"iconColor": "blue",
"iconName": "Open",
"iconOnly": false,
"id": "1",
"isHeader": undefined,
"key": "commandOpen",
"name": "Open",
"overflow": undefined,
"parentItemKey": undefined,
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
Object {
Expand All @@ -47,17 +50,20 @@ exports[`CommandBar renders 1`] = `
"ItemKey": "commandNew",
},
},
"divider": undefined,
"enabled": false,
"farItem": undefined,
"iconColor": "blue",
"iconName": "New",
"iconOnly": true,
"id": "2",
"isHeader": undefined,
"key": "commandNew",
"name": "New",
"overflow": undefined,
"parentItemKey": undefined,
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
Object {
Expand All @@ -75,17 +81,20 @@ exports[`CommandBar renders 1`] = `
"ItemKey": "commandSave",
},
},
"divider": undefined,
"enabled": false,
"farItem": true,
"iconColor": "green",
"iconName": "Save",
"iconOnly": true,
"id": "3",
"isHeader": undefined,
"key": "commandSave",
"name": "Save",
"overflow": undefined,
"parentItemKey": undefined,
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
]
Expand Down Expand Up @@ -154,17 +163,20 @@ exports[`CommandBar renders subitems and shows the flyout menu 1`] = `
"ItemKey": "commandOpen",
},
},
"divider": undefined,
"enabled": true,
"farItem": undefined,
"iconColor": "blue",
"iconName": "Open",
"iconOnly": false,
"id": "1",
"isHeader": undefined,
"key": "commandOpen",
"name": "Open",
"overflow": undefined,
"parentItemKey": undefined,
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
Object {
Expand All @@ -181,17 +193,20 @@ exports[`CommandBar renders subitems and shows the flyout menu 1`] = `
"ItemKey": "commandNew",
},
},
"divider": undefined,
"enabled": false,
"farItem": undefined,
"iconColor": "blue",
"iconName": "New",
"iconOnly": true,
"id": "2",
"isHeader": undefined,
"key": "commandNew",
"name": "New",
"overflow": undefined,
"parentItemKey": undefined,
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
Object {
Expand All @@ -209,17 +224,20 @@ exports[`CommandBar renders subitems and shows the flyout menu 1`] = `
"ItemKey": "commandSave",
},
},
"divider": undefined,
"enabled": false,
"farItem": true,
"iconColor": "green",
"iconName": "Save",
"iconOnly": true,
"id": "3",
"isHeader": undefined,
"key": "commandSave",
"name": "Save",
"overflow": undefined,
"parentItemKey": undefined,
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
Object {
Expand All @@ -234,17 +252,20 @@ exports[`CommandBar renders subitems and shows the flyout menu 1`] = `
"ItemParentKey": "commandOpen",
},
},
"divider": undefined,
"enabled": undefined,
"farItem": undefined,
"iconColor": undefined,
"iconName": "New",
"iconOnly": undefined,
"id": "5",
"isHeader": undefined,
"key": "sub1",
"name": "Sub 1",
"overflow": undefined,
"parentItemKey": "commandOpen",
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
Object {
Expand All @@ -259,17 +280,20 @@ exports[`CommandBar renders subitems and shows the flyout menu 1`] = `
"ItemParentKey": "commandOpen",
},
},
"divider": undefined,
"enabled": undefined,
"farItem": undefined,
"iconColor": undefined,
"iconName": "Save",
"iconOnly": undefined,
"id": "6",
"isHeader": undefined,
"key": "sub2",
"name": "Sub 2",
"overflow": undefined,
"parentItemKey": "commandOpen",
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
]
Expand Down
28 changes: 28 additions & 0 deletions CommandBar/CommandBar/__tests__/__snapshots__/datasetmapping.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,20 @@ Array [
"ItemKey": "commandOpen",
},
},
"divider": undefined,
"enabled": true,
"farItem": undefined,
"iconColor": "blue",
"iconName": "Open",
"iconOnly": false,
"id": "1",
"isHeader": undefined,
"key": "commandOpen",
"name": "Open",
"overflow": undefined,
"parentItemKey": undefined,
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
"disabled": false,
Expand All @@ -47,6 +50,7 @@ Array [
},
},
},
"itemType": 0,
"key": "commandOpen",
"onClick": [MockFunction],
"split": undefined,
Expand Down Expand Up @@ -75,17 +79,20 @@ Array [
"ItemKey": "commandNew",
},
},
"divider": undefined,
"enabled": false,
"farItem": undefined,
"iconColor": "blue",
"iconName": "New",
"iconOnly": true,
"id": "2",
"isHeader": undefined,
"key": "commandNew",
"name": "New",
"overflow": undefined,
"parentItemKey": undefined,
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
"disabled": true,
Expand All @@ -98,6 +105,7 @@ Array [
},
},
},
"itemType": 0,
"key": "commandNew",
"onClick": [MockFunction],
"split": undefined,
Expand Down Expand Up @@ -126,17 +134,20 @@ Array [
"ItemParentKey": "commandNew",
},
},
"divider": undefined,
"enabled": false,
"farItem": undefined,
"iconColor": "blue",
"iconName": "New",
"iconOnly": true,
"id": "5",
"isHeader": undefined,
"key": "commandNewFrom",
"name": "NewFrom",
"overflow": undefined,
"parentItemKey": "commandNew",
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
"disabled": true,
Expand All @@ -149,6 +160,7 @@ Array [
},
},
},
"itemType": 0,
"key": "commandNewFrom",
"onClick": [MockFunction],
"split": undefined,
Expand Down Expand Up @@ -177,17 +189,20 @@ Array [
"ItemParentKey": "commandNewFrom",
},
},
"divider": undefined,
"enabled": false,
"farItem": undefined,
"iconColor": "blue",
"iconName": "New",
"iconOnly": true,
"id": "7",
"isHeader": undefined,
"key": "commandNewFromSub1",
"name": "NewFromSub1",
"overflow": undefined,
"parentItemKey": "commandNewFrom",
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
"disabled": true,
Expand All @@ -200,6 +215,7 @@ Array [
},
},
},
"itemType": 0,
"key": "commandNewFromSub1",
"onClick": [MockFunction],
"split": undefined,
Expand Down Expand Up @@ -229,17 +245,20 @@ Array [
"ItemParentKey": "commandNewFrom",
},
},
"divider": undefined,
"enabled": false,
"farItem": undefined,
"iconColor": "blue",
"iconName": "New",
"iconOnly": true,
"id": "8",
"isHeader": undefined,
"key": "commandNewFromSub2",
"name": "NewFromSub2",
"overflow": undefined,
"parentItemKey": "commandNewFrom",
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
"disabled": true,
Expand All @@ -252,6 +271,7 @@ Array [
},
},
},
"itemType": 0,
"key": "commandNewFromSub2",
"onClick": [MockFunction],
"split": undefined,
Expand Down Expand Up @@ -289,17 +309,20 @@ Array [
"ItemKey": "commandSave",
},
},
"divider": undefined,
"enabled": false,
"farItem": true,
"iconColor": "green",
"iconName": "Save",
"iconOnly": true,
"id": "3",
"isHeader": undefined,
"key": "commandSave",
"name": "Save",
"overflow": undefined,
"parentItemKey": undefined,
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
"disabled": true,
Expand All @@ -312,6 +335,7 @@ Array [
},
},
},
"itemType": 0,
"key": "commandSave",
"onClick": [MockFunction],
"split": undefined,
Expand Down Expand Up @@ -341,17 +365,20 @@ Array [
"ItemParentKey": "commandSave",
},
},
"divider": undefined,
"enabled": false,
"farItem": true,
"iconColor": "green",
"iconName": "Save",
"iconOnly": true,
"id": "6",
"isHeader": undefined,
"key": "commandSaveAndClose",
"name": "SaveAndClose",
"overflow": undefined,
"parentItemKey": "commandSave",
"split": undefined,
"topDivider": undefined,
"visible": undefined,
},
"disabled": true,
Expand All @@ -364,6 +391,7 @@ Array [
},
},
},
"itemType": 0,
"key": "commandSaveAndClose",
"onClick": [MockFunction],
"split": undefined,
Expand Down
Loading

0 comments on commit 979aab3

Please sign in to comment.