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

package/button/buttonGroup.tsx

@@ -45,7 +45,7 @@ export default class ButtonGroup extends BaseComponent<ButtonGroupProps> {
         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 isButtonType = get(item, 'type.elementType') === 'Button';
                 const buttonProps = get(item, 'props') as ButtonProps;
                 if (buttonProps) {
                     const { type, theme, disabled } = buttonProps;

package/button/index.tsx

@@ -18,6 +18,7 @@ class Button extends React.PureComponent<ButtonProps> {
         ...BaseButton.propTypes,
         ...IconButton.propTypes,
     };
+    static elementType: string;
     constructor(props = {}) {
         super(props);
     }
@@ -34,5 +35,6 @@ class Button extends React.PureComponent<ButtonProps> {
         }
     }
 }
+Button.elementType = 'Button';
 
 export default Button;

package/checkbox/_story/checkbox.stories.js

@@ -31,6 +31,8 @@ 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,20 +235,27 @@ class Checkbox extends BaseComponent<CheckboxProps, CheckboxState> {
         const name = inGroup && this.context.checkboxGroup.name;
         const xSemiPropChildren = this.props['x-semi-children-alias'] || 'children';
 
-        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}
-            </>
-        );
+        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>
+            );
+        };
+
         return (
             // label is better than span, however span is here which is to solve gitlab issue #364
             <span
@@ -276,11 +283,7 @@ class Checkbox extends BaseComponent<CheckboxProps, CheckboxState> {
                     onInputFocus={this.handleFocusVisible}
                     onInputBlur={this.handleBlur}
                 />
-                {
-                    props.isCardType ?
-                        <div>{renderContent()}</div> :
-                        renderContent()
-                }
+                {renderContent()}
             </span>
         );
     }

package/checkbox/checkboxGroup.tsx

@@ -120,6 +120,7 @@ class CheckboxGroup extends BaseComponent<CheckboxGroupProps, CheckboxGroupState
             [`${prefix }-wrapper`]: true,
             [`${prefix }-${ direction}`]: direction,
             [`${prefix}-${direction}-cardType`]: direction && isCardType,
+            [`${prefix}-${direction}-pureCardType`]: direction && isPureCardType,
         }, className);
 
         const realValue = this.state.value.slice();

package/dist/css/semi.css

@@ -3508,7 +3508,7 @@ body {
   box-sizing: border-box;
   position: relative;
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   flex-wrap: wrap;
   font-size: 14px;
   line-height: 20px;
@@ -3516,6 +3516,7 @@ 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;
@@ -3526,11 +3527,16 @@ 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;
@@ -3633,7 +3639,6 @@ body {
 }
 .semi-checkbox-cardType .semi-checkbox-inner {
   position: relative;
-  margin-right: 8px;
   flex-shrink: 0;
 }
 .semi-checkbox-cardType .semi-checkbox-inner-display {
@@ -3642,22 +3647,18 @@ body {
 .semi-checkbox-cardType .semi-checkbox-inner-pureCardType {
   opacity: 0;
   width: 0;
-  margin-right: 0;
 }
 .semi-checkbox-cardType .semi-checkbox-addon {
   font-weight: 600;
   font-size: 14px;
   line-height: 20px;
   color: var(--semi-color-text-0);
-  margin-left: 0;
-  padding-left: 0;
 }
 .semi-checkbox-cardType .semi-checkbox-extra {
   font-weight: normal;
   font-size: 14px;
   line-height: 20px;
   color: var(--semi-color-text-2);
-  padding-left: 0;
 }
 .semi-checkbox-cardType .semi-checkbox-extra.semi-checkbox-cardType_extra_noChildren {
   margin-top: 0;
@@ -3759,9 +3760,7 @@ 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);
@@ -3779,21 +3778,24 @@ body {
 .semi-checkboxGroup .semi-checkbox.semi-checkbox-vertical {
   margin-bottom: 16px;
 }
+.semi-checkboxGroup-horizontal {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+}
 .semi-checkboxGroup-horizontal .semi-checkbox {
-  margin-right: 16px;
   display: inline-flex;
 }
-.semi-checkboxGroup-horizontal .semi-checkbox:last-of-type {
-  margin-right: 0;
-}
-.semi-checkboxGroup-vertical .semi-checkbox {
-  margin-bottom: 12px;
+.semi-checkboxGroup-vertical {
+  display: flex;
+  flex-direction: column;
+  row-gap: 12px;
 }
-.semi-checkboxGroup-vertical .semi-checkbox:last-of-type {
-  margin-bottom: 0;
+.semi-checkboxGroup-vertical-cardType {
+  row-gap: 16px;
 }
-.semi-checkboxGroup-vertical-cardType .semi-checkbox {
-  margin-bottom: 16px;
+.semi-checkboxGroup-vertical-pureCardType .semi-checkbox {
+  column-gap: 0;
 }
 
 .semi-rtl .semi-checkbox,
@@ -3805,43 +3807,10 @@ body {
   left: auto;
   right: 0;
 }
-.semi-rtl .semi-checkbox-addon,
-.semi-portal-rtl .semi-checkbox-addon {
-  padding-left: 0;
-  padding-right: 8px;
-}
-.semi-rtl .semi-checkbox-extra,
-.semi-portal-rtl .semi-checkbox-extra {
-  padding-left: 0;
-  padding-right: 24px;
-}
-.semi-rtl .semi-checkbox-cardType .semi-checkbox-inner,
-.semi-portal-rtl .semi-checkbox-cardType .semi-checkbox-inner {
-  margin-right: 0;
-  margin-left: 8px;
-}
-.semi-rtl .semi-checkbox-cardType .semi-checkbox-addon,
-.semi-portal-rtl .semi-checkbox-cardType .semi-checkbox-addon {
-  margin-right: 0;
-  padding-right: 0;
-}
-.semi-rtl .semi-checkbox-cardType .semi-checkbox-extra,
-.semi-portal-rtl .semi-checkbox-cardType .semi-checkbox-extra {
-  padding-right: 0;
-}
 .semi-rtl .semi-checkboxGroup,
 .semi-portal-rtl .semi-checkboxGroup {
   direction: rtl;
 }
-.semi-rtl .semi-checkboxGroup-horizontal .semi-checkbox,
-.semi-portal-rtl .semi-checkboxGroup-horizontal .semi-checkbox {
-  margin-right: 0;
-  margin-left: 16px;
-}
-.semi-rtl .semi-checkboxGroup-horizontal .semi-checkbox:last-of-type,
-.semi-portal-rtl .semi-checkboxGroup-horizontal .semi-checkbox:last-of-type {
-  margin-left: 0;
-}
 
 .semi-collapse-item {
   border-bottom: 1px solid var(--semi-color-border);
@@ -14664,9 +14633,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 +14683,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 +14708,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 +14718,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 +14774,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 +14795,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 +14811,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 +14899,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 +14914,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 +14952,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;