UI adjustments

RoamJS · Dec 22, 2023 · cd6b0ad · cd6b0ad
1 parent d85b443
commit cd6b0ad
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 37 deletions.
diff --git a/src/components/Export.tsx b/src/components/Export.tsx
@@ -74,6 +74,7 @@ const ExportProgress = ({ id }: { id: string }) => {
 export type ExportDialogProps = {
   results?: Result[] | ((isSamePageEnabled: boolean) => Promise<Result[]>);
   title?: string;
+  isExportDiscourseGraph?: boolean;
 };
 
 type ExportDialogComponent = (
@@ -94,6 +95,7 @@ const ExportDialog: ExportDialogComponent = ({
   isOpen,
   results = [],
   title = "Share Data",
+  isExportDiscourseGraph = false,
 }) => {
   const exportId = useMemo(() => nanoid(), []);
   useEffect(() => {
@@ -137,6 +139,10 @@ const ExportDialog: ExportDialogComponent = ({
   const isCanvasPage = checkForCanvasPage(selectedPageTitle);
   const [isSendToGraph, setIsSendToGraph] = useState(false);
   const [livePages, setLivePages] = useState<Result[]>([]);
+  const [selectedTabId, setSelectedTabId] = useState("sendto");
+  useEffect(() => {
+    if (isExportDiscourseGraph) setSelectedTabId("export");
+  }, [isExportDiscourseGraph]);
   const getDiscourseGraphSetting = () =>
     getExtensionAPI().settings.get("discourse-graphs");
   const [discourseGraphSetting, setDiscourseGraphSetting] = useState(
@@ -294,48 +300,65 @@ const ExportDialog: ExportDialogComponent = ({
             onChange={(e) => setFilename(e.target.value)}
           />
         </Label>
-        <FormGroup
-          className={discourseGraphEnabled ? "" : "hidden"}
-          label="Include Discourse Context"
-          inline
-        >
-          <Checkbox
-            checked={includeDiscourseContext}
-            onChange={(e) => {
-              setIncludeDiscourseContext(
-                (e.target as HTMLInputElement).checked
-              );
-            }}
-          />
-        </FormGroup>
-        <div className="text-right">
+
+        <div className="flex justify-between items-end">
           <span>
             {typeof results === "function"
               ? "Calculating number of results..."
               : `Exporting ${results.length} results`}
           </span>
-          {window.samepage && (
-            <Checkbox
-              checked={isSamePageEnabled}
-              onChange={(e) =>
-                setIsSamePageEnabled((e.target as HTMLInputElement).checked)
-              }
-              style={{ marginBottom: 0 }}
-              labelElement={
-                <Tooltip
-                  content={
-                    "Use SamePage's backend to gather this export [EXPERIMENTAL]."
+          <div className="flex flex-col items-end">
+            <FormGroup
+              className={`m-0 ${discourseGraphEnabled ? "" : "hidden"}`}
+              inline
+            >
+              <Checkbox
+                alignIndicator={"right"}
+                checked={includeDiscourseContext}
+                onChange={(e) => {
+                  setIncludeDiscourseContext(
+                    (e.target as HTMLInputElement).checked
+                  );
+                }}
+                labelElement={
+                  <Tooltip
+                    className="m-0"
+                    content={
+                      "Include the Discourse Context of each result in the export."
+                    }
+                  >
+                    <span>Discourse Context</span>
+                  </Tooltip>
+                }
+              />
+            </FormGroup>
+            {window.samepage && (
+              <FormGroup className="m-0 " inline>
+                <Checkbox
+                  alignIndicator={"right"}
+                  checked={isSamePageEnabled}
+                  onChange={(e) =>
+                    setIsSamePageEnabled((e.target as HTMLInputElement).checked)
                   }
-                >
-                  <img
-                    src="https://samepage.network/images/logo.png"
-                    height={24}
-                    width={24}
-                  />
-                </Tooltip>
-              }
-            />
-          )}
+                  style={{ marginBottom: 0 }}
+                  labelElement={
+                    <Tooltip
+                      className="m-0"
+                      content={
+                        "Use SamePage's backend to gather this export [EXPERIMENTAL]."
+                      }
+                    >
+                      <img
+                        src="https://samepage.network/images/logo.png"
+                        height={24}
+                        width={24}
+                      />
+                    </Tooltip>
+                  }
+                />
+              </FormGroup>
+            )}
+          </div>
         </div>
       </div>
       <div className={Classes.DIALOG_FOOTER}>
@@ -479,7 +502,12 @@ const ExportDialog: ExportDialogComponent = ({
         enforceFocus={false}
         portalClassName={"roamjs-export-dialog-body"}
       >
-        <Tabs id="export-tabs" large={true}>
+        <Tabs
+          id="export-tabs"
+          large={true}
+          selectedTabId={selectedTabId}
+          onChange={(newTabId: string) => setSelectedTabId(newTabId)}
+        >
           <Tab id="sendto" title="Send To" panel={SendToPanel} />
           <Tab id="export" title="Export" panel={ExportPanel} />
         </Tabs>

diff --git a/src/discourseGraphsMode.ts b/src/discourseGraphsMode.ts
@@ -896,6 +896,7 @@ const initializeDiscourseGraphsMode = async (args: OnloadArgs) => {
           exportRender({
             results,
             title: "Export Discourse Graph",
+            isExportDiscourseGraph: true,
           });
         },
       });