@elliemae/ds-chat 2.0.0-next.9 → 2.0.0-rc.12

package/esm/parts/chat-container/ChatContainer.js

@@ -1,9 +1,14 @@
+import 'core-js/modules/esnext.async-iterator.filter.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.filter.js';
+import 'core-js/modules/esnext.async-iterator.for-each.js';
+import 'core-js/modules/esnext.iterator.for-each.js';
 import _jsx from '@babel/runtime/helpers/esm/jsx';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import React from 'react';
 import { noop } from 'lodash';
 import { describe } from 'react-desc';
-import DSIndeterminateProgressIndicator from '@elliemae/ds-basic/IndeterminateProgressIndicator';
+import DSIndeterminateProgressIndicator from '@elliemae/ds-indeterminate-progress-indicator';
 import DSBanner, { BANNER_TYPES } from '@elliemae/ds-banner';
 import { ChatComposer } from '../chat-composer/ChatContainerComposer.js';
 import { ChatContainerMessagesList } from '../chat-container-messages-list/ChatContainerMessagesList.js';
@@ -21,7 +26,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 const ChatContainer = props => {
   var _containerRef$current;
 
-  useValidateProps(props, ChatContainerWithSchema.toTypescript());
+  useValidateProps(props, containerProps);
   const {
     sendingText,
     sendingMessages,
@@ -30,15 +35,20 @@ const ChatContainer = props => {
     messagesListProps,
     composerProps,
     composerProps: {
-      onResize: onComposerResize
+      onResize: onComposerResize,
+      onKeyDown: onComposerKeyDown
     },
     actionRef,
-    autoScroll,
     device,
     isLoading,
     hasMoreItems,
-    getMoreMessages
+    getMoreMessages,
+    ariaLabel
   } = props;
+  const bannerRef = React.useRef({
+    focusOnWrapper: noop,
+    focusOnLink: noop
+  });
   const containerRef = React.useRef();
   const listRef = React.useRef({
     scrollToIndex: noop
@@ -46,21 +56,51 @@ const ChatContainer = props => {
   const onResize = React.useCallback(height => {
     if (onComposerResize) onComposerResize(height);
 
-    if (autoScroll) {
-      listRef.current.scrollToIndex(messagesListProps.messages.length - 1, {
-        align: 'end'
-      });
+    if (height > 30) {
+      /*
+       setTimeout is used to equal the animation duration from the 
+       composer text area when increase its size
+      */
+      setTimeout(() => {
+        actionRef.current.scrollToIndex(messagesListProps.messages.length - 1, {
+          align: 'start'
+        });
+      }, 50);
     }
-  }, [onComposerResize, messagesListProps.messages, autoScroll]);
+  }, [onComposerResize, messagesListProps.messages, actionRef]);
   const Container = device === 'desktop' ? StyledChatContainerContent : MobileStyledChatContainerContent;
+  const handleTabs = React.useCallback(e => {
+    if (onComposerKeyDown) onComposerKeyDown(e);else {
+      const ref = actionRef || listRef;
+
+      if (e.shiftKey && e.key === 'Tab') {
+        e.preventDefault();
+
+        if (['top', 'bottom'].includes(bannerPosition)) {
+          bannerRef.current.focusOnWrapper();
+        } else {
+          const last = ref.current.getMessagesInView().pop();
+          ref.current.focusToIndexWithoutScroll(last);
+        }
+      }
+    }
+  }, [actionRef, onComposerKeyDown, bannerPosition]); // Map actions
+
+  React.useEffect(() => {
+    if (actionRef && actionRef.current) {
+      actionRef.current.focusOnBanner = bannerRef.current.focusOnWrapper;
+      actionRef.current.focusOnBannerLink = bannerRef.current.focusOnLink;
+    }
+  }, [actionRef]);
   return /*#__PURE__*/jsxs(Container, {
     rows: ['minmax(0, 1fr)', 'auto'],
     ref: containerRef,
     role: "region",
-    "aria-label": "chat window",
+    "aria-label": ariaLabel,
     children: [/*#__PURE__*/_jsx("div", {
       style: {
-        position: 'relative'
+        position: 'relative',
+        overflow: 'hidden'
       }
     }, void 0, /*#__PURE__*/jsx(ChatContainerMessagesList, _objectSpread(_objectSpread({}, messagesListProps), {}, {
       actionRef: actionRef || listRef,
@@ -68,13 +108,17 @@ const ChatContainer = props => {
       hasMoreItems: hasMoreItems,
       getMoreMessages: getMoreMessages,
       sendingMessages: sendingMessages,
-      sendingText: sendingText
+      sendingText: sendingText,
+      bannerPosition: bannerPosition,
+      bannerRef: bannerRef
     })), ['top', 'bottom'].includes(isLoading) ? /*#__PURE__*/_jsx(StyledIndicatorContainer, {
-      isLoading: isLoading
+      isLoading: isLoading,
+      "data-testid": "ds-chat-loading-indicator"
     }, void 0, _DSIndeterminateProgr || (_DSIndeterminateProgr = /*#__PURE__*/_jsx(DSIndeterminateProgressIndicator, {
       processing: true,
       title: "Loading"
-    }))) : null, ['top', 'bottom'].includes(bannerPosition) ? /*#__PURE__*/_jsx(StyledIndicatorContainer, {
+    }))) : null, /*#__PURE__*/_jsx(StyledIndicatorContainer, {
+      linear: true,
       isLoading: bannerPosition
     }, void 0, /*#__PURE__*/_jsx(DSBanner, {
       showCloseButton: true,
@@ -88,15 +132,18 @@ const ChatContainer = props => {
       },
       onClose: bannerProps.onClose,
       isOpen: true,
-      type: BANNER_TYPES.INFO
-    })) : null, sendingMessages && sendingMessages.length > 0 ? _StyledIndicatorConta || (_StyledIndicatorConta = /*#__PURE__*/_jsx(StyledIndicatorContainer, {
+      type: bannerProps.type || BANNER_TYPES.INFO,
+      actionRef: bannerRef
+    })), sendingMessages && sendingMessages.length > 0 ? _StyledIndicatorConta || (_StyledIndicatorConta = /*#__PURE__*/_jsx(StyledIndicatorContainer, {
       isLoading: "bottom",
-      linear: true
+      linear: true,
+      "data-testid": "ds-chat-loading-indicator"
     }, void 0, /*#__PURE__*/_jsx(DSIndeterminateProgressIndicator, {
       processing: true,
       title: "Loading",
       lineOnly: true
     }))) : null), /*#__PURE__*/jsx(ChatComposer, _objectSpread(_objectSpread({}, composerProps), {}, {
+      onKeyDown: handleTabs,
       onResize: onResize,
       maxHeight: (((_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.clientHeight) || 0) / 2,
       actionRef: actionRef || listRef

package/esm/parts/chat-container/config/useValidateProps.js

@@ -1,7 +1,7 @@
 import { useValidateTypescriptPropTypes } from '@elliemae/ds-props-helpers';
 
-const useValidateProps = (props, schema) => {
-  useValidateTypescriptPropTypes(props, schema);
+const useValidateProps = (props, propTypes) => {
+  useValidateTypescriptPropTypes(props, propTypes);
 };
 
 export { useValidateProps };

package/esm/parts/chat-container/props.js

@@ -1,5 +1,6 @@
 import { PropTypes } from 'react-desc';
 import { noop } from 'lodash';
+import { BANNER_TYPES } from '@elliemae/ds-banner';
 import { defaultProps as defaultProps$1 } from '../chat-container-messages-list/props.js';
 import { defaultComposerPros } from '../chat-composer/props.js';
 
@@ -14,13 +15,15 @@ const defaultProps = {
   getMoreMessages: noop,
   bannerPosition: undefined,
   bannerProps: {
+    type: BANNER_TYPES.INFO,
     label: 'Unread Messages',
     viewLabel: 'View',
     onView: noop,
     onClose: noop
   },
   sendingMessages: undefined,
-  sendingText: 'Sending'
+  sendingText: 'Sending',
+  ariaLabel: 'Chat window'
 };
 const containerProps = {
   messagesListProps: PropTypes.object.description('ChatMessageList props "messages" / "onScrollEnds"').defaultValue(defaultProps.messagesListProps),
@@ -31,10 +34,11 @@ const containerProps = {
   hasMoreItems: PropTypes.oneOf(['top', 'bottom', undefined]).description('Show Load More button at the `top` or `bottom` of the container'),
   getMoreMessages: PropTypes.func.description('Called when the user clicks on load more').defaultValue(defaultProps.getMoreMessages),
   bannerPosition: PropTypes.oneOf(['top', 'bottom', undefined]).description('Show Loading messages indicator at the `top` or `bottom` of the container'),
-  bannerProps: PropTypes.object.description('Banner configuration').defaultValue(defaultProps.bannerProps),
+  bannerProps: PropTypes.object.description("Banner configuration:\n  label: string;\n  viewLabel: string;\n  type: BANNER_TYPES;\n  onView: () => void;\n  onClose: () => void;\n  ").defaultValue(defaultProps.bannerProps),
   sendingMessages: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.string), PropTypes.arrayOf(PropTypes.number)]).description('Array of ids of sending messages').defaultValue(defaultProps.sendingMessages),
   sendingText: PropTypes.string.description('Label description for messages in sending status').defaultValue(defaultProps.sendingText),
-  actionRef: PropTypes.object.description("Reference: \n        { \n          scrollToIndex: (n: number) => void,\n          getMessagesInView: () => number[],\n          focusToIndex: (n: number) => void,\n          focusToList: () => void,\n          focusToComposer: () => void,\n          focusToSend: () => void,\n        }\n        \n      ").defaultValue(defaultProps.actionRef)
+  actionRef: PropTypes.object.description("Reference: \n        { \n          scrollToIndex: (n: number) => void,\n          getMessagesInView: () => number[],\n          focusToIndex: (n: number) => void,\n          focusToList: () => void,\n          focusToComposer: () => void,\n          focusToSend: () => void,\n        }\n        \n      ").defaultValue(defaultProps.actionRef),
+  ariaLabel: PropTypes.string.description('Aria Label description for chat container').defaultValue(defaultProps.ariaLabel)
 };
 
 export { containerProps, defaultProps };

package/esm/parts/chat-container/styled.js

@@ -10,7 +10,7 @@ const StyledChatContainerContent = /*#__PURE__*/styled(Grid).withConfig({
 })(["height:100%;min-width:", "px;overflow:hidden;background:", ";position:relative;"], CONTAINER_WIDTH, props => props.theme.colors.neutral['050']);
 const StyledIndicatorContainer = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-d732wo-1"
-})(["position:absolute;width:calc(100% + ", ");padding:", ";left:-", ";right:-", ";background:", ";", " ", ""], props => props.theme.space.xxs, props => !props.linear ? props.theme.space.xxs : 0, props => props.theme.space.xxs, props => props.theme.space.xxs, props => props.theme.colors.neutral['000'], props => props.isLoading === 'top' ? 'top: 0;' : '', props => props.isLoading === 'bottom' ? 'bottom: 0;' : '');
+})(["transition:0.4s ease-in-out;position:absolute;visibility:hidden;pointer-events:none;width:100%;padding:0 ", ";left:0;right:0;background:", ";", " ", ""], props => !props.linear ? props.theme.space.xxs : 0, props => props.theme.colors.neutral['000'], props => props.isLoading === 'top' ? "\n  top: -41px;\n  transform: translate(0, 41px);\n  visibility: visible;\n  pointer-events: auto\n  " : '', props => props.isLoading === 'bottom' ? "\n  bottom: -41px;\n  transform: translate(0, -41px);\n  visibility: visible;\n  pointer-events: auto;\n  " : '');
 const MobileStyledChatContainerContent = /*#__PURE__*/styled(StyledChatContainerContent).withConfig({
   componentId: "sc-d732wo-2"
 })(["", ",", "{font-size:16px;}", "{font-size:13px;}", "{background-color:#fff;box-shadow:-0 1px 3px rgba(53,60,70,0.8);}", ",", "{font-size:16px;text-align:left;}", "{font-size:13px;}", "{font-size:16px;}"], StyledTitleLeftBubble, StyleBodyWrapper, StyledTitleRightBubble, Wrapper, Title, Message, Time, StyledComposerInput);

package/esm/parts/chat-container-header/ChatContainerHeader.js

@@ -1,7 +1,8 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
-import React from 'react';
+import 'react';
 import { SimpleTruncatedTooltipText } from '@elliemae/ds-truncated-tooltip-text';
 import { StyledChatContainerContentHeader, StyledChatContainerContentHeaderLabel, StyledChatContainerContentHeaderActions } from './styled.js';
+import { validHeaderChilds } from './helpers.js';
 
 const ChatContainerHeader = props => {
   const {
@@ -21,7 +22,7 @@ const ChatContainerHeader = props => {
   }, void 0, /*#__PURE__*/_jsx(SimpleTruncatedTooltipText, {
     value: title
   })), /*#__PURE__*/_jsx(StyledChatContainerContentHeaderActions, {
-    cols: React.Children.toArray(children).filter(e => e).map(() => '32px'),
+    cols: validHeaderChilds(children),
     justifyContent: "flex-end",
     "data-testid": "chat-container-header-children"
   }, void 0, children));

package/esm/parts/chat-container-header/helpers.js

@@ -0,0 +1,23 @@
+import 'core-js/modules/esnext.async-iterator.map.js';
+import 'core-js/modules/esnext.iterator.map.js';
+import 'core-js/modules/esnext.async-iterator.filter.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.filter.js';
+import 'core-js/modules/esnext.async-iterator.constructor.js';
+import 'core-js/modules/esnext.async-iterator.to-array.js';
+import 'core-js/modules/esnext.iterator.to-array.js';
+import React from 'react';
+
+const validHeaderChilds = children => React.Children.toArray(children).filter(e => {
+  if (Array.isArray(e.props.children)) {
+    return false;
+  }
+
+  if (e.props.children === undefined && e.$$typeof.toString() === 'Symbol(react.element)') {
+    return true;
+  }
+
+  return !!e.props.children;
+}).map(() => '32px');
+
+export { validHeaderChilds };

package/esm/parts/chat-container-header/styled.js

@@ -1,14 +1,14 @@
 import styled from 'styled-components';
 import { Grid } from '@elliemae/ds-grid';
 
-const StyledChatContainerContentHeader = /*#__PURE__*/styled(Grid).withConfig({
+const StyledChatContainerContentHeaderActions = /*#__PURE__*/styled(Grid).withConfig({
   componentId: "sc-jmynvr-0"
-})(["width:100%;min-height:48px;border-bottom:1px solid ", ";background:", ";"], props => props.theme.colors.neutral['200'], props => props.theme.colors.neutral['050']);
-const StyledChatContainerContentHeaderLabel = /*#__PURE__*/styled(Grid).withConfig({
+})(["max-width:80px;"]);
+const StyledChatContainerContentHeader = /*#__PURE__*/styled(Grid).withConfig({
   componentId: "sc-jmynvr-1"
-})(["justify-content:center;align-items:center;font-weight:bold;font-size:18px;color:", ";"], props => props.theme.colors.neutral['700']);
-const StyledChatContainerContentHeaderActions = /*#__PURE__*/styled(Grid).withConfig({
+})(["width:100%;min-height:48px;border-bottom:1px solid ", ";background:", ";", "{& button{background:transparent;}}"], props => props.theme.colors.neutral['200'], props => props.theme.colors.neutral['050'], StyledChatContainerContentHeaderActions);
+const StyledChatContainerContentHeaderLabel = /*#__PURE__*/styled(Grid).withConfig({
   componentId: "sc-jmynvr-2"
-})(["max-width:80px;"]);
+})(["justify-content:center;align-items:center;font-weight:bold;font-size:18px;color:", ";"], props => props.theme.colors.neutral['700']);
 
 export { StyledChatContainerContentHeader, StyledChatContainerContentHeaderActions, StyledChatContainerContentHeaderLabel };

package/esm/parts/chat-container-messages-list/ChatContainerMessagesList.js

@@ -1,9 +1,20 @@
+import 'core-js/modules/esnext.async-iterator.filter.js';
+import 'core-js/modules/esnext.iterator.filter.js';
 import _jsx from '@babel/runtime/helpers/esm/jsx';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
+import 'core-js/modules/esnext.async-iterator.some.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.some.js';
+import 'core-js/modules/esnext.async-iterator.for-each.js';
+import 'core-js/modules/esnext.iterator.for-each.js';
+import 'core-js/modules/esnext.async-iterator.map.js';
+import 'core-js/modules/esnext.iterator.map.js';
+import 'core-js/modules/esnext.async-iterator.find.js';
+import 'core-js/modules/esnext.iterator.find.js';
 import React from 'react';
 import { describe } from 'react-desc';
 import { useVirtual } from 'react-virtual';
-import DSButton from '@elliemae/ds-basic/Button';
+import DSButton from '@elliemae/ds-button';
 import { ChatBubble } from '../bubble/ChatBubble.js';
 import { BUBBLE_TYPES } from '../bubble/props.js';
 import { MessageDelimiter } from '../message-delimiter/MessageDelimiter.js';
@@ -17,27 +28,35 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-const getPadding = hasMoreItems => {
+const getPadding = _ref => {
+  let {
+    hasMoreItems,
+    bannerPosition,
+    isLoading
+  } = _ref;
   const padding = {
     paddingStart: 0,
     paddingEnd: -5
   };
-  if (hasMoreItems === 'top') padding.paddingStart = 42;else if (hasMoreItems === 'bottom') padding.paddingEnd = 42;
+  if ([hasMoreItems, bannerPosition, isLoading].some(item => item === 'top')) padding.paddingStart = 42;else if ([hasMoreItems, bannerPosition, isLoading].some(item => item === 'bottom')) padding.paddingEnd = 42;
   return padding;
 };
 
 const ChatContainerMessagesList = props => {
-  useValidateProps(props, ChatContainerMessagesListWithSchema.toTypescript());
+  useValidateProps(props, listProps);
   const {
     sendingText,
+    bannerPosition,
     sendingMessages,
     messages,
     actionRef,
     onScrollEnds,
     getMoreMessages,
     hasMoreItems,
-    isLoading
+    isLoading,
+    bannerRef
   } = props;
+  const loadMoreRef = React.useRef(null);
   const virtualListRef = React.useRef(); // estimateSize should not be really required given what was stated on
   // https://github.com/tannerlinsley/react-virtual/issues/23
 
@@ -49,71 +68,88 @@ const ChatContainerMessagesList = props => {
     size: messages.length,
     parentRef: virtualListRef,
     overscan: 15
-  }, getPadding(hasMoreItems)), {}, {
+  }, getPadding({
+    hasMoreItems,
+    bannerPosition,
+    isLoading
+  })), {}, {
     estimateSize: React.useCallback(() => 80, [])
   }));
   const onScrollStop = React.useCallback(() => {
+    var _virtualListRef$curre;
+
     const {
       bottom,
       top
-    } = virtualListRef.current.getBoundingClientRect();
+    } = (_virtualListRef$curre = virtualListRef.current) === null || _virtualListRef$curre === void 0 ? void 0 : _virtualListRef$curre.getBoundingClientRect();
     const list = virtualListRef.current.querySelectorAll('[data-element="chat-element-list-item"]');
     const indexList = [];
     list.forEach(item => {
       const {
-        top: itemTop
+        top: itemTop,
+        bottom: itemBottom
       } = item.getBoundingClientRect();
-      if (itemTop < bottom && itemTop > top) indexList.push(item.dataset.index);
+      const itemPadding = 10;
+      if (itemTop + itemPadding < bottom && itemBottom - itemPadding > top) indexList.push(item.dataset.index);
     });
     if (onScrollEnds) onScrollEnds(indexList);
     return indexList;
   }, [onScrollEnds]);
-  const scrollAndFocus = React.useCallback(index => {
-    vScroll(index, {
-      align: 'center'
-    });
+  const onlyFocus = React.useCallback(index => {
     setTimeout(() => {
       virtualListRef.current.querySelector("[data-index=\"".concat(index, "\"]")).focus();
     }, 300);
-  }, [vScroll]);
+  }, []);
+  const scrollAndFocus = React.useCallback(function (index) {
+    let b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+      align: 'center'
+    };
+    vScroll(index, b);
+    onlyFocus(index);
+  }, [onlyFocus, vScroll]);
   React.useEffect(() => {
     if (actionRef && actionRef.current) {
-      actionRef.current.scrollToIndex = (a, b = {
-        align: 'center'
-      }) => {
+      actionRef.current.scrollToIndex = function (a) {
+        let b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+          align: 'center'
+        };
         vScroll(a, b);
       };
 
       actionRef.current.getMessagesInView = onScrollStop;
 
-      actionRef.current.focusToIndex = (a, b = {
-        align: 'center'
-      }) => {
-        scrollAndFocus(a);
+      actionRef.current.focusToIndex = function (a) {
+        let b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+          align: 'center'
+        };
+        scrollAndFocus(a, b);
       };
 
-      actionRef.current.focusToList = (a, b = {
-        align: 'center'
-      }) => {
-        var _virtualListRef$curre;
+      actionRef.current.focusToIndexWithoutScroll = onlyFocus;
+
+      actionRef.current.focusToList = a => {
+        var _virtualListRef$curre2;
 
-        (_virtualListRef$curre = virtualListRef.current) === null || _virtualListRef$curre === void 0 ? void 0 : _virtualListRef$curre.focus();
+        (_virtualListRef$curre2 = virtualListRef.current) === null || _virtualListRef$curre2 === void 0 ? void 0 : _virtualListRef$curre2.focus();
       };
     }
-  }, [actionRef, onScrollStop, scrollAndFocus, vScroll]);
+  }, [actionRef, onScrollStop, onlyFocus, scrollAndFocus, vScroll]);
   const handleKey = React.useCallback(e => {
-    e.preventDefault();
     const {
       key
     } = e;
     const index = Number(e.currentTarget.dataset.index);
+    e.stopPropagation();
 
     switch (key) {
       case 'ArrowUp':
+        e.preventDefault();
         if (index > 0) virtualListRef.current.querySelector("[data-index=\"".concat(index - 1, "\"]")).focus();
         break;
 
       case 'ArrowDown':
+        e.preventDefault();
+
         if (index < messages.length - 1) {
           virtualListRef.current.querySelector("[data-index=\"".concat(index + 1, "\"]")).focus();
         }
@@ -121,18 +157,96 @@ const ChatContainerMessagesList = props => {
         break;
 
       case 'Home':
+        e.preventDefault();
         scrollAndFocus(0);
         break;
 
       case 'End':
+        e.preventDefault();
         scrollAndFocus(messages.length - 1);
         break;
 
       case 'Tab':
-        actionRef.current.focusToComposer();
+        e.preventDefault();
+
+        if (hasMoreItems === 'bottom' && !e.shiftKey) {
+          var _loadMoreRef$current;
+
+          (_loadMoreRef$current = loadMoreRef.current) === null || _loadMoreRef$current === void 0 ? void 0 : _loadMoreRef$current.focus();
+        } else if (hasMoreItems === 'top' && e.shiftKey) {
+          var _loadMoreRef$current2;
+
+          (_loadMoreRef$current2 = loadMoreRef.current) === null || _loadMoreRef$current2 === void 0 ? void 0 : _loadMoreRef$current2.focus();
+        } else if (!e.shiftKey) {
+          if (bannerPosition) {
+            bannerRef.current.focusOnWrapper();
+          } else {
+            actionRef.current.focusToComposer();
+          }
+        } else {
+          var _virtualListRef$curre3;
+
+          (_virtualListRef$curre3 = virtualListRef.current) === null || _virtualListRef$curre3 === void 0 ? void 0 : _virtualListRef$curre3.focus();
+        }
+
+        break;
+    }
+  }, [actionRef, hasMoreItems, messages.length, bannerPosition, scrollAndFocus]);
+  const handleListKey = React.useCallback(e => {
+    const {
+      key
+    } = e;
+
+    switch (key) {
+      case 'ArrowUp':
+        e.preventDefault();
+        onlyFocus(onScrollStop().shift());
+        break;
+
+      case 'ArrowDown':
+        e.preventDefault();
+        onlyFocus(onScrollStop().pop());
+        break;
+
+      case 'Home':
+        e.preventDefault();
+        scrollAndFocus(0);
+        break;
+
+      case 'End':
+        e.preventDefault();
+        scrollAndFocus(messages.length - 1);
+        break;
+
+      case 'Tab':
+        if (document.activeElement !== loadMoreRef.current) {
+          if (hasMoreItems === 'bottom' && !e.shiftKey) {
+            var _loadMoreRef$current3;
+
+            e.preventDefault();
+            (_loadMoreRef$current3 = loadMoreRef.current) === null || _loadMoreRef$current3 === void 0 ? void 0 : _loadMoreRef$current3.focus();
+          } else if (hasMoreItems === 'top' && e.shiftKey) {
+            var _loadMoreRef$current4;
+
+            e.preventDefault();
+            (_loadMoreRef$current4 = loadMoreRef.current) === null || _loadMoreRef$current4 === void 0 ? void 0 : _loadMoreRef$current4.focus();
+          } else if (!e.shiftKey) {
+            e.preventDefault();
+            actionRef.current.focusToComposer();
+          }
+        } else if (!e.shiftKey) {
+          e.preventDefault();
+          actionRef.current.focusToComposer();
+        } else {
+          var _virtualListRef$curre4;
+
+          e.preventDefault();
+          (_virtualListRef$curre4 = virtualListRef.current) === null || _virtualListRef$curre4 === void 0 ? void 0 : _virtualListRef$curre4.focus();
+        }
+
         break;
     }
-  }, [actionRef, messages.length, scrollAndFocus]);
+  }, [actionRef, hasMoreItems, messages.length, onScrollStop, onlyFocus, scrollAndFocus]);
   React.useEffect(() => {
     let handlerCallback = null;
     const localVirtualRef = virtualListRef.current;
@@ -182,7 +296,7 @@ const ChatContainerMessagesList = props => {
       jsx(ChatBubble, _objectSpread(_objectSpread({}, row), {}, {
         helpMessage: isSending ? sendingText : row.helpMessage
       })) : null, row.type === BUBBLE_TYPES.DELIMITER ? /*#__PURE__*/jsx(MessageDelimiter, _objectSpread({}, row)) : null, row.type === BUBBLE_TYPES.SYSTEM ? /*#__PURE__*/jsx(SystemMessage, _objectSpread({}, row)) : null)
-    }, "ds-chat-bubble-".concat(index));
+    }, "ds-chat-bubble-".concat(index, "-").concat(row.dsId, "-").concat(row.type));
   }), [virtualItems, messages, sendingMessages, handleKey, sendingText]);
   return /*#__PURE__*/_jsx(StyledWrapper, {}, void 0, /*#__PURE__*/jsx(StyledChatContainerContentList, {
     "data-testid": "chat-thread-container",
@@ -190,7 +304,7 @@ const ChatContainerMessagesList = props => {
     "aria-live": "polite",
     ref: virtualListRef,
     role: "list",
-    onKeyDown: handleKey,
+    onKeyDown: handleListKey,
     children: /*#__PURE__*/_jsx(StyledChatContainerContentListScroll, {
       height: "".concat(totalSize, "px")
     }, void 0, render, !isLoading && hasMoreItems ? /*#__PURE__*/_jsx(StyledLoadMoreContainer, {
@@ -198,7 +312,9 @@ const ChatContainerMessagesList = props => {
     }, void 0, /*#__PURE__*/_jsx(DSButton, {
       labelText: "Load More",
       buttonType: "secondary",
-      onClick: getMoreMessages
+      onClick: getMoreMessages,
+      "data-testid": "ds-chat-load-more-btn",
+      innerRef: loadMoreRef
     })) : null)
   }));
 };

package/esm/parts/chat-container-messages-list/config/useValidateProps.js

@@ -1,7 +1,7 @@
 import { useValidateTypescriptPropTypes } from '@elliemae/ds-props-helpers';
 
-const useValidateProps = (props, schema) => {
-  useValidateTypescriptPropTypes(props, schema);
+const useValidateProps = (props, propTypes) => {
+  useValidateTypescriptPropTypes(props, propTypes);
 };
 
 export { useValidateProps };

package/esm/parts/chat-container-messages-list/props.js

@@ -7,11 +7,13 @@ const defaultProps = {
   onScrollEnds: () => [],
   getMoreMessages: noop,
   sendingMessages: undefined,
-  sendingText: 'Sending'
+  sendingText: 'Sending',
+  bannerPosition: undefined,
+  bannerRef: undefined
 };
 const listProps = {
   messages: PropTypes.arrayOf(PropTypes.object).description('The array of out-of-the-box items you want to render inside the ChatMessageList').defaultValue(defaultProps.messages),
-  actionRef: PropTypes.object.description("Reference: \n        { \n          scrollToIndex: (n: number) => void,\n          getMessagesInView: () => number[],\n          focusToIndex: (n: number) => void,\n          focusToList: () => void,\n          focusToComposer: () => void,\n          focusToSend: () => void,\n        }\n        \n      ").defaultValue(defaultProps.actionRef),
+  actionRef: PropTypes.object.description("Reference: \n        { \n          scrollToIndex: (n: number) => void,\n          getMessagesInView: () => number[],\n          focusToIndex: (n: number) => void,\n          focusToIndexWithoutScroll: (n: number) => void,\n          focusToList: () => void,\n          focusToComposer: () => void,\n          focusToSend: () => void,\n        }\n        \n      ").defaultValue(defaultProps.actionRef),
   onScrollEnds: PropTypes.func.description("Called when the scroll stops."),
   isLoading: PropTypes.oneOf(['top', 'bottom', undefined]).description('Keeps the load more space while the loading is in progress'),
   hasMoreItems: PropTypes.oneOf(['top', 'bottom', undefined]).description('Show Load More button at the `top` or `bottom` of the container'),

package/esm/parts/chat-container-messages-list/styled.js

@@ -8,7 +8,7 @@ const StyledWrapper = /*#__PURE__*/styled.div.withConfig({
 
 const StyledWrapperListItem = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-1jhprzr-1"
-})(["min-width:100%;", ";", ";", ";"], props => props.type === BUBBLE_TYPES.SENDER && "padding: ".concat(props.theme.space.xxs, " ").concat(props.theme.space.xxs, " 0px 13%\n  "), props => props.type === BUBBLE_TYPES.RECIPIENT && "padding: ".concat(props.theme.space.xxs, " 13% ").concat(props.theme.space.xxs, "\n    ").concat(props.theme.space.xxs, "\n  "), props => props.type === BUBBLE_TYPES.SYSTEM && "padding: ".concat(props.theme.space.xxs, " 0px\n  "));
+})(["min-width:100%;", ";", ";", ";"], props => props.type === BUBBLE_TYPES.SENDER && "padding: ".concat(props.theme.space.xxs, " ").concat(props.theme.space.xxs, " ").concat(props.theme.space.xxs, " 13%\n  "), props => props.type === BUBBLE_TYPES.RECIPIENT && "padding: ".concat(props.theme.space.xxs, " 13% ").concat(props.theme.space.xxs, "\n    ").concat(props.theme.space.xxs, "\n  "), props => props.type === BUBBLE_TYPES.SYSTEM && "padding: ".concat(props.theme.space.xxs, " 0px\n  "));
 const StyledChatContainerContentList = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-1jhprzr-2"
 })(["width:100%;height:100%;padding:", ";padding-bottom:0;overflow-y:auto;overflow-x:hidden;"], props => props.theme.space.xs);
