rsuite 5.16.3 → 5.17.0-beta.1

package/cjs/Overlay/OverlayTrigger.js

@@ -278,56 +278,65 @@ var OverlayTrigger = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   var preventDefault = (0, _react.useCallback)(function (event) {
     event.preventDefault();
   }, []);
-  var triggerEvents = {
-    onClick: onClick,
-    onContextMenu: onContextMenu,
-    onMouseOver: onMouseOver,
-    onMouseOut: onMouseOut,
-    onFocus: onFocus,
-    onBlur: onBlur,
-    onMouseMove: onMouseMove
-  };
+  var triggerEvents = (0, _react.useMemo)(function () {
+    // Pass events by props
+    var events = {
+      onClick: onClick,
+      onContextMenu: onContextMenu,
+      onMouseOver: onMouseOver,
+      onMouseOut: onMouseOut,
+      onFocus: onFocus,
+      onBlur: onBlur,
+      onMouseMove: onMouseMove
+    }; // When trigger is disabled, no predefined event listeners are added.
+
+    if (disabled || readOnly || plaintext || trigger === 'none') {
+      return events;
+    } // Get the cursor position through onMouseMove.
+    // https://rsuitejs.com/components/tooltip/#follow-cursor
+
+
+    if (followCursor) {
+      events.onMouseMove = (0, _utils.createChainedFunction)(handledMoveOverlay, onMouseMove);
+    } // The `click` event is usually used in `toggle` scenarios.
+    // The first click will open and the second click will close.
+
 
-  if (!disabled && !readOnly && !plaintext) {
     if ((0, _isOneOf.default)('click', trigger)) {
-      triggerEvents.onClick = (0, _utils.createChainedFunction)(handleOpenState, triggerEvents.onClick);
-    }
+      events.onClick = (0, _utils.createChainedFunction)(handleOpenState, events.onClick);
+      return events;
+    } // The difference between it and the click event is that it does not trigger the close.
 
-    if ((0, _isOneOf.default)('contextMenu', trigger)) {
-      triggerEvents.onContextMenu = (0, _utils.createChainedFunction)(preventDefault, handleOpenState, triggerEvents.onContextMenu);
-    }
 
     if ((0, _isOneOf.default)('active', trigger)) {
-      triggerEvents.onClick = (0, _utils.createChainedFunction)(handleDelayedOpen, triggerEvents.onClick);
+      events.onClick = (0, _utils.createChainedFunction)(handleDelayedOpen, events.onClick);
+      return events;
     }
 
     if ((0, _isOneOf.default)('hover', trigger)) {
-      var onMouseOverListener = null;
-      var onMouseOutListener = null;
-
-      if (trigger !== 'none') {
-        onMouseOverListener = function onMouseOverListener(e) {
-          return onMouseEventHandler(handleDelayedOpen, e);
-        };
+      var onMouseOverListener = function onMouseOverListener(e) {
+        return onMouseEventHandler(handleDelayedOpen, e);
+      };
 
-        onMouseOutListener = function onMouseOutListener(e) {
-          return onMouseEventHandler(handleDelayedClose, e);
-        };
-      }
+      var onMouseOutListener = function onMouseOutListener(e) {
+        return onMouseEventHandler(handleDelayedClose, e);
+      };
 
-      triggerEvents.onMouseOver = (0, _utils.createChainedFunction)(onMouseOverListener, onMouseOver);
-      triggerEvents.onMouseOut = (0, _utils.createChainedFunction)(onMouseOutListener, onMouseOut);
+      events.onMouseOver = (0, _utils.createChainedFunction)(onMouseOverListener, events.onMouseOver);
+      events.onMouseOut = (0, _utils.createChainedFunction)(onMouseOutListener, events.onMouseOut);
     }
 
     if ((0, _isOneOf.default)('focus', trigger)) {
-      triggerEvents.onFocus = (0, _utils.createChainedFunction)(handleDelayedOpen, onFocus);
-      triggerEvents.onBlur = (0, _utils.createChainedFunction)(handleDelayedClose, onBlur);
+      events.onFocus = (0, _utils.createChainedFunction)(handleDelayedOpen, events.onFocus);
+      events.onBlur = (0, _utils.createChainedFunction)(handleDelayedClose, events.onBlur);
     }
 
-    if (trigger !== 'none' && followCursor) {
-      triggerEvents.onMouseMove = (0, _utils.createChainedFunction)(handledMoveOverlay, onMouseMove);
+    if ((0, _isOneOf.default)('contextMenu', trigger)) {
+      events.onContextMenu = (0, _utils.createChainedFunction)(preventDefault, handleOpenState, events.onContextMenu);
     }
-  }
+
+    return events;
+  }, [disabled, followCursor, handleDelayedClose, handleDelayedOpen, handleOpenState, handledMoveOverlay, onBlur, onClick, onContextMenu, onFocus, onMouseMove, onMouseOut, onMouseOver, plaintext, preventDefault, readOnly, trigger]);
 
   var renderOverlay = function renderOverlay() {
     var overlayProps = (0, _extends2.default)({}, rest, {

package/cjs/Picker/PickerToggle.d.ts

@@ -15,7 +15,7 @@ export interface PickerToggleProps extends ToggleButtonProps {
     readOnly?: boolean;
     plaintext?: boolean;
     tabIndex?: number;
-    input?: boolean;
+    editable?: boolean;
     inputPlaceholder?: string;
     inputMask?: (string | RegExp)[];
     onInputChange?: (value: string, event: React.ChangeEvent) => void;

package/cjs/Picker/PickerToggle.js

@@ -51,12 +51,12 @@ var PickerToggle = /*#__PURE__*/_react.default.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,
@@ -74,8 +74,9 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       _props$caretAs = props.caretAs,
       caretAs = _props$caretAs === void 0 ? caretComponent : _props$caretAs,
       label = props.label,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(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 = (0, _objectWithoutPropertiesLoose2.default)(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 = (0, _react.useRef)(null);
+  var comboboxRef = (0, _react.useRef)(null);
 
   var _useState = (0, _react.useState)(false),
       activeState = _useState[0],
@@ -95,30 +96,46 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       setInputValue = _useState2[1];
 
   (0, _react.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 = (0, _react.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 = (0, _react.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());
@@ -126,10 +143,13 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   };
 
   var handleClean = (0, _react.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 = (0, _react.useCallback)(function (event) {
     var _event$target;
 
@@ -138,10 +158,18 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange(value, event);
   }, [onInputChange]);
   var handleInputKeyDown = (0, _react.useCallback)(function (event) {
-    if (input && event.key === _utils.KEY_VALUES.ENTER) {
+    if (editable && event.key === _utils.KEY_VALUES.ENTER) {
       onInputPressEnter === null || onInputPressEnter === void 0 ? void 0 : onInputPressEnter(event);
     }
-  }, [onInputPressEnter, input]);
+  }, [onInputPressEnter, editable]);
+  var renderInput = (0, _react.useCallback)(function (ref, props) {
+    return /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
+      ref: (0, _utils.mergeRefs)(inputRef, ref),
+      style: {
+        pointerEvents: editable ? undefined : 'none'
+      }
+    }, props));
+  }, [editable]);
   var ToggleCaret = (0, _useToggleCaret.default)(placement);
   var Caret = caretAs !== null && caretAs !== void 0 ? caretAs : ToggleCaret;
 
@@ -154,7 +182,8 @@ var PickerToggle = /*#__PURE__*/_react.default.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.default.createElement(Component, (0, _extends2.default)({
     role: "combobox",
     "aria-haspopup": "listbox",
@@ -162,9 +191,9 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     "aria-disabled": disabled,
     "aria-owns": id ? id + "-listbox" : undefined
   }, rest, {
-    ref: ref,
+    ref: (0, _utils.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.
     ,
@@ -181,16 +210,12 @@ var PickerToggle = /*#__PURE__*/_react.default.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.default.createElement("input", (0, _extends2.default)({
-        ref: (0, _utils.mergeRefs)(inputRef, ref)
-      }, props));
-    }
+    render: renderInput
   }), children ? /*#__PURE__*/_react.default.createElement("span", {
     className: prefix(hasValue ? 'value' : 'placeholder'),
     "aria-placeholder": typeof children === 'string' ? children : undefined

package/cjs/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/cjs/toaster/ToastContainer.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _reactDom = require("react-dom");
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _kebabCase = _interopRequireDefault(require("lodash/kebabCase"));
@@ -40,13 +38,15 @@ var useMessages = function useMessages() {
   }, [messages]);
   var push = (0, _react.useCallback)(function (message) {
     var key = (0, _utils.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 = (0, _react.useCallback)(function () {
     // Set all existing messages to be invisible.
     setMessages(messages.map(function (msg) {
@@ -93,7 +93,8 @@ var ToastContainer = /*#__PURE__*/_react.default.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 = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "placement"]);
+      callback = props.callback,
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "placement", "callback"]);
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
@@ -141,7 +142,10 @@ var ToastContainer = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     });
   });
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
-    ref: rootRef,
+    ref: function ref(selfRef) {
+      rootRef.current = selfRef;
+      callback === null || callback === void 0 ? void 0 : callback(selfRef);
+    },
     className: classes
   }), elements);
 });
@@ -152,22 +156,18 @@ ToastContainer.getInstance = function (props) {
 
   var containerRef = /*#__PURE__*/_react.default.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() {
-    (0, _reactDom.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]);
+    };
 
-  (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(ToastContainer, (0, _extends2.default)({}, rest, {
-    ref: containerRef
-  })), mountElement);
-  return [containerRef, destroy];
+    var _render = (0, _utils.render)( /*#__PURE__*/_react.default.createElement(ToastContainer, (0, _extends2.default)({}, rest, {
+      ref: containerRef,
+      callback: renderCallback
+    })), containerElement),
+        unmount = _render.unmount;
+  });
 };
 
 ToastContainer.displayName = 'ToastContainer';
@@ -175,7 +175,8 @@ ToastContainer.propTypes = {
   className: _propTypes.default.string,
   classPrefix: _propTypes.default.string,
   placement: _propTypes.default.elementType,
-  container: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func])
+  container: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func]),
+  callback: _propTypes.default.func
 };
 var _default = ToastContainer;
 exports.default = _default;

package/cjs/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/cjs/toaster/toaster.js

@@ -5,6 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _ToastContainer = _interopRequireDefault(require("./ToastContainer"));
 
 var defaultContainerId = 'default';
@@ -15,12 +19,8 @@ var containers = new Map();
  * @param options
  */
 
-function createContainer(containerId, props) {
-  var _ToastContainer$getIn = _ToastContainer.default.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.
@@ -28,6 +28,33 @@ function createContainer(containerId, props) {
  */
 
 
+function _createContainer() {
+  _createContainer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(containerId, props) {
+    var _yield$ToastContainer, container;
+
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return _ToastContainer.default.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;
@@ -41,21 +68,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);
-
-  if (!container) {
-    var _options$placement;
+  var containerId = (_options = options) === null || _options === void 0 ? void 0 : _options.placement;
+  var container = getContainer(containerId);
 
-    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/cjs/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;
 };