roamjs-components 0.74.14 → 0.74.15

package/components/ExtensionApiContext.d.ts

@@ -11,25 +11,7 @@ export declare const useExtensionAPI: () => {
                     id: string;
                     name: string;
                     description: string;
-                    action: {
-                        type: "button";
-                        onClick?: ((e: MouseEvent) => void) | undefined;
-                        content: string;
-                    } | {
-                        type: "switch";
-                        onChange?: ((e: React.ChangeEvent<HTMLInputElement>) => void) | undefined;
-                    } | {
-                        type: "input";
-                        placeholder: string;
-                        onChange?: ((e: React.ChangeEvent<HTMLInputElement>) => void) | undefined;
-                    } | {
-                        type: "select";
-                        items: string[];
-                        onChange?: ((e: React.ChangeEvent<HTMLInputElement>) => void) | undefined;
-                    } | {
-                        type: "reactComponent";
-                        component: React.FC<{}>;
-                    };
+                    action: import("../types").Action;
                 }[];
             }) => void;
         };

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 | (() => void);
+export declare const render: (props: Props<Record<string, unknown>>) => (() => void) | undefined;
 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 | (() => void);
+export declare const render: (props: Props) => (() => void) | undefined;
 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 | (() => void)>;
+export declare const render: (props: Props) => Promise<(() => void) | undefined>;
 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 | (() => void);
+export declare const render: (props: Props) => (() => void) | undefined;
 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": "Expansive toolset, utilities, & components for developing RoamJS extensions.",
-  "version": "0.74.14",
+  "version": "0.74.15",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {

package/types/index.d.ts

@@ -1,6 +1,5 @@
 import { AddPullWatch, PullBlock, SidebarAction, SidebarWindow, SidebarWindowInput, WriteAction } from "./native";
 import { RegisterSelection, ParseQuery, FireQuery, ConditionToDatalog, RegisterDatalogTranslator, ResultsViewComponent, QueryEditorComponent, ExportDialogComponent, QueryPageComponent, RunQuery, ListActiveQueries } from "./query-builder";
-import { SamePageApi } from "./samepage";
 import { RegisterCommand, UnregisterCommand } from "./smartblocks";
 import type marked from "marked";
 import type Markdown from "marked-react";
@@ -179,8 +178,6 @@ declare global {
         roamjs: {
             loaded: Set<string>;
             extension: {
-                multiplayer?: SamePageApi;
-                samepage?: SamePageApi;
                 queryBuilder?: {
                     ExportDialog: ExportDialogComponent;
                     QueryEditor: QueryEditorComponent;

package/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;AA0BA,mDAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;AAyBA,mDAAyB"}

package/types/native.d.ts

@@ -346,13 +346,14 @@ declare type CustomAction = {
     type: "reactComponent";
     component: React.FC;
 };
+export declare type Action = ButtonAction | SwitchAction | InputAction | SelectAction | CustomAction;
 declare type PanelConfig = {
     tabTitle: string;
     settings: {
         id: string;
         name: string;
         description: string;
-        action: ButtonAction | SwitchAction | InputAction | SelectAction | CustomAction;
+        action: Action;
     }[];
 };
 export declare type OnloadArgs = {

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 | (() => void);
+declare const createOverlayRender: <T extends Record<string, unknown>>(id: string, Overlay: (props: RoamOverlayProps<T>) => React.ReactElement) => (props: T) => (() => void) | undefined;
 export default createOverlayRender;

package/util/renderOverlay.d.ts

@@ -3,11 +3,10 @@ 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, path, before, }?: {
+declare const renderOverlay: <T extends Record<string, unknown>>({ id, Overlay, props, path, }?: {
     id?: string | undefined;
     Overlay?: ((props: RoamOverlayProps<T>) => React.ReactElement) | undefined;
     props?: T | undefined;
     path?: string | HTMLElement | null | undefined;
-    before?: number | HTMLElement | null | undefined;
-}) => (() => void) | void;
+}) => (() => void) | undefined;
 export default renderOverlay;

package/util/renderOverlay.js

@@ -6,19 +6,27 @@ 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 removeFromRegistry_1 = tslib_1.__importDefault(require("./removeFromRegistry"));
-const renderOverlay = ({ id = (0, nanoid_1.default)(), Overlay = (props) => react_1.default.createElement("div", props), props = {}, path = "body", before, } = {}) => {
+const BEFORE_REGEX = /::before\([\w.]+\)$/;
+const renderOverlay = ({ id = (0, nanoid_1.default)(), Overlay = (props) => react_1.default.createElement("div", props), props = {}, path = "body", } = {}) => {
+    var _a;
     const parent = document.createElement("div");
     parent.id = id.replace(/^\d*/, "");
-    const pathElement = typeof path === "string" ? document.querySelector(path) : path;
+    const pathElement = typeof path === "string"
+        ? document.querySelector(path.replace(BEFORE_REGEX, ""))
+        : path;
     if (pathElement && !pathElement.querySelector(`#${parent.id}`)) {
-        if (typeof before === "number") {
-            pathElement.insertBefore(parent, pathElement.children[before]);
+        const before = typeof path === "string" ? (_a = BEFORE_REGEX.exec(path)) === null || _a === void 0 ? void 0 : _a[1] : undefined;
+        if (!before) {
+            pathElement.appendChild(parent);
+        }
+        else if (!Number.isNaN(Number(before))) {
+            pathElement.insertBefore(parent, pathElement.children[Number(before)]);
         }
-        else if (typeof before === "object") {
-            pathElement.insertBefore(parent, before);
+        else if (pathElement.querySelector(before)) {
+            pathElement.insertBefore(parent, pathElement.querySelector(before));
         }
         else {
-            pathElement.appendChild(parent);
+            return undefined;
         }
         const onClose = () => {
             if (typeof props.onClose === "function")
@@ -35,6 +43,7 @@ const renderOverlay = ({ id = (0, nanoid_1.default)(), Overlay = (props) => reac
         });
         return onClose;
     }
+    return undefined;
 };
 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,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,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACnC,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,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE;QAC9D,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"}
+{"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,YAAY,GAAG,qBAAqB,CAAC;AAE3C,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,MAMX,EAAE,EAA4B,EAAE;;IAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACnC,MAAM,WAAW,GACf,OAAO,IAAI,KAAK,QAAQ;QACtB,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACxD,CAAC,CAAC,IAAI,CAAC;IACX,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE;QAC9D,MAAM,MAAM,GACV,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAA,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,0CAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,IAAI,CAAC,MAAM,EAAE;YACX,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SACjC;aAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE;YACxC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SACxE;aAAM,IAAI,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;YAC5C,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;SACrE;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;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;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}

package/types/samepage.d.ts

@@ -1,22 +0,0 @@
-declare type json = string | number | boolean | null | {
-    toJSON: () => string;
-} | json[] | {
-    [key: string]: json;
-};
-export declare type SamePageApi = {
-    addGraphListener: (args: {
-        operation: string;
-        handler: (e: json, graph: string) => void;
-    }) => void;
-    removeGraphListener: (args: {
-        operation: string;
-    }) => void;
-    sendToGraph: (args: {
-        graph: string;
-        operation: string;
-        data?: {
-            [k: string]: json;
-        };
-    }) => void;
-};
-export {};

package/types/samepage.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=samepage.js.map

package/types/samepage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"samepage.js","sourceRoot":"","sources":["../../src/types/samepage.ts"],"names":[],"mappings":""}