rsuite 5.16.3 → 5.17.0-beta.1

package/esm/Picker/PickerToggle.js

@@ -29,12 +29,12 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       readOnly = props.readOnly,
       plaintext = props.plaintext,
       hasValue = props.hasValue,
+      editable = props.editable,
       cleanableProp = props.cleanable,
       _props$tabIndex = props.tabIndex,
-      tabIndex = _props$tabIndex === void 0 ? 0 : _props$tabIndex,
+      tabIndexProp = _props$tabIndex === void 0 ? editable ? -1 : 0 : _props$tabIndex,
       id = props.id,
       value = props.value,
-      input = props.input,
       inputPlaceholder = props.inputPlaceholder,
       inputValueProp = props.inputValue,
       _props$inputMask = props.inputMask,
@@ -52,9 +52,10 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       _props$caretAs = props.caretAs,
       caretAs = _props$caretAs === void 0 ? caretComponent : _props$caretAs,
       label = props.label,
-      rest = _objectWithoutPropertiesLoose(props, ["active", "as", "classPrefix", "children", "caret", "className", "disabled", "readOnly", "plaintext", "hasValue", "cleanable", "tabIndex", "id", "value", "input", "inputPlaceholder", "inputValue", "inputMask", "onInputChange", "onInputPressEnter", "onInputBlur", "onInputFocus", "onClean", "onFocus", "onBlur", "placement", "caretComponent", "caretAs", "label"]);
+      rest = _objectWithoutPropertiesLoose(props, ["active", "as", "classPrefix", "children", "caret", "className", "disabled", "readOnly", "plaintext", "hasValue", "editable", "cleanable", "tabIndex", "id", "value", "inputPlaceholder", "inputValue", "inputMask", "onInputChange", "onInputPressEnter", "onInputBlur", "onInputFocus", "onClean", "onFocus", "onBlur", "placement", "caretComponent", "caretAs", "label"]);
 
   var inputRef = useRef(null);
+  var comboboxRef = useRef(null);
 
   var _useState = useState(false),
       activeState = _useState[0],
@@ -74,30 +75,46 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setInputValue = _useState2[1];
 
   useEffect(function () {
-    var value = getInputValue();
-    setInputValue(value);
+    if (comboboxRef.current) {
+      var _value = getInputValue();
+
+      setInputValue(_value);
+    }
   }, [getInputValue]);
   var classes = merge(className, withClassPrefix({
     active: activeProp || activeState
   }));
   var handleFocus = useCallback(function (event) {
     setActive(true);
-    onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
 
-    if (input) {
-      var _inputRef$current;
+    if (editable) {
+      // Avoid firing the onFocus event twice when DatePicker and DateRangePicker allow keyboard input.
+      if (event.target === inputRef.current) {
+        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
+      } // Force the input to be focused and editable.
 
-      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+
+      if (document.activeElement === comboboxRef.current) {
+        var _inputRef$current;
+
+        (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+      }
+    } else {
+      onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
     }
-  }, [input, onFocus]);
+  }, [editable, onFocus]);
   var handleBlur = useCallback(function (event) {
-    if (inputRef.current && document.activeElement !== inputRef.current) {
+    if (inputRef.current && !editable) {
+      setActive(false);
+    } // When activeElement is an input, it remains active.
+
+
+    if (editable && inputRef.current && document.activeElement !== inputRef.current) {
       setActive(false);
-      inputRef.current.blur();
     }
 
     onBlur === null || onBlur === void 0 ? void 0 : onBlur(event);
-  }, [onBlur]);
+  }, [editable, onBlur]);
 
   var handleInputBlur = function handleInputBlur(event) {
     setInputValue(getInputValue());
@@ -105,10 +122,13 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
 
   var handleClean = useCallback(function (event) {
+    var _inputRef$current2, _comboboxRef$current;
+
     event.stopPropagation();
-    onClean === null || onClean === void 0 ? void 0 : onClean(event);
-    setActive(false);
-  }, [onClean]);
+    onClean === null || onClean === void 0 ? void 0 : onClean(event); // When the value is cleared, the current component is still in focus.
+
+    editable ? (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus() : (_comboboxRef$current = comboboxRef.current) === null || _comboboxRef$current === void 0 ? void 0 : _comboboxRef$current.focus();
+  }, [editable, onClean]);
   var handleInputChange = useCallback(function (event) {
     var _event$target;
 
@@ -117,10 +137,18 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange(value, event);
   }, [onInputChange]);
   var handleInputKeyDown = useCallback(function (event) {
-    if (input && event.key === KEY_VALUES.ENTER) {
+    if (editable && event.key === KEY_VALUES.ENTER) {
       onInputPressEnter === null || onInputPressEnter === void 0 ? void 0 : onInputPressEnter(event);
     }
-  }, [onInputPressEnter, input]);
+  }, [onInputPressEnter, editable]);
+  var renderInput = useCallback(function (ref, props) {
+    return /*#__PURE__*/React.createElement("input", _extends({
+      ref: mergeRefs(inputRef, ref),
+      style: {
+        pointerEvents: editable ? undefined : 'none'
+      }
+    }, props));
+  }, [editable]);
   var ToggleCaret = useToggleCaret(placement);
   var Caret = caretAs !== null && caretAs !== void 0 ? caretAs : ToggleCaret;
 
