@nutui/nutui-react-taro 3.0.0-beta.1 → 3.0.0-beta.10

package/README.md

@@ -71,25 +71,55 @@ pnpm run dev
 # visit in browser: http：http://localhost:3000 (you don't have to open it manually if you've run it in the browser again)
 ```
 
-### running with mini-program
+### running with Taro
 
 ```sh
-# Clone repository
+# Clone the repository
 git clone https://github.com/jdf2e/nutui-react.git
 
-# Enter the project dictionary
+# Navigate to the project root directory
 cd nutui-react
 
 # Install dependencies
 pnpm install
 
-# Start development
-# dir：packages/nutui-taro-demo/dist/weapp
-pnpm run dev:taro:weapp
+# Enter mini-program development mode
+# Taro H5
+pnpm dev:taro h5
+# WeChat Mini Program
+pnpm dev:taro weapp
+# JD Mini Program
+pnpm dev:taro jd
+# For other platforms, refer to the scripts in the package.json file in the demo directory
+```
+
+### running with JDTaro
+
+1. Add a .npmrc file in the root directory of the repository with the following configuration:
+
+```shell
+git-branch-lockfile=true
+```
+
+```sh
+# Clone the repository
+git clone https://github.com/jdf2e/nutui-react.git
+
+# Navigate to the project root directory
+cd nutui-react
+
+# Install dependencies
+pnpm install
 
