armtek-uikit-react 1.0.197 → 1.0.198

package/package.json

@@ -1 +1 @@
-{"name":"armtek-uikit-react","version":"1.0.197","description":"Armtek UIKit for React","main":"cjs/index.js","module":"esm/index.js","types":"esm/index.d.ts","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"clsx":"^2.0.0","rc-slider":"^10.2.1","react":"<=18.0.0","react-datepicker":"^4.16.0","react-dom":"<=18.0.0","react-transition-group":"^4.4.5"},"peerDependencies":{"react":"<=18.0.0","react-dom":"<=18.0.0"},"engines":{"node":">=14.0.0"},"scripts":{"pub":"npm version patch && npm publish"}}
+{"name":"armtek-uikit-react","version":"1.0.198","description":"Armtek UIKit for React","main":"cjs/index.js","module":"esm/index.js","types":"esm/index.d.ts","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"clsx":"^2.0.0","rc-slider":"^10.2.1","react":"<=18.0.0","react-datepicker":"^4.16.0","react-dom":"<=18.0.0","react-transition-group":"^4.4.5"},"peerDependencies":{"react":"<=18.0.0","react-dom":"<=18.0.0"},"engines":{"node":">=14.0.0"},"scripts":{"pub":"npm version patch && npm publish"}}

package/ui/Form/Interval/Interval.d.ts

@@ -1,13 +1,14 @@
 import { TextFieldProps } from '../TextField/TextField';
-type OwnProps = {
+type OwnProps<ValueType = number | number[]> = {
     min: number;
     max: number;
-    value?: [number, number];
-    onChange?: (value: [number, number]) => void;
+    value?: ValueType;
+    onChange?: (value: ValueType) => void;
     labelStart?: string;
     labelEnd?: string;
-    defaultValue?: [number, number];
+    defaultValue?: ValueType;
+    range?: boolean;
 };
-export type IntervalProps = OwnProps & Omit<TextFieldProps, keyof OwnProps>;
-declare const Interval: import("react").ForwardRefExoticComponent<OwnProps & Omit<TextFieldProps, keyof OwnProps> & import("react").RefAttributes<unknown>>;
+export type IntervalProps<ValueType = number | number[]> = OwnProps<ValueType> & Omit<TextFieldProps, keyof OwnProps>;
+declare function Interval<ValueType = number | number[]>(props: IntervalProps<ValueType>): import("react/jsx-runtime").JSX.Element;
 export default Interval;

package/ui/Form/Interval/Interval.js

@@ -8,8 +8,8 @@ var _react = require("react");
 var _TextField = require("../TextField/TextField");
 var _HelperText = _interopRequireDefault(require("../../HelperText/HelperText"));
 var _jsxRuntime = require("react/jsx-runtime");
-const Interval = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
-  let {
+function Interval(props) {
+  const {
     value,
     defaultValue,
     labelStart,
@@ -20,11 +20,30 @@ const Interval = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     disabled,
     min = 0,
     max = 0,
+    range,
     ...inputProps
   } = props;
   const [focused, setFocused] = (0, _react.useState)(false);
   const [currentMin, setCurrentMin] = (0, _react.useState)(min);
-  const [currentMax, setCurrentMax] = (0, _react.useState)(max);
+  const [currentMax, setCurrentMax] = (0, _react.useState)(!range ? min : max);
+  const handleChange = (v, type) => {
+    if (type === 'max') {
+      setCurrentMax(v);
+      onChange == null || onChange([Array.isArray(value) && value.length === 2 ? value[0] : min, v]);
+      return;
+    }
+    if (!range) {
+      setCurrentMax(v);
+      if (onChange) onChange(v);
+    } else {
+      v = v < min ? min : v;
+      setCurrentMin(v);
+      if (onChange) {
+        const changeValue = [v, Array.isArray(value) && value.length === 2 ? value[1] : max];
+        onChange(changeValue);
+      }
+    }
+  };
   const handleFocus = () => {
     setFocused(true);
   };
@@ -32,16 +51,16 @@ const Interval = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     setFocused(false);
   };
   const handleMin = e => {
-    let val = parseInt(e.target.value);
-    val = val < min ? min : val;
-    setCurrentMin(val);
-    if (onChange) onChange([val, Array.isArray(value) && value.length === 2 ? value[1] : max]);
+    let val = 0;
+    if (e.target.value) val = parseInt(e.target.value);
+    if (val > max) return;
+    handleChange(val, 'min');
   };
   const handleMax = e => {
-    let val = parseInt(e.target.value);
+    let val = max;
+    if (e.target.value) val = parseInt(e.target.value);
     val = val > max ? max : val;
-    setCurrentMax(val);
-    if (onChange) onChange([Array.isArray(value) && value.length === 2 ? value[0] : min, val]);
+    handleChange(val, 'max');
   };
   let realMin = currentMin;
   let realMax = currentMax;
@@ -49,6 +68,7 @@ const Interval = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     realMin = value[0];
     realMax = value[1];
   }
+  if (!range) realMin = value || currentMax;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.TextFieldContainer, {
@@ -71,7 +91,7 @@ const Interval = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
               focused: true,
               onChange: handleMin
             })
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          }), range && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             className: 'arm-interval__item',
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.TextFieldInput, {
               ...inputProps,
@@ -93,6 +113,6 @@ const Interval = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
       })]
     })
   });