@@ -133,7 +161,8 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var showCleanButton = cleanableProp && hasValue && !readOnly; // When the component is read-only or disabled, the input is not interactive.
 
-  var inputFocused = readOnly || disabled ? false : input && activeState;
+  var inputFocused = readOnly || disabled ? false : editable && activeState;
+  var tabIndex = disabled ? undefined : tabIndexProp;
   return /*#__PURE__*/React.createElement(Component, _extends({
     role: "combobox",
     "aria-haspopup": "listbox",
@@ -141,9 +170,9 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     "aria-disabled": disabled,
     "aria-owns": id ? id + "-listbox" : undefined
   }, rest, {
-    ref: ref,
+    ref: mergeRefs(comboboxRef, ref),
     disabled: disabled,
-    tabIndex: disabled ? undefined : tabIndex,
+    tabIndex: tabIndex,
     className: classes,
     onFocus: !disabled ? handleFocus : null // The debounce is set to 200 to solve the flicker caused by the switch between input and div.
     ,
@@ -160,16 +189,12 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     readOnly: !inputFocused,
     disabled: disabled,
     "aria-controls": id ? id + "-listbox" : undefined,
-    tabIndex: -1,
+    tabIndex: editable ? 0 : -1,
     className: prefix('textbox', {
       'read-only': !inputFocused
     }),
     placeholder: inputPlaceholder,
-    render: function render(ref, props) {
-      return /*#__PURE__*/React.createElement("input", _extends({
-        ref: mergeRefs(inputRef, ref)
-      }, props));
-    }
+    render: renderInput
   }), children ? /*#__PURE__*/React.createElement("span", {
     className: prefix(hasValue ? 'value' : 'placeholder'),
     "aria-placeholder": typeof children === 'string' ? children : undefined

package/esm/toaster/ToastContainer.d.ts

@@ -7,6 +7,7 @@ export interface ToastContainerProps extends WithAsProps {
     placement?: PlacementType;
     /** Set the message to appear in the specified container */
     container?: HTMLElement | (() => HTMLElement);
+    callback?: (ref: React.RefObject<ToastContainerInstance>) => void;
 }
 export interface ToastContainerInstance {
     root: HTMLElement;
@@ -19,7 +20,7 @@ export interface NodeProps extends WithAsProps {
     onClose?: (event?: React.MouseEvent<HTMLDivElement>) => void;
 }
 interface ToastContainerComponent extends RsRefForwardingComponent<'div', ToastContainerProps> {
-    getInstance: (props: ToastContainerProps) => [React.RefObject<ToastContainerInstance>, () => void];
+    getInstance: (props: ToastContainerProps) => Promise<[React.RefObject<ToastContainerInstance>, () => void]>;
 }
 declare const ToastContainer: ToastContainerComponent;
 export default ToastContainer;

package/esm/toaster/ToastContainer.js

@@ -1,11 +1,10 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { useState, useImperativeHandle, useRef, useCallback } from 'react';
-import { render, unmountComponentAtNode } from 'react-dom';
 import PropTypes from 'prop-types';
 import kebabCase from 'lodash/kebabCase';
 import Transition from '../Animation/Transition';
-import { useClassNames, guid, createChainedFunction } from '../utils';
+import { useClassNames, guid, createChainedFunction, render } from '../utils';
 export var toastPlacements = ['topCenter', 'bottomCenter', 'topStart', 'topEnd', 'bottomStart', 'bottomEnd'];
 
 var useMessages = function useMessages() {
@@ -22,13 +21,15 @@ var useMessages = function useMessages() {
   }, [messages]);
   var push = useCallback(function (message) {
     var key = guid();
-    setMessages([].concat(messages, [{
-      key: key,
-      visible: true,
-      node: message
-    }]));
+    setMessages(function (prevMessages) {
+      return [].concat(prevMessages, [{
+        key: key,
+        visible: true,
+        node: message
+      }]);
+    });
     return key;
-  }, [messages]);
+  }, []);
   var clear = useCallback(function () {
     // Set all existing messages to be invisible.
     setMessages(messages.map(function (msg) {
@@ -76,7 +77,8 @@ var ToastContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
       classPrefix = _props$classPrefix === void 0 ? 'toast-container' : _props$classPrefix,
       _props$placement = props.placement,
       placement = _props$placement === void 0 ? 'topCenter' : _props$placement,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "className", "classPrefix", "placement"]);
+      callback = props.callback,
+      rest = _objectWithoutPropertiesLoose(props, ["as", "className", "classPrefix", "placement", "callback"]);
 
   var _useClassNames = useClassNames(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
@@ -125,7 +127,10 @@ var ToastContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     });
   });
   return /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
-    ref: rootRef,
+    ref: function ref(selfRef) {
+      rootRef.current = selfRef;
+      callback === null || callback === void 0 ? void 0 : callback(selfRef);
+    },
     className: classes
   }), elements);
 });
