@memori.ai/memori-react 2.18.7 → 2.18.9

package/src/components/MemoriWidget/MemoriWidget.tsx

@@ -122,8 +122,18 @@ const typeMessage = (
       hasBatchQueued,
     },
   });
-
   document.dispatchEvent(e);
+
+  const isSafariIOS =
+    window.navigator.userAgent.includes('Safari') &&
+    !window.navigator.userAgent.includes('Chrome') &&
+    /iPad|iPhone|iPod/.test(navigator.userAgent);
+
+  if (isSafariIOS) {
+    setTimeout(() => {
+      document.dispatchEvent(new CustomEvent('MemoriEndSpeak'));
+    }, 300);
+  }
 };
 const typeMessageHidden = (
   message: string,
@@ -189,6 +199,11 @@ const typeBatchMessages = (
       ?.hasAttribute('disabled');
   }
 
+  const isSafariIOS =
+    window.navigator.userAgent.includes('Safari') &&
+    !window.navigator.userAgent.includes('Chrome') &&
+    /iPad|iPhone|iPod/.test(navigator.userAgent);
+
   const stepsGenerator = (function* () {
     yield* messages;
   })();
@@ -200,20 +215,35 @@ const typeBatchMessages = (
     const step = next.value;
 
     if (step) {
+      if (!areInputsDisabled()) {
+        disableInputs();
+      }
+
+      let waitForPrevious = step.waitForPrevious;
+      if (isSafariIOS) waitForPrevious = false;
+
       typeMessage(
         step.message,
-        step.waitForPrevious,
+        waitForPrevious,
         step.hidden,
         step.typingText,
         step.useLoaderTextAsMsg,
         !next.done
       );
+
+      if (isSafariIOS) {
+        setTimeout(() => {
+          document.dispatchEvent(new CustomEvent('MemoriEndSpeak'));
+          reEnableInputs();
+        }, 3000);
+      }
     } else if (areInputsDisabled()) {
       reEnableInputs();
     }
 
     if (next.done) {
       document.removeEventListener('MemoriEndSpeak', submitNewMessage);
+      if (areInputsDisabled()) reEnableInputs();
       return;
     }
   };
@@ -776,13 +806,14 @@ const MemoriWidget = ({
   /**
    * Age verification
    */
-  const minAge = memori.ageRestriction
-    ? memori.ageRestriction
-    : memori.nsfw
-    ? 18
-    : memori.enableCompletions
-    ? 14
-    : 0;
+  const minAge =
+    memori.ageRestriction !== undefined
+      ? memori.ageRestriction
+      : memori.nsfw
+      ? 18
+      : memori.enableCompletions
+      ? 14
+      : 0;
   const [birthDate, setBirthDate] = useState<string | undefined>();
   const [showAgeVerification, setShowAgeVerification] = useState(false);
 
@@ -1544,35 +1575,6 @@ const MemoriWidget = ({
       audioContext.resume().then(() => speak(text));
       return;
     }
-    if (isIOS && isSafari) {
-      audioContext.suspend();
-
-      if (isPlayingAudio) {
-        try {
-          memoriSpeaking = false;
-          if (speechSynthesizer) {
-            speechSynthesizer.close();
-            speechSynthesizer = null;
-          }
-          if (audioDestination) {
-            audioDestination.pause();
-            audioDestination.close();
-          }
-          if (audioContext) {
-            // audioContext.close().then(() => {
-            //   audioContext = new AudioContext();
-            //   let buffer = audioContext.createBuffer(1, 10000, 22050);
-            //   let source = audioContext.createBufferSource();
-            //   source.buffer = buffer;
-            //   source.connect(audioContext.destination);
-            // });
-            audioContext.destination.disconnect();
-          }
-        } catch (e) {
-          console.error('stopAudio error: ', e);
-        }
-      }
-    }
     if (audioContext.state === 'closed') {
       audioContext = new AudioContext();
       let buffer = audioContext.createBuffer(1, 10000, 22050);
@@ -1590,7 +1592,9 @@ const MemoriWidget = ({
     }
 
     if (!speechSynthesizer) {
-      audioDestination = new speechSdk.SpeakerAudioDestination();
+      if (!isIOS) {
+        audioDestination = new speechSdk.SpeakerAudioDestination();
+      }
       let audioConfig =
         speechSdk.AudioConfig.fromSpeakerOutput(audioDestination);
       speechSynthesizer = new speechSdk.SpeechSynthesizer(
@@ -1628,9 +1632,6 @@ const MemoriWidget = ({
           memoriSpeaking = true;
 
           try {
-            // if (audioContext.destination.context.state === 'running') {
-            //   audioContext.destination.disconnect();
-            // }
             audioContext.decodeAudioData(result.audioData, function (buffer) {
               source.buffer = buffer;
               source.connect(audioContext.destination);
@@ -1669,11 +1670,13 @@ const MemoriWidget = ({
               speechSynthesizer.close();
               speechSynthesizer = null;
             }
+            emitEndSpeakEvent();
           }
         } else {
           audioContext.resume();
           setIsPlayingAudio(false);
           memoriSpeaking = false;
+          emitEndSpeakEvent();
         }
       },
       error => {
@@ -1681,6 +1684,7 @@ const MemoriWidget = ({
         window.speechSynthesis.speak(new SpeechSynthesisUtterance(text));
         setIsPlayingAudio(false);
         memoriSpeaking = false;
+        emitEndSpeakEvent();
       }
     );
 

package/src/index.stories.tsx

@@ -52,6 +52,52 @@ Localhost.args = {
   integrationID: '82f017cc-450b-4c47-acf5-47910d336ce9',
 };
 
+const TemplateWithBatchButton: Story<Props> = args => (
+  <div>
+    <button
+      style={{
+        position: 'fixed',
+        top: '0.5rem',
+        left: '0.5rem',
+        zIndex: 99999,
+      }}
+      onClick={() => {
+        window.typeBatchMessages([
+          {
+            message: 'uno di tre',
+            hidden: false,
+            waitForPrevious: true,
+          },
+          {
+            message: 'due di tre',
+            hidden: false,
+            waitForPrevious: true,
+          },
+          {
+            message: 'tre di tre',
+            hidden: false,
+            waitForPrevious: true,
+          },
+        ]);
+      }}
+    >
+      Start Batch
+    </button>
+    <Memori {...args} />
+  </div>
+);
+export const WithBatch = TemplateWithBatchButton.bind({});
+WithBatch.args = {
+  ownerUserName: 'nzambello',
+  memoriName: 'Nicola',
+  tenantID: 'app.memorytwin.com',
+  apiURL: 'https://backend.memori.ai',
+  baseURL: 'https://app.memorytwin.com',
+  uiLang: 'it',
+  showShare: true,
+  showSettings: true,
+};
+
 // export const Instruction = Template.bind({});
 // Instruction.args = {
 //   ownerUserName: 'nzambello',
@@ -65,42 +111,3 @@ Localhost.args = {
 //   pin: 'giver pin',
 //   authToken: 'your login token',
 // };
-
-export const DemoSophia = Template.bind({});
-DemoSophia.args = {
-  layout: 'TOTEM',
-  memoriName: 'Sophia',
-  ownerUserName: 'francescoimpellizzeri',
-  memoriID: '57405959-a2c5-4499-adb8-bb8dcc848ad5',
-  ownerUserID: '44ccefdb-d7a2-447e-9851-2a76be055a40',
-  tenantID: 'nextpresent.aclambda.online',
-  apiURL: 'https://backend.memori.ai',
-  baseURL: 'https://nextpresent.aclambda.online',
-  uiLang: 'it',
-  lang: 'it',
-  showShare: true,
-  showSettings: true,
-  integrationID: 'd10bbffd-26f3-4614-a092-15b215d04ffa',
-  initialQuestion: 'Welcome Totem',
-  contextVars: 'CONTEXT:TOTEM',
-  // https://assets.memori.ai/api/v2/asset/6af08bf1-f011-40ea-92a2-699b7b53a53c.glb
-};
-
-export const DemoStefano = Template.bind({});
-DemoStefano.args = {
-  layout: 'TOTEM',
-  memoriName: 'Stefano Zingoni',
-  ownerUserName: 'roberta.bianchi',
-  memoriID: 'd6df4c75-8dfb-4e6d-b19f-193fa8a9bcce',
-  ownerUserID: 'b242160e-c19c-468f-b7f8-b2dc1ce51045',
-  tenantID: 'gruppoe.aclambda.online',
-  apiURL: 'https://backend.memori.ai',
-  baseURL: 'https://gruppoe.aclambda.online',
-  uiLang: 'it',
-  lang: 'it',
-  showShare: true,
-  showSettings: true,
-  contextVars: 'CONTEXT:TOTEM',
-  integrationID: '5712601d-6174-45e7-bfb1-b4ac71c4ff80',
-  // https://assets.memori.ai/api/v2/asset/ed50c6a4-37cd-458b-9209-8cabfa256b30.glb
-};

package/src/index.tsx

@@ -24,8 +24,13 @@ export interface Props {
   layout?: WidgetProps['layout'];
   customLayout?: WidgetProps['customLayout'];
   showShare?: boolean;
-  showSettings?: boolean;
   showInstruct?: boolean;
+  showInputs?: boolean;
+  showDates?: boolean;
+  showContextPerLine?: boolean;
+  showSettings?: boolean;
+  showClear?: boolean;
+  showOnlyLastMessages?: boolean;
   showTypingText?: boolean;
   height?: number | string;
   baseURL?: string;
@@ -77,6 +82,11 @@ const Memori: React.FC<Props> = ({
   showSettings = true,
   showInstruct = false,
   showTypingText = false,
+  showClear = false,
+  showOnlyLastMessages = false,
+  showInputs = true,
+  showDates = false,
+  showContextPerLine = false,
   height = '100%',
   baseURL,
   apiURL = 'https://backend.memori.ai',
@@ -207,6 +217,11 @@ const Memori: React.FC<Props> = ({
       showSettings={showSettings}
       showInstruct={showInstruct}
       showTypingText={showTypingText}
+      showClear={showClear}
+      showOnlyLastMessages={showOnlyLastMessages}
+      showInputs={showInputs}
+      showDates={showDates}
+      showContextPerLine={showContextPerLine}
       integration={memori?.integrations?.find(i =>
         integrationID
           ? i.integrationID === integrationID
@@ -257,8 +272,13 @@ Memori.propTypes = {
   ]),
   customLayout: PropTypes.any,
   showShare: PropTypes.bool,
-  showSettings: PropTypes.bool,
   showInstruct: PropTypes.bool,
+  showInputs: PropTypes.bool,
+  showDates: PropTypes.bool,
+  showContextPerLine: PropTypes.bool,
+  showSettings: PropTypes.bool,
+  showClear: PropTypes.bool,
+  showOnlyLastMessages: PropTypes.bool,
   showTypingText: PropTypes.bool,
   height: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   baseURL: PropTypes.string,