@laser-ui/components 2.0.4 → 2.1.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.1.0](https://github.com/laser-ui/laser-ui/compare/v2.0.5...v2.1.0) (2025-06-09)
+
+### Features
+
+- **components:** support prevent close dialog ([6431830](https://github.com/laser-ui/laser-ui/commit/6431830b84ad26d3985f634b52e348f959eac674))
+
+## [2.0.5](https://github.com/laser-ui/laser-ui/compare/v2.0.4...v2.0.5) (2025-01-13)
+
+### Features
+
+- **components:** add `Dialogs` ([eca6d58](https://github.com/laser-ui/laser-ui/commit/eca6d580b7ea94990f8b80e1672f6eaec601550e))
+
 ## [2.0.4](https://github.com/laser-ui/laser-ui/compare/v2.0.3...v2.0.4) (2025-01-06)
 
 ### Bug Fixes

package/dialog-service.d.ts

@@ -4,6 +4,7 @@ export declare class DialogInstance<P extends object> {
     private type;
     private props;
     private service;
+    visible: boolean;
     get node(): React.ReactElement<P>;
     constructor(key: string | number, type: React.FC<P>, props: any, service: DialogService);
     rerender(props: Partial<P>): void;
@@ -11,8 +12,8 @@ export declare class DialogInstance<P extends object> {
 }
 export declare class DialogService {
     private _key;
-    private _dialogs;
     private _emitChange;
+    dialogs: DialogInstance<any>[];
     constructor(emitChange: (dialogs: DialogInstance<any>[]) => void);
     open<P extends object>(type: React.FC<P>, props: Omit<P, 'visible'>, key?: string | number): DialogInstance<P>;
     emitChange(key: string | number): void;

package/dialog-service.js

@@ -1,8 +1,25 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 export class DialogInstance {
     get node() {
+        var _a;
         const Type = this.type;
-        return _jsx(Type, Object.assign({}, this.props), this.key);
+        return (_jsx(Type, Object.assign({}, this.props, { visible: this.visible, skipFirstTransition: (_a = this.props.skipFirstTransition) !== null && _a !== void 0 ? _a : false, onClose: () => {
+                var _a, _b;
+                const res = (_b = (_a = this.props).onClose) === null || _b === void 0 ? void 0 : _b.call(_a);
+                if (res !== false) {
+                    this.close();
+                }
+            }, afterVisibleChange: (visible) => {
+                var _a, _b;
+                (_b = (_a = this.props).afterVisibleChange) === null || _b === void 0 ? void 0 : _b.call(_a, visible);
+                if (!visible) {
+                    const index = this.service.dialogs.findIndex((dialog) => dialog.key === this.key);
+                    if (index !== -1) {
+                        this.service.dialogs.splice(index, 1);
+                    }
+                    this.service.emitChange(this.key);
+                }
+            } }), this.key));
     }
     constructor(key, type, props, service) {
         Object.defineProperty(this, "key", {
@@ -29,13 +46,19 @@ export class DialogInstance {
             writable: true,
             value: service
         });
+        Object.defineProperty(this, "visible", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
     }
     rerender(props) {
         Object.assign(this.props, props);
         this.service.emitChange(this.key);
     }
     close() {
-        this.props.visible = false;
+        this.visible = false;
         this.service.emitChange(this.key);
     }
 }
@@ -47,62 +70,43 @@ export class DialogService {
             writable: true,
             value: -1
         });
-        Object.defineProperty(this, "_dialogs", {
+        Object.defineProperty(this, "_emitChange", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: []
+            value: void 0
         });
-        Object.defineProperty(this, "_emitChange", {
+        Object.defineProperty(this, "dialogs", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: []
         });
         this._emitChange = () => {
-            emitChange([].concat(this._dialogs));
+            emitChange([].concat(this.dialogs));
         };
     }
     open(type, props, key) {
         const dialogKey = key !== null && key !== void 0 ? key : `l_#${++this._key}`;
-        const dialogProps = Object.assign(Object.assign({}, props), { visible: true, skipFirstTransition: false, onClose: () => {
-                var _a, _b;
-                (_b = (_a = props).onClose) === null || _b === void 0 ? void 0 : _b.call(_a);
-                const index = this._dialogs.findIndex((dialog) => dialog.key === dialogKey);
-                if (index !== -1) {
-                    const instance = this._dialogs[index];
-                    instance.close();
-                }
-            }, afterVisibleChange: (visible) => {
-                var _a, _b;
-                (_b = (_a = props).afterVisibleChange) === null || _b === void 0 ? void 0 : _b.call(_a, visible);
-                if (!visible) {
-                    const index = this._dialogs.findIndex((dialog) => dialog.key === dialogKey);
-                    if (index !== -1) {
-                        this._dialogs.splice(index, 1);
-                        this._emitChange();
-                    }
-                }
-            } });
-        const instance = new DialogInstance(dialogKey, type, dialogProps, this);
-        this._dialogs.push(instance);
+        const instance = new DialogInstance(dialogKey, type, props, this);
+        this.dialogs.push(instance);
         this._emitChange();
         return instance;
     }
     emitChange(key) {
-        const index = this._dialogs.findIndex((dialog) => dialog.key === key);
+        const index = this.dialogs.findIndex((dialog) => dialog.key === key);
         if (index !== -1) {
             this._emitChange();
         }
     }
     closeAll(animation = true) {
         if (animation) {
-            this._dialogs.forEach((dialog) => {
+            this.dialogs.forEach((dialog) => {
                 dialog.close();
             });
         }
         else {
-            this._dialogs = [];
+            this.dialogs = [];
             this._emitChange();
         }
     }

package/index.d.ts

@@ -1,5 +1,5 @@
 export { useDialogService } from './hooks';
-export { Root, DialogService } from './root';
+export { Root, DialogService, Dialogs } from './root';
 export { ConfigProvider } from './config-provider';
 export { Accordion } from './accordion';
 export { Affix } from './affix';

package/index.js

@@ -1,5 +1,5 @@
 export { useDialogService } from './hooks';
-export { Root, DialogService } from './root';
+export { Root, DialogService, Dialogs } from './root';
 export { ConfigProvider } from './config-provider';
 export { Accordion } from './accordion';
 export { Affix } from './affix';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laser-ui/components",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "React components.",
   "keywords": [
     "ui",
@@ -37,5 +37,5 @@
     "access": "public",
     "directory": "../../dist/libs/components"
   },
-  "gitHead": "c1b2e9c6d6a38ae529eb752693fcdf3e299fb0e4"
+  "gitHead": "256aa0e63ef12fec93818bc3e528f3bd9f85f048"
 }

package/root/Dialogs.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import type { DialogInstance } from '../dialog-service';
+export declare const Dialogs: import("react").NamedExoticComponent<{
+    dialogs: DialogInstance<any>[];
+}>;

package/root/Dialogs.js

@@ -0,0 +1,4 @@
+import { memo } from 'react';
+export const Dialogs = memo(function (props) {
+    return props.dialogs.map((dialog) => dialog.node);
+});

package/root/Root.js

@@ -1,7 +1,8 @@
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEvent, useRefExtra } from '@laser-ui/hooks';
 import { isString, set } from 'lodash';
 import { useEffect, useMemo } from 'react';
+import { Dialogs } from './Dialogs';
 import { useDialogs } from './dialog-service';
 import { ROOT_DATA, RootContext } from './vars';
 import dayjs from '../dayjs';
@@ -69,5 +70,5 @@ export function Root(props) {
         default:
             break;
     }
-    return (_jsxs(RootContext, { value: context, children: [children, dialogs.map(({ node }) => node)] }));
+    return (_jsxs(RootContext, { value: context, children: [children, _jsx(Dialogs, { dialogs: dialogs })] }));
 }

package/root/index.d.ts

@@ -1,3 +1,4 @@
 export type { RootProps } from './types';
 export { Root } from './Root';
 export { DialogService } from './dialog-service';
+export { Dialogs } from './Dialogs';

package/root/index.js

@@ -1,2 +1,3 @@
 export { Root } from './Root';
 export { DialogService } from './dialog-service';
+export { Dialogs } from './Dialogs';