From 7a254a9412f444032214f72e03b8fd368789f6b0 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Fri, 24 Apr 2026 02:15:08 +0100
Subject: [PATCH] feat(base): redesign formula editor popover with polished
 header, pills, and accordion

---
 .../components/formula/formula-editor.tsx     | 177 ++++++++++++++----
 .../base/components/formula/formula-input.tsx |  53 +++---
 .../components/formula/function-palette.tsx   |  90 ++++++---
 .../components/formula/property-chip-row.tsx  |  68 +++++--
 .../property/create-property-popover.tsx      |   3 +-
 5 files changed, 292 insertions(+), 99 deletions(-)

diff --git a/apps/client/src/features/base/components/formula/formula-editor.tsx b/apps/client/src/features/base/components/formula/formula-editor.tsx
index b786e35b6..5f32e87db 100644
--- a/apps/client/src/features/base/components/formula/formula-editor.tsx
+++ b/apps/client/src/features/base/components/formula/formula-editor.tsx
@@ -1,5 +1,18 @@
 import { useState } from "react";
-import { Button, Divider, Group, Paper, Stack, Text } from "@mantine/core";
+import {
+  Button,
+  Divider,
+  Group,
+  Kbd,
+  Paper,
+  Stack,
+  Text,
+} from "@mantine/core";
+import {
+  IconAlertTriangle,
+  IconMathFunction,
+  IconPointFilled,
+} from "@tabler/icons-react";
 import { registry } from "@docmost/base-formula/client";
 import { FormulaInput } from "./formula-input";
 import { PropertyChipRow } from "./property-chip-row";
