@elliemae/pui-app-sdk 2.19.0 → 2.21.1

package/dist/cjs/utils/micro-frontend/guest.js

@@ -139,8 +139,7 @@ class CMicroAppGuest {
 
         host = ((_window$parent = window.parent) === null || _window$parent === void 0 ? void 0 : (_window$parent$emui = _window$parent.emui) === null || _window$parent$emui === void 0 ? void 0 : _window$parent$emui.MicroAppHost) || null;
       } else if (_emSsfGuest.default && this.props.hostName) {
-        _emSsfGuest.default.connect();
-
+        await _emSsfGuest.default.connect();
         const timeout = new Promise(resolve => {
           setTimeout(resolve, 100, null);
         });

package/dist/cjs/utils/micro-frontend/host.js

@@ -41,6 +41,7 @@ var _appdynamics = require("../../analytics/appdynamics.js");
 
 var _webAnalytics = require("../../analytics/web-analytics.js");
 
+/* eslint-disable max-lines */
 class CMicroAppHost {
   constructor(params) {
     (0, _defineProperty2.default)(this, "logger", void 0);
@@ -99,11 +100,11 @@ class CMicroAppHost {
   }
 
   getItem(key) {
-    return window.parent.sessionStorage.getItem(key);
+    return (0, _window.getWindow)().sessionStorage.getItem(key);
   }
 
   setItem(key, value) {
-    window.parent.sessionStorage.setItem(key, value);
+    (0, _window.getWindow)().sessionStorage.setItem(key, value);
   }
 
   getGuests() {
@@ -149,11 +150,11 @@ class CMicroAppHost {
   }
 
   getAuthToken() {
-    return window.parent.sessionStorage.getItem('Authorization');
+    return (0, _window.getWindow)().sessionStorage.getItem('Authorization');
   }
 
   renewAuthToken() {
-    return window.parent.sessionStorage.getItem('Authorization');
+    return (0, _window.getWindow)().sessionStorage.getItem('Authorization');
   }
 
   logout() {
@@ -185,8 +186,7 @@ class CMicroAppHost {
   setSystemVersion(version = 'latest') {
     window.emui.version = version;
     this.props.systemVersion = version;
-  } // eslint-disable-next-line max-lines
-
+  }
 
   sendBAEvent(data) {
     (0, _index3.sendBAEvent)({

package/dist/cjs/utils/session.js

@@ -23,12 +23,12 @@ let sessionExpiryWarningNotified = false;
 let timerHandle;
 let sessionExpiryWarningNotifiedAt;
 
-const resetUserIdleTime = () => {
+const resetUserIdleTime = (resetWarningModal = false) => {
   sessionExpiryWarningNotified = false;
   sessionExpiryWarningNotifiedAt = null;
   lastUserActivityTimeStamp = Date.now();
   Promise.resolve().then(() => {
-    resetListeners.forEach(listener => listener());
+    resetListeners.forEach(listener => listener(resetWarningModal));
   }).catch(() => {});
 };
 

package/dist/cjs/view/error-toast/index.js

@@ -7,7 +7,7 @@ exports.ErrorToast = void 0;
 
 var _react = require("react");
 
-var _Toast = require("@elliemae/ds-basic/Toast");
+var _dsToast = require("@elliemae/ds-toast");
 
 var _reactRedux = require("../../data/react-redux.js");
 
@@ -22,21 +22,21 @@ const ErrorToast = /*#__PURE__*/(0, _react.memo)(props => {
     // Only show toast when there is error set in redux state
     if (storeError && (storeError !== null && storeError !== void 0 && storeError.description || storeError !== null && storeError !== void 0 && storeError.messageText)) {
       const toastProps = {
-        position: _Toast.ToastPosition.TOP_RIGHT,
+        position: _dsToast.ToastPosition.TOP_RIGHT,
         messageTitle: 'Error',
-        type: _Toast.ToastType.ERROR,
+        type: _dsToast.ToastType.ERROR,
         ...props,
         ...storeError
       };
       const messageText = toastProps.description || toastProps.messageText;
-      if (messageText) (0, _Toast.toast)({
+      if (messageText) (0, _dsToast.toast)({
         messageText,
         ...toastProps
       });
       dispatch(_index.actions.clear());
     }
   }, [storeError, props, dispatch]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Toast.DSToast, { ...props
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dsToast.DSToast, { ...props
   });
 });
 exports.ErrorToast = ErrorToast;

package/dist/cjs/view/error-toast/index.stories.js

@@ -11,9 +11,9 @@ var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
 var _react = require("react");
 
-var _Toast = require("@elliemae/ds-basic/Toast");
+var _dsToast = require("@elliemae/ds-toast");
 
-var _Button = _interopRequireDefault(require("@elliemae/ds-basic/Button"));
+var _dsButton = _interopRequireDefault(require("@elliemae/ds-button"));
 
 var _reactRedux = require("../../data/react-redux.js");
 
@@ -62,7 +62,7 @@ exports.BasicError = BasicError;
 
 const showToast = ({
   messageText = 'Toast Message',
-  type = _Toast.ToastType.DEFAULT,
+  type = _dsToast.ToastType.DEFAULT,
   ...props
 }) => _index.error.set({
   type,
@@ -73,25 +73,25 @@ const showToast = ({
 });
 
 const successToast = props => showToast({ ...props,
-  type: _Toast.ToastType.SUCCESS
+  type: _dsToast.ToastType.SUCCESS
 });
 
 const infoToast = props => showToast({ ...props,
-  type: _Toast.ToastType.INFO
+  type: _dsToast.ToastType.INFO
 });
 
 const warningToast = props => showToast({ ...props,
-  type: _Toast.ToastType.WARNING
+  type: _dsToast.ToastType.WARNING
 });
 
 const errorToast = props => showToast({ ...props,
-  type: _Toast.ToastType.ERROR
+  type: _dsToast.ToastType.ERROR
 });
 
 const ToastButton = ({
   labelText,
   onClick
-}) => /*#__PURE__*/(0, _jsx3.default)(_Button.default, {
+}) => /*#__PURE__*/(0, _jsx3.default)(_dsButton.default, {
   buttonType: "text",
   labelText: labelText,
   onClick: onClick

package/dist/cjs/view/fields/check-box/index.js

@@ -15,7 +15,7 @@ exports.CheckBox = void 0;
 
 var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
-var _Checkbox = _interopRequireWildcard(require("@elliemae/ds-basic/form/Checkbox"));
+var _Checkbox = _interopRequireWildcard(require("@elliemae/ds-form/Checkbox"));
 
 var _reactHookForm = require("react-hook-form");
 

package/dist/cjs/view/fields/check-box/set-value.stories.js

@@ -13,7 +13,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _reactHookForm = require("react-hook-form");
 
-var _Button = _interopRequireDefault(require("@elliemae/ds-basic/Button"));
+var _dsButton = _interopRequireDefault(require("@elliemae/ds-button"));
 
 var _index = require("../../form/index.js");
 
@@ -78,6 +78,6 @@ SetValue.args = {
   defaultChecked: false
 };
 
-var _StyledDSButton = /*#__PURE__*/(0, _styledComponents.default)(_Button.default).withConfig({
+var _StyledDSButton = /*#__PURE__*/(0, _styledComponents.default)(_dsButton.default).withConfig({
   componentId: "sc-1lqqv9c-0"
 })(["margin-top:10px;"]);

package/dist/cjs/view/fields/combo-box/index.js

@@ -9,7 +9,7 @@ exports.ComboBox = void 0;
 
 var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
-var _ComboBox = _interopRequireDefault(require("@elliemae/ds-basic/form/ComboBox"));
+var _ComboBox = _interopRequireDefault(require("@elliemae/ds-form/ComboBox"));
 
 var _reactHookForm = require("react-hook-form");
 

package/dist/cjs/view/fields/date-input/index.js

@@ -9,7 +9,7 @@ exports.DateInput = void 0;
 
 var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
-var _DateInput = _interopRequireDefault(require("@elliemae/ds-basic/form/DateInput"));
+var _DateInput = _interopRequireDefault(require("@elliemae/ds-form/DateInput"));
 
 var _reactHookForm = require("react-hook-form");
 

package/dist/cjs/view/fields/form-item-layout/index.js

@@ -9,7 +9,7 @@ exports.FormItemLayout = void 0;
 
 var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
-var _FormItem = _interopRequireDefault(require("@elliemae/ds-basic/form/FormItem"));
+var _FormItem = _interopRequireDefault(require("@elliemae/ds-form/FormItem"));
 
 var _reactHookForm = require("react-hook-form");
 

package/dist/cjs/view/fields/input-mask/index.js

@@ -21,7 +21,7 @@ Object.defineProperty(exports, "MASK_TYPES", {
 
 var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
-var _InputMask = _interopRequireWildcard(require("@elliemae/ds-basic/form/InputMask"));
+var _InputMask = _interopRequireWildcard(require("@elliemae/ds-form/InputMask"));
 
 var _reactHookForm = require("react-hook-form");
 

package/dist/cjs/view/fields/large-text-box/index.js

@@ -9,7 +9,7 @@ exports.LargeTextBox = void 0;
 
 var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
-var _LargeInputText = _interopRequireDefault(require("@elliemae/ds-basic/form/LargeInputText"));
+var _LargeInputText = _interopRequireDefault(require("@elliemae/ds-form/LargeInputText"));
 
 var _reactHookForm = require("react-hook-form");
 

package/dist/cjs/view/fields/radio/index.js

@@ -9,7 +9,7 @@ exports.Radio = void 0;
 
 var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
-var _Radio = _interopRequireDefault(require("@elliemae/ds-basic/form/Radio"));
+var _Radio = _interopRequireDefault(require("@elliemae/ds-form/Radio"));
 
 var _reactHookForm = require("react-hook-form");
 

package/dist/cjs/view/fields/radio/set-value.stories.js

@@ -13,7 +13,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _reactHookForm = require("react-hook-form");
 
-var _Button = _interopRequireDefault(require("@elliemae/ds-basic/Button"));
+var _dsButton = _interopRequireDefault(require("@elliemae/ds-button"));
 
 var _index = require("../../form/index.js");
 
@@ -76,6 +76,6 @@ SetValue.args = {
   defaultChecked: true
 };
 
-var _StyledDSButton = /*#__PURE__*/(0, _styledComponents.default)(_Button.default).withConfig({
+var _StyledDSButton = /*#__PURE__*/(0, _styledComponents.default)(_dsButton.default).withConfig({
   componentId: "sc-fd8n0e-0"
 })(["margin-top:10px;"]);

package/dist/cjs/view/fields/radio-group/index.js

@@ -9,7 +9,7 @@ exports.RadioGroup = void 0;
 
 var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
-var _RadioGroup = _interopRequireDefault(require("@elliemae/ds-basic/form/RadioGroup"));
+var _RadioGroup = _interopRequireDefault(require("@elliemae/ds-form/RadioGroup"));
 
 var _reactHookForm = require("react-hook-form");
 

package/dist/cjs/view/fields/radio-group/index.stories.js

@@ -9,7 +9,7 @@ exports.default = exports.Basic = void 0;
 
 var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
-var _Radio = _interopRequireDefault(require("@elliemae/ds-basic/form/Radio"));
+var _Radio = _interopRequireDefault(require("@elliemae/ds-form/Radio"));
 
 var _reactHookForm = require("react-hook-form");
 

package/dist/cjs/view/fields/text-box/index.js

@@ -9,7 +9,7 @@ exports.TextBox = void 0;
 
 var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
-var _TextBox = _interopRequireDefault(require("@elliemae/ds-basic/form/TextBox"));
+var _TextBox = _interopRequireDefault(require("@elliemae/ds-form/TextBox"));
 
 var _reactHookForm = require("react-hook-form");
 

package/dist/cjs/view/form/submit-button/index.js

@@ -9,7 +9,7 @@ exports.FormSubmitButton = void 0;
 
 var _reactHookForm = require("react-hook-form");
 
-var _Button = _interopRequireDefault(require("@elliemae/ds-basic/Button"));
+var _dsButton = _interopRequireDefault(require("@elliemae/ds-button"));
 
 var _jsxRuntime = require("react/jsx-runtime");
 
@@ -21,7 +21,7 @@ const FormSubmitButton = ({ ...rest
       mode
     }
   } = (0, _reactHookForm.useFormContext)();
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, { ...rest,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dsButton.default, { ...rest,
     type: "submit",
     disabled: mode !== 'onSubmit' && (!formState.isDirty || formState.isDirty && !formState.isValid)
   });

package/dist/cjs/view/modals/session-expiry/index.js

@@ -35,10 +35,13 @@ const SessionExpiry = /*#__PURE__*/(0, _react.memo)(({
   const [isOpen, setIsOpen] = (0, _react.useState)(open);
   const timeLeft = (0, _customHooks.useTrackSessionExpiry)(warningNotifiedAt);
   const dispatch = (0, _reactRedux.useAppDispatch)();
+  (0, _react.useEffect)(() => {
+    setIsOpen(open);
+  }, [open]);
 
   const resetSession = () => {
     setIsOpen(false);
-    (0, _session.resetUserIdleTime)();
+    (0, _session.resetUserIdleTime)(true);
     dispatch(_actions.logout.cancel());
   };
 

package/dist/cjs/view/modals/wait-message/index.js

@@ -11,7 +11,7 @@ var _jsx3 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
 
 var _react = require("react");
 
-var _LoadingIndicator = _interopRequireDefault(require("@elliemae/ds-basic/LoadingIndicator"));
+var _dsLoadingIndicator = _interopRequireDefault(require("@elliemae/ds-loading-indicator"));
 
 var _reactRedux = require("../../../data/react-redux.js");
 
@@ -45,7 +45,7 @@ const WaitMessage = /*#__PURE__*/(0, _react.memo)(({
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsx3.default)(_htmlWaitMessage.HTMLWaitMessage, {
       close: isOpen !== null
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_LoadingIndicator.default, {
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_dsLoadingIndicator.default, {
       id: "em-loading",
       size: size,
       style: style,

package/dist/cjs/view/session-timeout/index.js

@@ -30,7 +30,11 @@ const SessionTimeout = () => {
       setwarningNotifiedAt(sessionExpiryWarningNotifiedAt);
       setSessionExpiryWarning(true);
     });
-    const resetCb = (0, _session.subscribeToResetSession)(setSessionExpiryWarning.bind(null, false));
+    const resetCb = (0, _session.subscribeToResetSession)(resetWarningModal => {
+      if (resetWarningModal === true) {
+        setSessionExpiryWarning(false);
+      }
+    });
     const sessionExpiredCb = (0, _session.subscribeToSessionExpiry)(() => {
       dispatch(_actions.logout.confirm());
       setSessionExpiryWarning(false);

package/dist/es/utils/micro-frontend/guest.js

@@ -126,7 +126,7 @@ export class CMicroAppGuest {
 
         host = ((_window$parent = window.parent) === null || _window$parent === void 0 ? void 0 : (_window$parent$emui = _window$parent.emui) === null || _window$parent$emui === void 0 ? void 0 : _window$parent$emui.MicroAppHost) || null;
       } else if (ssfGuest && this.props.hostName) {
-        ssfGuest.connect();
+        await ssfGuest.connect();
         const timeout = new Promise(resolve => {
           setTimeout(resolve, 100, null);
         });

package/dist/es/utils/micro-frontend/host.js

@@ -1,4 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+/* eslint-disable max-lines */
 import { publish, subscribe, unsubscribe } from 'pubsub-js';
 import { getDefaultTheme } from '@elliemae/pui-theme';
 import { getStore } from "../../data/store.js";
@@ -11,7 +13,7 @@ import { loadAppConfig } from "../app-config/index.js";
 import { browserHistory } from "../history.js";
 import { logger } from "./console-logger.js";
 import { HOST_WINDOW_RESIZED, HOST_WINDOW_BREAKPOINT_CHANGED } from "../constants.js";
-import { getCurrentBreakpoint, getViewportSize as getWindowViewportSize } from "../window.js";
+import { getWindow, getCurrentBreakpoint, getViewportSize as getWindowViewportSize } from "../window.js";
 import { sendBAEvent } from "../../analytics/index.js";
 import { setAppDynamicsUserData } from "../../analytics/appdynamics.js";
 import { updateBAEventParameters } from "../../analytics/web-analytics.js";
@@ -79,11 +81,11 @@ export class CMicroAppHost {
   }
 
   getItem(key) {
-    return window.parent.sessionStorage.getItem(key);
+    return getWindow().sessionStorage.getItem(key);
   }
 
   setItem(key, value) {
-    window.parent.sessionStorage.setItem(key, value);
+    getWindow().sessionStorage.setItem(key, value);
   }
 
   getGuests() {
@@ -129,11 +131,11 @@ export class CMicroAppHost {
   }
 
   getAuthToken() {
-    return window.parent.sessionStorage.getItem('Authorization');
+    return getWindow().sessionStorage.getItem('Authorization');
   }
 
   renewAuthToken() {
-    return window.parent.sessionStorage.getItem('Authorization');
+    return getWindow().sessionStorage.getItem('Authorization');
   }
 
   logout() {
@@ -165,8 +167,7 @@ export class CMicroAppHost {
   setSystemVersion(version = 'latest') {
     window.emui.version = version;
     this.props.systemVersion = version;
-  } // eslint-disable-next-line max-lines
-
+  }
 
   sendBAEvent(data) {
     sendBAEvent({

package/dist/es/utils/session.js

@@ -10,12 +10,12 @@ const userInteractionEvents = ['click', 'scroll', 'keypress', 'touchstart'];
 let sessionExpiryWarningNotified = false;
 let timerHandle;
 let sessionExpiryWarningNotifiedAt;
-export const resetUserIdleTime = () => {
+export const resetUserIdleTime = (resetWarningModal = false) => {
   sessionExpiryWarningNotified = false;
   sessionExpiryWarningNotifiedAt = null;
   lastUserActivityTimeStamp = Date.now();
   Promise.resolve().then(() => {
-    resetListeners.forEach(listener => listener());
+    resetListeners.forEach(listener => listener(resetWarningModal));
   }).catch(() => {});
 };
 

package/dist/es/view/error-toast/index.js

@@ -1,5 +1,5 @@
 import { useEffect, memo } from 'react';
-import { ToastPosition, ToastType, DSToast, toast } from '@elliemae/ds-basic/Toast';
+import { ToastPosition, ToastType, DSToast, toast } from '@elliemae/ds-toast';
 import { useAppSelector, useAppDispatch } from "../../data/react-redux.js";
 import { actions as error } from "../../data/error/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";

package/dist/es/view/error-toast/index.stories.js

@@ -3,8 +3,8 @@ import _jsx from "@babel/runtime/helpers/jsx";
 var _ErrorToast, _Renderer, _Renderer2;
 
 import { useEffect, useState } from 'react';
-import { ToastType } from '@elliemae/ds-basic/Toast';
-import DSButton from '@elliemae/ds-basic/Button';
+import { ToastType } from '@elliemae/ds-toast';
+import DSButton from '@elliemae/ds-button';
 import { useAppDispatch } from "../../data/react-redux.js";
 import { error } from "../../index.js";
 import { ErrorToast } from "./index.js";

package/dist/es/view/fields/check-box/index.js

@@ -1,5 +1,5 @@
 import _jsx2 from "@babel/runtime/helpers/jsx";
-import DSCheckbox, { CHECKBOX_VARIANT } from '@elliemae/ds-basic/form/Checkbox';
+import DSCheckbox, { CHECKBOX_VARIANT } from '@elliemae/ds-form/Checkbox';
 import { Controller } from 'react-hook-form';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const CheckBox = ({

package/dist/es/view/fields/check-box/set-value.stories.js

@@ -4,7 +4,7 @@ import _styled from "styled-components";
 var _ToggleValue;
 
 import { useFormContext, get } from 'react-hook-form';
-import DSButton from '@elliemae/ds-basic/Button';
+import DSButton from '@elliemae/ds-button';
 import { Form } from "../../form/index.js";
 import { CheckBox, CHECKBOX_VARIANT } from "./index.js";
 import { ConnectForm } from "../connect-form.js";

package/dist/es/view/fields/combo-box/index.js

@@ -1,5 +1,5 @@
 import _jsx2 from "@babel/runtime/helpers/jsx";
-import DSComboBox from '@elliemae/ds-basic/form/ComboBox';
+import DSComboBox from '@elliemae/ds-form/ComboBox';
 import { Controller } from 'react-hook-form';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const ComboBox = ({

package/dist/es/view/fields/date-input/index.js

@@ -1,5 +1,5 @@
 import _jsx2 from "@babel/runtime/helpers/jsx";
-import DSDateInput from '@elliemae/ds-basic/form/DateInput';
+import DSDateInput from '@elliemae/ds-form/DateInput';
 import { Controller } from 'react-hook-form';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const DateInput = ({

package/dist/es/view/fields/form-item-layout/index.js

@@ -1,5 +1,5 @@
 import _jsx2 from "@babel/runtime/helpers/jsx";
-import DSFormItemLayout from '@elliemae/ds-basic/form/FormItem';
+import DSFormItemLayout from '@elliemae/ds-form/FormItem';
 import { get } from 'react-hook-form';
 import { ConnectForm } from "../connect-form.js";
 import { jsx as _jsx } from "react/jsx-runtime";

package/dist/es/view/fields/input-mask/index.js

@@ -1,5 +1,5 @@
 import _jsx2 from "@babel/runtime/helpers/jsx";
-import DSInputMask, { MASK_TYPES, MASK_PIPES } from '@elliemae/ds-basic/form/InputMask';
+import DSInputMask, { MASK_TYPES, MASK_PIPES } from '@elliemae/ds-form/InputMask';
 import { Controller } from 'react-hook-form';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const InputMask = ({

package/dist/es/view/fields/large-text-box/index.js

@@ -1,5 +1,5 @@
 import _jsx2 from "@babel/runtime/helpers/jsx";
-import DSLargeInputText from '@elliemae/ds-basic/form/LargeInputText';
+import DSLargeInputText from '@elliemae/ds-form/LargeInputText';
 import { Controller } from 'react-hook-form';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const LargeTextBox = ({

package/dist/es/view/fields/radio/index.js

@@ -1,5 +1,5 @@
 import _jsx2 from "@babel/runtime/helpers/jsx";
-import DSRadio from '@elliemae/ds-basic/form/Radio';
+import DSRadio from '@elliemae/ds-form/Radio';
 import { Controller } from 'react-hook-form';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const Radio = ({

package/dist/es/view/fields/radio/set-value.stories.js

@@ -4,7 +4,7 @@ import _styled from "styled-components";
 var _ToggleValue;
 
 import { useFormContext, get } from 'react-hook-form';
-import DSButton from '@elliemae/ds-basic/Button';
+import DSButton from '@elliemae/ds-button';
 import { Form } from "../../form/index.js";
 import { Radio } from "./index.js";
 import { ConnectForm } from "../connect-form.js";

package/dist/es/view/fields/radio-group/index.js

@@ -1,5 +1,5 @@
 import _jsx2 from "@babel/runtime/helpers/jsx";
-import DSRadioGroup from '@elliemae/ds-basic/form/RadioGroup';
+import DSRadioGroup from '@elliemae/ds-form/RadioGroup';
 import { Controller } from 'react-hook-form';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const RadioGroup = ({

package/dist/es/view/fields/radio-group/index.stories.js

@@ -2,7 +2,7 @@ import _jsx from "@babel/runtime/helpers/jsx";
 
 var _DSRadio, _DSRadio2;
 
-import DSRadio from '@elliemae/ds-basic/form/Radio';
+import DSRadio from '@elliemae/ds-form/Radio';
 import { get } from 'react-hook-form';
 import { RadioGroup } from "./index.js";
 import { Form } from "../../form/index.js";

package/dist/es/view/fields/text-box/index.js

@@ -1,5 +1,5 @@
 import _jsx2 from "@babel/runtime/helpers/jsx";
-import DSTextBox from '@elliemae/ds-basic/form/TextBox';
+import DSTextBox from '@elliemae/ds-form/TextBox';
 import { Controller } from 'react-hook-form';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const TextBox = ({

package/dist/es/view/form/submit-button/index.js

@@ -1,5 +1,5 @@
 import { useFormContext } from 'react-hook-form';
-import DSButton from '@elliemae/ds-basic/Button';
+import DSButton from '@elliemae/ds-button';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const FormSubmitButton = ({ ...rest
 }) => {

package/dist/es/view/modals/session-expiry/index.js

@@ -2,7 +2,7 @@ import _jsx from "@babel/runtime/helpers/jsx";
 
 var _p;
 
-import { memo, useState } from 'react';
+import { memo, useEffect, useState } from 'react';
 import DSModal, { MODAL_SUB_TYPE_V2, MODAL_TYPE_V2 } from '@elliemae/ds-modal';
 import { useAppDispatch } from "../../../data/react-redux.js";
 import { logout } from "../../../data/logout/actions.js";
@@ -16,10 +16,13 @@ export const SessionExpiry = /*#__PURE__*/memo(({
   const [isOpen, setIsOpen] = useState(open);
   const timeLeft = useTrackSessionExpiry(warningNotifiedAt);
   const dispatch = useAppDispatch();
+  useEffect(() => {
+    setIsOpen(open);
+  }, [open]);
 
   const resetSession = () => {
     setIsOpen(false);
-    resetUserIdleTime();
+    resetUserIdleTime(true);
     dispatch(logout.cancel());
   };
 

package/dist/es/view/modals/wait-message/index.js

@@ -1,6 +1,6 @@
 import _jsx from "@babel/runtime/helpers/jsx";
 import { memo, useEffect } from 'react';
-import DSLoadingIndicator from '@elliemae/ds-basic/LoadingIndicator';
+import DSLoadingIndicator from '@elliemae/ds-loading-indicator';
 import { useAppSelector } from "../../../data/react-redux.js";
 import { HTMLWaitMessage } from "./html-wait-message.js";
 import { waitStartEvent, waitEndEvent } from "../../../analytics/user-wait-event.js";

package/dist/es/view/session-timeout/index.js

@@ -15,7 +15,11 @@ export const SessionTimeout = () => {
       setwarningNotifiedAt(sessionExpiryWarningNotifiedAt);
       setSessionExpiryWarning(true);
     });
-    const resetCb = subscribeToResetSession(setSessionExpiryWarning.bind(null, false));
+    const resetCb = subscribeToResetSession(resetWarningModal => {
+      if (resetWarningModal === true) {
+        setSessionExpiryWarning(false);
+      }
+    });
     const sessionExpiredCb = subscribeToSessionExpiry(() => {
       dispatch(logout.confirm());
       setSessionExpiryWarning(false);

package/dist/types/data/react-redux.d.ts

@@ -1,6 +1,12 @@
 import { TypedUseSelectorHook } from 'react-redux';
 import { RootState } from './store';
-export declare const useAppDispatch: () => import("redux-thunk").ThunkDispatch<import("redux").CombinedState<{
+export declare const useAppDispatch: () => import("redux").Dispatch<{
+    payload: import("./wait-message/reducer").WaitMessageState;
+    type: string;
+} | import("redux").AnyAction | {
+    payload: import("./breakpoint").Breakpoints;
+    type: string;
+}> & import("redux-thunk").ThunkDispatch<import("redux").CombinedState<{
     waitMessage: import("./wait-message/reducer").WaitMessageState;
     error: import("./error").ErrorState;
     breakpoint: import("./breakpoint").BreakpointState;
@@ -10,11 +16,5 @@ export declare const useAppDispatch: () => import("redux-thunk").ThunkDispatch<i
     error: import("./error").ErrorState;
     breakpoint: import("./breakpoint").BreakpointState;
     liveMessage: import("./live-message").LiveMessageState;
-}>, undefined, import("redux").AnyAction> & import("redux").Dispatch<{
-    payload: import("./wait-message/reducer").WaitMessageState;
-    type: string;
-} | import("redux").AnyAction | {
-    payload: import("./breakpoint").Breakpoints;
-    type: string;
-}>;
+}>, undefined, import("redux").AnyAction>;
 export declare const useAppSelector: TypedUseSelectorHook<RootState>;

package/dist/types/utils/session.d.ts

@@ -1,14 +1,17 @@
 declare type WARNLISTENER = {
     (sessionExpiryWarningNotifiedAt: number | null): void;
 };
+declare type RESETLISTENER = {
+    (resetWarningModal: unknown): void;
+};
 declare type LISTENER = {
     (): void;
 };
-export declare const resetUserIdleTime: () => void;
+export declare const resetUserIdleTime: (resetWarningModal?: unknown) => void;
 export declare const stopSessionMonitoring: () => void;
 export declare const initSessionMonitoring: () => void;
 export declare const subscribeToSessionExpiryWarning: (onSessionExpiryWarn: WARNLISTENER) => () => void;
 export declare const subscribeToSessionExpiry: (onSessionExpiry: LISTENER) => () => void;
-export declare const subscribeToResetSession: (onResetListener: LISTENER) => () => void;
+export declare const subscribeToResetSession: (onResetListener: RESETLISTENER) => () => void;
 export declare const trackActivity: (element: Document | null, cb: (...args: unknown[]) => void) => () => void;
 export {};

package/dist/types/view/fields/check-box/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { CHECKBOX_VARIANT } from '@elliemae/ds-basic/form/Checkbox';
+import { CHECKBOX_VARIANT } from '@elliemae/ds-form/Checkbox';
 import { RegisterOptions, FieldValues, FieldPath } from 'react-hook-form';
 export declare type CheckBoxProps<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = {
     name: string;

package/dist/types/view/fields/input-mask/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { MASK_TYPES, MASK_PIPES } from '@elliemae/ds-basic/form/InputMask';
+import { MASK_TYPES, MASK_PIPES } from '@elliemae/ds-form/InputMask';
 import { RegisterOptions, FieldValues, FieldPath } from 'react-hook-form';
 export declare type InputMaskProps<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/pui-app-sdk",
-  "version": "2.19.0",
+  "version": "2.21.1",
   "description": "ICE MT UI Platform Application SDK ",
   "sideEffects": [
     "*.css",
@@ -89,29 +89,37 @@
   },
   "peerDependencies": {
     "@elliemae/app-react-dependencies": "^2.10.0",
-    "@elliemae/ds-basic": "^1.60.0",
-    "@elliemae/ds-date-picker": "^1.60.0",
-    "@elliemae/ds-modal": "^1.60.0",
-    "@elliemae/ds-popperjs": "^1.60.0",
+    "@elliemae/ds-basic": "^2.0.0",
+    "@elliemae/ds-button": "^2.0.0",
+    "@elliemae/ds-form": "^2.0.0",
+    "@elliemae/ds-loading-indicator": "^2.0.0",
+    "@elliemae/ds-date-picker": "^2.0.0",
+    "@elliemae/ds-modal": "^2.0.0",
+    "@elliemae/ds-popperjs": "^2.0.0",
+    "@elliemae/ds-toast": "^2.0.0",
     "@elliemae/em-ssf-guest": "^1.11.1",
-    "@elliemae/pui-diagnostics": "^2.7.2",
+    "@elliemae/pui-diagnostics": "^2.7.3",
     "@elliemae/pui-micro-frontend-base": "^1.10.0",
     "@elliemae/pui-theme": "^2.3.0",
-    "@elliemae/pui-user-monitoring": "^1.12.1"
+    "@elliemae/pui-user-monitoring": "^1.12.2"
   },
   "devDependencies": {
     "@elliemae/app-react-dependencies": "~2.10.0",
     "@elliemae/browserslist-config-elliemae-latest-browsers": "~1.2.1",
-    "@elliemae/ds-basic": "~1.60.0",
-    "@elliemae/ds-date-picker": "~1.60.0",
-    "@elliemae/ds-modal": "~1.60.0",
-    "@elliemae/ds-popperjs": "~1.60.0",
+    "@elliemae/ds-basic": "~2.0.0",
+    "@elliemae/ds-button": "~2.0.0",
+    "@elliemae/ds-form": "~2.0.0",
+    "@elliemae/ds-loading-indicator": "~2.0.0",
+    "@elliemae/ds-date-picker": "~2.0.0",
+    "@elliemae/ds-modal": "~2.0.0",
+    "@elliemae/ds-popperjs": "~2.0.0",
+    "@elliemae/ds-toast": "~2.0.0",
     "@elliemae/em-ssf-guest": "~1.11.1",
-    "@elliemae/pui-cli": "~5.21.1",
-    "@elliemae/pui-diagnostics": "~2.7.2",
+    "@elliemae/pui-cli": "~5.23.0",
+    "@elliemae/pui-diagnostics": "~2.7.3",
     "@elliemae/pui-e2e-test-sdk": "~6.8.0",
     "@elliemae/pui-micro-frontend-base": "~1.10.0",
     "@elliemae/pui-theme": "~2.3.0",
-    "@elliemae/pui-user-monitoring": "~1.12.1"
+    "@elliemae/pui-user-monitoring": "~1.12.2"
   }
 }