diff --git a/web/package.json b/web/package.json index 5d3c1390..4256b68b 100644 --- a/web/package.json +++ b/web/package.json @@ -47,9 +47,9 @@ "mdast-util-from-markdown": "^2.0.3", "mdast-util-gfm": "^3.1.0", "mermaid": "^11.14.0", + "micromark-extension-gfm": "^3.0.0", "micromark-util-decode-string": "^2.0.1", "micromark-util-normalize-identifier": "^2.0.1", - "micromark-extension-gfm": "^3.0.0", "react": "^19.2.6", "react-dom": "^19.2.6", "react-hot-toast": "^2.6.0", @@ -64,8 +64,11 @@ "remark-breaks": "^4.0.0", "remark-gfm": "^4.0.1", "remark-math": "^6.0.0", + "remark-parse": "^11.0.0", + "remark-rehype": "^11.1.2", "tailwind-merge": "^3.5.0", "tailwindcss": "^4.2.4", + "unified": "^11.0.5", "unist-util-visit": "^5.1.0" }, "devDependencies": { diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index e6f04876..7d92b97f 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -152,12 +152,21 @@ importers: remark-math: specifier: ^6.0.0 version: 6.0.0 + remark-parse: + specifier: ^11.0.0 + version: 11.0.0 + remark-rehype: + specifier: ^11.1.2 + version: 11.1.2 tailwind-merge: specifier: ^3.5.0 version: 3.5.0 tailwindcss: specifier: ^4.2.4 version: 4.2.4 + unified: + specifier: ^11.0.5 + version: 11.0.5 unist-util-visit: specifier: ^5.1.0 version: 5.1.0 diff --git a/web/src/components/AppSidebar/AppSidebar.tsx b/web/src/components/AppSidebar/AppSidebar.tsx index c750b54a..d6a85a2b 100644 --- a/web/src/components/AppSidebar/AppSidebar.tsx +++ b/web/src/components/AppSidebar/AppSidebar.tsx @@ -249,7 +249,7 @@ const CollectionSidebarContent = ({ context }: { context: MemoStatsContext }) => setMobileOpen(false)} /> {showViews && } - setMobileOpen(false)} /> + setMobileOpen(false)} /> ); }; diff --git a/web/src/components/AppSidebar/TagsSection.tsx b/web/src/components/AppSidebar/TagsSection.tsx index 6a6ab9c2..4ee450a8 100644 --- a/web/src/components/AppSidebar/TagsSection.tsx +++ b/web/src/components/AppSidebar/TagsSection.tsx @@ -15,6 +15,8 @@ interface Props { onSelect?: () => void; /** When set, tag clicks land on this route with the tag filter instead of filtering the current one. */ navigationTarget?: string; + /** Whose tags these are; keeps tree expansion state from bleeding between users and views. */ + scope: string; } const TagPath = forwardRef(({ tag }, ref) => { @@ -58,7 +60,7 @@ const FlatTagRow = ({ tag, amount, active, onClick }: FlatTagRowProps) => { ); }; -const TagsSection = ({ tagCount, onSelect, navigationTarget }: Props) => { +const TagsSection = ({ tagCount, onSelect, navigationTarget, scope }: Props) => { const t = useTranslate(); const navigate = useNavigate(); const { filters, setFilters, getFiltersByFactor, addFilter, removeFilter } = useMemoFilterContext(); @@ -123,7 +125,7 @@ const TagsSection = ({ tagCount, onSelect, navigationTarget }: Props) => { {treeMode ? ( - + ) : (
{tags.map(([tag, amount]) => ( diff --git a/web/src/components/CreateIdentityProviderDialog.tsx b/web/src/components/CreateIdentityProviderDialog.tsx index 961441fa..76187d67 100644 --- a/web/src/components/CreateIdentityProviderDialog.tsx +++ b/web/src/components/CreateIdentityProviderDialog.tsx @@ -241,7 +241,9 @@ function FormField({ children: ReactNode; }) { return ( -
+ // flex gap, not space-y: fields wrap Select triggers, whose focus guards would otherwise + // pick up the stack's margin and shift the field while the popup is open (see ui/popup.ts). +