@@ -135,22 +140,18 @@ ToastContainer.getInstance = function (props) {
       rest = _objectWithoutPropertiesLoose(props, ["container"]);
 
   var containerRef = /*#__PURE__*/React.createRef();
-  var mountElement = document.createElement('div');
-  var containerElement = typeof container === 'function' ? container() : container; //  Parent is document.body or the existing dom element
-
-  var parentElement = containerElement || document.body; // Add the detached element to the parent
-
-  parentElement.appendChild(mountElement);
-
-  function destroy() {
-    unmountComponentAtNode(mountElement);
-    parentElement.removeChild(mountElement);
-  }
+  var containerElement = (typeof container === 'function' ? container() : container) || document.body;
+  return new Promise(function (resolve) {
+    var renderCallback = function renderCallback() {
+      resolve([containerRef, unmount]);
+    };
 
-  render( /*#__PURE__*/React.createElement(ToastContainer, _extends({}, rest, {
-    ref: containerRef
-  })), mountElement);
-  return [containerRef, destroy];
+    var _render = render( /*#__PURE__*/React.createElement(ToastContainer, _extends({}, rest, {
+      ref: containerRef,
+      callback: renderCallback
+    })), containerElement),
+        unmount = _render.unmount;
+  });
 };
 
 ToastContainer.displayName = 'ToastContainer';
@@ -158,6 +159,7 @@ ToastContainer.propTypes = {
   className: PropTypes.string,
   classPrefix: PropTypes.string,
   placement: PropTypes.elementType,
-  container: PropTypes.oneOfType([PropTypes.node, PropTypes.func])
+  container: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  callback: PropTypes.func
 };
 export default ToastContainer;

package/esm/toaster/toaster.d.ts

