From bf5722f4d39b9b6fb8c1459772d8ad6d81eac820 Mon Sep 17 00:00:00 2001 From: Nouman Tahir Date: Sun, 1 Aug 2021 14:18:44 +0500 Subject: [PATCH] fixed dropdown modal issue --- package.json | 2 +- ...wnButtonView.js => dropdownButtonView.tsx} | 11 ++-- yarn.lock | 53 +++++++------------ 3 files changed, 24 insertions(+), 42 deletions(-) rename src/components/dropdownButton/view/{dropdownButtonView.js => dropdownButtonView.tsx} (92%) diff --git a/package.json b/package.json index b6109fa19..6b681f308 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "react-native-linear-gradient": "^2.4.2", "react-native-matomo-sdk": "feruzm/react-native-matomo-sdk", "react-native-modal": "^11.5.6", - "react-native-modal-dropdown": "ecency/react-native-modal-dropdown", + "react-native-modal-dropdown": "^1.0.1", "react-native-modal-popover": "^2.0.1", "react-native-modal-translucent": "^5.0.0", "react-native-navigation-bar-color": "^1.0.0", diff --git a/src/components/dropdownButton/view/dropdownButtonView.js b/src/components/dropdownButton/view/dropdownButtonView.tsx similarity index 92% rename from src/components/dropdownButton/view/dropdownButtonView.js rename to src/components/dropdownButton/view/dropdownButtonView.tsx index c1a14273b..78837cd5b 100644 --- a/src/components/dropdownButton/view/dropdownButtonView.js +++ b/src/components/dropdownButton/view/dropdownButtonView.tsx @@ -1,7 +1,6 @@ import React from 'react'; -import { View, Text, TouchableHighlight, ActivityIndicator } from 'react-native'; +import { View, Text, ActivityIndicator, TouchableHighlight} from 'react-native'; import EStyleSheet from 'react-native-extended-stylesheet'; - // External components import ModalDropdown from 'react-native-modal-dropdown'; import { Icon } from '../../icon'; @@ -26,10 +25,6 @@ const renderDropdownRow = ( noHighlight, dropdownRowWrapper, ) => ( - - ); const DropdownButtonView = ({ @@ -73,6 +67,8 @@ const DropdownButtonView = ({ null} + renderRow={(rowData, rowID, highlighted) => renderDropdownRow( rowData, diff --git a/yarn.lock b/yarn.lock index 728196a48..6a9abe2f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3269,7 +3269,7 @@ create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@*, create-react-class@^15.6.2: +create-react-class@^15.6.2: version "15.7.0" resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.7.0.tgz#7499d7ca2e69bb51d13faf59bd04f0c65a1d6c1e" integrity sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng== @@ -3547,16 +3547,6 @@ depd@~1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -deprecated-react-native-listview@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/deprecated-react-native-listview/-/deprecated-react-native-listview-0.0.5.tgz#fc8a6dc45b0a8ba611e6014e13b38d6d763e763f" - integrity sha512-Cy7nDdd+KU+nR3tY1BSMuoZpsYC6OVSZyAiUSTDBop2lIgzCseDx7XI57x6h+NXer/8aor2yiQDQfeFcmBMwgQ== - dependencies: - create-react-class "*" - fbjs "*" - invariant "*" - react-clone-referenced-element "*" - destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" @@ -4447,19 +4437,6 @@ fbjs-scripts@^1.1.0: semver "^5.1.0" through2 "^2.0.0" -fbjs@*, fbjs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz#0907067fb3f57a78f45d95f1eacffcacd623c165" - integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg== - dependencies: - cross-fetch "^3.0.4" - fbjs-css-vars "^1.0.0" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.18" - fbjs@^0.8.4: version "0.8.17" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" @@ -4487,6 +4464,19 @@ fbjs@^1.0.0: setimmediate "^1.0.5" ua-parser-js "^0.7.18" +fbjs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz#0907067fb3f57a78f45d95f1eacffcacd623c165" + integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg== + dependencies: + cross-fetch "^3.0.4" + fbjs-css-vars "^1.0.0" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.18" + figures@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" @@ -5290,7 +5280,7 @@ intl@^1.2.5: resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde" integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94= -invariant@*, invariant@2.2.4, invariant@^2.2.2, invariant@^2.2.4: +invariant@2.2.4, invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -8120,11 +8110,6 @@ react-addons-shallow-compare@15.6.2: fbjs "^0.8.4" object-assign "^4.1.0" -react-clone-referenced-element@*: - version "1.1.0" - resolved "https://registry.yarnpkg.com/react-clone-referenced-element/-/react-clone-referenced-element-1.1.0.tgz#9cdda7f2aeb54fea791f3ab8c6ab96c7a77d0158" - integrity sha512-FKOsfKbBkPxYE8576EM6uAfHC4rnMpLyH6/TJUL4WcHUEB3EUn8AxPjnnV/IiwSSzsClvHYK+sDELKN/EJ0WYg== - react-devtools-core@^4.6.0: version "4.14.0" resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.14.0.tgz#4b9dc50937ed4cf4c04fa293430cac62d829fa8b" @@ -8296,11 +8281,11 @@ react-native-matomo-sdk@feruzm/react-native-matomo-sdk: version "0.4.1" resolved "https://codeload.github.com/feruzm/react-native-matomo-sdk/tar.gz/392b1cfca771b28005821ef909ffb9a2082156d9" -react-native-modal-dropdown@ecency/react-native-modal-dropdown: - version "0.7.0" - resolved "https://codeload.github.com/ecency/react-native-modal-dropdown/tar.gz/0269a57c8c248f91a3c599ea20ac106f43f27d1b" +react-native-modal-dropdown@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/react-native-modal-dropdown/-/react-native-modal-dropdown-1.0.1.tgz#24a9396dcb5dadf92feea1deae1089bcef054b20" + integrity sha512-7QAuKvdsIMvz5N2FnRGrZKb+JR3bYFFelONdmfwp1UW3acOyrhF32H06aMD09x2PdBz3VaR5+3iApt9FYClktQ== dependencies: - deprecated-react-native-listview "0.0.5" prop-types "^15.6.0" react-native-modal-popover@^2.0.1: