Merge remote-tracking branch 'refs/remotes/origin/feat/new-admin-ui' …

…into feat/container # Conflicts: # packages/admin-ui/src/Grid/Grid.tsx # packages/admin-ui/src/index.ts # packages/ui/src/Grid/Grid.tsx
webiny · Nov 21, 2024 · 90d0c94 · 90d0c94
2 parents b338f6c + cafeb1d
commit 90d0c94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/packages/admin-ui/src/Grid/Grid.tsx b/packages/admin-ui/src/Grid/Grid.tsx
@@ -64,9 +64,9 @@ const ColumnBase = React.forwardRef<HTMLDivElement, ColumnProps>(
     }
 );
 
-ColumnBase.displayName = "Col";
+ColumnBase.displayName = "Column";
 
-const Column = makeDecoratable("Col", ColumnBase);
+const Column = makeDecoratable("Column", ColumnBase);
 
 const gridVariants = cva("grid", {
     variants: {

diff --git a/packages/ui/src/Grid/Grid.tsx b/packages/ui/src/Grid/Grid.tsx
@@ -21,14 +21,14 @@ export type CellProps = RmwcGridCellProps & {
 export const Cell = (props: CellProps) => {
     const { children, style, className, align } = props;
     return (
-        <AdminUiGrid.Col
+        <AdminUiGrid.Column
             className={className}
             style={style}
             span={props.span as AdminUiColumnProps["span"]}
             align={align}
         >
             {children}
-        </AdminUiGrid.Col>
+        </AdminUiGrid.Column>
     );
 };
 
@@ -68,7 +68,7 @@ export const Grid = (props: GridProps) => {
 
     return (
         <AdminUiGrid className={className} style={style}>
-            {children as React.ReactElement<AdminUiColumnProps, typeof AdminUiGrid.Col>}
+            {children as React.ReactElement<AdminUiColumnProps, typeof AdminUiGrid.Column>}
         </AdminUiGrid>
     );
 };
diff --git a/yarn.lock b/yarn.lock
@@ -2414,20 +2414,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.23.0":
-  version: 7.26.2
-  resolution: "@babel/generator@npm:7.26.2"
-  dependencies:
-    "@babel/parser": ^7.26.2
-    "@babel/types": ^7.26.0
-    "@jridgewell/gen-mapping": ^0.3.5
-    "@jridgewell/trace-mapping": ^0.3.25
-    jsesc: ^3.0.2
-  checksum: 6ff850b7d6082619f8c2f518d993cf7254cfbaa20b026282cbef5c9b2197686d076a432b18e36c4d1a42721c016df4f77a8f62c67600775d9683621d534b91b4
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.25.9, @babel/generator@npm:^7.26.0":
+"@babel/generator@npm:^7.23.0, @babel/generator@npm:^7.25.9, @babel/generator@npm:^7.26.0":
   version: 7.26.2
   resolution: "@babel/generator@npm:7.26.2"
   dependencies: