fix(element): remove Space gap when child is hidden and attrs pass ch…

…ildren (#3526)
alibaba · Nov 7, 2022 · 8bcd51f · 8bcd51f
1 parent 5ab10b4
commit 8bcd51f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/packages/element/src/space/index.ts b/packages/element/src/space/index.ts
@@ -22,7 +22,7 @@ const spaceSize = {
 export const Space = defineComponent<SpaceProps>({
   name: 'FSpace',
   props: ['size', 'direction', 'align'],
-  setup(props, { slots }) {
+  setup(props, { attrs, slots }) {
     const layout = useFormLayout()
 
     return () => {
@@ -72,23 +72,24 @@ export const Space = defineComponent<SpaceProps>({
           {
             class: itemClassName,
             key: `${itemClassName}-${i}`,
-            style:
-              i === len - 1
-                ? {}
-                : {
-                    [direction === 'vertical'
-                      ? 'marginBottom'
-                      : marginDirection]:
-                      typeof size === 'string'
-                        ? `${spaceSize[size]}px`
-                        : `${size}px`,
-                  },
           },
           { default: () => [child] }
         )
       )
 
-      return h('div', { class: someSpaceClass }, { default: () => renderItems })
+      return h(
+        'div',
+        {
+          ...attrs,
+          class: { ...(attrs as any).class, ...someSpaceClass },
+          style: {
+            ...(attrs as any).style,
+            gap:
+              typeof size === 'string' ? `${spaceSize[size]}px` : `${size}px`,
+          },
+        },
+        { default: () => renderItems }
+      )
     }
   },
 })

diff --git a/packages/element/src/space/style.scss b/packages/element/src/space/style.scss
@@ -20,4 +20,8 @@
       align-items: baseline;
     }
   }
+
+  &-item {
+    display: contents;
+  }
 }