@lerx/promise-modal 0.2.4 → 0.2.6

package/dist/index.cjs

@@ -6,12 +6,11 @@ const convert = require('@winglet/common-utils/convert');
 const hook = require('@winglet/react-utils/hook');
 const hash = require('@winglet/common-utils/hash');
 const lib = require('@winglet/common-utils/lib');
-const compressCss = require('@winglet/style-utils/compressCss');
-const styleManager = require('@winglet/style-utils/styleManager');
+const styleManager = require('@winglet/style-utils/style-manager');
+const util = require('@winglet/style-utils/util');
 const reactDom = require('react-dom');
 const array = require('@winglet/common-utils/array');
 const hoc = require('@winglet/react-utils/hoc');
-const classNames = require('@winglet/style-utils/classNames');
 const filter = require('@winglet/common-utils/filter');
 const render = require('@winglet/react-utils/render');
 const console = require('@winglet/common-utils/console');
@@ -52,7 +51,7 @@ class ModalManager {
     static #styleManager = styleManager.styleManagerFactory(ModalManager.#scope);
     static #styleSheetDefinition = new Map();
     static defineStyleSheet(styleId, css) {
-        ModalManager.#styleSheetDefinition.set(styleId, compressCss.compressCss(css));
+        ModalManager.#styleSheetDefinition.set(styleId, util.compressCss(css));
     }
     static applyStyleSheet() {
         for (const [styleId, css] of ModalManager.#styleSheetDefinition)
@@ -676,15 +675,9 @@ const BackgroundFrame = ({ modalId, onChangeOrder, }) => {
         event.stopPropagation();
     }, [modal, onClose]);
     const Background = react.useMemo(() => modal?.BackgroundComponent || BackgroundComponent, [BackgroundComponent, modal]);
-    const className = react.useMemo(() => modal
-        ? classNames.cx(background, {
-            [active$1]: modal.closeOnBackdropClick && modal.visible,
-            [visible$1]: modal.manualDestroy ? modal.alive : modal.visible,
-        })
-        : undefined, [modal]);
     if (!modal)
         return null;
-    return (jsxRuntime.jsx("div", { className: className, onClick: handleClose, children: Background && (jsxRuntime.jsx(Background, { id: modal.id, type: modal.type, alive: modal.alive, visible: modal.visible, initiator: modal.initiator, manualDestroy: modal.manualDestroy, closeOnBackdropClick: modal.closeOnBackdropClick, background: modal.background, onChange: onChange, onConfirm: onConfirm, onClose: onClose, onDestroy: onDestroy, onChangeOrder: onChangeOrder, context: userDefinedContext })) }));
+    return (jsxRuntime.jsx("div", { className: util.cxLite(background, modal.closeOnBackdropClick && modal.visible && active$1, (modal.manualDestroy ? modal.alive : modal.visible) && visible$1), onClick: handleClose, children: Background && (jsxRuntime.jsx(Background, { id: modal.id, type: modal.type, alive: modal.alive, visible: modal.visible, initiator: modal.initiator, manualDestroy: modal.manualDestroy, closeOnBackdropClick: modal.closeOnBackdropClick, background: modal.background, onChange: onChange, onConfirm: onConfirm, onClose: onClose, onDestroy: onDestroy, onChangeOrder: onChangeOrder, context: userDefinedContext })) }));
 };
 
 const AlertInner = react.memo(({ modal, handlers }) => {
@@ -793,15 +786,9 @@ const ForegroundFrame = ({ modalId, onChangeOrder, }) => {
     const { context: userDefinedContext } = useUserDefinedContext();
     const { modal, onChange, onConfirm, onClose, onDestroy } = useModal(modalId);
     const Foreground = react.useMemo(() => modal?.ForegroundComponent || ForegroundComponent, [ForegroundComponent, modal]);
-    const className = react.useMemo(() => modal
-        ? classNames.cx(foreground, {
-            [active]: modal.visible,
-            [visible]: modal.manualDestroy ? modal.alive : modal.visible,
-        })
-        : undefined, [modal]);
     if (!modal)
         return null;
-    return (jsxRuntime.jsx("div", { className: className, children: jsxRuntime.jsxs(Foreground, { id: modal.id, type: modal.type, alive: modal.alive, visible: modal.visible, initiator: modal.initiator, manualDestroy: modal.manualDestroy, closeOnBackdropClick: modal.closeOnBackdropClick, background: modal.background, onChange: onChange, onConfirm: onConfirm, onClose: onClose, onDestroy: onDestroy, onChangeOrder: onChangeOrder, context: userDefinedContext, children: [modal.type === 'alert' && (jsxRuntime.jsx(AlertInner, { modal: modal, handlers: { onConfirm } })), modal.type === 'confirm' && (jsxRuntime.jsx(ConfirmInner, { modal: modal, handlers: { onConfirm, onClose } })), modal.type === 'prompt' && (jsxRuntime.jsx(PromptInner, { modal: modal, handlers: { onChange, onConfirm, onClose } }))] }) }));
+    return (jsxRuntime.jsx("div", { className: util.cxLite(foreground, modal.visible && active, (modal.manualDestroy ? modal.alive : modal.visible) && visible), children: jsxRuntime.jsxs(Foreground, { id: modal.id, type: modal.type, alive: modal.alive, visible: modal.visible, initiator: modal.initiator, manualDestroy: modal.manualDestroy, closeOnBackdropClick: modal.closeOnBackdropClick, background: modal.background, onChange: onChange, onConfirm: onConfirm, onClose: onClose, onDestroy: onDestroy, onChangeOrder: onChangeOrder, context: userDefinedContext, children: [modal.type === 'alert' && (jsxRuntime.jsx(AlertInner, { modal: modal, handlers: { onConfirm } })), modal.type === 'confirm' && (jsxRuntime.jsx(ConfirmInner, { modal: modal, handlers: { onConfirm, onClose } })), modal.type === 'prompt' && (jsxRuntime.jsx(PromptInner, { modal: modal, handlers: { onChange, onConfirm, onClose } }))] }) }));
 };
 
 const useSubscribeModal = (modal) => {

package/dist/index.mjs

@@ -4,12 +4,11 @@ import { convertMsFromDuration } from '@winglet/common-utils/convert';
 import { useReference, useOnMountLayout, useHandle, useVersion, useOnMount } from '@winglet/react-utils/hook';
 import { polynomialHash } from '@winglet/common-utils/hash';
 import { getRandomString, counterFactory } from '@winglet/common-utils/lib';
-import { compressCss } from '@winglet/style-utils/compressCss';
-import { styleManagerFactory, destroyScope } from '@winglet/style-utils/styleManager';
+import { styleManagerFactory, destroyScope } from '@winglet/style-utils/style-manager';
+import { compressCss, cxLite } from '@winglet/style-utils/util';
 import { createPortal } from 'react-dom';
 import { map } from '@winglet/common-utils/array';
 import { withErrorBoundary } from '@winglet/react-utils/hoc';
-import { cx } from '@winglet/style-utils/classNames';
 import { isString, isFunction } from '@winglet/common-utils/filter';
 import { renderComponent } from '@winglet/react-utils/render';
 import { printError } from '@winglet/common-utils/console';
@@ -674,15 +673,9 @@ const BackgroundFrame = ({ modalId, onChangeOrder, }) => {
         event.stopPropagation();
     }, [modal, onClose]);
     const Background = useMemo(() => modal?.BackgroundComponent || BackgroundComponent, [BackgroundComponent, modal]);
-    const className = useMemo(() => modal
-        ? cx(background, {
-            [active$1]: modal.closeOnBackdropClick && modal.visible,
-            [visible$1]: modal.manualDestroy ? modal.alive : modal.visible,
-        })
-        : undefined, [modal]);
     if (!modal)
         return null;
-    return (jsx("div", { className: className, onClick: handleClose, children: Background && (jsx(Background, { id: modal.id, type: modal.type, alive: modal.alive, visible: modal.visible, initiator: modal.initiator, manualDestroy: modal.manualDestroy, closeOnBackdropClick: modal.closeOnBackdropClick, background: modal.background, onChange: onChange, onConfirm: onConfirm, onClose: onClose, onDestroy: onDestroy, onChangeOrder: onChangeOrder, context: userDefinedContext })) }));
+    return (jsx("div", { className: cxLite(background, modal.closeOnBackdropClick && modal.visible && active$1, (modal.manualDestroy ? modal.alive : modal.visible) && visible$1), onClick: handleClose, children: Background && (jsx(Background, { id: modal.id, type: modal.type, alive: modal.alive, visible: modal.visible, initiator: modal.initiator, manualDestroy: modal.manualDestroy, closeOnBackdropClick: modal.closeOnBackdropClick, background: modal.background, onChange: onChange, onConfirm: onConfirm, onClose: onClose, onDestroy: onDestroy, onChangeOrder: onChangeOrder, context: userDefinedContext })) }));
 };
 
 const AlertInner = memo(({ modal, handlers }) => {
@@ -791,15 +784,9 @@ const ForegroundFrame = ({ modalId, onChangeOrder, }) => {
     const { context: userDefinedContext } = useUserDefinedContext();
     const { modal, onChange, onConfirm, onClose, onDestroy } = useModal(modalId);
     const Foreground = useMemo(() => modal?.ForegroundComponent || ForegroundComponent, [ForegroundComponent, modal]);
-    const className = useMemo(() => modal
-        ? cx(foreground, {
-            [active]: modal.visible,
-            [visible]: modal.manualDestroy ? modal.alive : modal.visible,
-        })
-        : undefined, [modal]);
     if (!modal)
         return null;
-    return (jsx("div", { className: className, children: jsxs(Foreground, { id: modal.id, type: modal.type, alive: modal.alive, visible: modal.visible, initiator: modal.initiator, manualDestroy: modal.manualDestroy, closeOnBackdropClick: modal.closeOnBackdropClick, background: modal.background, onChange: onChange, onConfirm: onConfirm, onClose: onClose, onDestroy: onDestroy, onChangeOrder: onChangeOrder, context: userDefinedContext, children: [modal.type === 'alert' && (jsx(AlertInner, { modal: modal, handlers: { onConfirm } })), modal.type === 'confirm' && (jsx(ConfirmInner, { modal: modal, handlers: { onConfirm, onClose } })), modal.type === 'prompt' && (jsx(PromptInner, { modal: modal, handlers: { onChange, onConfirm, onClose } }))] }) }));
+    return (jsx("div", { className: cxLite(foreground, modal.visible && active, (modal.manualDestroy ? modal.alive : modal.visible) && visible), children: jsxs(Foreground, { id: modal.id, type: modal.type, alive: modal.alive, visible: modal.visible, initiator: modal.initiator, manualDestroy: modal.manualDestroy, closeOnBackdropClick: modal.closeOnBackdropClick, background: modal.background, onChange: onChange, onConfirm: onConfirm, onClose: onClose, onDestroy: onDestroy, onChangeOrder: onChangeOrder, context: userDefinedContext, children: [modal.type === 'alert' && (jsx(AlertInner, { modal: modal, handlers: { onConfirm } })), modal.type === 'confirm' && (jsx(ConfirmInner, { modal: modal, handlers: { onConfirm, onClose } })), modal.type === 'prompt' && (jsx(PromptInner, { modal: modal, handlers: { onChange, onConfirm, onClose } }))] }) }));
 };
 
 const useSubscribeModal = (modal) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lerx/promise-modal",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Universal React modal utility that can be used outside React components with promise-based results for alert, confirm, and prompt modals",
   "keywords": [
     "react",
@@ -67,7 +67,7 @@
   "dependencies": {
     "@winglet/common-utils": "^0.2.2",
     "@winglet/react-utils": "^0.2.4",
-    "@winglet/style-utils": "^0.2.1"
+    "@winglet/style-utils": "^0.2.2"
   },
   "devDependencies": {
     "@chromatic-com/storybook": "^3.2.6",