documentBuilderBranch -> documentBuilderSubtree

src/bricks/renderers/documentView/DocumentView.tsx

@@ -17,7 +17,7 @@
 
 import "@/vendors/bootstrapWithoutRem.css";
 import "@/sidebar/sidebarBootstrapOverrides.scss";
-import { buildDocumentBuilderBranch } from "@/pageEditor/documentBuilder/documentTree";
+import { buildDocumentBuilderSubtree } from "@/pageEditor/documentBuilder/documentTree";
 import React from "react";
 import { type DocumentViewProps } from "./DocumentViewProps";
 import DocumentContext from "@/pageEditor/documentBuilder/render/DocumentContext";
@@ -56,7 +56,7 @@ const DocumentView: React.FC<DocumentViewProps> = ({
       <StylesheetsContext.Provider value={{ stylesheets }}>
         <Stylesheets href={stylesheets}>
           {body.map((documentElement, index) => {
-            const documentBuilderBranch = buildDocumentBuilderBranch(
+            const documentBuilderSubtree = buildDocumentBuilderSubtree(
               documentElement,
               {
                 staticId: joinPathParts("body", "children"),
@@ -65,11 +65,11 @@ const DocumentView: React.FC<DocumentViewProps> = ({
               },
             );
 
-            if (documentBuilderBranch == null) {
+            if (documentBuilderSubtree == null) {
               return null;
             }
 
-            const { Component, props } = documentBuilderBranch;
+            const { Component, props } = documentBuilderSubtree;
             // eslint-disable-next-line react/no-array-index-key -- They have no other unique identifier
             return <Component key={index} {...props} />;
           })}

src/pageEditor/documentBuilder/documentBuilderTypes.ts

@@ -145,7 +145,7 @@ export type DynamicPath = {
   }>;
 };
 
-export type BuildDocumentBuilderBranch = (
+export type BuildDocumentBuilderSubtree = (
   root: DocumentBuilderElement,
   tracePath: DynamicPath,
 ) => DocumentBuilderComponent | null;

src/pageEditor/documentBuilder/documentTree.test.tsx

@@ -23,7 +23,7 @@ import blockRegistry from "@/bricks/registry";
 import MarkdownRenderer from "@/bricks/renderers/MarkdownRenderer";
 import * as contentScriptAPI from "@/contentScript/messenger/api";
 import { uuidv4 } from "@/types/helpers";
-import { buildDocumentBuilderBranch } from "./documentTree";
+import { buildDocumentBuilderSubtree } from "./documentTree";
 import {
   type DocumentBuilderElement,
   type DocumentBuilderElementType,
@@ -46,7 +46,7 @@ describe("When rendered in panel", () => {
   });
 
   const renderDocument = (config: DocumentBuilderElement) => {
-    const branch = buildDocumentBuilderBranch(config, {
+    const branch = buildDocumentBuilderSubtree(config, {
       staticId: "body",
       branches: [],
     });

src/pageEditor/documentBuilder/documentTree.tsx

@@ -20,7 +20,7 @@ import BlockElement from "@/pageEditor/documentBuilder/render/BlockElement";
 import { get } from "lodash";
 import { Col, Container, Row, Image } from "react-bootstrap";
 import {
-  type BuildDocumentBuilderBranch,
+  type BuildDocumentBuilderSubtree,
   type ButtonElementConfig,
   type DocumentBuilderComponent,
   type DocumentBuilderElement,
@@ -59,7 +59,7 @@ const UnknownType: React.FC<{ componentType: string }> = ({
   <div className="text-danger">Unknown component type: {componentType}</div>
 );
 
-export const buildDocumentBuilderBranch: BuildDocumentBuilderBranch = (
+export const buildDocumentBuilderSubtree: BuildDocumentBuilderSubtree = (
   root,
   tracePath,
 ) => {
@@ -84,16 +84,16 @@ export const buildDocumentBuilderBranch: BuildDocumentBuilderBranch = (
   ) {
     documentBuilderComponent.props.children = root.children.map(
       (child, index) => {
-        const branch = buildDocumentBuilderBranch(child, {
+        const subtree = buildDocumentBuilderSubtree(child, {
           staticId: joinPathParts(staticId, root.type, "children"),
           branches: [...branches, { staticId, index }],
         });
 
-        if (branch == null) {
+        if (subtree == null) {
           return null;
         }
 
-        const { Component, props } = branch;
+        const { Component, props } = subtree;
         // eslint-disable-next-line react/no-array-index-key -- They have no other unique identifier
         return <Component key={index} {...props} />;
       },
@@ -265,7 +265,7 @@ export function getDocumentBuilderComponent(
         elementKey: config.elementKey,
         config: config.element,
         tracePath,
-        buildDocumentBuilderBranch,
+        buildDocumentBuilderSubtree,
       };
 
       return {

src/pageEditor/documentBuilder/render/ListElement.tsx

@@ -20,7 +20,7 @@ import DocumentContext from "./DocumentContext";
 import { type Args } from "@/runtime/mapArgs";
 import Loader from "@/components/Loader";
 import {
-  type BuildDocumentBuilderBranch,
+  type BuildDocumentBuilderSubtree,
   type DocumentBuilderElement,
   type DynamicPath,
 } from "@/pageEditor/documentBuilder/documentBuilderTypes";
@@ -41,7 +41,7 @@ type DocumentListProps = {
   array: UnknownObject[];
   elementKey?: string;
   config: Args;
-  buildDocumentBuilderBranch: BuildDocumentBuilderBranch;
+  buildDocumentBuilderSubtree: BuildDocumentBuilderSubtree;
   tracePath: DynamicPath;
 };
 
@@ -51,7 +51,7 @@ const ListElementInternal: React.FC<DocumentListProps> = ({
   array = DEFAULT_ARRAY,
   elementKey,
   config,
-  buildDocumentBuilderBranch,
+  buildDocumentBuilderSubtree,
   tracePath,
 }) => {
   const { staticId, branches } = tracePath;
@@ -138,7 +138,7 @@ const ListElementInternal: React.FC<DocumentListProps> = ({
     <>
       {rootDefinitions?.map(({ documentElement, elementContext }, index) => {
         const { Component, props } =
-          buildDocumentBuilderBranch(
+          buildDocumentBuilderSubtree(
             documentElement as DocumentBuilderElement,
             {
               staticId: joinPathParts(staticId, "list", "children"),

src/pageEditor/exampleStarterBrickConfigs.ts

@@ -26,17 +26,17 @@ const quickbarActionId = validateRegistryId("@pixiebrix/quickbar/add");
 
 export function getExampleBrickPipeline(type: StarterBrickType): BrickPipeline {
   if (type === "actionPanel") {
-    const documentBuilderBlock = createNewConfiguredBrick(documentBrickId);
-    return [documentBuilderBlock];
+    const documentBuilderBrick = createNewConfiguredBrick(documentBrickId);
+    return [documentBuilderBrick];
   }
 
   if (type === "quickBarProvider") {
-    const quickbarActionBlock = createNewConfiguredBrick(quickbarActionId);
-    quickbarActionBlock.config = {
+    const quickbarActionBrick = createNewConfiguredBrick(quickbarActionId);
+    quickbarActionBrick.config = {
       title: "Example Action",
       action: toExpression("pipeline", []),
     };
-    return [quickbarActionBlock];
+    return [quickbarActionBrick];
   }
 
   return [];