roamjs-components 0.73.5 → 0.73.8

package/components/FormDialog.d.ts

@@ -28,7 +28,7 @@ declare type Props<T> = {
     }>;
 };
 declare const FormDialog: <T extends Record<string, unknown>>({ title, content, isOpen, onClose, onSubmit, fields, }: RoamOverlayProps<Props<T>>) => JSX.Element;
-export declare const render: (props: Props<Record<string, unknown>>) => () => void;
+export declare const render: (props: Props<Record<string, unknown>>) => void | (() => void);
 export declare const prompt: ({ defaultAnswer, question, title, }: {
     title: string;
     question: string;

package/components/ProgressDialog.d.ts

@@ -7,5 +7,5 @@ export declare const ID = "roamjs-progress-dialog-root";
 declare const ProgressDialog: ({ onClose, ...props }: {
     onClose: () => void;
 } & Props) => JSX.Element;
-export declare const render: (props: Props) => () => void;
+export declare const render: (props: Props) => void | (() => void);
 export default ProgressDialog;

package/components/SimpleAlert.d.ts

@@ -11,5 +11,5 @@ declare type Props = {
 declare const SimpleAlert: (Markdown: typeof Marked) => ({ onClose, content, onConfirm, onCancel, externalLink, confirmText, dontShowAgain, }: Props & {
     onClose: () => void;
 }) => React.ReactElement;
-export declare const render: (props: Props) => Promise<() => void>;
+export declare const render: (props: Props) => Promise<void | (() => void)>;
 export default SimpleAlert;

package/components/TokenDialog.d.ts

@@ -5,7 +5,7 @@ declare type Props = {
 declare const TokenDialog: ({ onClose, onEnter }: {
     onClose: () => void;
 } & Props) => JSX.Element;
-export declare const render: (props: Props) => () => void;
+export declare const render: (props: Props) => void | (() => void);
 export declare const addTokenDialogCommand: (props?: Props) => void;
 export declare const checkRoamJSTokenWarning: () => Promise<string>;
 export default TokenDialog;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "roamjs-components",
   "description": "Description for roamjs-components",
-  "version": "0.73.5",
+  "version": "0.73.8",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {

package/util/createOverlayRender.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 import { RoamOverlayProps } from "./renderOverlay";
-declare const createOverlayRender: <T extends Record<string, unknown>>(id: string, Overlay: (props: RoamOverlayProps<T>) => React.ReactElement) => (props: T) => () => void;
+declare const createOverlayRender: <T extends Record<string, unknown>>(id: string, Overlay: (props: RoamOverlayProps<T>) => React.ReactElement) => (props: T) => void | (() => void);
 export default createOverlayRender;

package/util/getRenderRoot.js

@@ -1,4 +1,5 @@
 "use strict";
+// @DEPRECATED
 Object.defineProperty(exports, "__esModule", { value: true });
 const getRenderRoot = (id) => {
     var _a;

package/util/getRenderRoot.js.map

@@ -1 +1 @@
-{"version":3,"file":"getRenderRoot.js","sourceRoot":"","sources":["../src/util/getRenderRoot.ts"],"names":[],"mappings":";;AAAA,MAAM,aAAa,GAAG,CAAC,EAAU,EAAkB,EAAE;;IACnD,MAAM,MAAM,GAAG,UAAU,EAAE,OAAO,CAAC;IACnC,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAmB,CAAC;IACnE,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC/C,OAAO,QAAQ,CAAC;KACjB;IACD,MAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9C,OAAO,CAAC,EAAE,GAAG,MAAM,CAAC;IACpB,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,aAAa,0CAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACzC,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"getRenderRoot.js","sourceRoot":"","sources":["../src/util/getRenderRoot.ts"],"names":[],"mappings":";AAAA,cAAc;;AAEd,MAAM,aAAa,GAAG,CAAC,EAAU,EAAkB,EAAE;;IACnD,MAAM,MAAM,GAAG,UAAU,EAAE,OAAO,CAAC;IACnC,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAmB,CAAC;IACnE,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC/C,OAAO,QAAQ,CAAC;KACjB;IACD,MAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9C,OAAO,CAAC,EAAE,GAAG,MAAM,CAAC;IACpB,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,aAAa,0CAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACzC,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}

package/util/renderOverlay.d.ts

@@ -3,9 +3,11 @@ export declare type RoamOverlayProps<T extends Record<string, unknown> = Record<
     onClose: () => void;
     isOpen: boolean;
 } & T;
-declare const renderOverlay: <T extends Record<string, unknown>>({ id, Overlay, props, }?: {
+declare const renderOverlay: <T extends Record<string, unknown>>({ id, Overlay, props, path, before, }?: {
     id?: string | undefined;
     Overlay?: ((props: RoamOverlayProps<T>) => React.ReactElement) | undefined;
     props?: T | undefined;
-}) => () => void;
+    path?: string | HTMLElement | null | undefined;
+    before?: number | HTMLElement | null | undefined;
+}) => (() => void) | void;
 export default renderOverlay;

package/util/renderOverlay.js

@@ -5,26 +5,36 @@ const nanoid_1 = tslib_1.__importDefault(require("nanoid"));
 const react_1 = tslib_1.__importDefault(require("react"));
 const react_dom_1 = tslib_1.__importDefault(require("react-dom"));
 const dispatchToRegistry_1 = tslib_1.__importDefault(require("./dispatchToRegistry"));
-const getRenderRoot_1 = tslib_1.__importDefault(require("./getRenderRoot"));
 const removeFromRegistry_1 = tslib_1.__importDefault(require("./removeFromRegistry"));
-const renderOverlay = ({ id = (0, nanoid_1.default)(), Overlay = (props) => react_1.default.createElement("div", props), props = {}, } = {}) => {
-    const parent = (0, getRenderRoot_1.default)(id);
-    const onClose = () => {
-        if (typeof props.onClose === "function")
-            props.onClose();
-        react_dom_1.default.unmountComponentAtNode(parent);
-        parent.remove();
-        (0, removeFromRegistry_1.default)({
-            reactRoots: [parent],
-        });
-    };
-    if (!parent.hasAttribute("data-existing")) {
+const renderOverlay = ({ id = (0, nanoid_1.default)(), Overlay = (props) => react_1.default.createElement("div", props), props = {}, path = "body", before, } = {}) => {
+    const parent = document.createElement("div");
+    parent.id = id;
+    const pathElement = typeof path === "string" ? document.querySelector(path) : path;
+    if (pathElement && !pathElement.querySelector(`#${id}`)) {
+        if (typeof before === "number") {
+            pathElement.insertBefore(parent, pathElement.children[before]);
+        }
+        else if (typeof before === "object") {
+            pathElement.insertBefore(parent, before);
+        }
+        else {
+            pathElement.appendChild(parent);
+        }
+        const onClose = () => {
+            if (typeof props.onClose === "function")
+                props.onClose();
+            react_dom_1.default.unmountComponentAtNode(parent);
+            parent.remove();
+            (0, removeFromRegistry_1.default)({
+                reactRoots: [parent],
+            });
+        };
         react_dom_1.default.render(react_1.default.createElement(Overlay, Object.assign(Object.assign({}, props), { isOpen: true, onClose })), parent);
         (0, dispatchToRegistry_1.default)({
             reactRoots: [parent],
         });
+        return onClose;
     }
-    return onClose;
 };
 exports.default = renderOverlay;
 //# sourceMappingURL=renderOverlay.js.map

package/util/renderOverlay.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderOverlay.js","sourceRoot":"","sources":["../src/util/renderOverlay.ts"],"names":[],"mappings":";;;AAAA,4DAA4B;AAC5B,0DAA0B;AAC1B,kEAAiC;AACjC,sFAAsD;AACtD,4EAA4C;AAC5C,sFAAsD;AAStD,MAAM,aAAa,GAAG,CAAoC,EACxD,EAAE,GAAG,IAAA,gBAAM,GAAE,EACb,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,eAAK,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,EACtD,KAAK,GAAG,EAAO,MAKb,EAAE,EAAE,EAAE;IACR,MAAM,MAAM,GAAG,IAAA,uBAAa,EAAC,EAAE,CAAC,CAAC;IACjC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU;YAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QACzD,mBAAQ,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,EAAE,CAAC;QAChB,IAAA,4BAAkB,EAAC;YACjB,UAAU,EAAE,CAAC,MAAM,CAAC;SACrB,CAAC,CAAC;IACL,CAAC,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE;QACzC,mBAAQ,CAAC,MAAM,CACb,eAAK,CAAC,aAAa,CAAC,OAAO,kCACtB,KAAK,KACR,MAAM,EAAE,IAAI,EACZ,OAAO,IACP,EACF,MAAM,CACP,CAAC;QACF,IAAA,4BAAkB,EAAC;YACjB,UAAU,EAAE,CAAC,MAAM,CAAC;SACrB,CAAC,CAAC;KACJ;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"renderOverlay.js","sourceRoot":"","sources":["../src/util/renderOverlay.ts"],"names":[],"mappings":";;;AAAA,4DAA4B;AAC5B,0DAA0B;AAC1B,kEAAiC;AACjC,sFAAsD;AACtD,sFAAsD;AAStD,MAAM,aAAa,GAAG,CAAoC,EACxD,EAAE,GAAG,IAAA,gBAAM,GAAE,EACb,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,eAAK,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,EACtD,KAAK,GAAG,EAAO,EACf,IAAI,GAAG,MAAM,EACb,MAAM,MAOJ,EAAE,EAAuB,EAAE;IAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,MAAM,WAAW,GACf,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjE,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE;QACvD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;SAChE;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YACrC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAC1C;aAAM;YACL,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SACjC;QACD,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU;gBAAE,KAAK,CAAC,OAAO,EAAE,CAAC;YACzD,mBAAQ,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,EAAE,CAAC;YAChB,IAAA,4BAAkB,EAAC;gBACjB,UAAU,EAAE,CAAC,MAAM,CAAC;aACrB,CAAC,CAAC;QACL,CAAC,CAAC;QACF,mBAAQ,CAAC,MAAM,CACb,eAAK,CAAC,aAAa,CAAC,OAAO,kCACtB,KAAK,KACR,MAAM,EAAE,IAAI,EACZ,OAAO,IACP,EACF,MAAM,CACP,CAAC;QACF,IAAA,4BAAkB,EAAC;YACjB,UAAU,EAAE,CAAC,MAAM,CAAC;SACrB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;KAChB;AACH,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}