@laser-ui/components 0.1.4 → 0.1.6

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.6](https://github.com/laser-ui/laser-ui/compare/v0.1.5...v0.1.6) (2023-10-13)
+
+**Note:** Version bump only for package @laser-ui/components
+
+## [0.1.5](https://github.com/laser-ui/laser-ui/compare/v0.1.4...v0.1.5) (2023-10-09)
+
+### Bug Fixes
+
+- **components:** fix form `enter` ([ebbe78b](https://github.com/laser-ui/laser-ui/commit/ebbe78b2afc3ee3f257847f143ee23fe12fd17fa))
+
 ## [0.1.4](https://github.com/laser-ui/laser-ui/compare/v0.1.3...v0.1.4) (2023-09-18)
 
 ### Bug Fixes

package/form/Form.js

@@ -23,7 +23,16 @@ export const Form = (props) => {
     return (_jsx("form", Object.assign({}, restProps, mergeCS(styled('form', `form--${size}`), {
         className: restProps.className,
         style: restProps.style,
-    }), { ref: formRef, children: _jsx(ConfigProvider, { context: { componentSize: size }, children: _jsx(FormContext.Provider, { value: {
+    }), { ref: formRef, onSubmit: (e) => {
+            var _a;
+            (_a = restProps.onSubmit) === null || _a === void 0 ? void 0 : _a.call(restProps, e);
+            e.preventDefault();
+            e.stopPropagation();
+        }, onReset: (e) => {
+            var _a;
+            (_a = restProps.onReset) === null || _a === void 0 ? void 0 : _a.call(restProps, e);
+            e.preventDefault();
+        }, children: _jsx(ConfigProvider, { context: { componentSize: size }, children: _jsx(FormContext.Provider, { value: {
                     vertical,
                     labelWidth: labelWidth !== null && labelWidth !== void 0 ? labelWidth : (vertical ? undefined : 'auto'),
                     labelColon: labelColon !== null && labelColon !== void 0 ? labelColon : !vertical,

package/form/model/abstract-control.d.ts

@@ -5,7 +5,7 @@ export declare abstract class AbstractControl<V = any> {
     private _pristine;
     private _errors;
     private _hasOwnPendingAsyncValidator;
-    private _asyncValidationSubscription?;
+    private _abortAsyncValidation?;
     private _composedValidatorFn;
     private _composedAsyncValidatorFn;
     private _rawValidators;

package/form/model/abstract-control.js

@@ -1,5 +1,4 @@
 import { isArray } from 'lodash';
-import { forkJoin, from } from 'rxjs';
 import { DISABLED, INVALID, PENDING, VALID } from './vars';
 function mergeErrors(arrayOfErrors) {
     const res = {};
@@ -26,11 +25,8 @@ function composeAsyncValidators(validators) {
     }
     return function (control) {
         return new Promise((resolve) => {
-            const observables = forkJoin(presentValidators.map((fn) => fn(control)));
-            observables.subscribe({
-                next: (errors) => {
-                    resolve(mergeErrors(errors));
-                },
+            Promise.all(presentValidators.map((fn) => fn(control))).then((errors) => {
+                resolve(mergeErrors(errors));
             });
         });
     };
@@ -84,7 +80,7 @@ export class AbstractControl {
             writable: true,
             value: false
         });
-        Object.defineProperty(this, "_asyncValidationSubscription", {
+        Object.defineProperty(this, "_abortAsyncValidation", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -312,8 +308,8 @@ export class AbstractControl {
         return this.validator ? this.validator(this) : null;
     }
     _cancelExistingSubscription() {
-        if (this._asyncValidationSubscription) {
-            this._asyncValidationSubscription.unsubscribe();
+        if (this._abortAsyncValidation) {
+            this._abortAsyncValidation();
             this._hasOwnPendingAsyncValidator = false;
         }
     }
@@ -321,14 +317,20 @@ export class AbstractControl {
         if (this.asyncValidator) {
             this._status = PENDING;
             this._hasOwnPendingAsyncValidator = true;
-            this._asyncValidationSubscription = from(this.asyncValidator(this)).subscribe((errors) => {
+            let abort = false;
+            this._abortAsyncValidation = () => {
+                abort = true;
+            };
+            this.asyncValidator(this).then((errors) => {
                 var _a, _b;
-                this._hasOwnPendingAsyncValidator = false;
-                // This will trigger the recalculation of the validation status, which depends on
-                // the state of the asynchronous validation (whether it is in progress or not). So, it is
-                // necessary that we have updated the `_hasOwnPendingAsyncValidator` boolean flag first.
-                this.setErrors(errors);
-                (_b = (_a = this.root)._emitChange) === null || _b === void 0 ? void 0 : _b.call(_a);
+                if (!abort) {
+                    this._hasOwnPendingAsyncValidator = false;
+                    // This will trigger the recalculation of the validation status, which depends on
+                    // the state of the asynchronous validation (whether it is in progress or not). So, it is
+                    // necessary that we have updated the `_hasOwnPendingAsyncValidator` boolean flag first.
+                    this.setErrors(errors);
+                    (_b = (_a = this.root)._emitChange) === null || _b === void 0 ? void 0 : _b.call(_a);
+                }
             });
         }
     }

package/internal/popup/Popup.js

@@ -1,7 +1,6 @@
 import { useAsync, useEvent, useRefExtra, useResize } from '@laser-ui/hooks';
 import { isUndefined } from 'lodash';
 import { cloneElement, useEffect, useRef } from 'react';
-import { fromEvent } from 'rxjs';
 import { useLayout, useListenGlobalScrolling } from '../../hooks';
 export function Popup(props) {
     const { children, visible: visibleProp, trigger, disabled = false, mouseEnterDelay = 150, mouseLeaveDelay = 200, updatePosition, onVisibleChange, } = props;
@@ -46,13 +45,17 @@ export function Popup(props) {
     const listenGlobalScrolling = useListenGlobalScrolling(updatePosition.fn, disabled || !visibleProp);
     useEffect(() => {
         if (!disabled && visibleProp && !listenGlobalScrolling) {
-            const ob = fromEvent([pageScrollRef, ...updatePosition.containerRefs].map((ref) => ref.current).filter((el) => el), 'scroll', { passive: true }).subscribe({
-                next: () => {
-                    updatePosition.fn();
-                },
+            const els = [pageScrollRef, ...updatePosition.containerRefs].map((ref) => ref.current).filter((el) => el);
+            const listener = () => {
+                updatePosition.fn();
+            };
+            els.forEach((el) => {
+                el.addEventListener('scroll', listener, { passive: true });
             });
             return () => {
-                ob.unsubscribe();
+                els.forEach((el) => {
+                    el.removeEventListener('scroll', listener);
+                });
             };
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laser-ui/components",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "React components.",
   "keywords": [
     "ui",
@@ -26,24 +26,24 @@
   "module": "./index.js",
   "types": "./index.d.ts",
   "dependencies": {
-    "@laser-ui/hooks": "0.1.4",
-    "@laser-ui/utils": "0.1.4",
+    "@laser-ui/hooks": "0.1.6",
+    "@laser-ui/utils": "0.1.6",
     "@material-design-icons/svg": "^0.14.12",
     "jss": "^10.10.0",
     "jss-preset-default": "^10.10.0",
     "lodash": "^4.17.21",
-    "rcl-store": "^2.1.0",
-    "rxjs": "^7.8.1"
+    "rcl-store": "^2.1.0"
   },
   "peerDependencies": {
     "dayjs": "^1.11.0",
     "immer": ">=2.0.0",
     "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react-dom": "^18.0.0",
+    "tslib": "^2.0.0"
   },
   "publishConfig": {
     "access": "public",
     "directory": "../../dist/libs/components"
   },
-  "gitHead": "eb0e7cedff3b277b90e724eddc6850c3b623d7b2"
+  "gitHead": "da66a982fe29f71012ff6d0141ee90366da93ad2"
 }