@laser-ui/components 1.0.1 → 1.0.2

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.2](https://github.com/laser-ui/laser-ui/compare/v1.0.1...v1.0.2) (2024-07-20)
+
+### Bug Fixes
+
+- **components:** fix `Textarea` auto rows ([df91d01](https://github.com/laser-ui/laser-ui/commit/df91d01000137f7a93f0f59407c9f1d738e67d85))
+
 ## [1.0.1](https://github.com/laser-ui/laser-ui/compare/v1.0.0...v1.0.1) (2024-07-12)
 
 ### Bug Fixes

package/badge/Badge.js

@@ -17,7 +17,7 @@ export const Badge = (props) => {
         valueDown: false,
     });
     const show = showZero || valueProp > 0;
-    const value = show ? valueProp : (_a = dataRef.current.saveValue) !== null && _a !== void 0 ? _a : 0;
+    const value = show ? valueProp : ((_a = dataRef.current.saveValue) !== null && _a !== void 0 ? _a : 0);
     dataRef.current.saveValue = value;
     const nums = (value > max ? max : value)
         .toString()

package/date-picker/DatePicker.js

@@ -67,7 +67,7 @@ export const DatePicker = forwardRef((props, ref) => {
         dataRef.current.latestFocused = 'end';
     }
     const [_value, _changeValue] = useControlled(defaultModel !== null && defaultModel !== void 0 ? defaultModel : null, model, onModelChange, (a, b) => deepCompareDate(a, b, format), formControl === null || formControl === void 0 ? void 0 : formControl.control);
-    let [valueLeft, valueRight = null] = range ? (_a = _value) !== null && _a !== void 0 ? _a : [null, null] : [_value, null];
+    let [valueLeft, valueRight = null] = range ? ((_a = _value) !== null && _a !== void 0 ? _a : [null, null]) : [_value, null];
     if (range) {
         if (isNull(_value)) {
             [valueLeft, valueRight] = dataRef.current.rangeDate;
@@ -114,7 +114,7 @@ export const DatePicker = forwardRef((props, ref) => {
         forceUpdate();
     };
     const [placeholderLeft = t('DatePicker', range ? 'Start date' : 'Select date'), placeholderRight = t('DatePicker', 'End date')] = range
-        ? (_b = placeholder) !== null && _b !== void 0 ? _b : []
+        ? ((_b = placeholder) !== null && _b !== void 0 ? _b : [])
         : [placeholder];
     const { size, disabled } = useScopedProps({ size: sizeProp, disabled: disabledProp || (formControl === null || formControl === void 0 ? void 0 : formControl.control.disabled) });
     const maxZIndex = useMaxIndex(visible);

package/form/model/form-group.d.ts

@@ -3,7 +3,7 @@ import { AbstractControl } from './abstract-control';
 type Mutable<T> = {
     -readonly [P in keyof T]: T[P];
 };
-type GetFormControlPropertyFromArray<T, A> = Mutable<A> extends [infer K, ...infer R] ? K extends keyof T ? GetFormControlPropertyFromArray<T[K], R> : any : T;
+type GetFormControlPropertyFromArray<T, A> = Mutable<A> extends [infer K, ...infer R] ? (K extends keyof T ? GetFormControlPropertyFromArray<T[K], R> : any) : T;
 type GetFormControlProperty<T, S> = S extends `${infer K}.${infer R}` ? K extends keyof T ? GetFormControlProperty<T[K], R> : any : S extends keyof T ? T[S] : any;
 type GetFormGroupT<C extends FormGroup<any>> = C extends FormGroup<infer T> ? T : unknown;
 type GetFormGroupValue<T extends {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laser-ui/components",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "React components.",
   "keywords": [
     "ui",
@@ -40,5 +40,5 @@
     "access": "public",
     "directory": "../../dist/libs/components"
   },
-  "gitHead": "c081cc7694bf1f66aa541aec5f775dfda6e34486"
+  "gitHead": "55a7ca519ecde41b605f3ec922e3b7d79eca8bae"
 }

package/root/vars.d.ts

@@ -4,7 +4,7 @@ import type { Lang } from '../types';
 import resources from '../resources.json';
 export declare const Store: import("rcl-store").Store<{
     dialogs: DialogInstance<any>[];
-}, "dialogs">;
+}>;
 export declare const ROOT_DATA: {
     clickEvent?: {
         time: number;

package/textarea/Textarea.js

@@ -4,63 +4,46 @@ import { useForkRef } from '@laser-ui/hooks';
 import { isFunction, isNumber, isUndefined } from 'lodash';
 import { forwardRef, useEffect, useRef } from 'react';
 import { CLASSES } from './vars';
-import { useComponentProps, useControlled, useDesign, useJSS, useScopedProps, useStyled } from '../hooks';
+import { useComponentProps, useControlled, useDesign, useScopedProps, useStyled } from '../hooks';
 import { mergeCS } from '../utils';
 export const Textarea = forwardRef((props, ref) => {
     const _a = useComponentProps('Textarea', props), { styleOverrides, styleProvider, formControl, model, defaultModel, autoRows = false, resizable = true, showCount = false, size: sizeProp, onModelChange } = _a, restProps = __rest(_a, ["styleOverrides", "styleProvider", "formControl", "model", "defaultModel", "autoRows", "resizable", "showCount", "size", "onModelChange"]);
     const styled = useStyled(CLASSES, { textarea: styleProvider === null || styleProvider === void 0 ? void 0 : styleProvider.textarea }, styleOverrides);
-    const sheet = useJSS();
     const textareaRef = useRef(null);
     const combineTextareaRef = useForkRef(textareaRef, ref);
     const [value, changeValue] = useControlled(defaultModel !== null && defaultModel !== void 0 ? defaultModel : '', model, onModelChange, undefined, formControl === null || formControl === void 0 ? void 0 : formControl.control);
     const { size, disabled } = useScopedProps({ size: sizeProp, disabled: restProps.disabled || (formControl === null || formControl === void 0 ? void 0 : formControl.control.disabled) });
     useEffect(() => {
-        if (textareaRef.current) {
-            const cssText = textareaRef.current.style.cssText;
-            textareaRef.current.value = '';
-            textareaRef.current.rows = 1;
-            textareaRef.current.style.cssText = cssText + 'box-sizing:content-box;overflow:hidden;height:0px;min-height:unset;';
-            const outerSize = textareaRef.current.offsetHeight;
-            textareaRef.current.style.cssText = cssText + 'overflow:hidden;height:0px;min-height:unset;padding:0px;';
-            const lineHeight = textareaRef.current.scrollHeight;
-            textareaRef.current.value = value;
-            const n = Math.round(textareaRef.current.scrollHeight / lineHeight);
-            if (isNumber(restProps.rows)) {
-                textareaRef.current.rows = restProps.rows;
+        const textareaEl = textareaRef.current;
+        if (textareaEl && autoRows !== false) {
+            const cssText = textareaEl.style.cssText;
+            const rows = textareaEl.rows;
+            if (autoRows === true) {
+                textareaEl.style.cssText = cssText + 'overflow:hidden;height:0px;min-height:unset;';
+                const height = textareaEl.scrollHeight + (textareaEl.offsetHeight - textareaEl.clientHeight);
+                textareaEl.style.cssText = cssText;
+                textareaEl.style.height = height + 'px';
             }
             else {
-                textareaRef.current.removeAttribute('rows');
-            }
-            textareaRef.current.style.cssText = cssText;
-            let height;
-            let overflow;
-            let minHeight;
-            let maxHeight;
-            if (autoRows !== false) {
-                height = n * lineHeight;
-                overflow = 'hidden';
-                if (autoRows !== true) {
-                    if (isNumber(autoRows.minRows)) {
-                        minHeight = autoRows.minRows * lineHeight;
-                    }
-                    if (isNumber(autoRows.maxRows)) {
-                        maxHeight = autoRows.maxRows * lineHeight;
-                        if (autoRows.maxRows < n) {
-                            overflow = undefined;
-                        }
-                    }
+                textareaEl.style.cssText = cssText + 'overflow:hidden;height:0px;padding:0px;min-height:unset;';
+                const rowsHeight = textareaEl.scrollHeight + (textareaEl.offsetHeight - textareaEl.clientHeight);
+                textareaEl.rows = 1;
+                textareaEl.style.cssText = cssText + 'overflow:hidden;padding:0px;height:unset;min-height:unset;';
+                const rowHeight = textareaEl.clientHeight;
+                let n = Math.round(rowsHeight / rowHeight);
+                if (isNumber(autoRows.minRows) && n < autoRows.minRows) {
+                    n = autoRows.minRows;
                 }
+                if (isNumber(autoRows.maxRows) && n > autoRows.maxRows) {
+                    n = autoRows.maxRows;
+                }
+                textareaEl.rows = n;
+                textareaEl.style.cssText = cssText + 'height:unset;min-height:unset;';
             }
-            if (sheet.classes.rows) {
-                textareaRef.current.classList.toggle(sheet.classes.rows, false);
-            }
-            sheet.replaceRule('rows', {
-                height: isUndefined(height) ? undefined : height + outerSize,
-                overflow: isUndefined(overflow) ? undefined : 'hidden',
-                minHeight: isUndefined(minHeight) ? undefined : minHeight + outerSize,
-                maxHeight: isUndefined(maxHeight) ? undefined : maxHeight + outerSize,
-            });
-            textareaRef.current.classList.toggle(sheet.classes.rows, true);
+            return () => {
+                textareaEl.style.cssText = cssText;
+                textareaEl.rows = rows;
+            };
         }
     });
     const designProps = useDesign({ form: formControl });

package/time-picker/TimePicker.js

@@ -54,7 +54,7 @@ export const TimePicker = forwardRef((props, ref) => {
         dataRef.current.latestFocused = 'end';
     }
     const [_value, _changeValue] = useControlled(defaultModel !== null && defaultModel !== void 0 ? defaultModel : null, model, onModelChange, (a, b) => deepCompareDate(a, b, format), formControl === null || formControl === void 0 ? void 0 : formControl.control);
-    let [valueLeft, valueRight = null] = range ? (_a = _value) !== null && _a !== void 0 ? _a : [null, null] : [_value, null];
+    let [valueLeft, valueRight = null] = range ? ((_a = _value) !== null && _a !== void 0 ? _a : [null, null]) : [_value, null];
     if (range) {
         if (isNull(_value)) {
             [valueLeft, valueRight] = dataRef.current.rangeDate;
@@ -101,7 +101,7 @@ export const TimePicker = forwardRef((props, ref) => {
         forceUpdate();
     };
     const [placeholderLeft = t('TimePicker', range ? 'Start time' : 'Select time'), placeholderRight = t('TimePicker', 'End time')] = range
-        ? (_b = placeholder) !== null && _b !== void 0 ? _b : []
+        ? ((_b = placeholder) !== null && _b !== void 0 ? _b : [])
         : [placeholder];
     const { size, disabled } = useScopedProps({ size: sizeProp, disabled: disabledProp || (formControl === null || formControl === void 0 ? void 0 : formControl.control.disabled) });
     const maxZIndex = useMaxIndex(visible);

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Xie Jay
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.