@@ -7,7 +7,7 @@ export interface Toaster {
      * @param message
      * @param options
      */
-    push(message: React.ReactNode, options?: ToastContainerProps): string | undefined;
+    push(message: React.ReactNode, options?: ToastContainerProps): string | undefined | Promise<string | undefined>;
     /**
      * Remove a message by key
      * @param key

package/esm/toaster/toaster.js

@@ -1,3 +1,5 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import ToastContainer from './ToastContainer';
 var defaultContainerId = 'default';
 var containers = new Map();
@@ -7,12 +9,8 @@ var containers = new Map();
  * @param options
  */
 
-function createContainer(containerId, props) {
-  var _ToastContainer$getIn = ToastContainer.getInstance(props),
-      container = _ToastContainer$getIn[0];
-
-  containers.set(containerId || defaultContainerId, container);
-  return container;
+function createContainer(_x, _x2) {
+  return _createContainer.apply(this, arguments);
 }
 /**
  * Get the container by ID. Use default ID when ID is not available.
@@ -20,6 +18,33 @@ function createContainer(containerId, props) {
  */
 
 
+function _createContainer() {
+  _createContainer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(containerId, props) {
+    var _yield$ToastContainer, container;
+
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return ToastContainer.getInstance(props);
+
+          case 2:
+            _yield$ToastContainer = _context.sent;
+            container = _yield$ToastContainer[0];
+            containers.set(containerId || defaultContainerId, container);
+            return _context.abrupt("return", container);
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _createContainer.apply(this, arguments);
+}
+
 function getContainer(containerId) {
   if (containers.size == 0) {
     return null;
@@ -33,21 +58,24 @@ var toaster = function toaster(message) {
 };
 
 toaster.push = function (message, options) {
-  var _container$current;
+  var _options;
 
   if (options === void 0) {
     options = {};
   }
 
-  var container = getContainer(options.placement);
+  var containerId = (_options = options) === null || _options === void 0 ? void 0 : _options.placement;
+  var container = getContainer(containerId);
 
-  if (!container) {
-    var _options$placement;
-
-    container = createContainer((_options$placement = options.placement) !== null && _options$placement !== void 0 ? _options$placement : '', options);
+  if (container !== null && container !== void 0 && container.current) {
+    return container.current.push(message);
   }
 
-  return (_container$current = container.current) === null || _container$current === void 0 ? void 0 : _container$current.push(message);
+  return createContainer(containerId !== null && containerId !== void 0 ? containerId : '', options).then(function (ref) {
+    var _ref$current;
+
+    return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.push(message);
+  });
 };
 
 toaster.remove = function (key) {

package/esm/toaster/useToaster.d.ts

@@ -5,7 +5,7 @@ import { ToastContainerProps } from './ToastContainer';
  * @returns toaster { push, remove, clear }
  */
 declare const useToaster: () => {
-    push: (message: React.ReactNode, options?: ToastContainerProps) => string | undefined;
+    push: (message: React.ReactNode, options?: ToastContainerProps) => string | Promise<string | undefined> | undefined;
     remove: (key: string) => void;
     clear: () => void;
 };

package/esm/utils/index.d.ts

@@ -23,6 +23,7 @@ export { default as composeFunctions } from './composeFunctions';
 export { default as reactToString } from './reactToString';
 export { default as scrollTopAnimation } from './scrollTopAnimation';
 export { default as appendTooltip } from './appendTooltip';
+export { default as render } from './render';
 /** Hooks **/
 export { default as useClassNames } from './useClassNames';
 export { default as useEventListener } from './useEventListener';

package/esm/utils/index.js

@@ -25,6 +25,7 @@ export { default as composeFunctions } from './composeFunctions';
 export { default as reactToString } from './reactToString';
 export { default as scrollTopAnimation } from './scrollTopAnimation';
 export { default as appendTooltip } from './appendTooltip';
+export { default as render } from './render';
 /** Hooks **/
 
 export { default as useClassNames } from './useClassNames';

package/esm/utils/render.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare function render(element: React.ReactElement<any>, container: HTMLElement): any;
+export default render;

package/esm/utils/render.js

@@ -0,0 +1,37 @@
+import React from 'react';
+import * as ReactDOM from 'react-dom';
+var majorVersion = parseInt(React.version);
+var SuperposedReactDOM = ReactDOM;
+
+function render(element, container) {
+  var mountElement = document.createElement('div');
+  mountElement.className = 'rs-mount-element';
+  var containerElement = container || document.body; // Add the detached element to the root
+
+  containerElement.appendChild(mountElement);
+
+  if (majorVersion >= 18) {
+    /**
+     * ignore react 18 warnings
+     * Warning: You are importing createRoot from "react-dom" which is not supported. You should instead import it from "react-dom/client".
+     */
+    ReactDOM['__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED'].usingClientEntryPoint = true;
+    var createRoot = SuperposedReactDOM.createRoot;
+    var root = containerElement.__root || createRoot(mountElement, {
+      identifierPrefix: 'rs-root-'
+    });
+    root.render(element);
+    containerElement.__root = root;
+    return root;
+  }
+
+  SuperposedReactDOM.render(element, mountElement);
+  return {
+    unmount: function unmount() {
+      SuperposedReactDOM.unmountComponentAtNode(mountElement);
+      containerElement.removeChild(mountElement);
+    }
+  };
+}
+
+export default render;

package/esm/utils/useUniqueId.js

@@ -1,5 +1,6 @@
-import { useRef } from 'react';
+import * as React from 'react';
 import uniqueId from 'lodash/uniqueId';
+var reactUseId = React['useId' + ''];
 /**
  * Used for generating unique ID for DOM elements
  *
@@ -7,7 +8,11 @@ import uniqueId from 'lodash/uniqueId';
  */
 
 export default function useUniqueId(prefix, idProp) {
-  var idRef = useRef();
+  var idRef = React.useRef();
+
+  if (reactUseId !== undefined) {
+    return idProp !== null && idProp !== void 0 ? idProp : "" + prefix + reactUseId();
+  }
 
   if (!idRef.current) {
     idRef.current = uniqueId(prefix);