Merge pull request #548 from hossein-zare/dev-5.x

Bugfix: disabledStyle
hossein-zare · May 6, 2022 · 1edf8cc · 1edf8cc
2 parents c4d56d1 + a6b2e7f
commit 1edf8cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-dropdown-picker",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "description": "A single / multiple, categorizable, customizable, localizable and searchable item picker (drop-down) component for react native which supports both Android & iOS.",
   "keywords": [
     "picker",

diff --git a/src/components/Picker.js b/src/components/Picker.js
@@ -741,8 +741,9 @@ function Picker({
             zIndex: _zIndex
         },
         ...[style].flat(),
+        ...[_disabledStyle].flat(),
         pickerNoBorderRadius
-    ]), [rtl, style, pickerNoBorderRadius, _zIndex, THEME]);
+    ]), [rtl, style, _disabledStyle, pickerNoBorderRadius, _zIndex, THEME]);
 
     /**
      * The placeholder style.
@@ -818,9 +819,8 @@ function Picker({
     const _containerStyle = useMemo(() => ([
         THEME.container,
         zIndexContainer,
-        ...[containerStyle].flat(),
-        ...[_disabledStyle].flat()
-    ]), [zIndexContainer, containerStyle, disabled, _disabledStyle, THEME]);
+        ...[containerStyle].flat()
+    ]), [zIndexContainer, containerStyle, THEME]);
 
     /**
      * The arrow icon container style.