Merge branch 'main' of https://github.com/reflex-dev/reflex-web into carlos/replace-some-docs

Author: carlosabadia

pcweb/docgen_pipeline.py

@@ -169,7 +169,8 @@ class ReflexDocTransformer(DocumentTransformer[rx.Component]):
     the reflex package look identical to the locally-authored ones.
     """
 
-    def __init__(self, filename: str = "") -> None:
+    def __init__(self, virtual_filepath: str = "", filename: str = "") -> None:
+        self.virtual_filepath = virtual_filepath
         self.filename = filename
         self.env: dict = {}
 
@@ -234,7 +235,7 @@ def code_block(self, block: CodeBlock) -> rx.Component:
 
         # ``python exec`` only — execute code, produce nothing visible.
         if language == "python" and "exec" in flags:
-            _exec_code(block.content, self.env, self.filename)
+            _exec_code(block.content, self.env, self.virtual_filepath)
             return rx.fragment()
 
         # ``python eval`` (standalone) — eval and return the component directly.
@@ -378,10 +379,10 @@ def _render_demo(self, content: str, flags: set[str]) -> rx.Component:
 
         try:
             if "exec" in flags:
-                _exec_code(content, self.env, self.filename)
+                _exec_code(content, self.env, self.virtual_filepath)
                 comp = self.env[list(self.env.keys())[-1]]()
             elif "graphing" in flags:
-                _exec_code(content, self.env, self.filename)
+                _exec_code(content, self.env, self.virtual_filepath)
                 comp = self.env[list(self.env.keys())[-1]]()
                 parts = content.rpartition("def")
                 data, code = parts[0], parts[1] + parts[2]
@@ -393,7 +394,7 @@ def _render_demo(self, content: str, flags: set[str]) -> rx.Component:
                 comp = eval(content, self.env, self.env)
         except Exception as e:
             e.add_note(
-                f"While rendering demo block in {self.filename}:\n{content[:200]}"
+                f"While rendering demo block in {self.virtual_filepath}:\n{content[:200]}"
             )
             raise
 
@@ -416,10 +417,10 @@ def _render_demo_only(self, content: str, flags: set[str]) -> rx.Component:
 
         try:
             if "exec" in flags:
-                _exec_code(content, self.env, self.filename)
+                _exec_code(content, self.env, self.virtual_filepath)
                 comp = self.env[list(self.env.keys())[-1]]()
             elif "graphing" in flags:
-                _exec_code(content, self.env, self.filename)
+                _exec_code(content, self.env, self.virtual_filepath)
                 comp = self.env[list(self.env.keys())[-1]]()
                 parts = content.rpartition("def")
                 data, code = parts[0], parts[1] + parts[2]
@@ -430,7 +431,7 @@ def _render_demo_only(self, content: str, flags: set[str]) -> rx.Component:
                 comp = eval(content, self.env, self.env)
         except Exception as e:
             e.add_note(
-                f"While rendering demo-only block in {self.filename}:\n{content[:200]}"
+                f"While rendering demo-only block in {self.virtual_filepath}:\n{content[:200]}"
             )
             raise
 
@@ -681,10 +682,14 @@ def _parse_doc(filepath: str | Path) -> Document:
     return parse_document(source)
 
 
-def render_docgen_document(filepath: str | Path) -> rx.Component:
+def render_docgen_document(
+    virtual_filepath: str | Path, actual_filepath: str | Path
+) -> rx.Component:
     """Parse and render a doc file from the reflex package using reflex_docgen."""
-    doc = _parse_doc(filepath)
-    transformer = ReflexDocTransformer(filename=str(filepath))
+    doc = _parse_doc(actual_filepath)
+    transformer = ReflexDocTransformer(
+        virtual_filepath=str(virtual_filepath), filename=str(actual_filepath)
+    )
     return transformer.transform(doc)
 
 

pcweb/markdown_api.py

@@ -0,0 +1,22 @@
+"""Write per-doc raw Markdown files under ``.web/public`` for ``<route>.md`` URLs."""
+
+from pathlib import Path
+
+from reflex.constants import Dirs
+
+from pcweb.pages.docs import doc_markdown_sources
+
+PUBLIC_DIR = Path.cwd() / Dirs.WEB / Dirs.PUBLIC
+
+
+def generate_markdown_files() -> None:
+    for route, source_path in doc_markdown_sources.items():
+        resolved = Path(source_path)
+        if not resolved.is_absolute():
+            resolved = Path.cwd() / resolved
+        if not resolved.is_file():
+            continue
+
+        dest = PUBLIC_DIR / (route.strip("/") + ".md")
+        dest.parent.mkdir(parents=True, exist_ok=True)
+        dest.write_text(resolved.read_text(encoding="utf-8"), encoding="utf-8")

pcweb/pages/docs/__init__.py

@@ -132,6 +132,8 @@ def get_components_from_metadata(current_doc):
 recipes_list = defaultdict(list)
 docs_ns = SimpleNamespace()
 
+doc_markdown_sources: dict[str, str] = {}
+
 
 def exec_blocks(doc, href):
     """Execute the exec and demo blocks in the document."""
@@ -273,15 +275,32 @@ def get_component_docgen(virtual_doc: str, actual_path: str, title: str):
     if virtual_doc.startswith("docs/library"):
         return handle_library_doc(virtual_doc, actual_path, title, resolved)
 
-    def comp(_actual=actual_path):
+    def comp(_actual=actual_path, _virtual=virtual_doc):
         toc = get_docgen_toc(_actual)
         doc_content = Path(_actual).read_text(encoding="utf-8")
-        rendered = render_docgen_document(_actual)
+        rendered = render_docgen_document(
+            virtual_filepath=_virtual, actual_filepath=_actual
+        )
         return ((toc, doc_content), rendered)
 
     return make_docpage(resolved.route, resolved.display_title, virtual_doc, comp)
 
 
+for fd in flexdown_docs:
+    if fd.endswith("-style.md") or fd.endswith("-ll.md"):
+        continue
+    route = doc_route_from_path(fd)
+    if not _check_whitelisted_path(route):
+        continue
+    doc_markdown_sources[route] = doc_path_mapping.get(fd, fd)
+for virtual_doc, actual_path in docgen_docs.items():
+    if virtual_doc.endswith("-style.md") or virtual_doc.endswith("-ll.md"):
+        continue
+    route = doc_route_from_path(virtual_doc)
+    if not _check_whitelisted_path(route):
+        continue
+    doc_markdown_sources[route] = actual_path
+
 doc_routes = [
     library,
     custom_components,

pcweb/pages/use_cases/common/features_1.py

@@ -12,19 +12,19 @@ def feature_card(
         rx.el.span(title, class_name="font-semibold text-slate-12 text-lg mt-2"),
         rx.el.p(
             description,
-            class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium",
+            class_name="text-secondary-11 text-sm font-medium",
         )
         if description
         else None,
         rx.el.ul(
             *[
                 rx.el.li(
                     item,
-                    class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium mt-1",
+                    class_name="text-secondary-11 text-sm font-medium mt-1",
                 )
                 for item in items
             ],
-            class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium list-disc list-inside",
+            class_name="text-secondary-11 text-sm font-medium list-disc list-inside",
         )
         if items
         else None,

pcweb/pages/use_cases/common/features_2.py

@@ -21,17 +21,17 @@ def feature_card(
         rx.el.span(title, class_name="font-semibold text-slate-12 text-lg mt-4"),
         rx.el.p(
             description,
-            class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium mt-2",
+            class_name="text-secondary-11 text-sm font-medium mt-2",
         ),
         rx.el.ul(
             *[
                 rx.el.li(
                     item,
-                    class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium mt-1",
+                    class_name="text-secondary-11 text-sm font-medium mt-1",
                 )
                 for item in items
             ],
-            class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium list-disc list-inside mt-2",
+            class_name="text-secondary-11 text-sm font-medium list-disc list-inside mt-2",
         )
         if items
         else None,

pcweb/pages/use_cases/common/final_section.py

@@ -14,14 +14,14 @@ def right_content(h1: str, description: str) -> rx.Component:
         ),
         rx.el.p(
             description,
-            class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium mt-2",
+            class_name="text-secondary-11 text-sm font-medium mt-2",
         ),
         ui.link(
             render_=ui.button(
                 "Go to the builder",
                 size="lg",
                 variant="outline",
-                class_name="w-fit font-semibold lg:mt-auto mt-8 text-m-slate-11 dark:text-m-slate-9 border-m-slate-5 dark:border-m-slate-12",
+                class_name="w-fit font-semibold lg:mt-auto mt-8 text-secondary-11 border-m-slate-5 dark:border-m-slate-12",
             ),
             to=REFLEX_BUILD_URL,
             target="_blank",
@@ -39,7 +39,7 @@ def left_content(h1: str, description: str) -> rx.Component:
         ),
         rx.el.p(
             description,
-            class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium",
+            class_name="text-secondary-11 text-sm font-medium",
         ),
         demo_form_dialog(
             trigger=ui.button(

pcweb/pages/use_cases/common/quote.py

@@ -16,15 +16,15 @@ def quote_card(
             ),
             rx.el.p(
                 description,
-                class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium",
+                class_name="text-secondary-11 text-sm font-medium",
             ),
             class_name="flex flex-col gap-6 border-b border-m-slate-4 dark:border-m-slate-12 p-10",
         ),
         rx.el.div(
             rx.el.p(quote, class_name="text-slate-12 text-lg font-semibold"),
             rx.el.p(
                 name,
-                class_name="text-m-slate-11 dark:text-m-slate-9 text-base font-medium",
+                class_name="text-secondary-11 text-base font-medium",
             ),
             class_name="flex flex-col gap-2 p-10",
         ),

pcweb/pages/use_cases/common/social_proof.py

@@ -8,11 +8,11 @@ def first_card(title: str) -> rx.Component:
     return rx.el.div(
         ui.icon(
             "CheckmarkBadge02Icon",
-            class_name="text-m-slate-11 dark:text-m-slate-9 shrink-0",
+            class_name="text-secondary-11 shrink-0",
         ),
         rx.el.span(
             title,
-            class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium text-wrap",
+            class_name="text-secondary-11 text-sm font-medium text-wrap",
         ),
         class_name="flex flex-row gap-2.5 items-center max-lg:justify-center lg:col-span-2 px-10 h-full max-lg:h-[10.75rem] max-lg:w-full lg:border-r border-b w-full",
     )

pcweb/pages/use_cases/common/stats.py

@@ -19,7 +19,7 @@ def stat_card(
         ),
         rx.el.p(
             description,
-            class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium",
+            class_name="text-secondary-11 text-sm font-medium",
         ),
         class_name="flex flex-col items-start p-10 gap-2 border-slate-3 lg:border-b lg:border-r",
     )

pcweb/pages/use_cases/consulting/views/social_proof.py

@@ -19,11 +19,11 @@ def first_card(title: str) -> rx.Component:
     return rx.el.div(
         ui.icon(
             "CheckmarkBadge02Icon",
-            class_name="text-m-slate-11 dark:text-m-slate-9 shrink-0",
+            class_name="text-secondary-11 shrink-0",
         ),
         rx.el.span(
             title,
-            class_name="text-m-slate-11 dark:text-m-slate-9 text-sm font-medium text-wrap",
+            class_name="text-secondary-11 text-sm font-medium text-wrap",
         ),
         class_name="flex flex-row gap-2.5 items-center max-lg:justify-center lg:col-span-2 px-10 h-full max-lg:h-[10.75rem] max-lg:w-full w-full lg:border-r",
     )