react-dialogger 1.1.93 → 1.1.95

package/components/DialogContent.js

@@ -72,13 +72,13 @@ var jumper_animate_1 = require("../utils/effects/jumper-animate");
 var _context_1 = require("../context/index.js");
 var appLogger_1 = require("../helpers/appLogger");
 var DialogContent = function (props) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     var firstUpdate = React.useRef(true);
-    var _f = (0, react_1.useContext)(_context_1.DialogContentContext), dialog = _f.dialog, dialogRef = _f.dialogRef, prevDialogRect = _f.prevDialogRect, backdropRef = _f.backdropRef, snackbarRef = _f.snackbarRef, footerRef = _f.footerRef, resizeableObject = _f.resizeableObject, body = _f.body;
+    var _h = (0, react_1.useContext)(_context_1.DialogContentContext), dialog = _h.dialog, dialogRef = _h.dialogRef, prevDialogRect = _h.prevDialogRect, backdropRef = _h.backdropRef, snackbarRef = _h.snackbarRef, footerRef = _h.footerRef, resizeableObject = _h.resizeableObject, body = _h.body;
     var dialogOptions = dialog.dialogOptions;
     var baseOptions = dialogOptions.base;
-    var _g = React.useState(false), fullscreenMode = _g[0], setFullscreenMode = _g[1];
-    var _h = React.useState(null), rect = _h[0], setRect = _h[1];
+    var _j = React.useState(false), fullscreenMode = _j[0], setFullscreenMode = _j[1];
+    var _k = React.useState(null), rect = _k[0], setRect = _k[1];
     var bounds = ((_a = dialog.dialogOptions.base) === null || _a === void 0 ? void 0 : _a.memoBounds) ? (0, _helpers_1.getDialogBounds)(dialog.dialogOptions.base.id) : null;
     var domZIndex = window.getComputedStyle(dialog.getDom()).zIndex;
     var positionSelector = function () {
@@ -177,7 +177,7 @@ var DialogContent = function (props) {
                     // @ts-ignore
                     dialog.props.keyboardListener(e.key, _this);
                 }
-            }, className: baseOptions.size.width === 'auto' ? 'auto' : "dialog-width-".concat(dialogOptions.base.size.width, " dialog-main show-opacity show-position-").concat(baseOptions.initialAnchor.vertical), style: __assign(__assign(__assign(__assign({ height: (_b = baseOptions.size.height) !== null && _b !== void 0 ? _b : 'auto' }, typeof baseOptions.size.width === "number" ? { width: "".concat(baseOptions.size.width, "px") } : { width: "".concat(baseOptions.size.width) }), { outline: 'none', fontFamily: (_c = baseOptions.style.fontFamily) !== null && _c !== void 0 ? _c : 'Arial' }), rect), { alignSelf: (_d = baseOptions.initialAnchor.vertical) !== null && _d !== void 0 ? _d : 'flex-start', justifySelf: (_e = baseOptions.initialAnchor.horizontal) !== null && _e !== void 0 ? _e : 'flex-start' }), children: (0, jsx_runtime_1.jsxs)(notistack_1.SnackbarProvider, { ref: snackbarRef, maxSnack: dialog.dialogOptions.snackbar.maxSnack, children: [(dialog.props.header || dialogOptions.slot.header) && ((0, jsx_runtime_1.jsx)(_1.DialogContentHeader, { header: dialog.props.header, bounds: bounds })), (0, jsx_runtime_1.jsx)(_1.DialogContentBody, { body: body }), (0, jsx_runtime_1.jsx)(_1.DialogContentFooter, { ref: footerRef }), (baseOptions.resizeable) &&
+            }, className: baseOptions.size.width === 'auto' ? 'auto' : "dialog-width-".concat(dialogOptions.base.size.width, " dialog-main show-opacity show-position-").concat(baseOptions.initialAnchor.vertical), style: __assign(__assign(__assign(__assign({ height: (_b = baseOptions.size.height) !== null && _b !== void 0 ? _b : 'auto' }, typeof baseOptions.size.width === "number" ? { width: "".concat(baseOptions.size.width, "px") } : { width: "".concat(baseOptions.size.width) }), { outline: 'none', fontFamily: (_c = baseOptions.style.fontFamily) !== null && _c !== void 0 ? _c : 'Arial' }), rect), { alignSelf: (_d = baseOptions.initialAnchor.vertical) !== null && _d !== void 0 ? _d : 'flex-start', justifySelf: (_e = baseOptions.initialAnchor.horizontal) !== null && _e !== void 0 ? _e : 'flex-start' }), children: (0, jsx_runtime_1.jsxs)(notistack_1.SnackbarProvider, { ref: snackbarRef, maxSnack: dialog.dialogOptions.snackbar.maxSnack, style: __assign({ width: 'min-content' }, (_g = (_f = dialog.dialogOptions) === null || _f === void 0 ? void 0 : _f.snackbar) === null || _g === void 0 ? void 0 : _g.style), children: [(dialog.props.header || dialogOptions.slot.header) && ((0, jsx_runtime_1.jsx)(_1.DialogContentHeader, { header: dialog.props.header, bounds: bounds })), (0, jsx_runtime_1.jsx)(_1.DialogContentBody, { body: body }), (0, jsx_runtime_1.jsx)(_1.DialogContentFooter, { ref: footerRef }), (baseOptions.resizeable) &&
                         (0, jsx_runtime_1.jsx)(React.Fragment, { children: (0, jsx_runtime_1.jsx)("div", { className: "resizable-handle", style: {
                                     zIndex: parseInt(domZIndex) + 1
                                 }, onMouseDown: resizeableObject === null || resizeableObject === void 0 ? void 0 : resizeableObject.resizeHandleMouseDown, children: (0, jsx_runtime_1.jsx)(_icons_1.ResizeIcon, { color: '#286e94' }) }) })] }) }) });