-});
+}
 var _default = exports.default = Interval;
 module.exports = exports.default;

package/ui/Form/Interval/IntervalSlide.d.ts

@@ -1,5 +1,5 @@
 import { IntervalProps } from './Interval';
 import { SliderProps } from '../../Slider/Slider';
-type PropsType = Omit<IntervalProps, 'color'> & Partial<Pick<SliderProps, 'color'>>;
-declare const IntervalSlide: (props: PropsType) => import("react/jsx-runtime").JSX.Element;
+type PropsType<ValueType = number | number[]> = Omit<IntervalProps<ValueType>, 'color'> & Partial<Pick<SliderProps<ValueType>, 'color'>>;
+declare function IntervalSlide<ValueType = number | number[]>(props: PropsType<ValueType>): import("react/jsx-runtime").JSX.Element;
 export default IntervalSlide;

package/ui/Form/Interval/IntervalSlide.js

@@ -8,41 +8,42 @@ var _Interval = _interopRequireDefault(require("./Interval"));
 var _react = require("react");
 var _Slider = _interopRequireDefault(require("../../Slider/Slider"));
 var _jsxRuntime = require("react/jsx-runtime");
-const IntervalSlide = props => {
+function IntervalSlide(props) {
   const {
     onChange,
     color,
     ...restProps
   } = props;
-  const [value, setValue] = (0, _react.useState)([props.min, props.max]);
+  const defaultValue = restProps.defaultValue || (restProps.range ? [restProps.min, restProps.max] : 0);
+  const [currentValue, setCurrentValue] = (0, _react.useState)(defaultValue);
   const handleChange = value => {
-    setValue(value);
     if (onChange) onChange(value);
   };
   const handleSlide = value => {
-    if (Array.isArray(value)) handleChange(value);
+    handleChange(value);
+    setCurrentValue(value);
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Interval.default, {
-        value: value,
+        value: currentValue,
         ...restProps,
-        onChange: setValue
+        onChange: handleSlide
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: 'arm-intervalslide__slider',
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Slider.default, {
-          range: true,
           min: props.min,
           max: props.max,
           disabled: props.disabled,
           color: color,
-          value: restProps.value || value,
+          value: restProps.value || currentValue,
           size: props.size,
-          onChange: handleSlide
+          onChange: handleSlide,
+          range: props.range
         })
       })]
     })
   });
-};
+}
 var _default = exports.default = IntervalSlide;
 module.exports = exports.default;

package/ui/Slider/Slider.d.ts

@@ -1,9 +1,9 @@
 import './style.scss';
 import { SliderProps as RcSliderProps } from 'rc-slider/lib/Slider';
 import { ColorStatusType, ColorType, SizeType } from '../../types/theme';
-export type SliderProps = {
+export type SliderProps<ValueType = number | number[]> = {
     size?: Exclude<SizeType, 'extraLarge' | 'medium'>;
     color?: Exclude<ColorType, 'neutral'> | Exclude<ColorStatusType, 'info'>;
-} & Omit<RcSliderProps, 'size'>;
-declare const Slider: (props: SliderProps) => import("react/jsx-runtime").JSX.Element;
+} & Omit<RcSliderProps<ValueType>, 'size'>;
+declare function Slider<ValueType = number | number[]>(props: SliderProps<ValueType>): import("react/jsx-runtime").JSX.Element;
 export default Slider;

package/ui/Slider/Slider.js

@@ -8,7 +8,7 @@ require("./style.scss");
 var _HelperText = _interopRequireDefault(require("../HelperText/HelperText"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _jsxRuntime = require("react/jsx-runtime");
-const Slider = props => {
+function Slider(props) {
   const {
     size = 'large',
     color = 'primary',
@@ -35,6 +35,6 @@ const Slider = props => {
       })]
     })
   });
-};
+}
 var _default = exports.default = Slider;
 module.exports = exports.default;