@@ -11,6 +24,7 @@ type Props = {
   properties: IBaseProperty[];
   editingPropertyId: string | null;
   initialSource?: string;
+  name?: string;
   onSave: (
     source: string,
     ast: unknown,
@@ -24,6 +38,7 @@ export function FormulaEditor({
   properties,
   editingPropertyId,
   initialSource = "",
+  name,
   onSave,
   onCancel,
 }: Props) {
@@ -35,48 +50,136 @@ export function FormulaEditor({
     registry,
   );
   const canSave = parseState.state === "ok";
-
   const insertAtEnd = (snippet: string) =>
     setSource((s) => `${s}${s ? " " : ""}${snippet}`);
 
   return (
-    <Paper p="md" withBorder>
-      <Stack gap="sm">
-        <Text fw={500}>Formula</Text>
-        <FormulaInput
-          value={source}
-          onChange={setSource}
-          error={parseState.state === "error" ? parseState : undefined}
-          resultType={parseState.state === "ok" ? parseState.resultType : undefined}
-        />
-        <Divider />
-        <Text size="sm" c="dimmed">Properties</Text>
-        <PropertyChipRow
-          properties={properties.filter((p) => p.id !== editingPropertyId)}
-          onInsert={(name) => insertAtEnd(`prop("${name}")`)}
-        />
-        <Divider />
-        <Text size="sm" c="dimmed">Functions</Text>
-        <FunctionPalette
-          registry={registry}
-          onInsert={(name) => insertAtEnd(`${name}()`)}
-        />
-        <Group justify="flex-end">
-          <Button variant="subtle" onClick={onCancel}>Cancel</Button>
-          <Button
-            disabled={!canSave}
-            onClick={() => {
-              if (parseState.state !== "ok") return;
-              onSave(
-                source,
-                parseState.ast,
-                parseState.resultType,
-                parseState.dependencies,
-              );
+    <Paper
+      withBorder
+      radius="md"
+      shadow="sm"
+      p={0}
+      style={{ overflow: "hidden" }}
+    >
+      <Stack gap={0}>
+        <Group
+          gap={10}
+          px="md"
+          py={12}
+          style={{
+            borderBottom: "1px solid var(--mantine-color-gray-2)",
+          }}
+        >
+          <div
+            style={{
+              width: 22,
+              height: 22,
+              borderRadius: 5,
+              display: "grid",
+              placeItems: "center",
+              background: "var(--mantine-color-blue-0)",
+              color: "var(--mantine-color-blue-6)",
             }}
           >
-            Save
-          </Button>
+            <IconMathFunction size={14} />
+          </div>
+          <Text size="sm" fw={600}>
+            Formula
+          </Text>
+          {name && (
+            <Text size="sm" c="dimmed">
+              · {name}
+            </Text>
+          )}
+        </Group>
+
+        <Stack gap={8} px="md" py="sm">
+          <FormulaInput
+            value={source}
+            onChange={setSource}
+            hasError={parseState.state === "error"}
+          />
+          <Group justify="space-between" gap={8} mih={18}>
+            {parseState.state === "error" ? (
+              <Group gap={6} c="red.7">
+                <IconAlertTriangle size={12} />
+                <Text size="xs">{parseState.message}</Text>
+              </Group>
+            ) : parseState.state === "ok" ? (
+              <Group gap={6} c="dimmed">
+                <IconPointFilled size={10} color="var(--mantine-color-teal-6)" />
+                <Text size="xs">
+                  Returns{" "}
+                  <Text span fw={600} c="gray.8">
+                    {parseState.resultType}
+                  </Text>
+                </Text>
+              </Group>
+            ) : (
+              <Text size="xs" c="dimmed">
+                Click a property or function below to insert.
+              </Text>
+            )}
+          </Group>
+        </Stack>
+
+        <Divider />
+
+        <Stack gap={10} px="md" py="sm">
+          <PropertyChipRow
+            properties={properties.filter((p) => p.id !== editingPropertyId)}
+            onInsert={(name) => insertAtEnd(`prop("${name}")`)}
+          />
+        </Stack>
+
+        <Divider />
+
+        <Stack gap={8} px="md" py="sm">
+          <Text size="xs" fw={600} c="gray.7">
+            Functions
+          </Text>
+          <FunctionPalette
+            registry={registry}
+            onInsert={(name) => insertAtEnd(`${name}()`)}
+          />
+        </Stack>
+
+        <Group
+          justify="space-between"
+          px="md"
+          py={10}
+          style={{
+            borderTop: "1px solid var(--mantine-color-gray-2)",
+            background: "var(--mantine-color-gray-0)",
+          }}
+        >
+          <Group gap={6}>
+            <Kbd>⌘</Kbd>
+            <Kbd>↵</Kbd>
+            <Text size="xs" c="dimmed">
+              to save
+            </Text>
+          </Group>
+          <Group gap={8}>
+            <Button variant="subtle" size="xs" onClick={onCancel}>
+              Cancel
+            </Button>
+            <Button
+              size="xs"
+              disabled={!canSave}
+              onClick={() => {
+                if (parseState.state !== "ok") return;
+                onSave(
+                  source,
+                  parseState.ast,
+                  parseState.resultType,
+                  parseState.dependencies,
+                );
+              }}
+            >
+              Save
+            </Button>
+          </Group>
         </Group>
       </Stack>
     </Paper>
diff --git a/apps/client/src/features/base/components/formula/formula-input.tsx b/apps/client/src/features/base/components/formula/formula-input.tsx
index e165c8f17..11c3c12c0 100644
--- a/apps/client/src/features/base/components/formula/formula-input.tsx
+++ b/apps/client/src/features/base/components/formula/formula-input.tsx
@@ -1,35 +1,36 @@
-import { Textarea, Text } from "@mantine/core";
+import { Textarea } from "@mantine/core";
 
 type Props = {
   value: string;
   onChange: (v: string) => void;
-  error?: { message: string; span?: { start: number; end: number } };
-  resultType?: string;
+  hasError?: boolean;
 };
 
-export function FormulaInput({ value, onChange, error, resultType }: Props) {
+export function FormulaInput({ value, onChange, hasError }: Props) {
   return (
-    <div>
-      <Textarea
-        autosize
-        minRows={3}
-        maxRows={8}
-        value={value}
-        onChange={(e) => onChange(e.currentTarget.value)}
-        styles={{ input: { fontFamily: "ui-monospace, monospace", fontSize: 13 } }}
-        placeholder='prop("Price") * prop("Qty")'
-      />
-      {error && (
-        <Text size="xs" c="red.7" mt="xs">
-          {error.message}
-          {error.span ? ` (col ${error.span.start + 1})` : null}
-        </Text>
-      )}
-      {!error && resultType && (
-        <Text size="xs" c="dimmed" mt="xs">
-          Returns: {resultType}
-        </Text>
-      )}
-    </div>
+    <Textarea
+      autosize
+      minRows={3}
+      maxRows={8}
+      value={value}
+      onChange={(e) => onChange(e.currentTarget.value)}
+      placeholder='prop("Price") * prop("Qty")'
+      styles={{
+        input: {
+          fontFamily:
+            "ui-monospace, SFMono-Regular, Menlo, 'JetBrains Mono', monospace",
+          fontSize: 13,
+          lineHeight: 1.65,
+          backgroundColor: "var(--mantine-color-gray-0)",
+          borderColor: hasError
+            ? "var(--mantine-color-red-6)"
+            : "var(--mantine-color-blue-6)",
+          borderWidth: 1.5,
+          boxShadow: hasError
+            ? "0 0 0 3px var(--mantine-color-red-1)"
+            : "0 0 0 3px var(--mantine-color-blue-1)",
+        },
+      }}
+    />
   );
 }
diff --git a/apps/client/src/features/base/components/formula/function-palette.tsx b/apps/client/src/features/base/components/formula/function-palette.tsx
index 690456add..7370bbf8f 100644
--- a/apps/client/src/features/base/components/formula/function-palette.tsx
+++ b/apps/client/src/features/base/components/formula/function-palette.tsx
@@ -1,4 +1,11 @@
-import { Accordion, Badge, Group, Tooltip } from "@mantine/core";
+import { useState } from "react";
+import {
+  Accordion,
+  Group,
+  Text,
+  Tooltip,
+  UnstyledButton,
+} from "@mantine/core";
 import type { FormulaFn } from "@docmost/base-formula/client";
 
 const CATEGORIES = ["logic", "math", "string", "date", "coercion"] as const;
@@ -10,33 +17,72 @@ export function FunctionPalette({
   registry: ReadonlyMap<string, FormulaFn>;
   onInsert: (name: string) => void;
 }) {
+  const [open, setOpen] = useState<string | null>("logic");
+
   const byCat = new Map<string, FormulaFn[]>();
   for (const fn of registry.values()) {
     if (!byCat.has(fn.category)) byCat.set(fn.category, []);
     byCat.get(fn.category)!.push(fn);
   }
+
   return (
-    <Accordion multiple>
-      {CATEGORIES.map((cat) => (
-        <Accordion.Item key={cat} value={cat}>
-          <Accordion.Control>{cat}</Accordion.Control>
-          <Accordion.Panel>
-            <Group gap={4}>
-              {(byCat.get(cat) ?? []).map((fn) => (
-                <Tooltip key={fn.name} label={fn.doc}>
-                  <Badge
-                    variant="outline"
-                    style={{ cursor: "pointer" }}
-                    onClick={() => onInsert(fn.name)}
-                  >
-                    {fn.name}
-                  </Badge>
-                </Tooltip>
-              ))}
-            </Group>
-          </Accordion.Panel>
-        </Accordion.Item>
-      ))}
+    <Accordion
+      value={open}
+      onChange={setOpen}
+      variant="contained"
+      radius="md"
+      styles={{
+        item: { borderColor: "var(--mantine-color-gray-3)" },
+        control: { padding: "9px 12px" },
+        label: { fontSize: 13, fontWeight: 500, textTransform: "capitalize" },
+        content: { padding: "8px 10px 12px" },
+      }}
+    >
+      {CATEGORIES.map((cat) => {
+        const fns = byCat.get(cat) ?? [];
+        return (
+          <Accordion.Item key={cat} value={cat}>
+            <Accordion.Control>
+              <Group gap={8}>
+                <span>{cat}</span>
+                <Text size="xs" c="dimmed" ff="monospace">
+                  {fns.length}
+                </Text>
+              </Group>
+            </Accordion.Control>
+            <Accordion.Panel>
+              <Group gap={6}>
+                {fns.map((fn) => (
+                  <Tooltip key={fn.name} label={fn.doc} withArrow>
+                    <UnstyledButton
+                      onClick={() => onInsert(fn.name)}
+                      style={{
+                        display: "inline-flex",
+                        alignItems: "center",
+                        gap: 3,
+                        padding: "3px 9px",
+                        borderRadius: 5,
+                        fontFamily:
+                          "ui-monospace, SFMono-Regular, Menlo, 'JetBrains Mono', monospace",
+                        fontSize: 12.5,
+                        color: "var(--mantine-color-blue-7)",
+                        background: "var(--mantine-color-white)",
+                        border: "1px solid var(--mantine-color-gray-3)",
+                        cursor: "pointer",
+                      }}
+                    >
+                      {fn.name}
+                      <span style={{ color: "var(--mantine-color-gray-5)" }}>
+                        ()
+                      </span>
+                    </UnstyledButton>
+                  </Tooltip>
+                ))}
+              </Group>
+            </Accordion.Panel>
+          </Accordion.Item>
+        );
+      })}
     </Accordion>
   );
 }
diff --git a/apps/client/src/features/base/components/formula/property-chip-row.tsx b/apps/client/src/features/base/components/formula/property-chip-row.tsx
index ab90e7bc0..ec545ad3d 100644
--- a/apps/client/src/features/base/components/formula/property-chip-row.tsx
+++ b/apps/client/src/features/base/components/formula/property-chip-row.tsx
@@ -1,4 +1,6 @@
-import { Badge, Group } from "@mantine/core";
+import { useState, useMemo } from "react";
+import { Group, TextInput, UnstyledButton, Text } from "@mantine/core";
+import { IconSearch } from "@tabler/icons-react";
 import type { IBaseProperty } from "@/features/base/types/base.types";
 
 export function PropertyChipRow({
@@ -8,18 +10,58 @@ export function PropertyChipRow({
   properties: IBaseProperty[];
   onInsert: (name: string) => void;
 }) {
+  const [query, setQuery] = useState("");
+
+  const visible = useMemo(() => {
+    const q = query.trim().toLowerCase();
+    if (!q) return properties;
+    return properties.filter((p) => p.name.toLowerCase().includes(q));
+  }, [properties, query]);
+
   return (
-    <Group gap={4}>
-      {properties.map((p) => (
-        <Badge
-          key={p.id}
-          variant="light"
-          style={{ cursor: "pointer" }}
-          onClick={() => onInsert(p.name)}
-        >
-          {p.name}
-        </Badge>
-      ))}
-    </Group>
+    <div>
+      <Group justify="space-between" mb={8}>
+        <Text size="xs" fw={600} c="gray.7">
+          Properties
+        </Text>
+        <TextInput
+          size="xs"
+          placeholder="Search"
+          leftSection={<IconSearch size={12} />}
+          value={query}
+          onChange={(e) => setQuery(e.currentTarget.value)}
+          w={140}
+        />
+      </Group>
+      {visible.length === 0 ? (
+        <Text size="xs" c="dimmed" py={6}>
+          No matches.
+        </Text>
+      ) : (
+        <Group gap={6}>
+          {visible.map((p) => (
+            <UnstyledButton
+              key={p.id}
+              onClick={() => onInsert(p.name)}
+              style={{
+                display: "inline-flex",
+                alignItems: "center",
+                padding: "3px 9px",
+                borderRadius: 6,
+                fontSize: 12.5,
+                fontWeight: 500,
+                lineHeight: 1.4,
+                background: "var(--mantine-color-blue-0)",
+                border: "1px solid var(--mantine-color-blue-2)",
+                color: "var(--mantine-color-blue-7)",
+                cursor: "pointer",
+              }}
+            >
+              {p.name}
+            </UnstyledButton>
+          ))}
+        </Group>
+      )}
+    </div>
   );
 }
diff --git a/apps/client/src/features/base/components/property/create-property-popover.tsx b/apps/client/src/features/base/components/property/create-property-popover.tsx
index 33d87891e..76ecf54ff 100644
--- a/apps/client/src/features/base/components/property/create-property-popover.tsx
+++ b/apps/client/src/features/base/components/property/create-property-popover.tsx
@@ -206,7 +206,7 @@ export function CreatePropertyPopover({ baseId, properties, onPropertyCreated }:
         onClose={noop}
         position="bottom-start"
         shadow="md"
-        width={320}
+        width={selectedType === "formula" ? 460 : 320}
         withinPortal
       >
         <Popover.Target>
@@ -246,6 +246,7 @@ export function CreatePropertyPopover({ baseId, properties, onPropertyCreated }:
               <FormulaEditor
                 properties={properties ?? []}
                 editingPropertyId={null}
+                name={name.trim() || undefined}
                 onCancel={handleBackToTypePicker}
                 onSave={(source, ast, resultType, dependencies) => {
                   createPropertyMutation.mutate(