rsuite 5.78.1 → 5.79.0

package/esm/Form/hooks/useSchemaModel.js

@@ -1,58 +1,7 @@
 'use client';
-import { SchemaModel, ObjectType } from 'schema-typed';
+import { SchemaModel } from 'schema-typed';
 import { useRef, useCallback } from 'react';
-/**
- * Convert a flat schema object to a nested schema object
- *
- * @example
- *
- * ```js
- * const schema = {
- *  'address.city': StringType().isRequired('City is required'),
- *  'address.street': StringType().isRequired('Street is required')
- * };
- *
- * const result = unflattenSchemaObject(schema);
- *
- * // result
- * {
- *    address: ObjectType().shape({
- *      city: StringType().isRequired('City is required'),
- *      street: StringType().isRequired('Street is required')
- *    })
- * }
- * ```
- */
-function unflattenSchemaObject(schema) {
-  var result = {};
-  var $type = Symbol('schema-type');
-  Object.keys(schema).forEach(function (key) {
-    if (key.includes('.')) {
-      var keys = key.split('.');
-      var lastKey = keys.pop() || '';
-      var current = result;
-      keys.forEach(function (subKey) {
-        var _ref;
-        current[subKey] = current[subKey] || (_ref = {}, _ref[$type] = 'object-type', _ref);
-        current = current[subKey];
-      });
-      current[lastKey] = schema[key];
-    } else {
-      result[key] = schema[key];
-    }
-  });
-  function convertToShape(obj) {
-    Object.keys(obj).forEach(function (key) {
-      var _obj$key;
-      if (((_obj$key = obj[key]) === null || _obj$key === void 0 ? void 0 : _obj$key[$type]) === 'object-type') {
-        delete obj[key][$type];
-        obj[key] = ObjectType().shape(convertToShape(obj[key]));
-      }
-    });
-    return obj;
-  }
-  return convertToShape(result);
-}
+import { constructFlatSchema } from "../utils/constructFlatSchema.js";
 function useSchemaModel(formModel, nestedField) {
   var subRulesRef = useRef([]);
   var pushFieldRule = useCallback(function (name, fieldRule) {
@@ -76,15 +25,15 @@ function useSchemaModel(formModel, nestedField) {
     if (realSubRules.length === 0) {
       return formModel;
     }
-    var subRuleObject = realSubRules.map(function (_ref2) {
-      var _ref3;
-      var name = _ref2.name,
-        fieldRule = _ref2.fieldRule;
-      return _ref3 = {}, _ref3[name] = fieldRule.current, _ref3;
+    var subRuleObject = realSubRules.map(function (_ref) {
+      var _ref2;
+      var name = _ref.name,
+        fieldRule = _ref.fieldRule;
+      return _ref2 = {}, _ref2[name] = fieldRule.current, _ref2;
     }).reduce(function (a, b) {
       return Object.assign(a, b);
     }, {});
-    return SchemaModel.combine(formModel, SchemaModel(nestedField ? unflattenSchemaObject(subRuleObject) : subRuleObject));
+    return SchemaModel.combine(formModel, SchemaModel(nestedField ? constructFlatSchema(subRuleObject) : subRuleObject));
   }, [formModel, nestedField]);
   return {
     getCombinedModel: getCombinedModel,

package/esm/Form/utils/constructFlatSchema.d.ts

@@ -0,0 +1,4 @@
+/**
+ * combine flat schema to nested schema
+ */
+export declare function constructFlatSchema(schema: any): any;

package/esm/Form/utils/constructFlatSchema.js

@@ -0,0 +1,38 @@
+'use client';
+import { ObjectType, ArrayType } from 'schema-typed';
+import set from 'lodash/set';
+
+/**
+ * combine flat schema to nested schema
+ */
+export function constructFlatSchema(schema) {
+  var shape = {};
+  Object.keys(schema).forEach(function (key) {
+    set(shape, key, {
+      schema: schema[key],
+      primitiveType: true
+    });
+  });
+  function convertShapeToSchema(shape, result, internal) {
+    Object.keys(shape).forEach(function (key) {
+      var currentShape = shape[key];
+      if (Array.isArray(currentShape)) {
+        var _ArrayType;
+        result[key] = (_ArrayType = ArrayType()).of.apply(_ArrayType, currentShape.map(function (v) {
+          if (v.primitiveType) {
+            return v.schema;
+          }
+          return convertShapeToSchema(v, {}, true);
+        }));
+      } else {
+        if (currentShape.primitiveType) {
+          result[key] = currentShape.schema;
+        } else {
+          result[key] = convertShapeToSchema(currentShape, {}, true);
+        }
+      }
+    });
+    return internal ? ObjectType().shape(result) : result;
+  }
+  return convertShapeToSchema(shape, {});
+}

package/esm/RangeSlider/RangeSlider.js

@@ -1,7 +1,7 @@
 'use client';
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-var _excluded = ["aria-label", "aria-labelledby", "aria-valuetext", "as", "barClassName", "className", "classPrefix", "constraint", "defaultValue", "disabled", "graduated", "progress", "vertical", "readOnly", "min", "max", "step", "value", "handleClassName", "handleStyle", "handleTitle", "tooltip", "getAriaValueText", "renderTooltip", "renderMark", "onChange", "onChangeCommitted"];
+var _excluded = ["aria-label", "aria-labelledby", "aria-valuetext", "as", "barClassName", "className", "classPrefix", "constraint", "defaultValue", "disabled", "graduated", "progress", "keepTooltipOpen", "vertical", "readOnly", "min", "max", "step", "value", "handleClassName", "handleStyle", "handleTitle", "tooltip", "getAriaValueText", "renderTooltip", "renderMark", "onChange", "onChangeCommitted"];
 import React, { useMemo, useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import getWidth from 'dom-lib/getWidth';
@@ -40,6 +40,8 @@ var RangeSlider = /*#__PURE__*/React.forwardRef(function (props, ref) {
     graduated = propsWithDefaults.graduated,
     _propsWithDefaults$pr = propsWithDefaults.progress,
     progress = _propsWithDefaults$pr === void 0 ? true : _propsWithDefaults$pr,
+    _propsWithDefaults$ke = propsWithDefaults.keepTooltipOpen,
+    keepTooltipOpen = _propsWithDefaults$ke === void 0 ? false : _propsWithDefaults$ke,
     vertical = propsWithDefaults.vertical,
     readOnly = propsWithDefaults.readOnly,
     _propsWithDefaults$mi = propsWithDefaults.min,
@@ -295,7 +297,8 @@ var RangeSlider = /*#__PURE__*/React.forwardRef(function (props, ref) {
     'aria-valuemax': max,
     'aria-valuemin': min,
     'aria-label': ariaLabel,
-    'aria-labelledby': ariaLabelledby
+    'aria-labelledby': ariaLabelledby,
+    keepTooltipOpen: keepTooltipOpen
   };
   return /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
     ref: ref,

package/esm/Slider/Handle.d.ts

@@ -13,6 +13,7 @@ export interface HandleProps extends WithAsProps, React.HTMLAttributes<HTMLDivEl
     onDragEnd?: (event: React.MouseEvent, dataset?: DOMStringMap) => void;
     'data-range'?: number[];
     'data-key'?: string;
+    keepTooltipOpen?: boolean;
 }
 declare const Handle: RsRefForwardingComponent<'div', HandleProps>;
 export default Handle;

package/esm/Slider/Handle.js

@@ -1,7 +1,7 @@
 'use client';
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-var _excluded = ["as", "classPrefix", "className", "disabled", "style", "children", "position", "vertical", "tooltip", "rtl", "value", "role", "tabIndex", "renderTooltip", "onDragStart", "onDragMove", "onDragEnd", "onKeyDown", "data-range", "data-key"];
+var _excluded = ["as", "classPrefix", "className", "disabled", "style", "children", "position", "vertical", "tooltip", "rtl", "value", "role", "tabIndex", "renderTooltip", "onDragStart", "onDragMove", "onDragEnd", "onKeyDown", "data-range", "data-key", "keepTooltipOpen"];
 import React from 'react';
 import PropTypes from 'prop-types';
 import Tooltip from "../Tooltip/index.js";
@@ -33,7 +33,9 @@ var Handle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onKeyDown = props.onKeyDown,
     dataRange = props['data-range'],
     dateKey = props['data-key'],
+    keepTooltipOpen = props.keepTooltipOpen,
     rest = _objectWithoutPropertiesLoose(props, _excluded);
+  var actualTooltip = tooltip || keepTooltipOpen;
   var horizontalKey = rtl ? 'right' : 'left';
   var direction = vertical ? 'bottom' : horizontalKey;
   var styles = _extends({}, style, (_extends2 = {}, _extends2[direction] = position + "%", _extends2));
@@ -41,11 +43,12 @@ var Handle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     merge = _useClassNames.merge,
     prefix = _useClassNames.prefix;
   var _useDrag = useDrag({
-      tooltip: tooltip,
+      tooltip: actualTooltip,
       disabled: disabled,
       onDragStart: onDragStart,
       onDragMove: onDragMove,
-      onDragEnd: onDragEnd
+      onDragEnd: onDragEnd,
+      keepTooltipOpen: keepTooltipOpen
     }),
     active = _useDrag.active,
     onMoveStart = _useDrag.onMoveStart,
@@ -53,7 +56,7 @@ var Handle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     rootRef = _useDrag.rootRef,
     tooltipRef = _useDrag.tooltipRef;
   var handleClasses = merge(className, prefix('handle'), {
-    active: active
+    active: active || keepTooltipOpen
   });
   return /*#__PURE__*/React.createElement(Component, {
     role: role,
@@ -68,7 +71,7 @@ var Handle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     "data-range": dataRange,
     "data-key": dateKey,
     "data-testid": "slider-handle"
-  }, tooltip && /*#__PURE__*/React.createElement(Tooltip, {
+  }, actualTooltip && /*#__PURE__*/React.createElement(Tooltip, {
     "aria-hidden": "true",
     ref: tooltipRef,
     className: merge(prefix('tooltip'), 'placement-top')

package/esm/Slider/Slider.d.ts

@@ -52,6 +52,8 @@ export interface SliderProps<T = number> extends WithAsProps, FormControlBasePro
     getAriaValueText?: (value: number, eventKey?: 'start' | 'end') => string;
     /** Callback function that is fired when the mouseup is triggered. */
     onChangeCommitted?: (value: T, event: React.MouseEvent) => void;
+    /** If true, tooltip will always be visible  even without hover */
+    keepTooltipOpen?: boolean;
 }
 export declare const sliderPropTypes: {
     min: PropTypes.Requireable<number>;

package/esm/Slider/Slider.js

@@ -1,7 +1,7 @@
 'use client';
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-var _excluded = ["aria-label", "aria-labelledby", "aria-valuetext", "as", "graduated", "className", "barClassName", "progress", "vertical", "disabled", "readOnly", "plaintext", "classPrefix", "min", "handleClassName", "handleStyle", "handleTitle", "tooltip", "step", "defaultValue", "value", "max", "placeholder", "getAriaValueText", "renderTooltip", "renderMark", "onChange", "onChangeCommitted"];
+var _excluded = ["aria-label", "aria-labelledby", "aria-valuetext", "as", "graduated", "className", "barClassName", "progress", "vertical", "disabled", "readOnly", "plaintext", "classPrefix", "min", "handleClassName", "handleStyle", "handleTitle", "tooltip", "step", "defaultValue", "value", "max", "placeholder", "getAriaValueText", "renderTooltip", "renderMark", "onChange", "onChangeCommitted", "keepTooltipOpen"];
 import React, { useCallback, useMemo, useRef } from 'react';
 import PropTypes from 'prop-types';
 import getWidth from 'dom-lib/getWidth';
@@ -83,6 +83,7 @@ var Slider = /*#__PURE__*/React.forwardRef(function (props, ref) {
     renderMark = propsWithDefaults.renderMark,
     onChange = propsWithDefaults.onChange,
     onChangeCommitted = propsWithDefaults.onChangeCommitted,
+    keepTooltipOpen = propsWithDefaults.keepTooltipOpen,
     rest = _objectWithoutPropertiesLoose(propsWithDefaults, _excluded);
   var barRef = useRef(null);
   var _useClassNames = useClassNames(classPrefix),
@@ -242,6 +243,7 @@ var Slider = /*#__PURE__*/React.forwardRef(function (props, ref) {
     tooltip: tooltip,
     rtl: rtl,
     value: value,
+    keepTooltipOpen: keepTooltipOpen,
     renderTooltip: renderTooltip,
     onDragMove: handleChangeValue,
     onKeyDown: handleKeyDown,

package/esm/Slider/useDrag.d.ts

@@ -5,6 +5,7 @@ interface DragProps {
     onDragStart?: (event: React.MouseEvent) => void;
     onDragMove?: (event: React.DragEvent, dataset?: DOMStringMap) => void;
     onDragEnd?: (event: React.MouseEvent, dataset?: DOMStringMap) => void;
+    keepTooltipOpen?: boolean;
 }
 declare const useDrag: (props: DragProps) => {
     active: boolean;

package/esm/Slider/useDrag.js

@@ -11,7 +11,8 @@ var useDrag = function useDrag(props) {
     disabled = props.disabled,
     onDragMove = props.onDragMove,
     onDragEnd = props.onDragEnd,
-    onDragStart = props.onDragStart;
+    onDragStart = props.onDragStart,
+    keepTooltipOpen = props.keepTooltipOpen;
   var _useState = useState(false),
     active = _useState[0],
     setActive = _useState[1];
@@ -67,10 +68,13 @@ var useDrag = function useDrag(props) {
     setTooltipPosition();
   });
   useEffect(function () {
+    if (keepTooltipOpen) {
+      onMouseEnter();
+    }
     return function () {
       releaseMoves();
     };
-  }, [releaseMoves]);
+  }, [releaseMoves, keepTooltipOpen]);
   return {
     active: active,
     rootRef: rootRef,

package/esm/useToaster/useToaster.d.ts

@@ -5,7 +5,7 @@ import { ToastContainerProps } from '../toaster/ToastContainer';
  * It is often used with the Message and Notification components.
  * @returns toaster { push, remove, clear }
  *
- * @see https://rsuitejs.com/components/use-toaster/
+ * @see https://rsuitejs.com/components/toaster/
  */
 declare const useToaster: () => {
     /**

package/esm/useToaster/useToaster.js

@@ -9,7 +9,7 @@ import { CustomContext } from "../CustomProvider/CustomProvider.js";
  * It is often used with the Message and Notification components.
  * @returns toaster { push, remove, clear }
  *
- * @see https://rsuitejs.com/components/use-toaster/
+ * @see https://rsuitejs.com/components/toaster/
  */
 var useToaster = function useToaster() {
   var _useContext = useContext(CustomContext),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.78.1",
+  "version": "5.79.0",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -39,7 +39,7 @@
     "react-use-set": "^1.0.0",
     "react-window": "^1.8.8",
     "rsuite-table": "^5.19.1",
-    "schema-typed": "^2.3.0"
+    "schema-typed": "^2.4.1"
   },
   "peerDependencies": {
     "react": ">=16.8.0",