-# OR run as jd mini-program
-# dir：packages/nutui-taro-demo/dist/jd
-pnpm run dev:taro:jd
+# Enter mini-program development mode
+# Taro H5
+pnpm dev:jdtaro h5
+# WeChat Mini Program
+pnpm dev:jdtaro weapp
+# JD Mini Program
+pnpm dev:jdtaro jd
+# harmony cpp
+pnpm dev:jdtaro:jdharmonycpp
 ```
 
 ## Build Versions

package/dist/cjs/packages/actionsheet/actionsheet.js

@@ -68,14 +68,17 @@ var ActionSheet = function ActionSheet(props) {
     }, options.length ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-list")
     }, options.map(function(item, index) {
+        var statusClass = "".concat(item.disabled ? "".concat(classPrefix, "-item-disabled") : '', " ").concat(item.danger ? "".concat(classPrefix, "-item-danger") : '');
         return /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: "".concat(classPrefix, "-item ").concat(item.disabled ? 'disabled' : '', " ").concat(item.danger ? 'danger' : ''),
+            className: "".concat(classPrefix, "-item ").concat(statusClass),
             key: index,
             onClick: function onClick() {
                 return chooseItem(item, index);
             }
-        }, item[optionKey.name], /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: "".concat(classPrefix, "-item-description")
+        }, /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "".concat(classPrefix, "-item-name ").concat(statusClass)
+        }, item[optionKey.name]), /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "".concat(classPrefix, "-item-description ").concat(statusClass)
         }, item[optionKey.description]));
     })) : children, cancelText && /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-cancel"),

package/dist/cjs/packages/actionsheet/style/actionsheet.scss

@@ -26,20 +26,26 @@
     line-height: $actionsheet-item-line-height;
     font-size: $font-size-base;
     color: $actionsheet-item-color;
-    background-color: $color-background-overlay;
     cursor: pointer;
-
+    &-name {
+      text-align: $actionsheet-item-text-align;
+      line-height: $actionsheet-item-line-height;
+      font-size: $font-size-base;
+      color: $actionsheet-item-color;
+    }
     &-description {
       display: block;
       font-size: $font-size-s;
       color: $color-text;
+      text-align: $actionsheet-item-text-align;
+      line-height: $actionsheet-item-line-height;
     }
 
-    &.danger {
+    &-danger {
       color: $actionsheet-item-danger;
     }
 
-    &.disabled {
+    &-disabled {
       color: $color-text-disabled !important;
       cursor: not-allowed;
     }

package/dist/cjs/packages/actionsheet/style/style.css

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -12,16 +16,10 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
-[dir=rtl] .nut-overlay,
-.nut-rtl .nut-overlay {
-  left: auto;
-  right: 0;
-}
-
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
@@ -59,18 +57,17 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
-  color: var(--nutui-color-title, #1a1a1a);
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -83,35 +80,40 @@
   padding: var(--nutui-popup-title-padding, 16px);
   position: relative;
 }
-.nut-popup-title-left {
-  position: absolute;
-  left: var(--nutui-popup-title-padding, 16px);
-}
-.nut-popup-title-title {
+.nut-popup-title-wrapper {
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
+}
+.nut-popup-title-title {
+  color: var(--nutui-gray-7);
   font-weight: var(--nutui-font-weight-bold, 600);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
+  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-color-text-help, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
+  color: var(--nutui-gray-6);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
+.nut-popup-title-description-gap {
+  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, 8px));
+}
+.nut-popup-title-left {
+  position: absolute;
+  top: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, 16px);
+}
 .nut-popup-title-right {
   position: absolute;
-  z-index: 1;
-  cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  display: flex;
-  justify-content: center;
-  align-items: center;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-color-text-help, #888b94);
+  z-index: 1;
+  width: var(--nutui-popup-icon-size, 20px);
+  height: var(--nutui-popup-icon-size, 20px);
+  color: var(--nutui-gray-7);
+  cursor: pointer;
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -132,59 +134,48 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
-  /* #ifndef rn */
+  max-width: 295px;
   transform: translate(-50%, -50%);
-  /* #endif */
 }
 .nut-popup-center.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-bottom, .nut-popup-top {
-  max-height: 83%;
+  max-height: 87%;
 }
 .nut-popup-bottom {
   bottom: 0;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 300px;
-  /* #endif */
 }
 .nut-popup-bottom.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0;
 }
 .nut-popup-right {
   top: 0;
   right: 0;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .nut-popup-right.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) 0 0 var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-left {
   top: 0;
   left: 0;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .nut-popup-left.nut-popup-round {
-  border-radius: 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0;
+  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0;
 }
 .nut-popup-top {
   top: 0;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 100px;
-  /* #endif */
 }
 .nut-popup-top.nut-popup-round {
-  border-radius: 0 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px);
+  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-slide {
   /* 从顶部滑出 */
@@ -250,22 +241,16 @@
 }
 @keyframes popup-slide-top-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-top-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-top-enter-active, .nut-popup-slide-top-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0%, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-top-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -277,22 +262,16 @@
 }
 @keyframes popup-slide-right-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 @keyframes popup-slide-right-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 .nut-popup-slide-right-enter-active, .nut-popup-slide-right-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-right-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -304,22 +283,16 @@
 }
 @keyframes popup-slide-bottom-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 @keyframes slide-bottom-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-bottom-enter-active, .nut-popup-slide-bottom-appear-active {
-  /* #ifndef rn */
   transform: translate(0, 0);
-  /* #endif */
   animation-fill-mode: both;
   animation-name: popup-slide-bottom-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -331,16 +304,12 @@
 }
 @keyframes popup-slide-left-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-left-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-left-enter-active, .nut-popup-slide-left-appear-active {
@@ -394,9 +363,7 @@
 .nut-rtl .nut-popup-center {
   left: auto;
   right: 50%;
-  /* #ifndef rn */
   transform: translate(50%, -50%);
-  /* #endif*/
 }
 [dir=rtl] .nut-popup-bottom,
 .nut-rtl .nut-popup-bottom {
@@ -414,10 +381,10 @@
 }
 .nut-actionsheet.nut-popup {
   min-height: 10%;
-  background-color: var(--nutui-actionsheet-background-color, var(--nutui-color-background-overlay, #ffffff));
+  background-color: var(--nutui-actionsheet-background-color, var(--nutui-gray-1));
 }
 .nut-actionsheet .nut-popup-title {
-  border-bottom: 1px solid var(--nutui-actionsheet-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border-bottom: 1px solid var(--nutui-actionsheet-border-color, var(--nutui-black-3));
 }
 .nut-actionsheet-list {
   display: block;
@@ -432,25 +399,32 @@
   text-align: var(--nutui-actionsheet-item-text-align, center);
   line-height: var(--nutui-actionsheet-item-line-height, 24px);
   font-size: var(--nutui-font-size-base, 14px);
-  color: var(--nutui-actionsheet-item-color, var(--nutui-color-title, #1a1a1a));
-  background-color: var(--nutui-color-background-overlay, #ffffff);
+  color: var(--nutui-actionsheet-item-color, var(--nutui-gray-7));
   cursor: pointer;
 }
+.nut-actionsheet-cancel-name, .nut-actionsheet-item-name {
+  text-align: var(--nutui-actionsheet-item-text-align, center);
+  line-height: var(--nutui-actionsheet-item-line-height, 24px);
+  font-size: var(--nutui-font-size-base, 14px);
+  color: var(--nutui-actionsheet-item-color, var(--nutui-gray-7));
+}
 .nut-actionsheet-cancel-description, .nut-actionsheet-item-description {
   display: block;
   font-size: var(--nutui-font-size-s, 12px);
-  color: var(--nutui-color-text, #505259);
+  color: var(--nutui-gray-6);
+  text-align: var(--nutui-actionsheet-item-text-align, center);
+  line-height: var(--nutui-actionsheet-item-line-height, 24px);
 }
-.nut-actionsheet-cancel.danger, .nut-actionsheet-item.danger {
-  color: var(--nutui-actionsheet-item-danger, var(--nutui-color-danger, #ff0f23));
+.nut-actionsheet-cancel-danger, .nut-actionsheet-item-danger {
+  color: var(--nutui-actionsheet-item-danger, var(--nutui-red-2));
 }
-.nut-actionsheet-cancel.disabled, .nut-actionsheet-item.disabled {
-  color: var(--nutui-color-text-disabled, #c2c4cc) !important;
+.nut-actionsheet-cancel-disabled, .nut-actionsheet-item-disabled {
+  color: var(--nutui-gray-4) !important;
   cursor: not-allowed;
 }
 .nut-actionsheet-cancel {
   margin-top: 5px;
-  border-top: 1px solid var(--nutui-actionsheet-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border-top: 1px solid var(--nutui-actionsheet-border-color, var(--nutui-black-3));
   border-radius: var(--nutui-actionsheet-border-radius, 0);
 }
 .nut-actionsheet-safe-area {