rd merge

Author: softmarshmallow

editor-packages/editor-dashboard/scaffold/editor-dashboard-hierarchy.tsx

@@ -17,7 +17,7 @@ export function DashboardHierarchy() {
   const renderItem = useCallback(
     (item: DashboardItem, i: number) => {
       const selected = selection.includes(item.id);
-      const depth = item.path.split("/").length - 1;
+      const depth = getHierarchyDepth(item.path);
 
       return (
         <HierarchyRow
@@ -77,3 +77,16 @@ function pushhash(router: NextRouter, hash: string) {
       }
     });
 }
+
+/**
+ * get the depth via the path (ignore the first slash)
+ * @param path
+ * @returns
+ */
+function getHierarchyDepth(path: string): number {
+  const splits = path.split("/");
+  if (splits[0] === "") {
+    return splits.length - 2;
+  }
+  return splits.length - 1;
+}

editor-packages/editor-dashboard/scaffold/editor-dashboard.tsx

@@ -172,7 +172,7 @@ function RootDirectory({
 }) {
   return (
     <div style={{ marginBottom: 32 }}>
-      <RootDirectoryContextMenuProvider cwd={path}>
+      <RootDirectoryContextMenuProvider cwd={path} disabled>
         <Collapsible.Root open={expanded} onOpenChange={onExpandChange}>
           <SectionHeader
             id={path}
@@ -212,9 +212,11 @@ function Providers({ children }: React.PropsWithChildren<{}>) {
 
 function RootDirectoryContextMenuProvider({
   children,
+  disabled,
   cwd,
 }: React.PropsWithChildren<{
   cwd: string;
+  disabled?: boolean;
 }>) {
   const { mkdir } = useDashboard();
   const items: MenuItem<string>[] = [
@@ -239,6 +241,10 @@ function RootDirectoryContextMenuProvider({
     [mkdir]
   );
 
+  if (disabled) {
+    return <>{children}</>;
+  }
+
   return (
     <ContextMenu items={items} onSelect={onselect}>
       {children}