Fix ESLint and selectVoice

compulim · Aug 22, 2019 · 26e3e29 · 26e3e29
1 parent 7aea86b
commit 26e3e29
Show file tree

Hide file tree

Showing 5 changed files with 213 additions and 52 deletions.
diff --git a/packages/bundle/package-lock.json b/packages/bundle/package-lock.json
diff --git a/packages/bundle/package.json b/packages/bundle/package.json
@@ -46,7 +46,7 @@
     "prop-types": "^15.7.2",
     "sanitize-html": "^1.19.0",
     "url-search-params-polyfill": "^5.0.0",
-    "web-speech-cognitive-services": "4.0.1-master.d9fc5d3",
+    "web-speech-cognitive-services": "4.0.1-master.2143983",
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {

diff --git a/packages/component/src/Composer.js b/packages/component/src/Composer.js
@@ -6,7 +6,7 @@ import {
 import { connect, Provider } from 'react-redux';
 import { css } from 'glamor';
 import PropTypes from 'prop-types';
-import React, { useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 
 import {
   clearSuggestedActions,
@@ -152,6 +152,7 @@ const Composer = ({
   referenceGrammarID,
   renderMarkdown,
   scrollToEnd,
+  selectVoice,
   sendBoxRef,
   sendTimeout,
   sendTyping,
@@ -163,18 +164,18 @@ const Composer = ({
   username,
   webSpeechPonyfillFactory
 }) => {
-  const patchedGrammars = useMemo(() => grammars || []);
+  const patchedGrammars = useMemo(() => grammars || [], [grammars]);
   const patchedSendTypingIndicator = useMemo(() => {
     if (typeof sendTyping === 'undefined') {
       return sendTypingIndicator;
-    } else {
-      // TODO: [P3] Take this deprecation code out when releasing on or after January 13 2020
-      console.warn(
-        'Web Chat: "sendTyping" has been renamed to "sendTypingIndicator". Please use "sendTypingIndicator" instead. This deprecation migration will be removed on or after January 13 2020.'
-      );
-
-      return sendTyping;
     }
+
+    // TODO: [P3] Take this deprecation code out when releasing on or after January 13 2020
+    console.warn(
+      'Web Chat: "sendTyping" has been renamed to "sendTypingIndicator". Please use "sendTypingIndicator" instead. This deprecation migration will be removed on or after January 13 2020.'
+    );
+
+    return sendTyping;
   }, [sendTyping, sendTypingIndicator]);
 
   const patchedStyleOptions = useMemo(
@@ -209,9 +210,9 @@ const Composer = ({
     dispatch
   ]);
 
-  const selectVoice = useCallback(
-    (selectVoice, language) => selectVoice || defaultSelectVoice.bind(null, { language })
-  );
+  const patchedSelectVoice = useCallback(selectVoice || defaultSelectVoice.bind(null, { language: locale }), [
+    selectVoice
+  ]);
 
   const focusSendBoxContext = useMemo(() => createFocusSendBoxContext({ sendBoxRef }), [sendBoxRef]);
 
@@ -221,7 +222,7 @@ const Composer = ({
   ]);
 
   const hoistedDispatchers = useMemo(
-    () => mapMap(DISPATCHERS, dispatcher => (...args) => dispatch(dispatcher.apply(this, args))),
+    () => mapMap(DISPATCHERS, dispatcher => (...args) => dispatch(dispatcher(...args))),
     [dispatch]
   );
 
@@ -252,7 +253,7 @@ const Composer = ({
       groupTimestamp,
       renderMarkdown,
       scrollToEnd,
-      selectVoice,
+      selectVoice: patchedSelectVoice,
       sendBoxRef,
       sendTimeout,
       sendTypingIndicator: patchedSendTypingIndicator,
@@ -269,17 +270,17 @@ const Composer = ({
       directLine,
       disabled,
       focusSendBoxContext,
-      grammars,
       groupTimestamp,
       hoistedDispatchers,
+      patchedGrammars,
+      patchedSelectVoice,
+      patchedSendTypingIndicator,
+      patchedStyleOptions,
+      patchedStyleSet,
       renderMarkdown,
       scrollToEnd,
-      selectVoice,
       sendBoxRef,
       sendTimeout,
-      sendTypingIndicator,
-      styleOptions,
-      styleSet,
       userID,
       username,
       webSpeechPonyfill
@@ -336,8 +337,8 @@ export default ConnectedComposerWithStore;
 
 Composer.defaultProps = {
   activityRenderer: undefined,
-  adaptiveCardHostConfig: undefined,
   attachmentRenderer: undefined,
+  botAvatarInitials: undefined,
   cardActionMiddleware: undefined,
   children: undefined,
   disabled: false,
@@ -347,20 +348,22 @@ Composer.defaultProps = {
   referenceGrammarID: '',
   renderMarkdown: text => text,
   selectVoice: undefined,
+  sendBoxRef: undefined,
   sendTimeout: 20000,
   sendTyping: undefined,
   sendTypingIndicator: false,
-  store: undefined,
   styleOptions: {},
+  styleSet: undefined,
+  userAvatarInitials: undefined,
   userID: '',
   username: '',
   webSpeechPonyfillFactory: undefined
 };
 
 Composer.propTypes = {
   activityRenderer: PropTypes.func,
-  adaptiveCardHostConfig: PropTypes.any,
   attachmentRenderer: PropTypes.func,
+  botAvatarInitials: PropTypes.string,
   cardActionMiddleware: PropTypes.func,
   children: PropTypes.any,
   directLine: PropTypes.shape({
@@ -385,11 +388,15 @@ Composer.propTypes = {
   renderMarkdown: PropTypes.func,
   scrollToEnd: PropTypes.func.isRequired,
   selectVoice: PropTypes.func,
+  sendBoxRef: PropTypes.shape({
+    current: PropTypes.any
+  }),
   sendTimeout: PropTypes.number,
   sendTyping: PropTypes.bool,
   sendTypingIndicator: PropTypes.bool,
-  store: PropTypes.any,
   styleOptions: PropTypes.any,
+  styleSet: PropTypes.any,
+  userAvatarInitials: PropTypes.string,
   userID: PropTypes.string,
   username: PropTypes.string,
   webSpeechPonyfillFactory: PropTypes.func

diff --git a/packages/component/src/defaultSelectVoice.test.js b/packages/component/src/defaultSelectVoice.test.js
@@ -2,6 +2,8 @@
  * @jest-environment node
  */
 
+/* global global */
+
 import selectVoice from './defaultSelectVoice';
 
 const VOICES = [