Skip to content

Commit 93b1184

Browse files
Merge branch 'master' of github.com:salesforce/design-system-react
2 parents d926931 + 34aafd6 commit 93b1184

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

components/component-docs.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3552,8 +3552,19 @@
35523552
"type": {
35533553
"name": "array"
35543554
},
3555-
"required": true,
3556-
"description": "`Dropdown` options. See `Dropdown`."
3555+
"required": false,
3556+
"description": "`Dropdown` options. See `Dropdown`.",
3557+
"defaultValue": {
3558+
"value": "[]",
3559+
"computed": false
3560+
}
3561+
},
3562+
"dropdown": {
3563+
"type": {
3564+
"name": "node"
3565+
},
3566+
"required": false,
3567+
"description": "A [Dropdown](http://react.lightningdesignsystem.com/components/dropdown-menus/) component. The props from this drop will be merged and override any default props.\n**Note:** onAction will not be overridden, both `DropDown`'s onSelect(dropDownActionOption) and onAction(rowItem, dropdownActionOption) will be called with appropriate parameters"
35573568
}
35583569
},
35593570
"name": "row-actions",

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "design-system-react",
3-
"version": "0.8.16",
3+
"version": "0.8.17",
44
"description": "Salesforce Lightning Design System for React",
55
"license": "SEE LICENSE IN README.md",
66
"engines": {

patch.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)