@douyinfe/semi-ui 2.17.0-beta.0 → 2.17.0-beta.1

package/empty/index.tsx

@@ -79,17 +79,17 @@ export default class Empty extends BaseComponent<EmptyProps, EmptyState> {
         const { className, image, description, style, title, imageStyle, children, layout, darkModeImage } = this.props;
 
         const alt = typeof description === 'string' ? description : 'empty';
-        const imgSrc = this.state.mode && darkModeImage ? darkModeImage : image;
+        const imgSrc = ((this.state.mode === 'dark') && darkModeImage) ? darkModeImage : image;
         let imageNode = null;
         if (typeof imgSrc === 'string') {
-            imageNode = <img alt={alt} src={imgSrc} />;
+            imageNode = <img alt={alt} src={imgSrc}/>;
         } else if (imgSrc && 'id' in (imgSrc as any)) {
             imageNode = (
                 <svg
                     // className={iconCls}
                     aria-hidden="true"
                 >
-                    <use xlinkHref={`#${(imgSrc as any).id}`} />
+                    <use xlinkHref={`#${(imgSrc as any).id}`}/>
                 </svg>
             );
         } else {

package/lib/cjs/cascader/index.js

@@ -801,6 +801,33 @@ class Cascader extends _baseComponent.default {
       return firstInProps || treeDataHasChange;
     };
 
+    const getRealKeys = (realValue, keyEntities) => {
+      // normallizedValue is used to save the value in two-dimensional array format
+      let normallizedValue = [];
+
+      if ((0, _isArray.default)(realValue)) {
+        normallizedValue = (0, _isArray.default)(realValue[0]) ? realValue : [realValue];
+      } else {
+        if (realValue !== undefined) {
+          normallizedValue = [[realValue]];
+        }
+      } // formatValuePath is used to save value of valuePath
+
+
+      const formatValuePath = [];
+      (0, _forEach.default)(normallizedValue).call(normallizedValue, valueItem => {
+        const formatItem = onChangeWithObject ? (0, _map.default)(valueItem).call(valueItem, i => i === null || i === void 0 ? void 0 : i.value) : valueItem;
+        formatValuePath.push(formatItem);
+      }); // formatKeys is used to save key of value
+
+      const formatKeys = [];
+      (0, _forEach.default)(formatValuePath).call(formatValuePath, v => {
+        const formatKeyItem = (0, _util.findKeysForValues)(v, keyEntities);
+        !(0, _isEmpty2.default)(formatKeyItem) && formatKeys.push(formatKeyItem);
+      });
+      return formatKeys;
+    };
+
     const needUpdateTreeData = needUpdate('treeData') || needUpdateData();
     const needUpdateValue = needUpdate('value') || (0, _isEmpty2.default)(prevProps) && defaultValue;
 
@@ -817,31 +844,15 @@ class Cascader extends _baseComponent.default {
         let realKeys = prevState.checkedKeys; // when data was updated
 
         if (needUpdateValue) {
-          // normallizedValue is used to save the value in two-dimensional array format
-          let normallizedValue = [];
-          const realValue = needUpdate('value') ? value : defaultValue; // eslint-disable-next-line max-depth
-
-          if ((0, _isArray.default)(realValue)) {
-            normallizedValue = (0, _isArray.default)(realValue[0]) ? realValue : [realValue];
-          } else {
-            if (realValue !== undefined) {
-              normallizedValue = [[realValue]];
-            }
-          } // formatValuePath is used to save value of valuePath
-
-
-          const formatValuePath = [];
-          (0, _forEach.default)(normallizedValue).call(normallizedValue, valueItem => {
-            const formatItem = onChangeWithObject ? (0, _map.default)(valueItem).call(valueItem, i => i === null || i === void 0 ? void 0 : i.value) : valueItem;
-            formatValuePath.push(formatItem);
-          }); // formatKeys is used to save key of value
-
-          const formatKeys = [];
-          (0, _forEach.default)(formatValuePath).call(formatValuePath, v => {
-            const formatKeyItem = (0, _util.findKeysForValues)(v, keyEntities);
-            !(0, _isEmpty2.default)(formatKeyItem) && formatKeys.push(formatKeyItem);
-          });
-          realKeys = formatKeys;
+          const realValue = needUpdate('value') ? value : defaultValue;
+          realKeys = getRealKeys(realValue, keyEntities);
+        } else {
+          // needUpdateValue is false
+          // if treeData is updated & Cascader is controlled, realKeys should be recalculated
+          if (needUpdateTreeData && 'value' in props) {
+            const realValue = value;
+            realKeys = getRealKeys(realValue, keyEntities);
+          }
         }
 
         if ((0, _isSet2.default)(realKeys)) {

package/lib/cjs/empty/index.js

@@ -88,7 +88,7 @@ class Empty extends _baseComponent.default {
       darkModeImage
     } = this.props;
     const alt = typeof description === 'string' ? description : 'empty';
-    const imgSrc = this.state.mode && darkModeImage ? darkModeImage : image;
+    const imgSrc = this.state.mode === 'dark' && darkModeImage ? darkModeImage : image;
     let imageNode = null;
 
     if (typeof imgSrc === 'string') {

package/lib/es/cascader/index.js

@@ -742,6 +742,37 @@ class Cascader extends BaseComponent {
       return firstInProps || treeDataHasChange;
     };
 
+    const getRealKeys = (realValue, keyEntities) => {
+      // normallizedValue is used to save the value in two-dimensional array format
+      let normallizedValue = [];
+
+      if (_Array$isArray(realValue)) {
+        normallizedValue = _Array$isArray(realValue[0]) ? realValue : [realValue];
+      } else {
+        if (realValue !== undefined) {
+          normallizedValue = [[realValue]];
+        }
+      } // formatValuePath is used to save value of valuePath
+
+
+      const formatValuePath = [];
+
+      _forEachInstanceProperty(normallizedValue).call(normallizedValue, valueItem => {
+        const formatItem = onChangeWithObject ? _mapInstanceProperty(valueItem).call(valueItem, i => i === null || i === void 0 ? void 0 : i.value) : valueItem;
+        formatValuePath.push(formatItem);
+      }); // formatKeys is used to save key of value
+
+
+      const formatKeys = [];
+
+      _forEachInstanceProperty(formatValuePath).call(formatValuePath, v => {
+        const formatKeyItem = findKeysForValues(v, keyEntities);
+        !_isEmpty(formatKeyItem) && formatKeys.push(formatKeyItem);
+      });
+
+      return formatKeys;
+    };
+
     const needUpdateTreeData = needUpdate('treeData') || needUpdateData();
     const needUpdateValue = needUpdate('value') || _isEmpty(prevProps) && defaultValue;
 
@@ -758,35 +789,15 @@ class Cascader extends BaseComponent {
         let realKeys = prevState.checkedKeys; // when data was updated
 
         if (needUpdateValue) {
-          // normallizedValue is used to save the value in two-dimensional array format
-          let normallizedValue = [];
-          const realValue = needUpdate('value') ? value : defaultValue; // eslint-disable-next-line max-depth
-
-          if (_Array$isArray(realValue)) {
-            normallizedValue = _Array$isArray(realValue[0]) ? realValue : [realValue];
-          } else {
-            if (realValue !== undefined) {
-              normallizedValue = [[realValue]];
-            }
-          } // formatValuePath is used to save value of valuePath
-
-
-          const formatValuePath = [];
-
-          _forEachInstanceProperty(normallizedValue).call(normallizedValue, valueItem => {
-            const formatItem = onChangeWithObject ? _mapInstanceProperty(valueItem).call(valueItem, i => i === null || i === void 0 ? void 0 : i.value) : valueItem;
-            formatValuePath.push(formatItem);
-          }); // formatKeys is used to save key of value
-
-
-          const formatKeys = [];
-
-          _forEachInstanceProperty(formatValuePath).call(formatValuePath, v => {
-            const formatKeyItem = findKeysForValues(v, keyEntities);
-            !_isEmpty(formatKeyItem) && formatKeys.push(formatKeyItem);
-          });
-
-          realKeys = formatKeys;
+          const realValue = needUpdate('value') ? value : defaultValue;
+          realKeys = getRealKeys(realValue, keyEntities);
+        } else {
+          // needUpdateValue is false
+          // if treeData is updated & Cascader is controlled, realKeys should be recalculated
+          if (needUpdateTreeData && 'value' in props) {
+            const realValue = value;
+            realKeys = getRealKeys(realValue, keyEntities);
+          }
         }
 
         if (_isSet(realKeys)) {

package/lib/es/empty/index.js

@@ -67,7 +67,7 @@ export default class Empty extends BaseComponent {
       darkModeImage
     } = this.props;
     const alt = typeof description === 'string' ? description : 'empty';
-    const imgSrc = this.state.mode && darkModeImage ? darkModeImage : image;
+    const imgSrc = this.state.mode === 'dark' && darkModeImage ? darkModeImage : image;
     let imageNode = null;
 
     if (typeof imgSrc === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.17.0-beta.0",
+    "version": "2.17.0-beta.1",
     "description": "",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -15,11 +15,11 @@
     "dependencies": {
         "@babel/runtime-corejs3": "^7.15.4",
         "@douyinfe/semi-animation": "2.12.0",
-        "@douyinfe/semi-animation-react": "2.17.0-beta.0",
-        "@douyinfe/semi-foundation": "2.17.0-beta.0",
-        "@douyinfe/semi-icons": "2.17.0-beta.0",
+        "@douyinfe/semi-animation-react": "2.17.0-beta.1",
+        "@douyinfe/semi-foundation": "2.17.0-beta.1",
+        "@douyinfe/semi-icons": "2.17.0-beta.1",
         "@douyinfe/semi-illustrations": "2.15.0",
-        "@douyinfe/semi-theme-default": "2.17.0-beta.0",
+        "@douyinfe/semi-theme-default": "2.17.0-beta.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
@@ -66,13 +66,13 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "471474bb6fe0a743bc3daba532279969cc9374a5",
+    "gitHead": "f2829772791684497142f4bf6839063b9ef4427f",
     "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.17.0-beta.0",
+        "@douyinfe/semi-scss-compile": "2.17.0-beta.1",
         "@storybook/addon-knobs": "^6.3.1",
         "@types/lodash": "^4.14.176",
         "@types/react": ">=16.0.0",