@@ -20,6 +20,6 @@ const StyledLoadMoreContainer = /*#__PURE__*/styled.div.withConfig({
 })(["position:absolute;width:calc(100% + ", ");padding:", ";left:-", ";right:-", ";display:grid;justify-content:center;align-items:center;", " ", ""], props => props.theme.space.xxs, props => props.theme.space.xxs, props => props.theme.space.xxs, props => props.theme.space.xxs, props => props.hasMoreItems === 'top' ? 'top: 0;' : '', props => props.hasMoreItems === 'bottom' ? 'bottom: 0;' : '');
 const ListItem = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-1jhprzr-5"
-})(["&:focus,&:focus-visible{outline:none;&:after{content:'';display:block;position:absolute;pointer-events:none;background:rgba(255,255,255,0.5);width:calc(100% + ", ");height:100%;}}"], props => props.theme.space.xxs);
+})(["&:focus,&:focus-visible{outline:none;&:after{content:'';display:block;position:absolute;top:0;left:-", ";pointer-events:none;border-radius:2px;background-color:#ebedf0;width:calc(100% + 24px);border:2px solid #1e79c2;height:100%;z-index:-1;}}"], props => props.theme.space.xxs);
 
 export { ListItem, StyledChatContainerContentList, StyledChatContainerContentListScroll, StyledLoadMoreContainer, StyledWrapper, StyledWrapperListItem };

package/esm/parts/chat-empty-state/ChatEmptyState.js

@@ -3,7 +3,7 @@ import 'core-js/modules/web.url.to-json.js';
 import { useMemo } from 'react';
 import { describe } from 'react-desc';
 import { Grid } from '@elliemae/ds-grid';
-import Communications from '@elliemae/ds-icons/Communications';
+import { Communications } from '@elliemae/ds-icons';
 import { emptyStateProps, defaultProps } from './props.js';
 import { MessageWrapper, ChatEmptyStateWrapper } from './styled.js';
 import { useValidateProps } from './config/useValidateProps.js';