rsuite 5.15.2 → 5.16.2

package/cjs/Picker/PickerToggle.js

@@ -73,7 +73,8 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       caretComponent = props.caretComponent,
       _props$caretAs = props.caretAs,
       caretAs = _props$caretAs === void 0 ? caretComponent : _props$caretAs,
-      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 = 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"]);
   var inputRef = (0, _react.useRef)(null);
 
   var _useState = (0, _react.useState)(false),
@@ -193,7 +194,9 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   }), children ? /*#__PURE__*/_react.default.createElement("span", {
     className: prefix(hasValue ? 'value' : 'placeholder'),
     "aria-placeholder": typeof children === 'string' ? children : undefined
-  }, children) : null, showCleanButton && /*#__PURE__*/_react.default.createElement(_CloseButton.default, {
+  }, label && /*#__PURE__*/_react.default.createElement("span", {
+    className: prefix('label')
+  }, label, ": "), children) : null, showCleanButton && /*#__PURE__*/_react.default.createElement(_CloseButton.default, {
     className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["clean"]))),
     tabIndex: -1,
     locale: {

package/cjs/SelectPicker/SelectPicker.d.ts

@@ -1,6 +1,6 @@
 import React, { Ref } from 'react';
 import { PickerLocale } from '../locales';
-import { PickerInstance } from '../Picker';
+import { PickerInstance, PickerToggleProps } from '../Picker';
 import { FormControlPickerProps, ItemDataType } from '../@types/common';
 import { ListProps } from 'react-virtualized/dist/commonjs/List';
 export interface SelectProps<T> {
@@ -40,7 +40,13 @@ export interface MultipleSelectProps<T> extends Omit<SelectProps<T>, 'renderValu
     /** Custom render selected items */
     renderValue?: (value: T[], item: ItemDataType<T>[], selectedElement: React.ReactNode) => React.ReactNode;
 }
-export interface SelectPickerProps<T> extends FormControlPickerProps<T, PickerLocale, ItemDataType<T>>, SelectProps<T> {
+export interface SelectPickerProps<T> extends Omit<FormControlPickerProps<T, PickerLocale, ItemDataType<T>>, 'value' | 'defaultValue' | 'onChange'>, SelectProps<T>, Pick<PickerToggleProps, 'caretAs' | 'label'> {
+    /** Initial value */
+    defaultValue?: T;
+    /** Current value of the component. Creates a controlled component */
+    value?: T | null;
+    /** Called after the value has been changed */
+    onChange?: (value: T | null, event: React.SyntheticEvent) => void;
 }
 export interface SelectPickerComponent {
     <T>(props: SelectPickerProps<T> & {

package/cjs/SelectPicker/test/SelectPicker.test.js

@@ -67,4 +67,34 @@ var pickerRef = /*#__PURE__*/_react.default.createRef();
 _react.default.createElement(_SelectPicker.default, {
   ref: pickerRef,
   data: []
+}); // With a label
+
+
+/*#__PURE__*/
+_react.default.createElement(_SelectPicker.default, {
+  label: "User",
+  data: []
+});
+
+/*#__PURE__*/
+_react.default.createElement(_SelectPicker.default, {
+  data: [{
+    label: 'Ascending',
+    value: 'asc'
+  }, {
+    label: 'Descending',
+    value: 'desc'
+  }],
+  value: "asc",
+  onChange: function onChange(value) {
+    (0, _tsExpect.expectType)(value);
+  }
+});
+
+/*#__PURE__*/
+_react.default.createElement(_SelectPicker.default, {
+  caretAs: function caretAs() {
+    return /*#__PURE__*/_react.default.createElement("div", null);
+  },
+  data: []
 });

package/cjs/TreePicker/TreePicker.d.ts

@@ -1,10 +1,10 @@
 import React from 'react';
 import { PickerLocale } from '../locales';
-import { PickerComponent } from '../Picker';
+import { PickerComponent, PickerToggleProps } from '../Picker';
 import { TreeDragProps, TreeBaseProps } from '../Tree/Tree';
 import { FormControlPickerProps, ItemDataType } from '../@types/common';
 export declare const maxTreeHeight = 320;
-export interface TreePickerProps<T = number | string> extends TreeBaseProps<T, ItemDataType>, TreeDragProps, FormControlPickerProps<T, PickerLocale, ItemDataType> {
+export interface TreePickerProps<T = number | string> extends TreeBaseProps<T, ItemDataType>, TreeDragProps, FormControlPickerProps<T, PickerLocale, ItemDataType>, Pick<PickerToggleProps, 'caretAs'> {
     /** The height of Dropdown */
     height?: number;
     /** Tree node cascade */

package/cjs/TreePicker/test/TreePicker.test.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/TreePicker/test/TreePicker.test.js

@@ -0,0 +1,15 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _TreePicker = _interopRequireDefault(require("../TreePicker"));
+
+/*#__PURE__*/
+_react.default.createElement(_TreePicker.default, {
+  caretAs: function caretAs() {
+    return /*#__PURE__*/_react.default.createElement("div", null);
+  },
+  data: []
+});

package/cjs/utils/attachParent.d.ts

@@ -0,0 +1 @@
+export declare function attachParent<T>(data: T, parent: T): T;

package/cjs/utils/attachParent.js

@@ -0,0 +1,15 @@
+"use strict";
+
+exports.__esModule = true;
+exports.attachParent = attachParent;
+
+function attachParent(data, parent) {
+  // mark "parent" unenumable
+  Object.defineProperty(data, 'parent', {
+    value: parent,
+    writable: false,
+    enumerable: false,
+    configurable: true
+  });
+  return data;
+}

package/cjs/utils/treeUtils.js

@@ -66,6 +66,8 @@ var _reactToString = _interopRequireDefault(require("./reactToString"));
 
 var _constants = require("./constants");
 
+var _attachParent = require("./attachParent");
+
 // gap of tree node
 var TREE_NODE_GAP = 4;
 /**
@@ -113,8 +115,7 @@ function flattenTree(tree, childrenKey, executor) {
 
     data.forEach(function (item, index) {
       var node = typeof executor === 'function' ? executor(item, index) : item;
-      node.parent = parent;
-      flattenData.push((0, _extends3.default)({}, node));
+      flattenData.push((0, _attachParent.attachParent)(node, parent));
 
       if (item[childrenKey]) {
         traverse(item[childrenKey], item);

package/cjs/utils/usePortal.d.ts

@@ -1,10 +1,12 @@
 import React from 'react';
 interface PortalProps {
-    id?: string;
     container?: HTMLElement | (() => HTMLElement | null) | null;
+    waitMount?: boolean;
 }
 declare function usePortal(props?: PortalProps): {
     target: HTMLElement | null;
-    Portal: React.FC<any>;
+    Portal: ((props: any) => JSX.Element) | (({ children }: {
+        children: React.ReactNode;
+    }) => React.ReactPortal | null);
 };
 export default usePortal;

package/cjs/utils/usePortal.js

@@ -1,41 +1,67 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
 exports.default = void 0;
 
-var _react = require("react");
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _reactDom = require("react-dom");
 
 var _canUseDOM = _interopRequireDefault(require("dom-lib/canUseDOM"));
 
+var MountedPortal = /*#__PURE__*/_react.default.memo(function (_ref) {
+  var children = _ref.children,
+      container = _ref.container;
+
+  var _useState = (0, _react.useState)(false),
+      mounted = _useState[0],
+      setMounted = _useState[1];
+
+  (0, _react.useEffect)(function () {
+    return setMounted(true);
+  }, []);
+
+  if (container && mounted) {
+    return /*#__PURE__*/(0, _reactDom.createPortal)(children, container);
+  }
+
+  return null;
+});
+
 function usePortal(props) {
   if (props === void 0) {
     props = {};
   }
 
   var _props = props,
-      id = _props.id,
-      container = _props.container;
+      container = _props.container,
+      _props$waitMount = _props.waitMount,
+      waitMount = _props$waitMount === void 0 ? false : _props$waitMount;
   var rootElemRef = (0, _react.useRef)(_canUseDOM.default ? document.body : null);
   (0, _react.useEffect)(function () {
-    var containerElement = typeof container === 'function' ? container() : container; // Look for existing target dom element to append to
-
-    var existingParent = id && document.querySelector("#" + id); // Parent is either a new root or the existing dom element
+    var containerElement = typeof container === 'function' ? container() : container; // Parent is either a new root or the existing dom element
 
-    var parentElement = containerElement || existingParent || document.body;
+    var parentElement = containerElement || document.body;
     rootElemRef.current = parentElement;
-  }, [rootElemRef, container, id]);
-  var Portal = (0, _react.useCallback)(function (_ref) {
-    var children = _ref.children;
-    if (rootElemRef.current != null) return /*#__PURE__*/(0, _reactDom.createPortal)(children, rootElemRef.current);
-    return null;
-  }, [rootElemRef]);
+  }, [rootElemRef, container]);
+  var Portal = (0, _react.useCallback)(function (_ref2) {
+    var children = _ref2.children;
+    return rootElemRef.current != null ? /*#__PURE__*/(0, _reactDom.createPortal)(children, rootElemRef.current) : null;
+  }, []);
+  var WaitMountPortal = (0, _react.useCallback)(function (props) {
+    return /*#__PURE__*/_react.default.createElement(MountedPortal, (0, _extends2.default)({
+      container: rootElemRef.current
+    }, props));
+  }, []);
   return {
     target: rootElemRef.current,
-    Portal: Portal
+    Portal: waitMount ? WaitMountPortal : Portal
   };
 }
 

package/dist/rsuite-rtl.css

@@ -7875,10 +7875,11 @@ textarea.rs-input {
   outline: 0;
 }
 .rs-input:focus {
-  -webkit-box-shadow: 0 0 0 3px rgba(52, 152, 255, 0.25);
-  -webkit-box-shadow: var(--rs-state-focus-shadow);
-          box-shadow: 0 0 0 3px rgba(52, 152, 255, 0.25);
-          box-shadow: var(--rs-state-focus-shadow);
+  outline: 3px solid rgba(52, 152, 255, 0.25);
+  outline: 3px solid var(--rs-color-focus-ring);
+}
+.rs-theme-high-contrast .rs-input:focus {
+  outline-offset: 2px;
 }
 .rs-input:disabled {
   background-color: #f7f7fa;
@@ -7962,10 +7963,15 @@ textarea.rs-input-sm {
 }
 .rs-input-group:not(.rs-input-group-disabled).rs-input-group-focus,
 .rs-input-group:focus-within {
-  -webkit-box-shadow: 0 0 0 3px rgba(52, 152, 255, 0.25);
-  -webkit-box-shadow: var(--rs-state-focus-shadow);
-          box-shadow: 0 0 0 3px rgba(52, 152, 255, 0.25);
-          box-shadow: var(--rs-state-focus-shadow);
+  outline: 3px solid rgba(52, 152, 255, 0.25);
+  outline: 3px solid var(--rs-color-focus-ring);
+}
+.rs-theme-high-contrast .rs-input-group:not(.rs-input-group-disabled).rs-input-group-focus,
+.rs-theme-high-contrast .rs-input-group:focus-within {
+  outline-offset: 2px;
+}
+.rs-input-group .rs-input-group {
+  outline: none !important;
 }
 .rs-input-group .rs-input-number,
 .rs-input-group .rs-input-group-addon,
@@ -7973,14 +7979,12 @@ textarea.rs-input-sm {
 .rs-input-group .rs-picker-date .rs-picker-toggle {
   border: none;
   border-radius: 0;
-  -webkit-box-shadow: none;
-          box-shadow: none;
+  outline: none;
 }
 .rs-input-group:not(.rs-input-group-inside) .rs-input {
   border: none;
   border-radius: 0;
-  -webkit-box-shadow: none;
-          box-shadow: none;
+  outline: none;
 }
 .rs-input-group:not(.rs-input-group-inside) .rs-input-number:not(:last-child) .rs-input-number-btn-group-vertical {
   border-radius: 0;
@@ -8094,8 +8098,7 @@ textarea.rs-input-sm {
   line-height: 1.42857143;
 }
 .rs-input-group.rs-input-group-inside .rs-input-group-btn:focus {
-  -webkit-box-shadow: none;
-          box-shadow: none;
+  outline: none;
 }
 .rs-input-group.rs-input-group-inside .rs-input-group-btn:first-child {
   border-bottom-right-radius: 6px;
@@ -11574,6 +11577,10 @@ textarea.rs-picker-search-input {
 .rs-picker-subtle.rs-picker-disabled .rs-picker-toggle:active::after {
   display: none;
 }
+.rs-picker-toggle-label {
+  color: #575757;
+  color: var(--rs-text-primary);
+}
 .rs-picker-toggle-value {
   display: block;
   overflow: hidden;
@@ -11649,6 +11656,13 @@ textarea.rs-picker-search-input {
   overflow: hidden;
   -webkit-transition: none;
   transition: none;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: column;
+          flex-direction: column;
   /* stylelint-disable-next-line */
 }
 .rs-theme-high-contrast .rs-picker-menu {
@@ -11725,10 +11739,11 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
   outline: 0;
 }
 .rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input:focus {
-  -webkit-box-shadow: 0 0 0 3px rgba(52, 152, 255, 0.25);
-  -webkit-box-shadow: var(--rs-state-focus-shadow);
-          box-shadow: 0 0 0 3px rgba(52, 152, 255, 0.25);
-          box-shadow: var(--rs-state-focus-shadow);
+  outline: 3px solid rgba(52, 152, 255, 0.25);
+  outline: 3px solid var(--rs-color-focus-ring);
+}
+.rs-theme-high-contrast .rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input:focus {
+  outline-offset: 2px;
 }
 .rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input:disabled {
   background-color: #f7f7fa;
@@ -13849,6 +13864,7 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 .rs-slider-handle {
   position: absolute;
   top: -50%;
+  outline: none;
 }
 .rs-slider-handle::before {
   content: '';
@@ -15721,15 +15737,6 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
   margin-right: -13px;
   border-right: 1px solid rgba(0, 0, 0, 0.1);
 }
-.rs-picker-menu {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: column;
-          flex-direction: column;
-}
 .rs-picker-menu.rs-tree-menu {
   padding-top: 12px;
 }