package/components/DialogContentFooter.js

@@ -74,10 +74,12 @@ var DialogContentFooter = (0, react_1.forwardRef)(function (props, ref) {
     };
     var footerProps = {};
     if (dialogOptions.slotProps.footer) {
-        footerProps = dialogOptions.slotProps.footer({
-            dialogOptions: dialogOptions,
-            inProcess: dialog.isInProcess()
-        });
+        // footerProps = dialogOptions.slotProps.footer({
+        //     dialogOptions: dialogOptions,
+        //     inProcess: dialog.isInProcess()
+        // })
+        // footerProps = {...dialogOptions.slotProps.footer, dialogOptions: dialogOptions, inProcess: dialog.isInProcess() }
+        footerProps = dialogOptions.slotProps.footer;
     }
     return (0, jsx_runtime_1.jsxs)("div", { className: 'dialog-footer', style: (_c = (_b = dialogOptions.base) === null || _b === void 0 ? void 0 : _b.footer) === null || _c === void 0 ? void 0 : _c.style, children: [(0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(_context_1.WithHeaderFooterContext, __assign({}, staticProps, { dialog: dialog, children: dialogOptions.slot.footer ?
                         (0, jsx_runtime_1.jsx)(CustomFooter, __assign({}, staticProps, footerProps))

package/components/DialogContentHeader.js

@@ -43,7 +43,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DialogContentHeader = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
@@ -79,13 +78,19 @@ var DialogContentHeader = function (_a) {
         dialog: dialog
     };
     if (dialogOptions.slot.header) {
-        var headerProps = dialogOptions.slotProps.header ? __assign({}, dialogOptions.slotProps.header(staticProps)) : {};
+        // const headerProps = dialogOptions.slotProps.header ? {...dialogOptions.slotProps.header(staticProps)} : {};
+        console.log('CustomHeader_Content', dialogOptions.slot.header, fullscreen);
+        var headerProps = dialogOptions.slotProps.header;
         return (0, jsx_runtime_1.jsx)("div", { onDoubleClick: function (event) {
-                var _a;
-                if ((_a = dialog === null || dialog === void 0 ? void 0 : dialog.dialogOptions.base) === null || _a === void 0 ? void 0 : _a.fullscreen) {
+                if (baseOptions.fullscreen) {
+                    if (bounds) {
+                        (0, _helpers_1.setDialogBounds)(dialog.dialogOptions.base.id, __assign(__assign({}, bounds), { fullscreen: !fullscreen }), dialogRef);
+                    }
                     setFullscreen(!fullscreen);
+                    event.stopPropagation();
+                    event.preventDefault();
                 }
-            }, style: (_c = baseOptions === null || baseOptions === void 0 ? void 0 : baseOptions.header) === null || _c === void 0 ? void 0 : _c.style, className: "dialog-header ".concat(baseOptions.draggable && !dialog.state.fullscreenMode ? 'drag-handle' : ''), children: (0, jsx_runtime_1.jsx)(_context_1.WithHeaderFooterContext, { dialog: dialog, children: (0, jsx_runtime_1.jsx)(CustomHeader, __assign({}, staticProps, headerProps, { dialog: _this })) }) });
+            }, style: (_c = baseOptions === null || baseOptions === void 0 ? void 0 : baseOptions.header) === null || _c === void 0 ? void 0 : _c.style, className: "dialog-header ".concat(baseOptions.draggable && !fullscreen ? 'drag-handle' : ''), children: (0, jsx_runtime_1.jsx)(_context_1.WithHeaderFooterContext, { dialog: dialog, fullscreen: fullscreen, setFullscreen: setFullscreen, children: (0, jsx_runtime_1.jsx)(CustomHeader, __assign({}, staticProps, headerProps)) }) });
     }
     if (header instanceof Function) {
         return (0, jsx_runtime_1.jsxs)("div", { onDoubleClick: function (event) {

package/features/DialogFullscreenAction.js

@@ -10,6 +10,7 @@ var DialogFullscreenAction = function () {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     // use this owned context while setFullscreen mode declared
     var _j = (0, react_1.useContext)(_context_1.DialogHeaderFooterContext), dialog = _j.dialog, setFullscreen = _j.setFullscreen, fullscreen = _j.fullscreen;
+    console.log('DialogFullscreenAction', fullscreen, setFullscreen);
     return (0, jsx_runtime_1.jsx)("div", { className: 'fullscreen-icon-wrapper', onClick: function (event) {
             setFullscreen(!fullscreen);
             (0, _helpers_1.setDialogBound)(dialog.dialogOptions.base.id, "fullscreen", !fullscreen);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-dialogger",
-  "version": "1.1.93",
+  "version": "1.1.95",
   "description": "This package is a continuation of the react-araci package. Due to an error, react-araci was removed, and it has been decided to continue under the new package name react-dialogger",
   "main": "index.js",
   "author": "Sueleyman Topaloglu",

package/styles/snackbar.css

@@ -3,4 +3,5 @@ div[role=alert][aria-describedby=notistack-snackbar] {
 }
 div[role=alert][aria-describedby=notistack-snackbar] > div:nth-of-type(2) {
   margin-left: auto !important;
+  padding-left: initial !important;
 }

package/types/DialogTypes.d.ts

@@ -3,7 +3,7 @@ import Dialog, { DialogAction } from "../models/index.js";
 import type { ITypeHeight, ITypeWidth } from "./SizePosTypes";
 import { DialogBase } from "../components/index.js";
 import type { FormikProps } from "formik";
-import type { RefObject } from "react";
+import type { CSSProperties, RefObject } from "react";
 import { Resizeable } from "../helpers/index.js";
 import type { DialogContentFooterReturnType, IActionIntents } from "./DialogActionTypes";
 import { SharedProps, SnackbarKey, SnackbarProvider, VariantType } from "notistack";
@@ -67,6 +67,7 @@ interface IDialogOptionsType {
         /**@deprecated
          * @link IDialogOptionsType['localText']*/
         busyMessage?: string;
+        style?: CSSProperties;
     };
     animate: 'jumper' | 'none';
     slot?: kSlot;
@@ -87,8 +88,8 @@ interface kSlotProps {
         style?: React.CSSProperties;
         [k: string]: any;
     };
-    footer?: (props: IBaseFooterProps) => Record<string, any>;
-    header?: (props: IBaseHeaderProps) => Record<string, any>;
+    footer?: Record<string, any>;
+    header?: Record<string, any>;
 }
 export interface IBaseDialogOptions {
     closeable?: boolean;
@@ -128,11 +129,11 @@ export interface IBaseDialogProgressOptions {
 export interface IBaseFooterProps extends BaseDialogSlotProps {
     inProcess?: IInProcess;
 }
-type FooterSlotProps = ReturnType<NonNullable<kSlotProps['footer']>>;
+type FooterSlotProps = kSlotProps['footer'];
 export type IFooterProps = IBaseFooterProps & FooterSlotProps;
 export interface IBaseHeaderProps extends BaseDialogSlotProps {
 }
-type HeaderSlotProps = ReturnType<NonNullable<kSlotProps['header']>>;
+type HeaderSlotProps = kSlotProps['header'];
 export type IHeaderProps = IBaseHeaderProps & HeaderSlotProps;
 export interface BaseDialogSlotProps {
     dialogOptions: DialogOptionsType;