agora-appbuilder-core 3.0.13 → 3.0.28-beta-9

package/template/react-native-toast-message/src/index.js

@@ -1,15 +1,18 @@
 import React, { Component } from 'react';
-import { Animated, PanResponder, Keyboard } from 'react-native';
+import { Animated, PanResponder, Keyboard, Dimensions } from 'react-native';
 import PropTypes from 'prop-types';
 
 import SuccessToast from './components/success';
 import ErrorToast from './components/error';
 import InfoToast from './components/info';
+
 import { complement } from './utils/arr';
 import { includeKeys } from './utils/obj';
 import { stylePropType } from './utils/prop-types';
 import { isIOS } from './utils/platform';
 import styles from './styles';
+import isMobileOrTablet from '../../src/utils/isMobileOrTablet';
+import { isMobileUA, isWebInternal } from '../../src/utils/common';
 
 const FRICTION = 8;
 
@@ -81,11 +84,15 @@ class Toast extends Component {
   }
 
   static show(options = {}) {
-    Toast._ref.show(options);
+    Toast._ref?.show(options);
   }
 
   static hide() {
-    Toast._ref.hide();
+    Toast._ref?.hide({ forceHide: true });
+  }
+
+  static getToastId() {
+    return Toast._ref?.getToastId();
   }
 
   constructor(props) {
@@ -109,7 +116,10 @@ class Toast extends Component {
       keyboardHeight: 0,
       keyboardVisible: false,
 
-      customProps: {}
+      customProps: {},
+      customStyle: this.getCustomStyle(),
+      isHovered: false,
+      toastId: 0
     };
 
     this.panResponder = PanResponder.create({
@@ -126,6 +136,40 @@ class Toast extends Component {
     });
   }
 
+  getToastId = () => {
+    return this.state?.toastId;
+  };
+
+  getCustomStyle = () => {
+    let customStyle = {};
+    if (isMobileOrTablet() || Dimensions.get('window').width < 768) {
+      customStyle = {
+        left: '3%',
+        right: '3%',
+        width: '94%'
+      };
+    } else if (Dimensions.get('window').width < 900) {
+      customStyle = {
+        left: '18%',
+        right: '18%',
+        width: '64%'
+      };
+    } else if (Dimensions.get('window').width < 1200) {
+      customStyle = {
+        left: '25%',
+        right: '25%',
+        width: '50%'
+      };
+    } else {
+      customStyle = {
+        left: '33.33%',
+        right: '33.33%',
+        width: '33.33%'
+      };
+    }
+    return customStyle;
+  };
+
   componentDidMount() {
     const noop = {
       remove: () => {}
@@ -211,8 +255,9 @@ class Toast extends Component {
   }
 
   async show(options = {}) {
+    const { update = false } = options;
     const { inProgress, isVisible } = this.state;
-    if (inProgress || isVisible) {
+    if ((inProgress || isVisible) && !update) {
       await this.hide();
     }
 
@@ -251,24 +296,29 @@ class Toast extends Component {
     }
   }
 
-  async hide({ speed } = {}) {
-    await this._setState((prevState) => ({
-      ...prevState,
-      inProgress: true
-    }));
-    await this.animateHide({
-      speed
-    });
-    this.clearTimer();
-    await this._setState((prevState) => ({
-      ...prevState,
-      isVisible: false,
-      inProgress: false
-    }));
-
-    const { onHide } = this.state;
-    if (onHide) {
-      onHide();
+  async hide({ speed, forceHide = false } = {}) {
+    if (this.state.isHovered && !forceHide && !isMobileUA()) {
+      return;
+    } else {
+      await this._setState((prevState) => ({
+        ...prevState,
+        inProgress: true
+      }));
+      await this.animateHide({
+        speed
+      });
+      this.clearTimer();
+      await this._setState((prevState) => ({
+        ...prevState,
+        isVisible: false,
+        inProgress: false,
+        toastId: 0
+      }));
+
+      const { onHide } = this.state;
+      if (onHide) {
+        onHide();
+      }
     }
   }
 
@@ -331,9 +381,15 @@ class Toast extends Component {
           'isVisible',
           'text1',
           'text2',
+          'leadingIcon',
+          'leadingIconName',
           'hide',
           'show',
-          'onPress'
+          'onPress',
+          'primaryBtn',
+          'secondaryBtn',
+          'checkbox',
+          'toastId'
         ]
       }),
       props: { ...customProps },
@@ -358,6 +414,11 @@ class Toast extends Component {
 
     return [
       styles.base,
+      {
+        left: this.state.customStyle.left,
+        right: this.state.customStyle.right,
+        width: this.state.customStyle.width
+      },
       styles[position],
       {
         transform: [{ translateY }]
@@ -366,7 +427,10 @@ class Toast extends Component {
   }
 
   onLayout(e) {
-    this.setState({ height: e.nativeEvent.layout.height });
+    this.setState({
+      height: e.nativeEvent.layout.height,
+      customStyle: this.getCustomStyle()
+    });
   }
 
   render() {
@@ -375,16 +439,45 @@ class Toast extends Component {
     const baseStyle = this.getBaseStyle(position, keyboardHeight);
 
     return (
-      <Animated.View
-        testID='animatedView'
-        onLayout={this.onLayout}
-        style={[baseStyle, style, { zIndex: 100 }]} //added zindex
-        {...this.panResponder.panHandlers}>
-        {this.renderContent(this.props)}
-      </Animated.View>
+      <PlatformWrapper
+        setIsHovered={(value) => {
+          if (!isMobileUA()) {
+            this.setState({
+              isHovered: value
+            });
+            setTimeout(() => {
+              if (!value) {
+                this.startTimer();
+              }
+            });
+          }
+        }}>
+        <Animated.View
+          testID='animatedView'
+          onLayout={this.onLayout}
+          style={[baseStyle, style, { zIndex: 100 }]} //added zindex
+          {...this.panResponder.panHandlers}>
+          {this.renderContent(this.props)}
+        </Animated.View>
+      </PlatformWrapper>
     );
   }
 }
+const PlatformWrapper = ({ children, setIsHovered }) => {
+  return isWebInternal() ? (
+    <div
+      onMouseEnter={() => {
+        setIsHovered(true);
+      }}
+      onMouseLeave={() => {
+        setIsHovered(false);
+      }}>
+      {children}
+    </div>
+  ) : (
+    <>{children}</>
+  );
+};
 
 Toast.propTypes = {
   config: PropTypes.objectOf(PropTypes.func),

package/template/react-native-toast-message/src/index.sdk.tsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Animated, PanResponder, Keyboard } from 'react-native';
+import { Animated, PanResponder, Keyboard, Dimensions } from 'react-native';
 import PropTypes from 'prop-types';
 
 import SuccessToast from './components/success';
@@ -10,6 +10,8 @@ import { includeKeys } from './utils/obj';
 import { stylePropType } from './utils/prop-types';
 import { isIOS } from './utils/platform';
 import styles from './styles';
+import isMobileOrTablet from '../../src/utils/isMobileOrTablet';
+import { isWebInternal, isMobileUA } from '../../src/utils/common';
 
 const FRICTION = 8;
 
@@ -81,11 +83,15 @@ class Toast extends Component {
   }
 
   static show(options = {}) {
-    Toast._ref.show(options);
+    Toast._ref?.show(options);
   }
 
   static hide() {
-    Toast._ref.hide();
+    Toast._ref?.hide({ forceHide: true });
+  }
+
+  static getToastId() {
+    return Toast._ref?.getToastId();
   }
 
   constructor(props) {
@@ -109,7 +115,10 @@ class Toast extends Component {
       keyboardHeight: 0,
       keyboardVisible: false,
 
-      customProps: {}
+      customProps: {},
+      customStyle: this.getCustomStyle(),
+      isHovered: false,
+      toastId: 0
     };
 
     this.panResponder = PanResponder.create({
@@ -126,6 +135,40 @@ class Toast extends Component {
     });
   }
 
+  getToastId = () => {
+    return this.state?.toastId;
+  };
+
+  getCustomStyle = () => {
+    let customStyle = {};
+    if (isMobileOrTablet() || Dimensions.get('window').width < 768) {
+      customStyle = {
+        left: '3%',
+        right: '3%',
+        width: '94%'
+      };
+    } else if (Dimensions.get('window').width < 900) {
+      customStyle = {
+        left: '18%',
+        right: '18%',
+        width: '64%'
+      };
+    } else if (Dimensions.get('window').width < 1200) {
+      customStyle = {
+        left: '25%',
+        right: '25%',
+        width: '50%'
+      };
+    } else {
+      customStyle = {
+        left: '33.33%',
+        right: '33.33%',
+        width: '33.33%'
+      };
+    }
+    return customStyle;
+  };
+
   componentDidMount() {
     const noop = {
       remove: () => {}
@@ -211,8 +254,9 @@ class Toast extends Component {
   }
 
   async show(options = {}) {
+    const { update = false } = options;
     const { inProgress, isVisible } = this.state;
-    if (inProgress || isVisible) {
+    if ((inProgress || isVisible) && !update) {
       await this.hide();
     }
 
@@ -251,24 +295,29 @@ class Toast extends Component {
     }
   }
 
-  async hide({ speed } = {}) {
-    await this._setState((prevState) => ({
-      ...prevState,
-      inProgress: true
-    }));
-    await this.animateHide({
-      speed
-    });
-    this.clearTimer();
-    await this._setState((prevState) => ({
-      ...prevState,
-      isVisible: false,
-      inProgress: false
-    }));
-
-    const { onHide } = this.state;
-    if (onHide) {
-      onHide();
+  async hide({ speed, forceHide = false } = {}) {
+    if (this.state.isHovered && !forceHide && !isMobileUA()) {
+      return;
+    } else {
+      await this._setState((prevState) => ({
+        ...prevState,
+        inProgress: true
+      }));
+      await this.animateHide({
+        speed
+      });
+      this.clearTimer();
+      await this._setState((prevState) => ({
+        ...prevState,
+        isVisible: false,
+        inProgress: false,
+        toastId: 0
+      }));
+
+      const { onHide } = this.state;
+      if (onHide) {
+        onHide();
+      }
     }
   }
 
@@ -331,9 +380,15 @@ class Toast extends Component {
           'isVisible',
           'text1',
           'text2',
+          'leadingIcon',
+          'leadingIconName',
           'hide',
           'show',
-          'onPress'
+          'onPress',
+          'primaryBtn',
+          'secondaryBtn',
+          'checkbox',
+          'toastId'
         ]
       }),
       props: { ...customProps },
@@ -358,6 +413,11 @@ class Toast extends Component {
 
     return [
       styles.base,
+      {
+        left: this.state.customStyle.left,
+        right: this.state.customStyle.right,
+        width: this.state.customStyle.width
+      },
       styles[position],
       {
         opacity: translateY
@@ -366,7 +426,10 @@ class Toast extends Component {
   }
 
   onLayout(e) {
-    this.setState({ height: e.nativeEvent.layout.height });
+    this.setState({
+      height: e.nativeEvent.layout.height,
+      customStyle: this.getCustomStyle()
+    });
   }
 
   render() {
@@ -375,21 +438,51 @@ class Toast extends Component {
     const baseStyle = this.getBaseStyle(position, keyboardHeight);
 
     return (
-      <Animated.View
-        testID='animatedView'
-        onLayout={this.onLayout}
-        style={[
-          baseStyle,
-          style,
-          { zIndex: 100, display: this.state.isVisible ? 'flex' : 'none' }
-        ]} //added zindex
-        {...this.panResponder.panHandlers}>
-        {this.renderContent(this.props)}
-      </Animated.View>
+      <PlatformWrapper
+        setIsHovered={(value) => {
+          if (!isMobileUA()) {
+            this.setState({
+              isHovered: value
+            });
+            setTimeout(() => {
+              if (!value) {
+                this.startTimer();
+              }
+            });
+          }
+        }}>
+        <Animated.View
+          testID='animatedView'
+          onLayout={this.onLayout}
+          style={[
+            baseStyle,
+            style,
+            { zIndex: 100, display: this.state.isVisible ? 'flex' : 'none' }
+          ]} //added zindex
+          {...this.panResponder.panHandlers}>
+          {this.renderContent(this.props)}
+        </Animated.View>
+      </PlatformWrapper>
     );
   }
 }
 
+const PlatformWrapper = ({ children, setIsHovered }) => {
+  return isWebInternal() ? (
+    <div
+      onMouseEnter={() => {
+        setIsHovered(true);
+      }}
+      onMouseLeave={() => {
+        setIsHovered(false);
+      }}>
+      {children}
+    </div>
+  ) : (
+    <>{children}</>
+  );
+};
+
 Toast.propTypes = {
   config: PropTypes.objectOf(PropTypes.func),
   style: stylePropType,

package/template/react-native-toast-message/src/styles.js

@@ -1,12 +1,11 @@
-import { StyleSheet } from 'react-native';
+import isMobileOrTablet from '../../src/utils/isMobileOrTablet';
+import { StyleSheet, Dimensions } from 'react-native';
 
 export default StyleSheet.create({
   base: {
     position: 'absolute',
     alignItems: 'center',
-    justifyContent: 'center',
-    left: 0,
-    right: 0
+    justifyContent: 'center'
   },
   top: {
     top: 0

package/template/react-native-toast-message/src/styles.sdk.ts

@@ -1,12 +1,11 @@
-import { StyleSheet } from 'react-native';
+import isMobileOrTablet from '../../src/utils/isMobileOrTablet';
+import { Dimensions, StyleSheet } from 'react-native';
 
 export default StyleSheet.create({
   base: {
     position: 'absolute',
     alignItems: 'center',
-    justifyContent: 'center',
-    left: 0,
-    right: 0
+    justifyContent: 'center'
   },
   top: {
     top: 30

package/template/react-native.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+    project: {
+        ios: {},
+        android: {},
+    },
+    assets: ["./src/assets/fonts"]
+}

package/template/src/App.tsx

@@ -9,30 +9,21 @@
  information visit https://appbuilder.agora.io. 
 *********************************************
 */
-import React, {useState} from 'react';
+import React, {useState, useLayoutEffect} from 'react';
 import {Platform} from 'react-native';
-import Join from './pages/Join';
-import VideoCall from './pages/VideoCall';
-import Create from './pages/Create';
-import {Route, Switch, Redirect} from './components/Router';
-import PrivateRoute from './components/PrivateRoute';
-import OAuth from './components/OAuth';
-import StoreToken from './components/StoreToken';
-import {shouldAuthenticate} from './utils/common';
 import KeyboardManager from 'react-native-keyboard-manager';
-// commented for v1 release
-//import {CustomRoutesInterface, CUSTOM_ROUTES_PREFIX} from 'customization-api';
-//import {useCustomization} from 'customization-implementation';
 import AppWrapper from './AppWrapper';
 import {
-  MeetingInfoContextInterface,
-  MeetingInfoDefaultValue,
-  MeetingInfoProvider,
-} from './components/meeting-info/useMeetingInfo';
-import {SetMeetingInfoProvider} from './components/meeting-info/useSetMeetingInfo';
+  RoomInfoContextInterface,
+  RoomInfoDefaultValue,
+  RoomInfoProvider,
+} from './components/room-info/useRoomInfo';
+import {SetRoomInfoProvider} from './components/room-info/useSetRoomInfo';
 import {ShareLinkProvider} from './components/useShareLink';
+import AppRoutes from './AppRoutes';
+import {isWebInternal} from './utils/common';
 
-//hook can't be used in the outside react function calls. so directly checking the platform.
+// hook can't be used in the outside react function calls. so directly checking the platform.
 if (Platform.OS === 'ios') {
   KeyboardManager.setEnable(true);
   KeyboardManager.setEnableAutoToolbar(false);
@@ -42,14 +33,21 @@ if (Platform.OS === 'ios') {
 
 //Extending the UI Kit Type defintion to add custom attribute to render interface
 declare module 'agora-rn-uikit' {
-  interface DefaultRenderInterface {
-    name: string;
-    screenUid: number;
-    offline: boolean;
-  }
-  interface RtcPropsInterface {
-    screenShareUid: number;
-    screenShareToken?: string;
+  // interface DefaultContentInterface {
+  //   name: string;
+  //   screenUid: number;
+  //   offline: boolean;
+  //   lastMessageTimeStamp: number;
+  // }
+  // interface RtcPropsInterface {
+  //   screenShareUid: number;
+  //   screenShareToken?: string;
+  // }
+}
+
+declare global {
+  interface Navigator {
+    notifyReady?: () => boolean;
   }
 }
 
@@ -83,48 +81,40 @@ const App: React.FC = () => {
   //     return null;
   //   }
   // };
-  const [meetingInfo, setMeetingInfo] = useState<MeetingInfoContextInterface>(
-    MeetingInfoDefaultValue,
-  );
+
+  const notifyReady = () => {
+    if (typeof window.navigator.notifyReady === 'function') {
+      console.log('recording-bot: notifyReady is available');
+      window.navigator.notifyReady();
+    } else {
+      console.log('recording-bot: notifyReady is un-available');
+    }
+  };
+
+  useLayoutEffect(() => {
+    if (isWebInternal()) {
+      // Register only on web
+      window.addEventListener('load', notifyReady);
+    }
+    return () => {
+      if (isWebInternal()) {
+        window.removeEventListener('load', notifyReady);
+      }
+    };
+  }, []);
+
+  const [roomInfo, setRoomInfo] =
+    useState<RoomInfoContextInterface>(RoomInfoDefaultValue);
 
   return (
     <AppWrapper>
-      <SetMeetingInfoProvider value={{setMeetingInfo}}>
-        <MeetingInfoProvider value={{...meetingInfo}}>
+      <SetRoomInfoProvider value={{setRoomInfo}}>
+        <RoomInfoProvider value={{...roomInfo}}>
           <ShareLinkProvider>
-            <Switch>
-              {/* commented for v1 release */}
-              {/* {RenderCustomRoutes()} */}
-              <Route exact path={'/'}>
-                <Redirect to={'/create'} />
-              </Route>
-              <Route exact path={'/authenticate'}>
-                {shouldAuthenticate ? <OAuth /> : <Redirect to={'/'} />}
-              </Route>
-              <Route path={'/auth-token/:token'}>
-                <StoreToken />
-              </Route>
-              <Route exact path={'/join'}>
-                <Join />
-              </Route>
-              {shouldAuthenticate ? (
-                <PrivateRoute
-                  path={'/create'}
-                  failureRedirectTo={'/authenticate'}>
-                  <Create />
-                </PrivateRoute>
-              ) : (
-                <Route path={'/create'}>
-                  <Create />
-                </Route>
-              )}
-              <Route path={'/:phrase'}>
-                <VideoCall />
-              </Route>
-            </Switch>
+            <AppRoutes />
           </ShareLinkProvider>
-        </MeetingInfoProvider>
-      </SetMeetingInfoProvider>
+        </RoomInfoProvider>
+      </SetRoomInfoProvider>
     </AppWrapper>
   );
 };