@douyinfe/semi-ui 2.16.0-beta.0 → 2.16.0

package/lib/cjs/typography/base.js

@@ -89,18 +89,12 @@ const wrapperDecorations = (props, content) => {
     underline,
     strong,
     link,
-    disabled,
-    icon
+    disabled
   } = props;
   let wrapped = content;
 
   const wrap = (isNeeded, tag) => {
-    let wrapProps = icon ? {
-      style: {
-        display: 'inline-flex',
-        alignItems: 'center'
-      }
-    } : {};
+    let wrapProps = {};
 
     if (!isNeeded) {
       return;
@@ -118,13 +112,7 @@ const wrapperDecorations = (props, content) => {
   wrap(underline && !link, 'u');
   wrap(strong, 'strong');
   wrap(props.delete, 'del');
-  wrap(link, disabled ? 'span' : 'a'); // When the content is not wrapped, and there is more than one element in the content (one of which is an icon), 
-  // use span to wrap the content, so that the content in the span is vertically aligned
-
-  if (wrapped === content && icon) {
-    wrap(true, 'span');
-  }
-
+  wrap(link, disabled ? 'span' : 'a');
   return wrapped;
 };
 

package/lib/cjs/typography/text.js

@@ -24,25 +24,15 @@ var _constants = require("@douyinfe/semi-foundation/lib/cjs/typography/constants
 
 var _base = _interopRequireDefault(require("./base"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-const prefixCls = _constants.cssClasses.PREFIX;
-
 class Text extends _react.PureComponent {
   render() {
-    const className = (0, _classnames.default)(this.props.className, {
-      ["".concat(prefixCls, "-text")]: true,
-      ["".concat(prefixCls, "-text-icon")]: this.props.icon
-    });
     return /*#__PURE__*/_react.default.createElement(_base.default, (0, _assign.default)({
       component: 'span'
-    }, this.props, {
-      className: className
-    }));
+    }, this.props));
   }
 
 }

package/lib/es/typography/base.js

@@ -45,18 +45,12 @@ const wrapperDecorations = (props, content) => {
     underline,
     strong,
     link,
-    disabled,
-    icon
+    disabled
   } = props;
   let wrapped = content;
 
   const wrap = (isNeeded, tag) => {
-    let wrapProps = icon ? {
-      style: {
-        display: 'inline-flex',
-        alignItems: 'center'
-      }
-    } : {};
+    let wrapProps = {};
 
     if (!isNeeded) {
       return;
@@ -74,13 +68,7 @@ const wrapperDecorations = (props, content) => {
   wrap(underline && !link, 'u');
   wrap(strong, 'strong');
   wrap(props.delete, 'del');
-  wrap(link, disabled ? 'span' : 'a'); // When the content is not wrapped, and there is more than one element in the content (one of which is an icon), 
-  // use span to wrap the content, so that the content in the span is vertically aligned
-
-  if (wrapped === content && icon) {
-    wrap(true, 'span');
-  }
-
+  wrap(link, disabled ? 'span' : 'a');
   return wrapped;
 };
 

package/lib/es/typography/text.js

@@ -3,20 +3,11 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { strings } from '@douyinfe/semi-foundation/lib/es/typography/constants';
 import Base from './base';
-import cls from 'classnames';
-import { cssClasses } from '@douyinfe/semi-foundation/lib/es/typography/constants';
-const prefixCls = cssClasses.PREFIX;
 export default class Text extends PureComponent {
   render() {
-    const className = cls(this.props.className, {
-      ["".concat(prefixCls, "-text")]: true,
-      ["".concat(prefixCls, "-text-icon")]: this.props.icon
-    });
     return /*#__PURE__*/React.createElement(Base, _Object$assign({
       component: 'span'
-    }, this.props, {
-      className: className
-    }));
+    }, this.props));
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.16.0-beta.0",
+    "version": "2.16.0",
     "description": "",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -15,18 +15,18 @@
     "dependencies": {
         "@babel/runtime-corejs3": "^7.15.4",
         "@douyinfe/semi-animation": "2.12.0",
-        "@douyinfe/semi-animation-react": "2.16.0-beta.0",
-        "@douyinfe/semi-foundation": "2.16.0-beta.0",
-        "@douyinfe/semi-icons": "2.16.0-beta.0",
+        "@douyinfe/semi-animation-react": "2.16.0",
+        "@douyinfe/semi-foundation": "2.16.0",
+        "@douyinfe/semi-icons": "2.16.0",
         "@douyinfe/semi-illustrations": "2.15.0",
-        "@douyinfe/semi-theme-default": "2.16.0-beta.0",
-        "@types/react-window": "^1.8.2",
+        "@douyinfe/semi-theme-default": "2.16.0",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
         "date-fns": "^2.9.0",
         "date-fns-tz": "^1.0.10",
         "lodash": "^4.17.21",
+        "prop-types": "^15.7.2",
         "react-resizable": "^1.8.0",
         "react-sortable-hoc": "^2.0.0",
         "react-window": "^1.8.2",
@@ -35,9 +35,6 @@
         "utility-types": "^3.10.0"
     },
     "peerDependencies": {
-        "@types/react": ">=16.0.0",
-        "@types/react-dom": ">=16.0.0",
-        "prop-types": "15.7.2",
         "react": ">=16.0.0",
         "react-dom": ">=16.0.0"
     },
@@ -69,15 +66,18 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "e2cb837fd9d77bd14f32f8bee74c16bcdf0d9196",
+    "gitHead": "71f3e6a9ae6f7794c993617dd3d94f565539ac49",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",
         "@babel/preset-react": "^7.14.5",
-        "@douyinfe/semi-scss-compile": "2.16.0-beta.0",
+        "@douyinfe/semi-scss-compile": "2.16.0",
         "@storybook/addon-knobs": "^6.3.1",
         "@types/lodash": "^4.14.176",
+        "@types/react": ">=16.0.0",
+        "@types/react-dom": ">=16.0.0",
+        "@types/react-window": "^1.8.2",
         "babel-loader": "^8.2.2",
         "babel-plugin-lodash": "^3.3.4",
         "case-sensitive-paths-webpack-plugin": "^2.4.0",

package/select/_story/select.stories.tsx

@@ -81,7 +81,7 @@ function CustomRender(props) {
             name: '夏可漫',
             email: 'xiakeman@example.com',
             avatar:
-                'https://sf6-cdn-tos.douyinstatic.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/root-web-sites/avatarDemo.jpeg',
+                'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/root-web-sites/dy.png',
         },
         {
             name: '申悦',

package/typography/_story/typography.stories.js

@@ -3,7 +3,7 @@ import withPropsCombinations from 'react-storybook-addon-props-combinations';
 
 import Icon from '../../icons';
 import Typography from '../index';
-import { IconLink, IconTick, IconPlusCircle } from '@douyinfe/semi-icons';
+import { IconLink, IconTick } from '@douyinfe/semi-icons';
 
 export default {
   title: 'Typography'
@@ -51,22 +51,10 @@ export const _Text = () => (
     <br />
     <Text link={{ href: 'https://semi.design/' }}>打开网站</Text>
     <br />
-    {/* 用户未通过icon API设置icon，而是通过children传入，则需要手动处理内容的对齐 */}
     <Text link>
-      <span style={ {display: 'inline-flex', alignItems: 'center' }}  >
-        <IconLink style={{ marginRight: 4 }}/>
-        网页链接
-      </span>
+      <IconLink />
+      网页链接
     </Text>
-    <br />
-    <Text link icon={<IconLink />} underline>带下划线的网页链接</Text>
-    <br />
-    <Text icon={<IconLink />} underline>带下划线的内容</Text>
-    <br />
-    <Text icon={<IconPlusCircle />} style={{ color: 'purple'}}>添加条件</Text>
-    <br />
-    <Text icon={<IconPlusCircle />} style={{ color: 'purple'}} size={'small'}>添加条件</Text>
-    <br />
   </div>
 );
 

package/typography/base.tsx

@@ -1,4 +1,4 @@
-import React, { Component, ReactElement } from 'react';
+import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import cls from 'classnames';
 import PropTypes from 'prop-types';
@@ -54,15 +54,15 @@ const prefixCls = cssClasses.PREFIX;
 const ELLIPSIS_STR = '...';
 
 const wrapperDecorations = (props: BaseTypographyProps, content: React.ReactNode) => {
-    const { mark, code, underline, strong, link, disabled, icon, } = props;
+    const { mark, code, underline, strong, link, disabled } = props;
     let wrapped = content;
     const wrap = (isNeeded: boolean | LinkType, tag: string) => {
-        let wrapProps = icon ? { style: { display: 'inline-flex', alignItems: 'center' } } : {};
+        let wrapProps = {};
         if (!isNeeded) {
             return;
         }
         if (typeof isNeeded === 'object') {
-            wrapProps = { ...isNeeded } as any;
+            wrapProps = { ...isNeeded };
         }
         wrapped = React.createElement(tag, wrapProps, wrapped);
     };
@@ -72,11 +72,6 @@ const wrapperDecorations = (props: BaseTypographyProps, content: React.ReactNode
     wrap(strong, 'strong');
     wrap(props.delete, 'del');
     wrap(link, disabled ? 'span' : 'a');
-    // When the content is not wrapped, and there is more than one element in the content (one of which is an icon), 
-    // use span to wrap the content, so that the content in the span is vertically aligned
-    if (wrapped === content && icon) {
-        wrap(true, 'span');
-    }
     return wrapped;
 };
 

package/typography/text.tsx

@@ -4,13 +4,9 @@ import { strings } from '@douyinfe/semi-foundation/typography/constants';
 import Base from './base';
 import { Ellipsis, TypographyBaseSize, TypographyBaseType, OmitTypographyProps } from './interface';
 import { CopyableConfig, LinkType } from './title';
-import cls from 'classnames';
-import { cssClasses } from '@douyinfe/semi-foundation/typography/constants';
 
 type OmitTextProps = OmitTypographyProps;
 
-const prefixCls = cssClasses.PREFIX;
-
 export interface TextProps extends Omit<React.HTMLAttributes<HTMLSpanElement>, OmitTextProps> {
     children?: React.ReactNode;
     className?: string;
@@ -67,10 +63,6 @@ export default class Text extends PureComponent<TextProps> {
     };
 
     render() {
-        const className = cls(this.props.className, {
-            [`${prefixCls}-text`]: true,
-            [`${prefixCls}-text-icon`]: this.props.icon,
-        });
-        return <Base component={'span'} {...this.props} className={className} />;
+        return <Base component={'span'} {...this.props} />;
     }
 }