Merge branch 'main' into release

cypress/integration/carousel.spec.js

@@ -1,4 +1,4 @@
-describe('carousel',  () => {
+describe('carousel', () => {
     it('ref method with control', () => {
         cy.visit('http://127.0.0.1:6006/iframe.html?id=carousel--controlled-usage&args=&viewMode=story');
         cy.get('.semi-carousel-content-item-active h3').contains('1');
@@ -40,7 +40,7 @@ describe('carousel',  () => {
         cy.get('.semi-carousel-content-item-active h3').contains('3');
 
         cy.get('div').contains('stop').click();
-        cy.tick(4300);
+        cy.tick(7300);
         cy.get('.semi-carousel-content-item-active h3').contains('3');
 
         cy.get('div').contains('prev').click();
@@ -52,9 +52,8 @@ describe('carousel',  () => {
         cy.get('.semi-carousel-content-item-active h3').contains('3');
 
         cy.get('div').contains('next').click();
-        cy.tick(300);
+        // cy.tick(300);
         cy.get('.semi-carousel-content-item-active h3').contains('4');
-
     });
 
     it('mouseover and mouseleave', () => {

cypress/integration/datePicker.spec.js

@@ -536,19 +536,19 @@ describe('DatePicker', () => {
     it('cashedSelectedValue after selected date', () => {
         cy.visit('http://localhost:6006/iframe.html?id=datepicker--cashed-selected-value&viewMode=story');
         cy.get('[data-cy=date] .semi-input').first().click();
-        cy.get('.semi-datepicker-day').contains("5").click();
+        cy.get('.semi-datepicker-day').contains("5").click({ force: true });
         cy.get('[data-cy=date] .semi-input').first().click();
         cy.get('.semi-popover .semi-datepicker-day-selected').contains('5');
 
         cy.get('[data-cy=dateTime] .semi-input').first().click();
-        cy.get('.semi-datepicker-day').contains("5").click();
+        cy.get('.semi-datepicker-day').contains("5").click({ force: true });
         cy.get('[data-cy=dateTime] .semi-input').first().click();
         cy.get('.semi-popover .semi-datepicker-day-selected').contains('5');
 
         cy.get('[data-cy=dateRange] .semi-input').eq(0).click();
-        cy.get('.semi-datepicker-day').contains("5").click();
+        cy.get('.semi-datepicker-day').contains("5").click({ force: true });
         cy.get('[data-cy=dateRange] .semi-input').eq(1).click();
-        cy.get('.semi-datepicker-day').contains("20").click();
+        cy.get('.semi-datepicker-day').contains("20").click({ force: true });
         cy.get('[data-cy=dateRange] .semi-input').eq(0).click();
         cy.get('.semi-popover .semi-datepicker-day-selected-start').contains('5');
         cy.get('.semi-popover .semi-datepicker-day-selected-end').contains('20');

lerna.json

@@ -1,5 +1,5 @@
 {
     "useWorkspaces": true,
     "npmClient": "yarn",
-    "version": "2.20.8"
+    "version": "2.21.2"
 }

packages/semi-animation-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@douyinfe/semi-animation-react",
-  "version": "2.21.0",
+  "version": "2.21.2",
   "description": "motion library for semi-ui-react",
   "keywords": [
     "motion",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@douyinfe/semi-animation": "2.12.0",
-    "@douyinfe/semi-animation-styled": "2.21.0",
+    "@douyinfe/semi-animation-styled": "2.21.2",
     "classnames": "^2.2.6"
   },
   "devDependencies": {

packages/semi-animation-styled/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@douyinfe/semi-animation-styled",
-  "version": "2.21.0",
+  "version": "2.21.2",
   "description": "semi styled animation",
   "keywords": [
     "semi",

packages/semi-animation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@douyinfe/semi-animation",
-  "version": "2.21.0",
+  "version": "2.21.2",
   "description": "animation base library for semi-ui",
   "keywords": [
     "animation",

packages/semi-eslint-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-semi-design",
-  "version": "2.21.0",
+  "version": "2.21.2",
   "description": "semi ui eslint plugin",
   "keywords": [
     "semi",

packages/semi-foundation/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.21.0",
+    "version": "2.21.2",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",

packages/semi-foundation/select/select.scss

@@ -1,7 +1,7 @@
 //@import '../theme/variables.scss';
 @import "./animation.scss";
-@import './variables.scss';
 @import './option.scss';
+@import './variables.scss';
 @import './mixin.scss';
 
 $module: #{$prefix}-select;

packages/semi-foundation/timePicker/timePicker.scss

@@ -8,6 +8,22 @@ $module-list: #{$prefix}-scrolllist;
     &-panel {
         .#{$module-list}-body {
             height: $height-timePicker_panel_body;
+
+            .#{$module-list}-item-wheel .#{$module-list}-list-outer-nocycle,
+            .#{$module-list}-item {
+                & > ul {
+                    &:before {
+                        height: ($height-timePicker_panel_body - $height-scrollList_item) * 0.5;
+                    }
+                }
+            }
+
+            .#{$module-list}-item,
+            .#{$module-list}-item-wheel .#{$module-list}-list-outer {
+                & > ul {
+                    padding-bottom: ($height-timePicker_panel_body - $height-scrollList_item) * 0.5;
+                }
+            }
         }
 
         .#{$module-list}-item,

packages/semi-foundation/timePicker/variables.scss

@@ -5,6 +5,7 @@ $color-timePicker_range_panel-border: rgba(0, 0, 0, .1); // 时间选择器描
 // Width/Height
 $width-timePicker_range_panel-border: 1px; // 时间选择器菜单分割线宽度
 $height-timePicker_panel_body: 252px; // 时间选择器菜单高度
+$height-scrollList_item: 36px; 
 $width-timePicker_panel_list_ampm: 72px; // 时间选择器菜单中列宽度 - 上午下午
 $width-timePicker_panel_list_hour: 64px; // 时间选择器菜单中列宽度 - 小时
 $width-timePicker_panel_list_minute: 64px; // 时间选择器菜单中列宽度 - 分钟

packages/semi-foundation/upload/foundation.ts

@@ -706,6 +706,8 @@ class UploadFoundation<P = Record<string, any>, S = Record<string, any>> extends
             this._adapter.updateFileList([]);
             this._adapter.notifyClear();
             this._adapter.notifyChange({ fileList: [] } as any);
+        }).catch(error => {
+            // if user pass reject promise, no need to do anything
         });
     }
 

packages/semi-icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@douyinfe/semi-icons",
-  "version": "2.21.0",
+  "version": "2.21.2",
   "description": "semi icons",
   "keywords": [
     "semi",
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-react": "^7.14.5",
-    "@douyinfe/semi-webpack-plugin": "2.21.0",
+    "@douyinfe/semi-webpack-plugin": "2.21.2",
     "babel-loader": "^8.2.2",
     "css-loader": "4.3.0",
     "del": "^6.0.0",

packages/semi-illustrations/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@douyinfe/semi-illustrations",
-  "version": "2.21.0",
+  "version": "2.21.2",
   "description": "semi illustrations",
   "keywords": [
     "semi",

packages/semi-next/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-next",
-    "version": "2.21.0",
+    "version": "2.21.2",
     "description": "Plugin that support Semi Design in Next.js",
     "author": "伍浩威 <[email protected]>",
     "homepage": "",
@@ -23,7 +23,7 @@
         "typescript": "^4"
     },
     "dependencies": {
-        "@douyinfe/semi-webpack-plugin": "2.21.0"
+        "@douyinfe/semi-webpack-plugin": "2.21.2"
     },
     "gitHead": "eb34a4f25f002bb4cbcfa51f3df93bed868c831a"
 }

packages/semi-scss-compile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@douyinfe/semi-scss-compile",
-  "version": "2.21.0",
+  "version": "2.21.2",
   "description": "compile semi scss to css",
   "author": "[email protected]",
   "license": "MIT",

packages/semi-theme-default/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-theme-default",
-    "version": "2.21.0",
+    "version": "2.21.2",
     "description": "semi-theme-default",
     "keywords": [
         "semi-theme",

packages/semi-ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.21.0",
+    "version": "2.21.2",
     "description": "",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -18,11 +18,11 @@
     ],
     "dependencies": {
         "@douyinfe/semi-animation": "2.12.0",
-        "@douyinfe/semi-animation-react": "2.21.0",
-        "@douyinfe/semi-foundation": "2.21.0",
-        "@douyinfe/semi-icons": "2.21.0",
+        "@douyinfe/semi-animation-react": "2.21.2",
+        "@douyinfe/semi-foundation": "2.21.2",
+        "@douyinfe/semi-icons": "2.21.2",
         "@douyinfe/semi-illustrations": "2.15.0",
-        "@douyinfe/semi-theme-default": "2.21.0",
+        "@douyinfe/semi-theme-default": "2.21.2",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
@@ -75,7 +75,7 @@
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",
         "@babel/preset-react": "^7.14.5",
-        "@douyinfe/semi-scss-compile": "2.21.0",
+        "@douyinfe/semi-scss-compile": "2.21.2",
         "@storybook/addon-knobs": "^6.3.1",
         "@types/lodash": "^4.14.176",
         "@types/react": ">=16.0.0",

packages/semi-webpack/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-webpack-plugin",
-    "version": "2.21.0",
+    "version": "2.21.2",
     "description": "",
     "author": "伍浩威 <[email protected]>",
     "homepage": "",