@elliemae/ds-chat 2.0.0-alpha.10 → 2.0.0-alpha.14

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

@@ -2,12 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 var _jsx = require('@babel/runtime/helpers/jsx');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var React = require('react');
 var lodash = require('lodash');
 var reactDesc = require('react-desc');
-var DSIndeterminateProgressIndicator = require('@elliemae/ds-basic/IndeterminateProgressIndicator');
+var DSIndeterminateProgressIndicator = require('@elliemae/ds-indeterminate-progress-indicator');
 var DSBanner = require('@elliemae/ds-banner');
 var ChatContainerComposer = require('../chat-composer/ChatContainerComposer.js');
 var ChatContainerMessagesList = require('../chat-container-messages-list/ChatContainerMessagesList.js');
@@ -30,10 +35,10 @@ 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__default["default"](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 ChatContainer = props => {
+const ChatContainer = props$1 => {
   var _containerRef$current;
 
-  useValidateProps.useValidateProps(props, ChatContainerWithSchema.toTypescript());
+  useValidateProps.useValidateProps(props$1, props.containerProps);
   const {
     sendingText,
     sendingMessages,
@@ -42,15 +47,20 @@ const ChatContainer = props => {
     messagesListProps,
     composerProps,
     composerProps: {
-      onResize: onComposerResize
+      onResize: onComposerResize,
+      onKeyDown: onComposerKeyDown
     },
     actionRef,
-    autoScroll,
     device,
     isLoading,
     hasMoreItems,
-    getMoreMessages
-  } = props;
+    getMoreMessages,
+    ariaLabel
+  } = props$1;
+  const bannerRef = React__default["default"].useRef({
+    focusOnWrapper: lodash.noop,
+    focusOnLink: lodash.noop
+  });
   const containerRef = React__default["default"].useRef();
   const listRef = React__default["default"].useRef({
     scrollToIndex: lodash.noop
@@ -58,21 +68,51 @@ const ChatContainer = props => {
   const onResize = React__default["default"].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' ? styled.StyledChatContainerContent : styled.MobileStyledChatContainerContent;
+  const handleTabs = React__default["default"].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__default["default"].useEffect(() => {
+    if (actionRef && actionRef.current) {
+      actionRef.current.focusOnBanner = bannerRef.current.focusOnWrapper;
+      actionRef.current.focusOnBannerLink = bannerRef.current.focusOnLink;
+    }
+  }, [actionRef]);
   return /*#__PURE__*/jsxRuntime.jsxs(Container, {
     rows: ['minmax(0, 1fr)', 'auto'],
     ref: containerRef,
     role: "region",
-    "aria-label": "chat window",
+    "aria-label": ariaLabel,
     children: [/*#__PURE__*/_jsx__default["default"]("div", {
       style: {
-        position: 'relative'
+        position: 'relative',
+        overflow: 'hidden'
       }
     }, void 0, /*#__PURE__*/jsxRuntime.jsx(ChatContainerMessagesList.ChatContainerMessagesList, _objectSpread(_objectSpread({}, messagesListProps), {}, {
       actionRef: actionRef || listRef,
@@ -80,13 +120,17 @@ const ChatContainer = props => {
       hasMoreItems: hasMoreItems,
       getMoreMessages: getMoreMessages,
       sendingMessages: sendingMessages,
-      sendingText: sendingText
+      sendingText: sendingText,
+      bannerPosition: bannerPosition,
+      bannerRef: bannerRef
     })), ['top', 'bottom'].includes(isLoading) ? /*#__PURE__*/_jsx__default["default"](styled.StyledIndicatorContainer, {
-      isLoading: isLoading
+      isLoading: isLoading,
+      "data-testid": "ds-chat-loading-indicator"
     }, void 0, _DSIndeterminateProgr || (_DSIndeterminateProgr = /*#__PURE__*/_jsx__default["default"](DSIndeterminateProgressIndicator__default["default"], {
       processing: true,
       title: "Loading"
-    }))) : null, ['top', 'bottom'].includes(bannerPosition) ? /*#__PURE__*/_jsx__default["default"](styled.StyledIndicatorContainer, {
+    }))) : null, /*#__PURE__*/_jsx__default["default"](styled.StyledIndicatorContainer, {
+      linear: true,
       isLoading: bannerPosition
     }, void 0, /*#__PURE__*/_jsx__default["default"](DSBanner__default["default"], {
       showCloseButton: true,
@@ -100,15 +144,18 @@ const ChatContainer = props => {
       },
       onClose: bannerProps.onClose,
       isOpen: true,
-      type: DSBanner.BANNER_TYPES.INFO
-    })) : null, sendingMessages && sendingMessages.length > 0 ? _StyledIndicatorConta || (_StyledIndicatorConta = /*#__PURE__*/_jsx__default["default"](styled.StyledIndicatorContainer, {
+      type: bannerProps.type || DSBanner.BANNER_TYPES.INFO,
+      actionRef: bannerRef
+    })), sendingMessages && sendingMessages.length > 0 ? _StyledIndicatorConta || (_StyledIndicatorConta = /*#__PURE__*/_jsx__default["default"](styled.StyledIndicatorContainer, {
       isLoading: "bottom",
-      linear: true
+      linear: true,
+      "data-testid": "ds-chat-loading-indicator"
     }, void 0, /*#__PURE__*/_jsx__default["default"](DSIndeterminateProgressIndicator__default["default"], {
       processing: true,
       title: "Loading",
       lineOnly: true
     }))) : null), /*#__PURE__*/jsxRuntime.jsx(ChatContainerComposer.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/cjs/parts/chat-container/config/useValidateProps.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var dsPropsHelpers = require('@elliemae/ds-props-helpers');
 
-const useValidateProps = (props, schema) => {
-  dsPropsHelpers.useValidateTypescriptPropTypes(props, schema);
+const useValidateProps = (props, propTypes) => {
+  dsPropsHelpers.useValidateTypescriptPropTypes(props, propTypes);
 };
 
 exports.useValidateProps = useValidateProps;

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var reactDesc = require('react-desc');
 var lodash = require('lodash');
+var DSBanner = require('@elliemae/ds-banner');
 var props = require('../chat-container-messages-list/props.js');
 var props$1 = require('../chat-composer/props.js');
 
@@ -18,13 +19,15 @@ const defaultProps = {
   getMoreMessages: lodash.noop,
   bannerPosition: undefined,
   bannerProps: {
+    type: DSBanner.BANNER_TYPES.INFO,
     label: 'Unread Messages',
     viewLabel: 'View',
     onView: lodash.noop,
     onClose: lodash.noop
   },
   sendingMessages: undefined,
-  sendingText: 'Sending'
+  sendingText: 'Sending',
+  ariaLabel: 'Chat window'
 };
 const containerProps = {
   messagesListProps: reactDesc.PropTypes.object.description('ChatMessageList props "messages" / "onScrollEnds"').defaultValue(defaultProps.messagesListProps),
@@ -35,20 +38,11 @@ const containerProps = {
   hasMoreItems: reactDesc.PropTypes.oneOf(['top', 'bottom', undefined]).description('Show Load More button at the `top` or `bottom` of the container'),
   getMoreMessages: reactDesc.PropTypes.func.description('Called when the user clicks on load more').defaultValue(defaultProps.getMoreMessages),
   bannerPosition: reactDesc.PropTypes.oneOf(['top', 'bottom', undefined]).description('Show Loading messages indicator at the `top` or `bottom` of the container'),
-  bannerProps: reactDesc.PropTypes.object.description('Banner configuration').defaultValue(defaultProps.bannerProps),
+  bannerProps: reactDesc.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: reactDesc.PropTypes.oneOfType([reactDesc.PropTypes.arrayOf(reactDesc.PropTypes.string), reactDesc.PropTypes.arrayOf(reactDesc.PropTypes.number)]).description('Array of ids of sending messages').defaultValue(defaultProps.sendingMessages),
   sendingText: reactDesc.PropTypes.string.description('Label description for messages in sending status').defaultValue(defaultProps.sendingText),
-  actionRef: reactDesc.PropTypes.object.description(`Reference: 
-        { 
-          scrollToIndex: (n: number) => void,
-          getMessagesInView: () => number[],
-          focusToIndex: (n: number) => void,
-          focusToList: () => void,
-          focusToComposer: () => void,
-          focusToSend: () => void,
-        }
-        
-      `).defaultValue(defaultProps.actionRef)
+  actionRef: reactDesc.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: reactDesc.PropTypes.string.description('Aria Label description for chat container').defaultValue(defaultProps.ariaLabel)
 };
 
 exports.containerProps = containerProps;

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

@@ -18,10 +18,10 @@ const StyledChatContainerContent = /*#__PURE__*/styled__default["default"](dsGri
 })(["height:100%;min-width:", "px;overflow:hidden;background:", ";position:relative;"], CONTAINER_WIDTH, props => props.theme.colors.neutral['050']);
 const StyledIndicatorContainer = /*#__PURE__*/styled__default["default"].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:", ";", " ", " & div,a{font-size:13px;}"], 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__default["default"](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;}"], styled$1.StyledTitleLeftBubble, styled$1.StyleBodyWrapper, styled$1.StyledTitleRightBubble, style.Wrapper, style.Title, style.Message, style.Time, styled$2.StyledComposerInput);
+})(["", ",", "{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;}", "{font-size:16px;}"], styled$1.StyledTitleLeftBubble, styled$1.StyleBodyWrapper, styled$1.StyledTitleRightBubble, style.Wrapper, style.Title, style.Message, style.Time, styled$2.StyledComposerInput, StyledIndicatorContainer);
 
 exports.CONTAINER_WIDTH = CONTAINER_WIDTH;
 exports.MobileStyledChatContainerContent = MobileStyledChatContainerContent;

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

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
-var React = require('react');
+require('react');
 var dsTruncatedTooltipText = require('@elliemae/ds-truncated-tooltip-text');
 var styled = require('./styled.js');
+var helpers = require('./helpers.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 const ChatContainerHeader = props => {
   const {
@@ -30,7 +30,7 @@ const ChatContainerHeader = props => {
   }, void 0, /*#__PURE__*/_jsx__default["default"](dsTruncatedTooltipText.SimpleTruncatedTooltipText, {
     value: title
   })), /*#__PURE__*/_jsx__default["default"](styled.StyledChatContainerContentHeaderActions, {
-    cols: React__default["default"].Children.toArray(children).filter(e => e).map(() => '32px'),
+    cols: helpers.validHeaderChilds(children),
     justifyContent: "flex-end",
     "data-testid": "chat-container-header-children"
   }, void 0, children));

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

@@ -0,0 +1,31 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.constructor.js');
+require('core-js/modules/esnext.async-iterator.to-array.js');
+require('core-js/modules/esnext.iterator.to-array.js');
+var React = require('react');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+const validHeaderChilds = children => React__default["default"].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');
+
+exports.validHeaderChilds = validHeaderChilds;

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

@@ -9,15 +9,15 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 
-const StyledChatContainerContentHeader = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
+const StyledChatContainerContentHeaderActions = /*#__PURE__*/styled__default["default"](dsGrid.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__default["default"](dsGrid.Grid).withConfig({
+})(["max-width:80px;"]);
+const StyledChatContainerContentHeader = /*#__PURE__*/styled__default["default"](dsGrid.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__default["default"](dsGrid.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__default["default"](dsGrid.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']);
 
 exports.StyledChatContainerContentHeader = StyledChatContainerContentHeader;
 exports.StyledChatContainerContentHeaderActions = StyledChatContainerContentHeaderActions;

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

@@ -4,10 +4,21 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+require('core-js/modules/esnext.async-iterator.some.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.some.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
+require('core-js/modules/esnext.async-iterator.find.js');
+require('core-js/modules/esnext.iterator.find.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.filter.js');
 var React = require('react');
 var reactDesc = require('react-desc');
 var reactVirtual = require('react-virtual');
-var DSButton = require('@elliemae/ds-basic/Button');
+var DSButton = require('@elliemae/ds-button');
 var ChatBubble = require('../bubble/ChatBubble.js');
 var props$1 = require('../bubble/props.js');
 var MessageDelimiter = require('../message-delimiter/MessageDelimiter.js');
@@ -28,27 +39,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__default["default"](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.useValidateProps(props, ChatContainerMessagesListWithSchema.toTypescript());
+const ChatContainerMessagesList = props$2 => {
+  useValidateProps.useValidateProps(props$2, props.listProps);
   const {
     sendingText,
+    bannerPosition,
     sendingMessages,
     messages,
     actionRef,
     onScrollEnds,
     getMoreMessages,
     hasMoreItems,
-    isLoading
-  } = props;
+    isLoading,
+    bannerRef
+  } = props$2;
+  const loadMoreRef = React__default["default"].useRef(null);
   const virtualListRef = React__default["default"].useRef(); // estimateSize should not be really required given what was stated on
   // https://github.com/tannerlinsley/react-virtual/issues/23
 
@@ -60,90 +79,185 @@ const ChatContainerMessagesList = props => {
     size: messages.length,
     parentRef: virtualListRef,
     overscan: 15
-  }, getPadding(hasMoreItems)), {}, {
+  }, getPadding({
+    hasMoreItems,
+    bannerPosition,
+    isLoading
+  })), {}, {
     estimateSize: React__default["default"].useCallback(() => 80, [])
   }));
   const onScrollStop = React__default["default"].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__default["default"].useCallback(index => {
-    vScroll(index, {
-      align: 'center'
-    });
+  const onlyFocus = React__default["default"].useCallback(index => {
     setTimeout(() => {
-      virtualListRef.current.querySelector(`[data-index="${index}"]`).focus();
+      virtualListRef.current.querySelector("[data-index=\"".concat(index, "\"]")).focus();
     }, 300);
-  }, [vScroll]);
+  }, []);
+  const scrollAndFocus = React__default["default"].useCallback(function (index) {
+    let b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+      align: 'center'
+    };
+    vScroll(index, b);
+    onlyFocus(index);
+  }, [onlyFocus, vScroll]);
   React__default["default"].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__default["default"].useCallback(e => {
-    e.preventDefault();
     const {
       key
     } = e;
     const index = Number(e.currentTarget.dataset.index);
+    e.stopPropagation();
 
     switch (key) {
       case 'ArrowUp':
-        if (index > 0) virtualListRef.current.querySelector(`[data-index="${index - 1}"]`).focus();
+        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="${index + 1}"]`).focus();
+          virtualListRef.current.querySelector("[data-index=\"".concat(index + 1, "\"]")).focus();
         }
 
         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__default["default"].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__default["default"].useEffect(() => {
     let handlerCallback = null;
     const localVirtualRef = virtualListRef.current;
@@ -174,7 +288,7 @@ const ChatContainerMessagesList = props => {
       position: 'absolute',
       top: 0,
       left: 0,
-      transform: `translateY(${start}px)`,
+      transform: "translateY(".concat(start, "px)"),
       width: '100%'
     };
     return /*#__PURE__*/jsxRuntime.jsx(styled.ListItem, {
@@ -193,7 +307,7 @@ const ChatContainerMessagesList = props => {
       jsxRuntime.jsx(ChatBubble.ChatBubble, _objectSpread(_objectSpread({}, row), {}, {
         helpMessage: isSending ? sendingText : row.helpMessage
       })) : null, row.type === props$1.BUBBLE_TYPES.DELIMITER ? /*#__PURE__*/jsxRuntime.jsx(MessageDelimiter.MessageDelimiter, _objectSpread({}, row)) : null, row.type === props$1.BUBBLE_TYPES.SYSTEM ? /*#__PURE__*/jsxRuntime.jsx(SystemMessage.SystemMessage, _objectSpread({}, row)) : null)
-    }, `ds-chat-bubble-${index}`);
+    }, "ds-chat-bubble-".concat(index, "-").concat(row.dsId, "-").concat(row.type));
   }), [virtualItems, messages, sendingMessages, handleKey, sendingText]);
   return /*#__PURE__*/_jsx__default["default"](styled.StyledWrapper, {}, void 0, /*#__PURE__*/jsxRuntime.jsx(styled.StyledChatContainerContentList, {
     "data-testid": "chat-thread-container",
@@ -201,15 +315,17 @@ const ChatContainerMessagesList = props => {
     "aria-live": "polite",
     ref: virtualListRef,
     role: "list",
-    onKeyDown: handleKey,
+    onKeyDown: handleListKey,
     children: /*#__PURE__*/_jsx__default["default"](styled.StyledChatContainerContentListScroll, {
-      height: `${totalSize}px`
+      height: "".concat(totalSize, "px")
     }, void 0, render, !isLoading && hasMoreItems ? /*#__PURE__*/_jsx__default["default"](styled.StyledLoadMoreContainer, {
       hasMoreItems: hasMoreItems
     }, void 0, /*#__PURE__*/_jsx__default["default"](DSButton__default["default"], {
       labelText: "Load More",
       buttonType: "secondary",
-      onClick: getMoreMessages
+      onClick: getMoreMessages,
+      "data-testid": "ds-chat-load-more-btn",
+      innerRef: loadMoreRef
     })) : null)
   }));
 };

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

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var dsPropsHelpers = require('@elliemae/ds-props-helpers');
 
-const useValidateProps = (props, schema) => {
-  dsPropsHelpers.useValidateTypescriptPropTypes(props, schema);
+const useValidateProps = (props, propTypes) => {
+  dsPropsHelpers.useValidateTypescriptPropTypes(props, propTypes);
 };
 
 exports.useValidateProps = useValidateProps;