dry-ux 1.86.0 → 1.87.0

package/dist/ui-utils/Modal.js

@@ -12,11 +12,11 @@ const useDraggable_1 = require("./useDraggable");
  * @param {ModalProps} props - The props for the Modal component.
  * @returns {JSX.Element} The Modal component.
  */
-const Modal = ({ id, instance: { handleClose, toggleOverlay, shown, overlay, options: { content, footerContent, cssClass = "", closeBtn, title, width, onClose, titleCloseBtn = true, centered, trackingId, draggable, actions = [], }, }, config: { defaultModalStyles = false, styles = {}, centered: globalCentered, draggable: globalDraggable, onOpen, onClose: globalOnClose, }, providerId, debug, }) => {
+const Modal = ({ id, instance: { handleClose, toggleOverlay, shown, overlay, key: instanceKey, options: { content, footerContent, cssClass = "", closeBtn, title, width, onClose, titleCloseBtn = true, centered, trackingId, draggable, actions = [], }, }, config: { defaultModalStyles = false, styles = {}, centered: globalCentered, draggable: globalDraggable, onOpen, onClose: globalOnClose, }, providerId, debug, }) => {
     const isCentered = centered !== null && centered !== void 0 ? centered : globalCentered;
     const isDraggable = !!(draggable !== null && draggable !== void 0 ? draggable : globalDraggable) && !!title;
     const draggableClass = isDraggable ? `dry-ux-draggable-${id}` : "";
-    (0, useDraggable_1.useDraggable)(isDraggable, shown, `dry-ux-draggable-${id}`);
+    (0, useDraggable_1.useDraggable)(isDraggable, shown, `dry-ux-draggable-${id}`, instanceKey);
     const applyStyles = React.useCallback(() => {
         document.querySelectorAll(".modal-dialog").forEach((el) => {
             el.style.width = typeof width == "number" ? `${width}px` : width;

package/dist/ui-utils/UIUtil.interface.d.ts

@@ -69,6 +69,10 @@ export type PopUpInstance = {
      * Indicates whether the PopUp is shown.
      */
     shown: boolean;
+    /**
+     * @internal Unique key that changes each time the instance is created/replaced.
+     */
+    key?: number;
     /**
      * The overlay content for the PopUp.
      */

package/dist/ui-utils/UIUtilProvider.js

@@ -248,6 +248,7 @@ class UIUtilProvider extends React.PureComponent {
         instances[id] = {
             options,
             shown: false,
+            key: Date.now(),
             handleClose: this.toggleModalInstance.bind(this),
             toggleOverlay: this.toggleModalOverlay.bind(this),
         };

package/dist/ui-utils/useDraggable.d.ts

@@ -6,5 +6,6 @@
  * @param enabled - Whether dragging is enabled.
  * @param shown - Current shown state; position resets when modal reopens.
  * @param modalClass - Unique CSS class on the modal to identify it.
+ * @param modalKey - When this value changes, drag position resets (e.g. when one modal replaces another).
  */
-export declare const useDraggable: (enabled: boolean, shown: boolean, modalClass: string) => void;
+export declare const useDraggable: (enabled: boolean, shown: boolean, modalClass: string, modalKey: number) => void;

package/dist/ui-utils/useDraggable.js

@@ -10,8 +10,9 @@ const React = require("react");
  * @param enabled - Whether dragging is enabled.
  * @param shown - Current shown state; position resets when modal reopens.
  * @param modalClass - Unique CSS class on the modal to identify it.
+ * @param modalKey - When this value changes, drag position resets (e.g. when one modal replaces another).
  */
-const useDraggable = (enabled, shown, modalClass) => {
+const useDraggable = (enabled, shown, modalClass, modalKey) => {
     const cleanupRef = React.useRef(null);
     React.useEffect(() => {
         if (cleanupRef.current) {
@@ -69,6 +70,6 @@ const useDraggable = (enabled, shown, modalClass) => {
                 cleanupRef.current = null;
             }
         };
-    }, [enabled, shown, modalClass]);
+    }, [enabled, shown, modalClass, modalKey]);
 };
 exports.useDraggable = useDraggable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dry-ux",
-  "version": "1.86.0",
+  "version": "1.87.0",
   "description": "",
   "main": "dist/index",
   "scripts": {
@@ -9,7 +9,7 @@
     "watch": "rimraf dist/ && tsc --watch",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.tsx\"",
     "update:version": "npm version minor --no-git-tag-version",
-    "prepub:npm": "npm run format && npm run build && npm run update:version && npm run docs",
+    "prepub:npm": "npm run format && npm run build && npm run update:version",
     "publish:npm": "npm run prepub:npm && npm publish",
     "pack": "npm run build && npm pack --pack-destination pack/",
     "docs": "typedoc --options typedoc.json && cd test && npm run build:test && cp -r proddist ../htmldocs/demo",