Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

fix(nav): stop ⌘B pinning the ERP rail open with no way to tell

aashub7e0e92e3438
diff --git a/apps/erp/app/components/ShortcutHelp.tsx b/apps/erp/app/components/ShortcutHelp.tsx
index 42fa23a0e3..3dbb027cef 100644
--- a/apps/erp/app/components/ShortcutHelp.tsx
+++ b/apps/erp/app/components/ShortcutHelp.tsx
@@ -59,11 +59,6 @@ const ShortcutHelp = () => {
description: t`Confirm a dialog`,
group: general
},
- {
- shortcut: SHORTCUTS.sidebarToggle,
- description: t`Toggle the sidebar`,
- group: general
- },
{
shortcut: SHORTCUTS.help,
description: t`Show keyboard shortcuts`,
diff --git a/apps/erp/app/routes/x+/_layout.tsx b/apps/erp/app/routes/x+/_layout.tsx
index ca55ded063..abc1aef123 100644
--- a/apps/erp/app/routes/x+/_layout.tsx
+++ b/apps/erp/app/routes/x+/_layout.tsx
@@ -496,6 +496,7 @@ export default function AuthenticatedRoute() {
<TooltipProvider>
<SidebarProvider
defaultOpen={false}
+ keyboardShortcut={false}
className="h-screen min-h-0"
>
<PrimaryNavigation />
diff --git a/packages/locale/locales/de/erp.po b/packages/locale/locales/de/erp.po
index 64343a9317..ed840f760b 100644
--- a/packages/locale/locales/de/erp.po
+++ b/packages/locale/locales/de/erp.po
@@ -19002,9 +19002,6 @@ msgstr "Ebene umschalten"
msgid "Toggle Properties"
msgstr "Eigenschaften umschalten"
-msgid "Toggle the sidebar"
-msgstr "Seitenleiste umschalten"
-
msgid "Toggle views"
msgstr "Ansichten umschalten"
diff --git a/packages/locale/locales/en/erp.po b/packages/locale/locales/en/erp.po
index 2d01833972..e617c6fac0 100644
--- a/packages/locale/locales/en/erp.po
+++ b/packages/locale/locales/en/erp.po
@@ -19002,9 +19002,6 @@ msgstr "Toggle level"
msgid "Toggle Properties"
msgstr "Toggle Properties"
-msgid "Toggle the sidebar"
-msgstr "Toggle the sidebar"
-
msgid "Toggle views"
msgstr "Toggle views"
diff --git a/packages/locale/locales/es/erp.po b/packages/locale/locales/es/erp.po
index ec55f8128b..9a85f8a69d 100644
--- a/packages/locale/locales/es/erp.po
+++ b/packages/locale/locales/es/erp.po
@@ -19002,9 +19002,6 @@ msgstr "Alternar nivel"
msgid "Toggle Properties"
msgstr "Alternar Propiedades"
-msgid "Toggle the sidebar"
-msgstr "Alternar la barra lateral"
-
msgid "Toggle views"
msgstr "Alternar vistas"
diff --git a/packages/locale/locales/fr/erp.po b/packages/locale/locales/fr/erp.po
index 7e456acd75..221d6fb20e 100644
--- a/packages/locale/locales/fr/erp.po
+++ b/packages/locale/locales/fr/erp.po
@@ -19002,9 +19002,6 @@ msgstr "Basculer le niveau"
msgid "Toggle Properties"
msgstr "Basculer les propriétés"
-msgid "Toggle the sidebar"
-msgstr "Activer/désactiver la barre latérale"
-
msgid "Toggle views"
msgstr "Basculer les vues"
diff --git a/packages/locale/locales/hi/erp.po b/packages/locale/locales/hi/erp.po
index a2656438d2..fc29edbc8b 100644
--- a/packages/locale/locales/hi/erp.po
+++ b/packages/locale/locales/hi/erp.po
@@ -19002,9 +19002,6 @@ msgstr "स्तर टॉगल करें"
msgid "Toggle Properties"
msgstr "गुण टॉगल करें"
-msgid "Toggle the sidebar"
-msgstr "साइडबार को टॉगल करें"
-
msgid "Toggle views"
msgstr "दृश्य टॉगल करें"
diff --git a/packages/locale/locales/it/erp.po b/packages/locale/locales/it/erp.po
index 81d619798e..8db771a05e 100644
--- a/packages/locale/locales/it/erp.po
+++ b/packages/locale/locales/it/erp.po
@@ -19002,9 +19002,6 @@ msgstr "Attiva/disattiva livello"
msgid "Toggle Properties"
msgstr "Attiva/Disattiva Proprietà"
-msgid "Toggle the sidebar"
-msgstr "Attiva/disattiva la barra laterale"
-
msgid "Toggle views"
msgstr "Attiva/disattiva visualizzazioni"
diff --git a/packages/locale/locales/ja/erp.po b/packages/locale/locales/ja/erp.po
index 5e3f47000b..cdd25a6bf3 100644
--- a/packages/locale/locales/ja/erp.po
+++ b/packages/locale/locales/ja/erp.po
@@ -19002,9 +19002,6 @@ msgstr "レベルを切り替え"
msgid "Toggle Properties"
msgstr "プロパティを切り替え"
-msgid "Toggle the sidebar"
-msgstr "サイドバーの表示/非表示を切り替える"
-
msgid "Toggle views"
msgstr "ビューを切り替える"
diff --git a/packages/locale/locales/ko/erp.po b/packages/locale/locales/ko/erp.po
index cd3d5ca459..4073b1303e 100644
--- a/packages/locale/locales/ko/erp.po
+++ b/packages/locale/locales/ko/erp.po
@@ -19002,9 +19002,6 @@ msgstr "레벨 전환"
msgid "Toggle Properties"
msgstr "속성 전환"
-msgid "Toggle the sidebar"
-msgstr "사이드바 토글"
-
msgid "Toggle views"
msgstr "보기 전환"
diff --git a/packages/locale/locales/pl/erp.po b/packages/locale/locales/pl/erp.po
index 9785d3f4dc..0bda265cc3 100644
--- a/packages/locale/locales/pl/erp.po
+++ b/packages/locale/locales/pl/erp.po
@@ -19002,9 +19002,6 @@ msgstr "Przełącz poziom"
msgid "Toggle Properties"
msgstr "Przełącz właściwości"
-msgid "Toggle the sidebar"
-msgstr "Przełącz pasek boczny"
-
msgid "Toggle views"
msgstr "Przełącz widoki"
diff --git a/packages/locale/locales/pt/erp.po b/packages/locale/locales/pt/erp.po
index a2915e3273..b7fc40bdf7 100644
--- a/packages/locale/locales/pt/erp.po
+++ b/packages/locale/locales/pt/erp.po
@@ -19002,9 +19002,6 @@ msgstr "Alternar nível"
msgid "Toggle Properties"
msgstr "Alternar Propriedades"
-msgid "Toggle the sidebar"
-msgstr "Alternar a barra lateral"
-
msgid "Toggle views"
msgstr "Alternar visualizações"
diff --git a/packages/locale/locales/ru/erp.po b/packages/locale/locales/ru/erp.po
index 15c1fe4ca8..aa959908c0 100644
--- a/packages/locale/locales/ru/erp.po
+++ b/packages/locale/locales/ru/erp.po
@@ -19002,9 +19002,6 @@ msgstr "Переключить уровень"
msgid "Toggle Properties"
msgstr "Переключить свойства"
-msgid "Toggle the sidebar"
-msgstr "Переключить боковую панель"
-
msgid "Toggle views"
msgstr "Переключить представления"
diff --git a/packages/locale/locales/tr/erp.po b/packages/locale/locales/tr/erp.po
index 0e6e1f637b..286298644b 100644
--- a/packages/locale/locales/tr/erp.po
+++ b/packages/locale/locales/tr/erp.po
@@ -19002,9 +19002,6 @@ msgstr "Seviye değiştir"
msgid "Toggle Properties"
msgstr "Özellikleri Aç/Kapat"
-msgid "Toggle the sidebar"
-msgstr "Kenar çubuğunu aç/kapat"
-
msgid "Toggle views"
msgstr "Görünümleri değiştir"
diff --git a/packages/locale/locales/zh/erp.po b/packages/locale/locales/zh/erp.po
index 6d17e62be7..bce3337707 100644
--- a/packages/locale/locales/zh/erp.po
+++ b/packages/locale/locales/zh/erp.po
@@ -19002,9 +19002,6 @@ msgstr "切换级别"
msgid "Toggle Properties"
msgstr "切换属性"
-msgid "Toggle the sidebar"
-msgstr "切换侧边栏"
-
msgid "Toggle views"
msgstr "切换视图"
diff --git a/packages/react/AGENTS.md b/packages/react/AGENTS.md
index 5c6725dbae..430eac6623 100644
--- a/packages/react/AGENTS.md
+++ b/packages/react/AGENTS.md
@@ -41,7 +41,7 @@ import { Button, Card, HStack, VStack, IconButton, cn } from "@carbon/react";
- **Choice screens**: `ChoiceCardGroup` (card radios, `autoFocus` focuses the selected card) and `RadioGroupButton` (radio styled as a secondary Button) give one tab stop + arrow-key select; Enter stays free for the screen's continue action
- **Layout**: `VStack` / `HStack` with numeric `spacing` prop (maps to `space-y-*`/`space-x-*`)
- **Overlays**: `Drawer`, `Modal`, `ModalDrawer` (unified drawer/modal), `BottomSheet`, `Popover`
-- **App nav**: `NavRail` is the primary left nav of both the ERP and MES shells (56px icon rail, expands after a 150ms mouse hover or when pinned via `SidebarProvider`/⌘B, left drawer below md that closes itself on navigation). Optional `header` (use `NavRailBrand` for a logo + name) and `footer` slots; `NavRailGroup` adds a titled section that shows as a divider while collapsed. Entries are `NavRailItem` (a button, or `asChild` for a trigger/link) and `NavRailLink`; `label` is a string and doubles as the accessible name. A Radix menu/popover opened from a `NavRailItem` keeps the rail as it was (open or collapsed) until it closes. Render inside `SidebarProvider`; the shadcn-style `Sidebar*` primitives remain for other layouts
+- **App nav**: `NavRail` is the primary left nav of both the ERP and MES shells (56px icon rail, expands after a 150ms mouse hover or when pinned via `SidebarProvider` (⌘B unless `keyboardShortcut={false}`, as in the ERP), left drawer below md that closes itself on navigation). Optional `header` (use `NavRailBrand` for a logo + name) and `footer` slots; `NavRailGroup` adds a titled section that shows as a divider while collapsed. Entries are `NavRailItem` (a button, or `asChild` for a trigger/link) and `NavRailLink`; `label` is a string and doubles as the accessible name. A Radix menu/popover opened from a `NavRailItem` keeps the rail as it was (open or collapsed) until it closes. Render inside `SidebarProvider`; the shadcn-style `Sidebar*` primitives remain for other layouts
- **Data**: `Table` (TanStack), chart components via sub-exports (`@carbon/react/Chart`)
- **Rich text**: `@carbon/react/Editor` and `@carbon/react/RichText` (wraps `@carbon/tiptap`)
- **Error boundary**: `@carbon/react/ErrorBoundary` — `RootErrorBoundary` (drop-in root `ErrorBoundary` for RR v7 that maps 404 / other HTTP / thrown `Error` to a styled screen) plus its parts (`ErrorScreen`, `GlitchHeading`, `StatusReadout`, `MagneticLink`, `NoiseOverlay`). Wrap it in the app's `Document` and pass `env` so `window.env` is set (the client crashes hydration otherwise). Copy is intentionally hardcoded English, not i18n.
diff --git a/packages/react/src/NavRail.tsx b/packages/react/src/NavRail.tsx
index 9b7d96cfca..9f9eb11d93 100644
--- a/packages/react/src/NavRail.tsx
+++ b/packages/react/src/NavRail.tsx
@@ -41,7 +41,7 @@ export const navRailItemClasses = [
/**
* The primary left navigation shared by the ERP and MES app shells: a 56px
* icon rail that grows to 208px while a mouse hovers it or while it is pinned
- * open (⌘B / a `SidebarTrigger`), and a left drawer below `md`. Open state
+ * open (a `SidebarTrigger`, or ⌘B where the provider binds it), and a left drawer below `md`. Open state
* comes from `SidebarProvider`, so it must be rendered inside one.
*/
// A pointer only passing over the rail (on its way to the page) shouldn't open it.
diff --git a/packages/react/src/Sidebar.tsx b/packages/react/src/Sidebar.tsx
index f6411e5841..0772dc0dd9 100644
--- a/packages/react/src/Sidebar.tsx
+++ b/packages/react/src/Sidebar.tsx
@@ -59,6 +59,8 @@ const SidebarProvider = React.forwardRef<
open?: boolean;
onOpenChange?: (open: boolean) => void;
touch?: boolean;
+ /** Bind ⌘B to toggle the sidebar. */
+ keyboardShortcut?: boolean;
}
>(
(
@@ -67,6 +69,7 @@ const SidebarProvider = React.forwardRef<
open: openProp,
onOpenChange: setOpenProp,
touch = false,
+ keyboardShortcut = true,
className,
style,
children,
@@ -110,7 +113,8 @@ const SidebarProvider = React.forwardRef<
action: (event) => {
event.preventDefault();
toggleSidebar();
- }
+ },
+ disabled: !keyboardShortcut
});
// We add a state so that we can do data-state="expanded" or "collapsed".