From 569aa83a8c86f4e5116c5c469ac411d1a7fb6171 Mon Sep 17 00:00:00 2001
From: Jan Potoms <2109932+Janpot@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:21:12 +0200
Subject: [PATCH] Exclude esm folder from icons alias (#2606)

---
 packages/toolpad-app/src/server/toolpadAppBuilder.ts      | 2 +-
 .../src/toolpad/propertyControls/NumberFormat.tsx         | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/toolpad-app/src/server/toolpadAppBuilder.ts b/packages/toolpad-app/src/server/toolpadAppBuilder.ts
index 8bd2f1ff58d..c3ac2fbb8ec 100644
--- a/packages/toolpad-app/src/server/toolpadAppBuilder.ts
+++ b/packages/toolpad-app/src/server/toolpadAppBuilder.ts
@@ -228,7 +228,7 @@ export function createViteConfig({
         alias: [
           {
             // FIXME(https://github.com/mui/material-ui/issues/35233)
-            find: /^@mui\/icons-material\/([^/]*)/,
+            find: /^@mui\/icons-material\/(?!esm\/)([^/]*)/,
             replacement: '@mui/icons-material/esm/$1',
           },
         ],
diff --git a/packages/toolpad-app/src/toolpad/propertyControls/NumberFormat.tsx b/packages/toolpad-app/src/toolpad/propertyControls/NumberFormat.tsx
index 047a0283e64..cbad4bf33d2 100644
--- a/packages/toolpad-app/src/toolpad/propertyControls/NumberFormat.tsx
+++ b/packages/toolpad-app/src/toolpad/propertyControls/NumberFormat.tsx
@@ -3,7 +3,7 @@ import { NumberFormat, NumberFormatEditor } from '@mui/toolpad-core/numberFormat
 import type { EditorProps } from '../../types';
 import PropertyControl from '../../components/PropertyControl';
 
-function GridColumnsPropEditor({
+function NumberFormatPropEditor({
   propType,
   label,
   value,
@@ -12,9 +12,11 @@ function GridColumnsPropEditor({
 }: EditorProps<NumberFormat>) {
   return (
     <PropertyControl propType={propType}>
-      <NumberFormatEditor label={label} disabled={disabled} value={value} onChange={onChange} />
+      <span>
+        <NumberFormatEditor label={label} disabled={disabled} value={value} onChange={onChange} />
+      </span>
     </PropertyControl>
   );
 }
 
-export default GridColumnsPropEditor;
+export default NumberFormatPropEditor;