diff --git a/README.md b/README.md index fb81879..b218e4a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

-chatwoot-react-native-widget (Work in progress) +chatwoot-react-native-widget

![](https://img.shields.io/npm/v/@chatwoot/react-native-widget?style=flat) @@ -7,8 +7,7 @@ chatwoot-react-native-widget (Work in progress) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](http://makeapullrequest.com) ![](https://img.shields.io/npm/l/@chatwoot/@chatwoot/react-native-widget) - -- **Supported Chatwoot version:** 1.13.2+ +- **Supported Chatwoot version:** 1.18.0+ screenshot @@ -70,15 +69,19 @@ const App = () => { Open widget - toggleWidget(false)} - isModalVisible={showWidget} - user={user} - customAttributes={customAttributes} - /> + { + showWidget&& + toggleWidget(false)} + isModalVisible={showWidget} + user={user} + customAttributes={customAttributes} + /> + } + ); }; @@ -127,16 +130,34 @@ The whole example is in the `/example` folder. + baseUrl + - + String + Chatwoot installation URL + + websiteToken - String - The website token copyied from website channel + Website channel token - baseUrl - - + locale + en String - Chatwoot installation url + Locale + + + isModalVisible + false + Boolean + Widget is visible or not + + + closeModal + - + Function + Close event user @@ -145,7 +166,7 @@ The whole example is in the `/example` folder. User information about the user like email, username and avatar_url - customattributes + customAttributes {} Object Additional information about the customer @@ -159,4 +180,4 @@ Feel free to send us feedback on [Twitter](https://twitter.com/chatwootapp) or [ If there's anything you'd like to chat about, please feel free to join our [Discord](https://discord.gg/cJXdrwS) chat! -_Chatwoot_ © 2017-2020, Chatwoot Inc - Released under the MIT License. +_Chatwoot_ © 2017-2021, Chatwoot Inc - Released under the MIT License. diff --git a/examples/.ruby-version b/examples/.ruby-version new file mode 100644 index 0000000..2c9b4ef --- /dev/null +++ b/examples/.ruby-version @@ -0,0 +1 @@ +2.7.3 diff --git a/examples/ios/Podfile b/examples/ios/Podfile index 391cea2..e8649a4 100644 --- a/examples/ios/Podfile +++ b/examples/ios/Podfile @@ -21,9 +21,9 @@ target 'examples' do # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable the next line. - use_flipper!() + # use_flipper!() - post_install do |installer| - react_native_post_install(installer) - end + # post_install do |installer| + # react_native_post_install(installer) + # end end \ No newline at end of file diff --git a/examples/ios/Podfile.lock b/examples/ios/Podfile.lock index c9d7b45..9e00ab5 100644 --- a/examples/ios/Podfile.lock +++ b/examples/ios/Podfile.lock @@ -1,6 +1,5 @@ PODS: - boost-for-react-native (1.63.0) - - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - FBLazyVector (0.64.0) - FBReactNativeSpec (0.64.0): @@ -10,55 +9,7 @@ PODS: - React-Core (= 0.64.0) - React-jsi (= 0.64.0) - ReactCommon/turbomodule/core (= 0.64.0) - - Flipper (0.75.1): - - Flipper-Folly (~> 2.5) - - Flipper-RSocket (~> 1.3) - - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.5.1): - - boost-for-react-native - - Flipper-DoubleConversion - - Flipper-Glog - - libevent (~> 2.1.12) - - OpenSSL-Universal (= 1.1.180) - - Flipper-Glog (0.3.6) - - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.3.0): - - Flipper-Folly (~> 2.5) - - FlipperKit (0.75.1): - - FlipperKit/Core (= 0.75.1) - - FlipperKit/Core (0.75.1): - - Flipper (~> 0.75.1) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.75.1): - - Flipper (~> 0.75.1) - - FlipperKit/FBCxxFollyDynamicConvert (0.75.1): - - Flipper-Folly (~> 2.5) - - FlipperKit/FBDefines (0.75.1) - - FlipperKit/FKPortForwarding (0.75.1): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.75.1) - - FlipperKit/FlipperKitLayoutPlugin (0.75.1): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.75.1) - - FlipperKit/FlipperKitNetworkPlugin (0.75.1): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.75.1): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.75.1): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin - glog (0.3.5) - - libevent (2.1.12) - - OpenSSL-Universal (1.1.180) - RCT-Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion @@ -321,32 +272,11 @@ PODS: - RNCAsyncStorage (1.14.1): - React-Core - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - - Flipper (~> 0.75.1) - - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.5) - - Flipper-Glog (= 0.3.6) - - Flipper-PeerTalk (~> 0.0.4) - - Flipper-RSocket (~> 1.3) - - FlipperKit (~> 0.75.1) - - FlipperKit/Core (~> 0.75.1) - - FlipperKit/CppBridge (~> 0.75.1) - - FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1) - - FlipperKit/FBDefines (~> 0.75.1) - - FlipperKit/FKPortForwarding (~> 0.75.1) - - FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1) - - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1) - - FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1) - - FlipperKit/FlipperKitReactPlugin (~> 0.75.1) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1) - - FlipperKit/SKIOSNetworkPlugin (~> 0.75.1) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -380,17 +310,6 @@ DEPENDENCIES: SPEC REPOS: trunk: - boost-for-react-native - - CocoaAsyncSocket - - Flipper - - Flipper-DoubleConversion - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - FlipperKit - - libevent - - OpenSSL-Universal - - YogaKit EXTERNAL SOURCES: DoubleConversion: @@ -456,20 +375,10 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5 - FBReactNativeSpec: 71cf5d0dc1eb6a2658f808c272b9a5b82b519e88 - Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021 - Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489 - Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5 - FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00 + FBReactNativeSpec: f6af9bcec43fcc256bbcc3458fffc8e61c2d40e6 glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 - libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c RCTRequired: 2f8cb5b7533219bf4218a045f92768129cf7050a RCTTypeSafety: 512728b73549e72ad7330b92f3d42936f2a4de5b @@ -496,8 +405,7 @@ SPEC CHECKSUMS: ReactCommon: cfe2b7fd20e0dbd2d1185cd7d8f99633fbc5ff05 RNCAsyncStorage: fe58eec522885718d6b297b7b658bf87d7ca557b Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 0d237943ab8cacaf88579854196cfc4cc012030b +PODFILE CHECKSUM: 3f57f8f9a44ff9ba5fc829e5392025271d888429 -COCOAPODS: 1.10.1 +COCOAPODS: 1.10.2 diff --git a/examples/ios/examples.xcodeproj/project.pbxproj b/examples/ios/examples.xcodeproj/project.pbxproj index d00d893..9311cb3 100644 --- a/examples/ios/examples.xcodeproj/project.pbxproj +++ b/examples/ios/examples.xcodeproj/project.pbxproj @@ -160,7 +160,6 @@ 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - D9385E89B8D1C6674A29025A /* [CP] Embed Pods Frameworks */, 029F5A2E4A473244021919BE /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -183,7 +182,6 @@ 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - C99DE30812F0CB0D16A2A7C7 /* [CP] Embed Pods Frameworks */, 5448A424E984FABB77C4498D /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -343,40 +341,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-examples/Pods-examples-resources.sh\"\n"; showEnvVarsInLog = 0; }; - C99DE30812F0CB0D16A2A7C7 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-examples/Pods-examples-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-examples/Pods-examples-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-examples/Pods-examples-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - D9385E89B8D1C6674A29025A /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-examples-examplesTests/Pods-examples-examplesTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-examples-examplesTests/Pods-examples-examplesTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-examples-examplesTests/Pods-examples-examplesTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; FD10A7F022414F080027D42C /* Start Packager */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -561,7 +525,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 "; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -626,7 +590,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 "; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/examples/yarn.lock b/examples/yarn.lock index 59fa37a..9f801b3 100644 --- a/examples/yarn.lock +++ b/examples/yarn.lock @@ -704,9 +704,21 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +<<<<<<< HEAD "@chatwoot/react-native-widget@^0.0.3": version "0.0.3" resolved "https://registry.yarnpkg.com/@chatwoot/react-native-widget/-/react-native-widget-0.0.3.tgz#072b74d8fcb17564b8529bc537d33e0159787870" +======= +"@chatwoot/react-native-widget@../chatwoot-react-native-widget-0.0.6.tgz": + version "0.0.6" + resolved "../chatwoot-react-native-widget-0.0.6.tgz#671d5a500ad9f5544597af5231fe7fbf9c9789c1" + dependencies: + react-native-modal "^11.7.0" + +"@chatwoot/react-native-widget@^0.0.3": + version "0.0.3" + resolved "https://registry.npmjs.org/@chatwoot/react-native-widget/-/react-native-widget-0.0.3.tgz#072b74d8fcb17564b8529bc537d33e0159787870" +>>>>>>> develop integrity sha512-fhvc2mhIXHd039kJEthLt92yQcOR6ApeMOGFmDc2JXFlGE46d+oKJuVjU1x1lMtUT6Ndez6nGbrtp89ev6Ntpg== dependencies: react-native-modal "^11.7.0" diff --git a/package-lock.json b/package-lock.json index 812e18e..d3fa2dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "@chatwoot/chatwoot-react-native-widget", - "version": "0.0.1", + "name": "@chatwoot/react-native-widget", + "version": "0.0.6", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -865,14 +865,6 @@ } } }, - "@react-native-async-storage/async-storage": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.14.1.tgz", - "integrity": "sha512-UkLUox2q5DKNYB6IMUzsuwrTJeXGLySvtQlnrqd3fd+96JErCT4X3xD+W1cvQjes0nm0LbaELbwObKc+Tea7wA==", - "requires": { - "deep-assign": "^3.0.0" - } - }, "@react-native-community/eslint-config": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@react-native-community/eslint-config/-/eslint-config-2.0.0.tgz", @@ -1429,14 +1421,6 @@ "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", "dev": true }, - "deep-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-3.0.0.tgz", - "integrity": "sha512-YX2i9XjJ7h5q/aQ/IM9PEwEnDqETAIYbggmdDB3HLTlSgo1CxPsj6pvhPG68rq6SVE0+p+6Ywsm5fTYNrYtBWw==", - "requires": { - "is-obj": "^1.0.0" - } - }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", @@ -2107,14 +2091,6 @@ "side-channel": "^1.0.4" } }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "requires": { - "loose-envify": "^1.0.0" - } - }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -2187,7 +2163,8 @@ "is-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "dev": true }, "is-regex": { "version": "1.1.2", @@ -2934,22 +2911,6 @@ "react-native-animatable": "1.3.3" } }, - "react-native-webview": { - "version": "11.2.4", - "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.2.4.tgz", - "integrity": "sha512-8C0HHNVhM3GlhtC30fO+sbH5J83zTRdi5qzdP2IvDV9tS0S0ZNPi97GJHjcIRc4dAtIoyn6NHdN5xREKGQZU9w==", - "requires": { - "escape-string-regexp": "2.0.0", - "invariant": "2.2.4" - }, - "dependencies": { - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" - } - } - }, "react-refresh": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz", diff --git a/package.json b/package.json index 5adb125..3d12780 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@chatwoot/react-native-widget", - "version": "0.0.5", + "version": "0.0.6", "description": "React Native widget for Chatwoot", "main": "index.js", "scripts": { diff --git a/src/App.js b/src/App.js index c81dbdf..b1f1a0b 100644 --- a/src/App.js +++ b/src/App.js @@ -51,8 +51,6 @@ const ChatWootWidget = ({ style={styles.modal} coverScreen isVisible={isModalVisible} - onSwipeComplete={() => isModalVisible} - swipeDirection="left" onBackdropPress={closeModal} onBackButtonPress={closeModal}>