diff --git a/packages/layout/src/components/GridContent/index.tsx b/packages/layout/src/components/GridContent/index.tsx index b566f2a1faad..061f2ef55aeb 100644 --- a/packages/layout/src/components/GridContent/index.tsx +++ b/packages/layout/src/components/GridContent/index.tsx @@ -25,7 +25,7 @@ const GridContent: React.FC = (props) => { const value = useContext(RouteContext); const { children, - contentWidth: propsContentWidth, + contentWidth: propsContentWidth = 'Fluid', className: propsClassName, style, } = props; @@ -35,7 +35,7 @@ const GridContent: React.FC = (props) => { const contentWidth = propsContentWidth || value.contentWidth; const className = `${prefixCls}-grid-content`; const { wrapSSR, hashId } = useStyle(className); - const isWide = contentWidth === 'Fixed'; + const isWide = contentWidth !== 'Fixed'; return wrapSSR(
๐Ÿ“ธ renders ./packages/card/src/demos/basic.tsx correctly
+
+
+
+
+
+ ๅธฆๅก็‰‡้˜ดๅฝฑ +
+ + + + + +
+
+
+ extra +
+
+
+
+ Card content +
+
+ Card content +
+
+ Card content +
+
+
๐Ÿ“ธ renders ./packages/field/src/demos/base.tsx correctl style="margin-right: 8px;" > - ๏ผŠ ๏ผŠ ๏ผŠ ๏ผŠ ๏ผŠ + ************************
๐Ÿด read and plain 1`] = ` style="margin-right: 8px;" > - ๏ผŠ ๏ผŠ ๏ผŠ ๏ผŠ ๏ผŠ + ************************
๐Ÿด read ant no plain 1`] = ` style="margin-right: 8px;" > - ๏ผŠ ๏ผŠ ๏ผŠ ๏ผŠ ๏ผŠ + ************************
{ const html = render( , ); - await html.findByText('๏ผŠ ๏ผŠ ๏ผŠ ๏ผŠ ๏ผŠ'); + await html.findByText('************************'); act(() => { fireEvent.click( diff --git a/tests/form/__snapshots__/demo.test.ts.snap b/tests/form/__snapshots__/demo.test.ts.snap index 81c4d7ee4f77..e4566b16d6bc 100644 --- a/tests/form/__snapshots__/demo.test.ts.snap +++ b/tests/form/__snapshots__/demo.test.ts.snap @@ -47992,13 +47992,14 @@ exports[`form demos > ๐Ÿ“ธ renders ./packages/form/src/demos/layout-footer.tsx c
๐Ÿ“ธ renders ./packages/form/src/demos/layout-footer.tsx c
diff --git a/tests/layout/__snapshots__/demo.test.ts.snap b/tests/layout/__snapshots__/demo.test.ts.snap index ce8d5ea1cfec..f359e3ae770a 100644 --- a/tests/layout/__snapshots__/demo.test.ts.snap +++ b/tests/layout/__snapshots__/demo.test.ts.snap @@ -287,13 +287,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/components/PageContai
๐Ÿ“ธ renders ./packages/layout/src/components/PageContai
๐Ÿ“ธ renders ./packages/layout/src/components/PageContai
๐Ÿ“ธ renders ./packages/layout/src/components/PageContai
๐Ÿ“ธ renders ./packages/layout/src/components/PageContai
๐Ÿ“ธ renders ./packages/layout/src/components/PageContai
๐Ÿ“ธ renders ./packages/layout/src/components/PageContai style="background: rgb(245, 247, 250);" > +
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ + + + + +
+
+ + + + + +
+
+ + + +
+
+
+
+
+ class="ant-spin-nested-loading" + > +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + + + + + + + +
+
+ ๆš‚ๆ— ๆ•ฐๆฎ +
+
+
+
+
+
+
+
@@ -1563,33 +1691,6 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/components/PageContai
- `; @@ -4174,13 +4275,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/AlwaysDefaultOp
Hello World @@ -4475,13 +4577,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/BreadcrumbsRepe
Hello World @@ -4718,13 +4821,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/DefaultOpenAllM
Hello World @@ -4961,13 +5065,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/IconFont.tsx co
Hello World @@ -5204,13 +5309,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/MenuGroup.tsx c
Hello World @@ -5469,13 +5575,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/MultipleMenuOne
Hello World @@ -5680,13 +5787,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/Nested.tsx corr
Hello World @@ -6014,13 +6122,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/TopmenuNested.t
Hello World @@ -6294,13 +6403,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/antd@4MenuIconF
๐Ÿ“ธ renders ./packages/layout/src/demos/api.tsx correct
Hello World
@@ -7888,13 +7999,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/background-cont
๐Ÿ“ธ renders ./packages/layout/src/demos/base.tsx correc
๐Ÿ“ธ renders ./packages/layout/src/demos/base.tsx correc
@@ -8705,13 +8818,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/classicMode.tsx
๐Ÿ“ธ renders ./packages/layout/src/demos/classicMode.tsx
@@ -9077,13 +9191,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/collapsedShowTi
๐Ÿ“ธ renders ./packages/layout/src/demos/collapsedShowTi
@@ -9778,13 +9893,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/config-provider
๐Ÿ“ธ renders ./packages/layout/src/demos/config-provider
@@ -10463,13 +10579,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/customSider.tsx
๐Ÿ“ธ renders ./packages/layout/src/demos/customize-colla
๐Ÿ“ธ renders ./packages/layout/src/demos/customizeMenu.t
Hello World
@@ -11317,13 +11436,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/dark.tsx correc
๐Ÿ“ธ renders ./packages/layout/src/demos/dark.tsx correc
@@ -11707,13 +11827,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/debug-demo.tsx
๐Ÿ“ธ renders ./packages/layout/src/demos/debug-demo.tsx
@@ -12118,13 +12239,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/designMenuCss.t
๐Ÿ“ธ renders ./packages/layout/src/demos/designMenuCss.t
@@ -12501,13 +12623,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/designSiderMenu
๐Ÿ“ธ renders ./packages/layout/src/demos/dynamic-setting
๐Ÿ“ธ renders ./packages/layout/src/demos/dynamic-setting >
๐Ÿ“ธ renders ./packages/layout/src/demos/dynamic-setting
@@ -14308,13 +14432,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/dynamicMenu.tsx
ๅฝ“ไปŽๆœๅŠกๅ™จ่Žทๅ–็š„่œๅ•ไธบ็ฉบๆ—ถ้š่—Sider๏ผš @@ -14834,13 +14959,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/footer.tsx corr
Hello World
@@ -15263,13 +15389,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/footer-global-t
๐Ÿ“ธ renders ./packages/layout/src/demos/ghost.tsx corre
๐Ÿ“ธ renders ./packages/layout/src/demos/hideMenu.tsx co
Hello World
@@ -17295,13 +17424,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/immersive-navig
๐Ÿ“ธ renders ./packages/layout/src/demos/menu-group.tsx class="ant-pro-page-container" >
๐Ÿ“ธ renders ./packages/layout/src/demos/menu-group.tsx >
๐Ÿ“ธ renders ./packages/layout/src/demos/mixMode.tsx cor
๐Ÿ“ธ renders ./packages/layout/src/demos/pageSimplify.ts
๐Ÿ“ธ renders ./packages/layout/src/demos/searchMenu.tsx
Hello World @@ -19608,13 +19742,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/siderMode.tsx c
๐Ÿ“ธ renders ./packages/layout/src/demos/siteMenu.tsx co
๐Ÿ“ธ renders ./packages/layout/src/demos/splitMenus.tsx >
xxxx
@@ -20967,13 +21104,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/theme.tsx corre
๐Ÿ“ธ renders ./packages/layout/src/demos/theme.tsx corre
@@ -21326,13 +21464,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/top-breadcrumb.
Hello World @@ -21645,13 +21784,14 @@ exports[`layout demos > ๐Ÿ“ธ renders ./packages/layout/src/demos/topMode.tsx cor
โšก๏ธ support more loading props 1`] = `
๐ŸŒ› PageContainer with custom loading 1`] = `
๐Ÿฒ FooterToolbar should know width 1`] = ` class="ant-pro-page-container" >
@@ -781,7 +782,7 @@ exports[`PageContainer > ๐Ÿฒ footer should know width 1`] = `