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

package/button/buttonGroup.tsx

@@ -1,9 +1,10 @@
-import React, { isValidElement, cloneElement } from 'react';
+import React, { isValidElement, cloneElement, ReactNode } 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 { Type, Size } from './Button';
+import { get } from 'lodash';
+import { Type, Size, ButtonProps } from './Button';
 
 import '@douyinfe/semi-foundation/button/button.scss';
 
@@ -39,9 +40,41 @@ 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;
+        let inner: ReactNode[];
+        let innerWithLine: ReactNode[] = [];
         const cls = classNames(`${prefixCls}-group`, className);
 
         if (children) {
@@ -50,7 +83,8 @@ 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}>{inner}</div>;
+        return <div className={cls} role="group" aria-label={ariaLabel}>{innerWithLine}</div>;
     }
 }

package/checkbox/_story/checkbox.stories.js

@@ -31,8 +31,6 @@ export const CheckboxDefault = () => {
       </Checkbox>
       <br />
       <Checkbox indeterminate>indeterminate</Checkbox>
-      <Checkbox onChange={e => console.log(e)} value={1} onChange={v => console.log(v)}>
-      </Checkbox>
     </div>
   );
 };

package/checkbox/checkbox.tsx

@@ -235,27 +235,20 @@ class Checkbox extends BaseComponent<CheckboxProps, CheckboxState> {
         const name = inGroup && this.context.checkboxGroup.name;
         const xSemiPropChildren = this.props['x-semi-children-alias'] || 'children';
 
-        const renderContent = () => {
-            if (!children && !extra) {
-                return null;
-            }
-
-            return (
-                <div className={`${prefix}-content`}>
-                    {children ? (
-                        <span id={addonId} className={`${prefix}-addon`} x-semi-prop={xSemiPropChildren}>
-                            {children}
-                        </span>
-                    ) : null}
-                    {extra ? (
-                        <div id={extraId} className={extraCls} x-semi-prop="extra">
-                            {extra}
-                        </div>
-                    ) : null}
-                </div>
-            );
-        };
-
+        const renderContent = () => (
+            <>
+                {children ? (
+                    <span id={addonId} className={`${prefix}-addon`} x-semi-prop={xSemiPropChildren}>
+                        {children}
+                    </span>
+                ) : null}
+                {extra ? (
+                    <div id={extraId} className={extraCls} x-semi-prop="extra">
+                        {extra}
+                    </div>
+                ) : null}
+            </>
+        );
         return (
             // label is better than span, however span is here which is to solve gitlab issue #364
             <span
@@ -283,7 +276,11 @@ class Checkbox extends BaseComponent<CheckboxProps, CheckboxState> {
                     onInputFocus={this.handleFocusVisible}
                     onInputBlur={this.handleBlur}
                 />
-                {renderContent()}
+                {
+                    props.isCardType ?
+                        <div>{renderContent()}</div> :
+                        renderContent()
+                }
             </span>
         );
     }

package/dist/css/semi.css

@@ -1778,6 +1778,10 @@ body {
 .semi-button-block {
   width: 100%;
 }
+.semi-button-group {
+  display: flex;
+  flex-wrap: wrap;
+}
 .semi-button-group > .semi-button {
   margin: 0;
   padding-left: 0;
@@ -1816,13 +1820,46 @@ 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 {
@@ -3471,7 +3508,7 @@ body {
   box-sizing: border-box;
   position: relative;
   display: flex;
-  align-items: flex-start;
+  align-items: center;
   flex-wrap: wrap;
   font-size: 14px;
   line-height: 20px;
@@ -3479,7 +3516,6 @@ body {
   cursor: pointer;
   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);
   transform: scale(var(--semi-transform_scale-none));
-  column-gap: 8px;
 }
 .semi-checkbox input[type=checkbox] {
   position: absolute;
@@ -3490,16 +3526,11 @@ body {
   margin: 0;
   opacity: 0;
 }
-.semi-checkbox-content {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  row-gap: 4px;
-}
 .semi-checkbox-addon {
   display: flex;
   flex: 1;
   align-items: center;
+  padding-left: 8px;
   color: var(--semi-color-text-0);
   line-height: 20px;
   user-select: none;
@@ -3728,7 +3759,9 @@ body {
   flex-grow: 1;
   flex-basis: 100%;
   box-sizing: border-box;
+  padding-left: 24px;
   color: var(--semi-color-text-2);
+  margin-top: 4px;
 }
 .semi-checkbox-focus {
   outline: 2px solid var(--semi-color-primary-light-active);