@douyinfe/semi-ui 2.19.0-alpha.5 → 2.19.0-alpha.6

package/button/buttonGroup.tsx

@@ -1,10 +1,9 @@
-import React, { isValidElement, cloneElement, ReactNode } from 'react';
+import React, { isValidElement, cloneElement } from 'react';
 import BaseComponent, { BaseProps } from '../_base/baseComponent';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { cssClasses, strings } from '@douyinfe/semi-foundation/button/constants';
-import { get } from 'lodash';
-import { Type, Size, ButtonProps } from './Button';
+import { Type, Size } from './Button';
 
 import '@douyinfe/semi-foundation/button/button.scss';
 
@@ -40,41 +39,9 @@ export default class ButtonGroup extends BaseComponent<ButtonGroupProps> {
         size: 'default',
     };
 
-    getInnerWithLine(inner) {
-        const innerWithLine: ReactNode[] = [];
-        let lineCls = `${prefixCls}-group-line`;
-        if (inner.length > 1) {
-            inner.slice(0, -1).forEach(item => {
-                const isButtonType = [get(item, 'type.displayName'), get(item, 'type.name')].includes('Button');
-                const buttonProps = get(item, 'props') as ButtonProps;
-                if (buttonProps) {
-                    const { type, theme, disabled } = buttonProps;
-                    lineCls = classNames(
-                        `${prefixCls}-group-line`,
-                        `${prefixCls}-group-line-${theme ?? 'light'}`, 
-                        `${prefixCls}-group-line-${type ?? 'primary'}`, 
-                        {
-                            [`${prefixCls}-group-line-disabled`]: disabled,
-                        }
-                    );
-                }
-                if (isButtonType) {
-                    innerWithLine.push(item, <span className={lineCls} />);
-                } else {
-                    innerWithLine.push(item);
-                }
-            });
-            innerWithLine.push(inner.slice(-1));
-            return innerWithLine;
-        } else {
-            return inner;
-        }
-    }
-
     render() {
         const { children, disabled, size, type, className, 'aria-label': ariaLabel, ...rest } = this.props;
-        let inner: ReactNode[];
-        let innerWithLine: ReactNode[] = [];
+        let inner;
         const cls = classNames(`${prefixCls}-group`, className);
 
         if (children) {
@@ -83,8 +50,7 @@ export default class ButtonGroup extends BaseComponent<ButtonGroupProps> {
                     ? cloneElement(itm, { disabled, size, type, ...itm.props, ...rest, key: index })
                     : itm
             ));
-            innerWithLine = this.getInnerWithLine(inner);
         }
-        return <div className={cls} role="group" aria-label={ariaLabel}>{innerWithLine}</div>;
+        return <div className={cls} role="group" aria-label={ariaLabel}>{inner}</div>;
     }
 }

package/dist/css/semi.css

