Skip to content

Commit 6f7f174

Browse files
author
Jordan Hunt
committed
Use underlayColor as default DropDown MenuItem and correct types
1 parent aae5e43 commit 6f7f174

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

styles/native/js/core/widgets/dropdown.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const DropDown = {
5252
},
5353
/* New dropdown styles start */
5454
valueContainer: {
55-
// All ViewStyle properties & rippleColor are allowed
55+
// All ViewStyle properties & rippleColor & activeOpacity & underlayColor are allowed
5656
},
5757
valueContainerDisabled: {
5858
// All ViewStyle properties are allowed
@@ -67,11 +67,12 @@ export const DropDown = {
6767
backgroundColor: input.backgroundColor,
6868
},
6969
itemContainer: {
70-
// All ViewStyle properties are allowed
70+
// All ViewStyle properties & rippleColor & activeOpacity & underlayColor are allowed
7171
maxWidth: 500,
7272
paddingVertical: 6,
7373
paddingHorizontal: 16,
7474
backgroundColor: input.backgroundColor,
75+
underlayColor: contrast.low,
7576
},
7677
item: {
7778
// All TextStlye properties are allowed

styles/native/ts/core/widgets/dropdown.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export const DropDown: DropDownType = {
5656
},
5757
/* New dropdown styles start */
5858
valueContainer: {
59-
// All ViewStyle properties & rippleColor are allowed
59+
// All ViewStyle properties & rippleColor & activeOpacity & underlayColor are allowed
6060
},
6161
valueContainerDisabled: {
6262
// All ViewStyle properties are allowed
@@ -71,11 +71,12 @@ export const DropDown: DropDownType = {
7171
backgroundColor: input.backgroundColor,
7272
},
7373
itemContainer: {
74-
// All ViewStyle properties are allowed
74+
// All ViewStyle properties & rippleColor & activeOpacity & underlayColor are allowed
7575
maxWidth: 500,
7676
paddingVertical: 6,
7777
paddingHorizontal: 16,
7878
backgroundColor: input.backgroundColor,
79+
underlayColor: contrast.low,
7980
},
8081
item: {
8182
// All TextStlye properties are allowed

styles/native/ts/types/widgets.d.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,19 @@ export interface DropDownType {
173173
valueDisabled?: TextStyle,
174174
validationMessage?: TextStyle,
175175
/* New dropdown styles start */
176-
valueContainer?: {
177-
rippleColor?: string
178-
} & ViewStyle;
176+
valueContainer?: ViewStyle & {
177+
rippleColor?: string;
178+
underlayColor?: string;
179+
activeOpacity?: number;
180+
};
179181
valueContainerDisabled?: ViewStyle;
180182
menuWrapper?: ViewStyle;
181183
item?: TextStyle;
182-
itemContainer?: ViewStyle;
184+
itemContainer?: ViewStyle & {
185+
rippleColor?: string;
186+
underlayColor?: string;
187+
activeOpacity?: number;
188+
};
183189
selectedItem?: TextStyle;
184190
selectedItemContainer?: ViewStyle;
185191
/* New dropdown styles end */

0 commit comments

Comments
 (0)