Merge branch 'DiscourseGraphs:main' into obsidian-bases

Author: KarolaKirsanow

apps/obsidian/src/components/NodeTypeSettings.tsx

@@ -1192,7 +1192,7 @@ const NodeTypeSettings = () => {
               ref={(el) => (el && setIcon(el, "arrow-left")) || undefined}
             />
           </button>
-          <h3 className="dg-h3">
+          <h3 className="dg-h3 !mb-0">
             {isEditingImported
               ? `[Read only] Imported from ${getAndFormatImportSource(editingNodeType.importedFromRid || "", plugin.settings.spaceNames)}`
               : "Edit node type"}

apps/roam/src/components/BirdEatsBugs.tsx

@@ -110,7 +110,7 @@ export const initFeedbackWidget = (): void => {
 
   if (window.birdeatsbug && "setOptions" in window.birdeatsbug) {
     window.birdeatsbug.setOptions!({
-      publicAppId: "faf02e48-84b7-4292-b76c-03d9342ba9aa",
+      publicAppId: "b4ea080f-9e8e-440c-a683-a9bf9e2bcd94",
       user: {
         email: getCurrentUserEmail(),
       },

apps/roam/src/components/LeftSidebarView.tsx

@@ -32,6 +32,7 @@ import {
   isQueryBlockRef,
   type LeftSidebarConfig,
   type LeftSidebarPersonalSectionConfig,
+  getGlobalSectionFoldedMarkerText,
   mergeGlobalSectionWithAccessor,
   mergePersonalSectionsWithAccessor,
 } from "~/utils/getLeftSidebarSettings";
@@ -51,7 +52,6 @@ import {
   PERSONAL_KEYS,
   GLOBAL_KEYS,
   LEFT_SIDEBAR_KEYS,
-  LEFT_SIDEBAR_SETTINGS_KEYS,
 } from "~/components/settings/utils/settingKeys";
 import type { LeftSidebarGlobalSettings } from "~/components/settings/utils/zodSchema";
 import { createBlock } from "roamjs-components/writes";
@@ -179,7 +179,13 @@ const toggleFoldedState = async ({
   }
 };
 
-const RoamRenderedBlock = ({ uid }: { uid: string }) => {
+const RoamRenderedBlock = ({
+  uid,
+  onNavigate,
+}: {
+  uid: string;
+  onNavigate: (e: React.MouseEvent) => void;
+}) => {
   const [version, setVersion] = useState(0);
 
   useEffect(() => {
@@ -192,8 +198,14 @@ const RoamRenderedBlock = ({ uid }: { uid: string }) => {
     };
   }, [uid]);
 
+  const handleClick = (e: React.MouseEvent) => {
+    const target = e.target as HTMLElement;
+    if (target.closest("button")) return;
+    onNavigate(e);
+  };
+
   return (
-    <div className="dg-sidebar-rendered-block">
+    <div className="dg-sidebar-rendered-block" onClick={handleClick}>
       <RenderRoamBlock key={version} uid={uid} open={false} />
     </div>
   );
@@ -215,8 +227,11 @@ const ChildRow = ({
   if (ref.type === "block" && isSmartBlockUid(ref.uid)) {
     return (
       <div className="pl-8 pr-2.5">
-        <div className="section-child-item rounded-sm leading-normal text-gray-600">
-          <RoamRenderedBlock uid={ref.uid} />
+        <div className="section-child-item cursor-pointer rounded-sm leading-normal text-gray-600">
+          <RoamRenderedBlock
+            uid={ref.uid}
+            onNavigate={(e) => void openTarget(e, child.text, onloadArgs)}
+          />
         </div>
       </div>
     );
@@ -617,53 +632,46 @@ const PersonalSections = ({
 
 const GlobalSection = ({
   config,
+  folded,
+  leftSidebarUid,
   onGlobalChildrenReorder,
   onloadArgs,
 }: {
   config: LeftSidebarConfig["global"];
+  folded: boolean;
+  leftSidebarUid: string;
   onGlobalChildrenReorder: (oldIndex: number, newIndex: number) => void;
   onloadArgs: OnloadArgs;
 }) => {
-  const [isOpen, setIsOpen] = useState<boolean>(!config.settings?.folded.value);
+  const [isOpen, setIsOpen] = useState<boolean>(!folded);
   const isTogglingRef = useRef(false);
   if (!config.children?.length) return null;
-  const isCollapsable = config.settings?.collapsable.value;
 
   const handleToggle = async () => {
-    if (!isCollapsable || !config.settings) return;
     if (isTogglingRef.current) return;
     isTogglingRef.current = true;
     try {
-      const settings = config.settings;
       const nextIsOpen = !isOpen;
       setIsOpen(nextIsOpen);
-      if (nextIsOpen) {
-        const children = getBasicTreeByParentUid(settings.uid);
-        await Promise.all(
-          children
-            .filter((c) => c.text === "Folded")
-            .map((c) => deleteBlock(c.uid)),
-        );
-        settings.folded.uid = undefined;
-        settings.folded.value = false;
-      } else {
-        const newUid = window.roamAlphaAPI.util.generateUID();
-        await createBlock({
-          parentUid: settings.uid,
-          node: { text: "Folded", uid: newUid },
-        });
-        settings.folded.uid = newUid;
-        settings.folded.value = true;
+      const userUid = window.roamAlphaAPI.user.uid();
+      if (userUid) {
+        const markerText = getGlobalSectionFoldedMarkerText(userUid);
+        if (nextIsOpen) {
+          const children = getBasicTreeByParentUid(leftSidebarUid);
+          await Promise.all(
+            children
+              .filter((c) => c.text === markerText)
+              .map((c) => deleteBlock(c.uid)),
+          );
+        } else {
+          await createBlock({
+            parentUid: leftSidebarUid,
+            node: { text: markerText },
+          });
+        }
+        refreshConfigTree();
       }
-      refreshConfigTree();
-      setGlobalSetting(
-        [
-          GLOBAL_KEYS.leftSidebar,
-          LEFT_SIDEBAR_KEYS.settings,
-          LEFT_SIDEBAR_SETTINGS_KEYS.folded,
-        ],
-        !nextIsOpen,
-      );
+      setPersonalSetting([PERSONAL_KEYS.globalSectionFolded], !nextIsOpen);
     } finally {
       isTogglingRef.current = false;
     }
@@ -690,18 +698,12 @@ const GlobalSection = ({
       >
         <div className="flex w-full items-center justify-between">
           <span>GLOBAL</span>
-          {isCollapsable && (
-            <span className="sidebar-title-button-chevron p-1">
-              <Icon icon={isOpen ? "chevron-down" : "chevron-right"} />
-            </span>
-          )}
+          <span className="sidebar-title-button-chevron p-1">
+            <Icon icon={isOpen ? "chevron-down" : "chevron-right"} />
+          </span>
         </div>
       </div>
-      {isCollapsable ? (
-        <Collapse isOpen={isOpen}>{children}</Collapse>
-      ) : (
-        children
-      )}
+      <Collapse isOpen={isOpen}>{children}</Collapse>
     </>
   );
 };
@@ -718,6 +720,9 @@ const buildConfig = (snapshot?: SettingsSnapshot): LeftSidebarConfig => {
     : getPersonalSetting<
         ReturnType<typeof getPersonalSettings>[typeof PERSONAL_KEYS.leftSidebar]
       >([PERSONAL_KEYS.leftSidebar]);
+  const globalSectionFoldedValue = snapshot
+    ? snapshot.personalSettings[PERSONAL_KEYS.globalSectionFolded]
+    : getPersonalSetting<boolean>([PERSONAL_KEYS.globalSectionFolded]);
 
   // Read UIDs from old system (needed for fold CRUD during dual-write)
   const oldConfig = getCurrentLeftSidebarConfig();
@@ -727,6 +732,10 @@ const buildConfig = (snapshot?: SettingsSnapshot): LeftSidebarConfig => {
     favoritesMigrated: oldConfig.favoritesMigrated,
     sidebarMigrated: oldConfig.sidebarMigrated,
     global: mergeGlobalSectionWithAccessor(oldConfig.global, globalValues),
+    globalSectionFolded: {
+      uid: oldConfig.globalSectionFolded.uid,
+      value: globalSectionFoldedValue ?? oldConfig.globalSectionFolded.value,
+    },
     personal: {
       uid: oldConfig.personal.uid,
       sections: mergePersonalSectionsWithAccessor(
@@ -916,6 +925,8 @@ const LeftSidebarView = ({
       <FavoritesPopover onloadArgs={onloadArgs} />
       <GlobalSection
         config={config.global}
+        folded={config.globalSectionFolded.value}
+        leftSidebarUid={config.uid}
         onGlobalChildrenReorder={reorderGlobalChildren}
         onloadArgs={onloadArgs}
       />
@@ -1045,6 +1056,9 @@ export const mountLeftSidebar = async ({
       .dg-sidebar-rendered-block .block-border-left { display: none; }
       .dg-sidebar-rendered-block .block-ref-count-button { display: none; }
       .dg-sidebar-rendered-block .rm-block-main { min-height: unset; padding: 0; }
+      .dg-sidebar-rendered-block * { pointer-events: none; }
+      .dg-sidebar-rendered-block button,
+      .dg-sidebar-rendered-block button * { pointer-events: auto; }
     `;
     document.head.appendChild(style);
   }

apps/roam/src/components/PublishNodeTitleButton.tsx

@@ -48,6 +48,5 @@ export const renderPublishNodeTitleButton = ({
   handleTitleAdditions(
     h1,
     <PublishNodeTitleButton uid={uid} title={title} nodeType={nodeType} />,
-    { layout: "inline" },
   );
 };