@@ -1778,10 +1778,6 @@ body {
 .semi-button-block {
   width: 100%;
 }
-.semi-button-group {
-  display: flex;
-  flex-wrap: wrap;
-}
 .semi-button-group > .semi-button {
   margin: 0;
   padding-left: 0;
@@ -1820,46 +1816,13 @@ body {
   border-top-left-radius: var(--semi-border-radius-small);
   border-bottom-left-radius: var(--semi-border-radius-small);
 }
+.semi-button-group > .semi-button:not(:last-child) .semi-button-content {
+  border-right: 1px var(--semi-color-border) solid;
+}
 .semi-button-group > .semi-button:last-child {
   border-top-right-radius: var(--semi-border-radius-small);
   border-bottom-right-radius: var(--semi-border-radius-small);
 }
-.semi-button-group-line {
-  display: inline-flex;
-  align-items: center;
-  background-color: var(--semi-color-border);
-}
-.semi-button-group-line-primary {
-  background-color: var(--semi-color-primary);
-}
-.semi-button-group-line-secondary {
-  background-color: var(--semi-color-secondary);
-}
-.semi-button-group-line-tertiary {
-  background-color: var(--semi-color-tertiary);
-}
-.semi-button-group-line-warning {
-  background-color: var(--semi-color-warning);
-}
-.semi-button-group-line-danger {
-  background-color: var(--semi-color-danger);
-}
-.semi-button-group-line-disabled {
-  background-color: var(--semi-color-disabled-bg);
-}
-.semi-button-group-line-light {
-  background-color: var(--semi-color-fill-0);
-}
-.semi-button-group-line-borderless {
-  background-color: transparent;
-}
-.semi-button-group-line::before {
-  display: block;
-  content: "";
-  width: 1px;
-  height: 20px;
-  background-color: var(--semi-color-border);
-}
 
 .semi-rtl .semi-button,
 .semi-portal-rtl .semi-button {
@@ -14664,9 +14627,8 @@ body {
   font-size: 14px;
   line-height: 20px;
   font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  position: relative;
   display: inline-flex;
-  flex-wrap: wrap;
+  column-gap: 8px;
   transition: background-color var(--semi-transition_duration-faster) var(--semi-transition_function-easeIn) var(--semi-transition_delay-fastest), border var(--semi-transition_duration-faster) var(--semi-transition_function-easeIn) var(--semi-transition_delay-fastest);
   min-height: 20px;
   min-width: 16px;
@@ -14715,6 +14677,7 @@ body {
   border-radius: var(--semi-border-radius-small);
 }
 .semi-radio-buttonRadioGroup {
+  position: relative;
   padding: 4px;
   border-radius: var(--semi-border-radius-small);
   line-height: 16px;
@@ -14739,8 +14702,6 @@ body {
   transition: background-color var(--semi-transition_duration-faster) var(--semi-transition_function-easeIn) var(--semi-transition_delay-fastest), border var(--semi-transition_duration-faster) var(--semi-transition_function-easeIn) var(--semi-transition_delay-fastest);
 }
 .semi-radio-cardRadioGroup .semi-radio-inner {
-  position: relative;
-  margin-right: 8px;
   flex-shrink: 0;
 }
 .semi-radio-cardRadioGroup .semi-radio-inner-display {
@@ -14751,8 +14712,6 @@ body {
   font-size: 14px;
   line-height: 20px;
   color: var(--semi-color-text-0);
-  margin-left: 0;
-  padding-left: 0;
 }
 .semi-radio-cardRadioGroup .semi-radio-extra {
   font-weight: normal;
@@ -14809,19 +14768,18 @@ body {
   border-color: var(--semi-color-primary-disabled);
 }
 .semi-radio-inner {
-  position: absolute;
-  display: inline-block;
-  top: 2px;
-  left: 0;
+  display: inline-flex;
+  margin-top: 2px;
+  position: relative;
   width: 16px;
   height: 16px;
   vertical-align: sub;
   user-select: none;
 }
 .semi-radio-inner-display {
-  position: absolute;
-  left: 0;
-  top: 0;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
   box-sizing: border-box;
   width: 16px;
   height: 16px;
@@ -14831,11 +14789,14 @@ body {
   transition: background-color var(--semi-transition_duration-faster) var(--semi-transition_function-easeIn) var(--semi-transition_delay-fastest), border var(--semi-transition_duration-faster) var(--semi-transition_function-easeIn) var(--semi-transition_delay-fastest);
 }
 .semi-radio-inner-display .semi-icon {
-  position: absolute;
   width: 100%;
   height: 100%;
   font-size: 14px;
 }
+.semi-radio-content {
+  display: flex;
+  flex-direction: column;
+}
 .semi-radio:hover .semi-radio-inner-display {
   background: var(--semi-color-fill-0);
 }
@@ -14844,14 +14805,11 @@ body {
 }
 .semi-radio-addon {
   user-select: none;
-  padding-left: 8px;
-  margin-left: 16px;
   color: var(--semi-color-text-0);
   display: inline-flex;
   align-items: center;
 }
 .semi-radio-addon-buttonRadio {
-  margin-left: 0;
   text-align: center;
   border-radius: var(--semi-border-radius-small);
   font-weight: 600;
@@ -14935,11 +14893,7 @@ body {
   color: var(--semi-color-disabled-text);
 }
 .semi-radio-extra {
-  flex-grow: 1;
-  flex-basis: 100%;
-  flex-shrink: 0;
   color: var(--semi-color-text-2);
-  padding-left: 24px;
   box-sizing: border-box;
 }
 .semi-radio-focus {
@@ -14954,25 +14908,21 @@ body {
   line-height: 20px;
   font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-.semi-radioGroup-vertical .semi-radio:last-of-type {
-  margin-bottom: 0;
+.semi-radioGroup-vertical {
+  display: flex;
+  flex-direction: column;
+  row-gap: 12px;
 }
 .semi-radioGroup-vertical-default .semi-radio {
-  display: block;
-  margin-bottom: 12px;
+  display: flex;
 }
 .semi-radioGroup-vertical-card .semi-radio {
   display: flex;
-  margin-bottom: 16px;
-}
-.semi-radioGroup-horizontal .semi-radio {
-  margin-right: 16px;
-}
-.semi-radioGroup-horizontal .semi-radio:last-of-type {
-  margin-right: 0;
 }
-.semi-radioGroup-horizontal-default {
-  display: inline-block;
+.semi-radioGroup-horizontal {
+  display: inline-flex;
+  flex-wrap: wrap;
+  gap: 16px;
 }
 .semi-radioGroup-buttonRadio {
   display: inline-block;
@@ -14996,59 +14946,10 @@ body {
 .semi-portal-rtl .semi-radio-buttonRadioGroup:not(:last-child) {
   padding-left: 0;
 }
-.semi-rtl .semi-radio-inner,
-.semi-portal-rtl .semi-radio-inner {
-  left: auto;
-  right: 0;
-}
-.semi-rtl .semi-radio-inner-display,
-.semi-portal-rtl .semi-radio-inner-display {
-  left: auto;
-  right: 0;
-}
-.semi-rtl .semi-radio-addon,
-.semi-portal-rtl .semi-radio-addon {
-  padding-left: 0;
-  margin-left: 0;
-  padding-right: 8px;
-  margin-right: 16px;
-}
-.semi-rtl .semi-radio-addon-buttonRadio,
-.semi-portal-rtl .semi-radio-addon-buttonRadio {
-  margin-right: 0;
-}
-.semi-rtl .semi-radio-extra,
-.semi-portal-rtl .semi-radio-extra {
-  padding-left: 0;
-  padding-right: 24px;
-}
-.semi-rtl-isCardRadioGroup .semi-radio-inner,
-.semi-portal-rtl-isCardRadioGroup .semi-radio-inner {
-  margin-right: 0;
-  margin-left: 8px;
-}
-.semi-rtl-isCardRadioGroup .semi-radio-addon,
-.semi-portal-rtl-isCardRadioGroup .semi-radio-addon {
-  margin-right: 0;
-  padding-right: 0;
-}
-.semi-rtl-isCardRadioGroup .semi-radio-extra,
-.semi-portal-rtl-isCardRadioGroup .semi-radio-extra {
-  padding-right: 0;
-}
 .semi-rtl .semi-radioGroup,
 .semi-portal-rtl .semi-radioGroup {
   direction: rtl;
 }
-.semi-rtl .semi-radioGroup-horizontal .semi-radio,
-.semi-portal-rtl .semi-radioGroup-horizontal .semi-radio {
-  margin-right: 0;
-  margin-left: 16px;
-}
-.semi-rtl .semi-radioGroup-horizontal .semi-radio:last-of-type,
-.semi-portal-rtl .semi-radioGroup-horizontal .semi-radio:last-of-type {
-  margin-left: 0;
-}
 
 .semi-rating {
   display: inline-block;