Merge pull request #9 from botstar/feat/tu_add-widget-state

feat:  🎸 implement widget state (loaded, error)

Author: chative-tu

.npmignore

@@ -0,0 +1,16 @@
+examples/
+
+# Logs
+*.log
+npm-debug.log
+
+# Runtime data
+tmp
+build
+dist
+*.tgz
+
+# Dependency directory
+node_modules/
+
+.DS_Store

README.md

@@ -66,6 +66,7 @@ export default function App() {
         onClosed={() => console.log('Widget closed')}
         onLoaded={() => console.log('Widget loaded')}
         onNewMessage={(message) => console.log('New message:', message)}
+        onError={(message) => console.log('Error', message)}
       />
     </View>
   );
@@ -85,6 +86,7 @@ export default function App() {
 | onClosed | () => void | No | Callback when the widget is closed |
 | onLoaded | () => void | No | Callback when the widget is loaded |
 | onNewMessage | () => void | No | Callback when a new message is received |
+| onError | (error:string) => void | No | Callback function triggered when an error occurs. |
 
 ## Methods
 

examples/App.js

@@ -4,7 +4,7 @@ import { Button, SafeAreaView, StyleSheet, View } from 'react-native';
 
 export default function App() {
   const chativeWidgetRef = useRef(null);
-  const channelId = 's49f3a621-2f07-45a4-8019-92663014b998'; // Replace with your channel id
+  const channelId = 's49f3a621-2f07-45a4-8019-92663014b997'; // Replace with your channel id
 
   const handleOpenModal = () => {
     chativeWidgetRef.current.show();
@@ -22,6 +22,10 @@ export default function App() {
     console.log('onNewMessage');
   }
 
+  const onError = (error) => {
+    console.log('Error:', error);
+  }
+
   const user = {
     user_id: 'UNIQUE_USER_ID',
     user: {
@@ -44,6 +48,7 @@ export default function App() {
         onLoaded={onLoaded}
         onClosed={handleCloseModal}
         onNewMessage={onNewMessage}
+        onError={onError}
       />
     </SafeAreaView>
   );

examples/package.json

@@ -7,10 +7,10 @@
     "android": "expo start --android",
     "ios": "expo start --ios",
     "web": "expo start --web",
-    "livechat": "yarn remove @chative.io/react-native-widget || true && yarn cache clean && yarn add ../chative.io-react-native-widget-v0.5.0.tgz"
+    "livechat": "yarn remove @chative.io/react-native-widget || true && yarn cache clean && yarn add ../chative.io-react-native-widget-v0.5.1.tgz"
   },
   "dependencies": {
-    "@chative.io/react-native-widget": "../chative.io-react-native-widget-v0.5.0.tgz",
+    "@chative.io/react-native-widget": "../chative.io-react-native-widget-v0.5.1.tgz",
     "@react-native-async-storage/async-storage": "^1.23.1",
     "@types/react": "~18.2.79",
     "expo": "~51.0.20",

examples/yarn.lock

@@ -796,9 +796,9 @@
     "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
-"@chative.io/react-native-widget@../chative.io-react-native-widget-v0.5.0.tgz":
-  version "0.5.0"
-  resolved "../chative.io-react-native-widget-v0.5.0.tgz#b074a980cd915570a5770b8a540949b47b951214"
+"@chative.io/react-native-widget@../chative.io-react-native-widget-v0.5.1.tgz":
+  version "0.5.1"
+  resolved "../chative.io-react-native-widget-v0.5.1.tgz#915eab11f56669755299544d916a25c03297064a"
 
 "@expo/bunyan@^4.0.0":
   version "4.0.0"

index.d.ts

@@ -23,6 +23,7 @@ declare module '@chative.io/react-native-widget' {
     insetBottom?: number;
     onClosed?: () => void;
     onLoaded?: () => void;
+    onError?: (error: any) => void;
     onNewMessage?: (message: any) => void;
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chative.io/react-native-widget",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "React Native SDK for Chative",
   "main": "index.js",
   "scripts": {

src/ChativeWidget.js

@@ -15,6 +15,7 @@ const propTypes = {
   onClosed: PropTypes.func,
   onLoaded: PropTypes.func,
   onNewMessage: PropTypes.func,
+  onError: PropTypes.func,
 };
 
 const ChativeWidget = forwardRef(({
@@ -27,6 +28,7 @@ const ChativeWidget = forwardRef(({
   onClosed,
   onLoaded,
   onNewMessage,
+  onError,
 }, ref) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const webViewRef = useRef(null);
@@ -74,6 +76,7 @@ const ChativeWidget = forwardRef(({
           onLoaded={onLoaded}
           onNewMessage={onNewMessage}
           onClosedWidget={handleClose}
+          onError={onError}
         />
       </View>
     </SafeAreaView>

src/WebView.js

@@ -3,19 +3,21 @@ import React, { forwardRef, useImperativeHandle, useRef } from 'react';
 import { StyleSheet } from 'react-native';
 import WebView from 'react-native-webview';
 import { WIDGET_URL } from './constants';
-import { generateScript, safeParse } from './utils';
+import { generateScript, generateScriptGetError, safeParse } from './utils';
 
 const propTypes = {
   channelId: PropTypes.string.isRequired,
   user: PropTypes.object,
   onLoaded: PropTypes.func,
   onClosedWidget: PropTypes.func,
   onNewMessage: PropTypes.func,
+  onError: PropTypes.func,
 };
 
-const WebViewComponent = forwardRef(({ channelId, user, onLoaded, onClosedWidget, onNewMessage }, ref) => {
+const WebViewComponent = forwardRef(({ channelId, user, onLoaded, onClosedWidget, onNewMessage, onError }, ref) => {
   const webViewRef = useRef(null);
   const javascriptInit = React.useMemo(() => generateScript(user), [user]);
+  const errorScript = React.useMemo(() => generateScriptGetError(), []);
 
   useImperativeHandle(ref, () => ({
     injectJavaScript: (script) => {
@@ -30,12 +32,12 @@ const WebViewComponent = forwardRef(({ channelId, user, onLoaded, onClosedWidget
     <WebView
       ref={webViewRef}
       style={styles.webViewContainer}
+      injectedJavaScript={errorScript}
       source={{
         uri: `${WIDGET_URL}/${channelId}?mode=livechat&state=${user ? 'off' : 'on'}`,
       }}
       onLoadEnd={() => {
         webViewRef.current?.injectJavaScript(javascriptInit);
-        onLoaded && onLoaded();
       }}
       onMessage={(event) => {
         const { data } = event.nativeEvent;
@@ -48,6 +50,14 @@ const WebViewComponent = forwardRef(({ channelId, user, onLoaded, onClosedWidget
         if (parsedData.event === 'new-agent-message') {
           onNewMessage && onNewMessage();
         }
+
+        if (parsedData.event === 'ready') {
+          onLoaded && onLoaded();
+        }
+
+        if (parsedData.event === 'error') {
+          onError && onError(parsedData.message);
+        }
       }}
     />
   );
@@ -61,4 +71,4 @@ const styles = StyleSheet.create({
 
 WebViewComponent.propTypes = propTypes;
 
-export default WebViewComponent;
+export default React.memo(WebViewComponent);

src/constants.js

@@ -2,3 +2,4 @@ export const COLOR_WHITE = '#fff';
 export const INDEX_SHOW = 999;
 export const INDEX_HIDE = -1;
 export const WIDGET_URL = 'https://messenger.svc.chative.io/site';
+export const QUERY_URL = 'https://gateway.svc.chative.io/web/live/query';