@botonic/react 0.26.1 → 0.27.0-alpha.0

package/src/components/multichannel/multichannel-text.jsx

@@ -1,4 +1,4 @@
-import { INPUT } from '@botonic/core'
+import { INPUT, isFacebook, isWhatsapp } from '@botonic/core'
 import React, { useContext } from 'react'
 
 import { RequestContext } from '../../contexts'
@@ -16,8 +16,6 @@ import {
   getButtonType,
   getMultichannelButtons,
   getMultichannelReplies,
-  isFacebook,
-  isWhatsapp,
   MENU_BUTTON_WHATSAPP_BUTTON_LIST,
   MULTICHANNEL_WHATSAPP_PROPS,
   WHATSAPP_LIST_MAX_BUTTONS,
@@ -113,7 +111,7 @@ export const MultichannelText = props => {
     return messages
   }
 
-  if (isWhatsapp(requestContext)) {
+  if (isWhatsapp(requestContext.session)) {
     const texts = getText(props.children)
     const { postbackButtons, urlButtons, webviewButtons } = getWhatsappButtons()
 
@@ -280,7 +278,7 @@ export const MultichannelText = props => {
     return <>{messages}</>
   }
 
-  if (isFacebook(requestContext)) {
+  if (isFacebook(requestContext.session)) {
     const text = getText(props.children)
     const multichannelFacebook = new MultichannelFacebook()
     const { texts, propsLastText, propsWithoutChildren } =

package/src/components/multichannel/multichannel-utils.js

@@ -1,5 +1,3 @@
-import { Providers } from '@botonic/core'
-
 /**
  *
  * Whatsapp does not support Markdown
@@ -73,13 +71,3 @@ export function getMultichannelButtons(node) {
 export function getMultichannelReplies(node) {
   return getFilteredElements(node, isMultichannelReply)
 }
-
-export const isWhatsapp = context =>
-  context.session &&
-  context.session.user &&
-  context.session.user.provider == Providers.Messaging.WHATSAPP
-
-export const isFacebook = context =>
-  context.session &&
-  context.session.user &&
-  context.session.user.provider == Providers.Messaging.FACEBOOK

package/src/components/multichannel/multichannel.jsx

@@ -1,3 +1,4 @@
+import { isFacebook, isWhatsapp } from '@botonic/core'
 import React, { useContext } from 'react'
 
 import { COMPONENT_TYPE } from '../../constants'
@@ -9,18 +10,17 @@ import { MultichannelCarousel } from './multichannel-carousel'
 import { MultichannelContext } from './multichannel-context'
 import { MultichannelReply } from './multichannel-reply'
 import { MultichannelText } from './multichannel-text'
-import {
-  isFacebook,
-  isWhatsapp,
-  MULTICHANNEL_WHATSAPP_PROPS,
-} from './multichannel-utils'
+import { MULTICHANNEL_WHATSAPP_PROPS } from './multichannel-utils'
 
 export const Multichannel = props => {
   const requestContext = useContext(RequestContext)
-  if (!isWhatsapp(requestContext) && !isFacebook(requestContext)) {
+  if (
+    !isWhatsapp(requestContext.session) &&
+    !isFacebook(requestContext.session)
+  ) {
     return props.children
   }
-  if (isFacebook(requestContext)) {
+  if (isFacebook(requestContext.session)) {
     const newChildren = deepMapWithIndex(props.children, child => {
       if (child && child.type && child.type.name === COMPONENT_TYPE.TEXT) {
         return (

package/src/constants.js

@@ -1,4 +1,5 @@
 import BotonicLogo from './assets/botonic_react_logo100x100.png'
+import UrlIcon from './assets/url-icon.png'
 
 export const COLORS = {
   // http://chir.ag/projects/name-that-color
@@ -36,6 +37,7 @@ export const WEBCHAT = {
     HEIGHT: 450,
     TITLE: 'Botonic',
     LOGO: BotonicLogo,
+    URL_ICON: UrlIcon,
     PLACEHOLDER: 'Ask me something...',
     FONT_FAMILY: "'Noto Sans JP', sans-serif",
     BORDER_RADIUS_TOP_CORNERS: '6px 6px 0px 0px',
@@ -115,6 +117,8 @@ export const WEBCHAT = {
     buttonStyleBackground: 'button.style.background',
     buttonStyleColor: 'button.style.color',
     customButton: 'button.custom',
+    urlIconImage: 'button.urlIcon.image',
+    urlIconEnabled: 'button.urlIcon.enable',
     // Replies
     alignReplies: 'replies.align',
     customReply: 'reply.custom',

package/src/webview-app.tsx

@@ -63,10 +63,14 @@ class App extends React.Component {
     if (provider === PROVIDER.FACEBOOK) {
       try {
         window.MessengerExtensions.requestCloseBrowser(
-          () => undefined,
-          err => console.log(err)
+          function success() {},
+          function error(err) {
+            window.close()
+          }
         )
-      } catch (e) {}
+      } catch (e) {
+        window.close()
+      }
     }
     if (provider === PROVIDER.WEBCHAT) {
       try {