From a0bfd1498adaac28f94a4b4f7da0f7a827b59b66 Mon Sep 17 00:00:00 2001 From: oasis Date: Tue, 18 Feb 2025 19:59:49 +0800 Subject: [PATCH 01/26] fix: checkbox review --- src/packages/checkbox/checkbox.scss | 2 + src/packages/checkbox/demos/taro/demo1.tsx | 81 ++++++++++++++++--- src/packages/checkboxgroup/checkboxgroup.scss | 6 +- 3 files changed, 76 insertions(+), 13 deletions(-) diff --git a/src/packages/checkbox/checkbox.scss b/src/packages/checkbox/checkbox.scss index 219df33a42..ec7893a2a8 100644 --- a/src/packages/checkbox/checkbox.scss +++ b/src/packages/checkbox/checkbox.scss @@ -7,6 +7,7 @@ &-icon { color: $color-text-disabled; font-size: $checkbox-icon-font-size; + flex-shrink: 0; } &-icon-checked { @@ -25,6 +26,7 @@ margin-left: $checkbox-label-margin-left; font-size: $checkbox-label-font-size; color: $checkbox-label-color; + flex-shrink: 0; &-disabled { color: $color-text-disabled; diff --git a/src/packages/checkbox/demos/taro/demo1.tsx b/src/packages/checkbox/demos/taro/demo1.tsx index d788202b18..69d4a9bb20 100644 --- a/src/packages/checkbox/demos/taro/demo1.tsx +++ b/src/packages/checkbox/demos/taro/demo1.tsx @@ -2,6 +2,7 @@ import React, { useState } from 'react' import { View } from '@tarojs/components' import { Check } from '@nutui/icons-react-taro' import { Cell, Checkbox } from '@nutui/nutui-react-taro' +import pxTransform from '@/utils/px-transform' const Demo1 = () => { const [checked] = useState(false) @@ -13,9 +14,11 @@ const Demo1 = () => { { alignItems: 'center', }} > - 复选框 - 描述信息 + + 复选框 + + + 描述信息 + } defaultChecked={!checked} /> } - className="test" label={ { alignItems: 'center', }} > - 复选框 - 描述信息 + + 复选框 + + + 描述信息 + } defaultChecked={checked} /> { alignItems: 'center', }} > - 复选框 - 描述信息 + + 复选框 + + + 描述信息 + } defaultChecked={checked} diff --git a/src/packages/checkboxgroup/checkboxgroup.scss b/src/packages/checkboxgroup/checkboxgroup.scss index 47f6ceff8e..85977d16d8 100644 --- a/src/packages/checkboxgroup/checkboxgroup.scss +++ b/src/packages/checkboxgroup/checkboxgroup.scss @@ -42,7 +42,8 @@ } &-list { - width: 100%; + width: auto; + flex-grow: 1; border-bottom: $checkbox-list-item-border; border-top: $checkbox-list-item-border; padding: $checkbox-list-padding; @@ -58,7 +59,8 @@ } &.nut-checkbox-reverse { - width: 100%; + width: auto; + flex-grow: 1; justify-content: space-between; } } From 93dd2125c79cb779600fb58b2b4edd55092bdddb Mon Sep 17 00:00:00 2001 From: oasis Date: Tue, 18 Feb 2025 20:22:44 +0800 Subject: [PATCH 02/26] fix: input review --- src/packages/input/input.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/input/input.scss b/src/packages/input/input.scss index e5ba903534..fcc26aa81e 100644 --- a/src/packages/input/input.scss +++ b/src/packages/input/input.scss @@ -27,7 +27,7 @@ flex: 1; color: $color-title; font-size: $input-font-size; - line-height: $input-font-size; + line-height: $font-size-l; padding: 0; border: 0; outline: 0 none; From b124726fdd21bc2bd875b23a76a8f64bb8636184 Mon Sep 17 00:00:00 2001 From: oasis Date: Wed, 19 Feb 2025 10:44:10 +0800 Subject: [PATCH 03/26] fix: searchbar review --- src/packages/searchbar/demos/taro/demo3.tsx | 8 +++++--- src/packages/searchbar/demos/taro/demo5.tsx | 11 +++-------- src/packages/searchbar/searchbar.taro.tsx | 3 --- src/packages/searchbar/searchbar.tsx | 1 - 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/packages/searchbar/demos/taro/demo3.tsx b/src/packages/searchbar/demos/taro/demo3.tsx index 1cbe893f18..7ba9a23ad5 100644 --- a/src/packages/searchbar/demos/taro/demo3.tsx +++ b/src/packages/searchbar/demos/taro/demo3.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react' -import { SearchBar, ConfigProvider, Toast } from '@nutui/nutui-react-taro' +import { ConfigProvider, SearchBar, Toast } from '@nutui/nutui-react-taro' const Demo3 = () => { const [show, SetShow] = useState(false) @@ -10,12 +10,14 @@ const Demo3 = () => { <> - toastShow()} /> + toastShow()} + style={{ backgroundColor: '#ff0f23' }} + /> { } right={ <> - + } diff --git a/src/packages/searchbar/searchbar.taro.tsx b/src/packages/searchbar/searchbar.taro.tsx index 76d9ec5c93..f6bacfe201 100644 --- a/src/packages/searchbar/searchbar.taro.tsx +++ b/src/packages/searchbar/searchbar.taro.tsx @@ -115,13 +115,10 @@ export const SearchBar: FunctionComponent< clearable ? `${classPrefix}-input-clear` : '' }`} ref={searchRef} - style={style} value={value || ''} placeholder={placeholder || locale.placeholder} disabled={disabled || readOnly} maxlength={maxLength} - // @ts-ignore - // onKeyDown={onKeypress} onInput={onInput} onFocus={focus} onBlur={blur} diff --git a/src/packages/searchbar/searchbar.tsx b/src/packages/searchbar/searchbar.tsx index 9901b7b5f9..5d30ffd976 100644 --- a/src/packages/searchbar/searchbar.tsx +++ b/src/packages/searchbar/searchbar.tsx @@ -114,7 +114,6 @@ export const SearchBar: FunctionComponent< clearable ? `${classPrefix}-input-clear` : '' }`} ref={searchRef} - style={style} value={value || ''} placeholder={placeholder || locale.placeholder} disabled={disabled} From c830b8f1df58676129c3a6734d50a366d0f5f361 Mon Sep 17 00:00:00 2001 From: oasis Date: Wed, 19 Feb 2025 11:15:50 +0800 Subject: [PATCH 04/26] fix: loading review --- src/packages/loading/demos/taro/demo4.tsx | 2 +- src/packages/loading/demos/taro/demo6.tsx | 4 ++-- src/packages/loading/demos/taro/demo7.tsx | 2 +- src/packages/loading/demos/taro/demo8.tsx | 7 ++++++- src/packages/loading/loading.scss | 10 ++++++++-- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/packages/loading/demos/taro/demo4.tsx b/src/packages/loading/demos/taro/demo4.tsx index 765485a0ad..4ac4ae8688 100644 --- a/src/packages/loading/demos/taro/demo4.tsx +++ b/src/packages/loading/demos/taro/demo4.tsx @@ -3,7 +3,7 @@ import { Loading, Cell } from '@nutui/nutui-react-taro' const Demo4 = () => { return ( - + 加载中 ) diff --git a/src/packages/loading/demos/taro/demo6.tsx b/src/packages/loading/demos/taro/demo6.tsx index b6f602bd05..55b7cb0100 100644 --- a/src/packages/loading/demos/taro/demo6.tsx +++ b/src/packages/loading/demos/taro/demo6.tsx @@ -4,8 +4,8 @@ import { Loading, Cell, ConfigProvider } from '@nutui/nutui-react-taro' const Demo6 = () => { return ( - - 加载中 + + 加载中 加载中 diff --git a/src/packages/loading/demos/taro/demo7.tsx b/src/packages/loading/demos/taro/demo7.tsx index 8bf6796868..71dc4b56d0 100644 --- a/src/packages/loading/demos/taro/demo7.tsx +++ b/src/packages/loading/demos/taro/demo7.tsx @@ -5,7 +5,7 @@ import { Star } from '@nutui/icons-react-taro' const Demo7 = () => { return ( - } /> + } /> ) } diff --git a/src/packages/loading/demos/taro/demo8.tsx b/src/packages/loading/demos/taro/demo8.tsx index 7caeb95fd2..15ad0e1c7d 100644 --- a/src/packages/loading/demos/taro/demo8.tsx +++ b/src/packages/loading/demos/taro/demo8.tsx @@ -1,6 +1,7 @@ import React, { useState } from 'react' import { View } from '@tarojs/components' import { Button, Cell, Loading, Overlay } from '@nutui/nutui-react-taro' +import pxTransform from '@/utils/px-transform' const Demo8 = () => { const [visible, setVisible] = useState(false) @@ -22,7 +23,11 @@ const Demo8 = () => { return ( <> - diff --git a/src/packages/loading/loading.scss b/src/packages/loading/loading.scss index 356d340396..92415b4f76 100644 --- a/src/packages/loading/loading.scss +++ b/src/packages/loading/loading.scss @@ -4,7 +4,7 @@ align-items: center; justify-content: center; - &.nut-loading-vertical { + &-vertical { flex-direction: column; } @@ -21,6 +21,7 @@ font-size: $loading-icon-size; } } + .nut-loading-lottie-box { width: 56px; height: 56px; @@ -29,10 +30,15 @@ } .nut-loading-text { - padding-top: $spacing-base; color: $loading-color; font-size: $loading-font-size; } + + &-vertical { + .nut-loading-text { + padding-top: $spacing-base; + } + } } @keyframes nut-loading-rotation { From fde649b2e8fdad1e218ea8a4e89ea60c57479ae4 Mon Sep 17 00:00:00 2001 From: oasis Date: Wed, 19 Feb 2025 12:50:59 +0800 Subject: [PATCH 05/26] fix: indicator review --- src/packages/indicator/demos/taro/demo1.tsx | 2 +- src/packages/indicator/indicator.scss | 35 ++++++++++----------- src/packages/indicator/indicator.taro.tsx | 10 ++++-- src/styles/variables.scss | 5 +-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/packages/indicator/demos/taro/demo1.tsx b/src/packages/indicator/demos/taro/demo1.tsx index 4dfb8e95c0..0d4565d431 100644 --- a/src/packages/indicator/demos/taro/demo1.tsx +++ b/src/packages/indicator/demos/taro/demo1.tsx @@ -11,7 +11,7 @@ const Demo1 = () => { - + diff --git a/src/packages/indicator/indicator.scss b/src/packages/indicator/indicator.scss index 6272f82c1b..a954f40c38 100644 --- a/src/packages/indicator/indicator.scss +++ b/src/packages/indicator/indicator.scss @@ -17,17 +17,13 @@ height: $indicator-dot-size; border-radius: 50%; background-color: $color-border-disabled; - margin: 0 $indicator-dot-margin; + margin-left: $indicator-dot-margin; opacity: 0.4; - &:first-child { + &-0 { margin-left: 0px; } - &:last-child { - margin-right: 0px; - } - &-active { width: $indicator-dot-active-size; border-radius: $indicator-border-radius; @@ -66,6 +62,16 @@ height: 6px; } } + + &.nut-indicator-fixed-width { + &.nut-indicator-white { + .nut-indicator-dot { + &-active { + height: 6px; + } + } + } + } } } @@ -118,6 +124,7 @@ background: rgba(255, 255, 255, 1); } } + &-dot { &-active { background: rgba(255, 255, 255, 1); @@ -141,16 +148,13 @@ .nut-indicator { &-dot { - margin: $indicator-dot-margin 0; + margin: 0px; + margin-top: $indicator-dot-margin; - &:first-child { + &-0 { margin-top: 0px; } - &:last-child { - margin-bottom: 0px; - } - &-active { width: $indicator-dot-size; height: $indicator-dot-active-size; @@ -171,12 +175,7 @@ [dir='rtl'] .nut-indicator, .nut-rtl .nut-indicator { &-dot { - &:first-child { - margin-left: $indicator-dot-margin; - margin-right: 0px; - } - - &:last-child { + &-0 { margin-right: $indicator-dot-margin; margin-left: 0px; } diff --git a/src/packages/indicator/indicator.taro.tsx b/src/packages/indicator/indicator.taro.tsx index 87b192b78f..4b04ca3a3c 100644 --- a/src/packages/indicator/indicator.taro.tsx +++ b/src/packages/indicator/indicator.taro.tsx @@ -1,6 +1,7 @@ import React, { FunctionComponent, ReactNode } from 'react' import classNames from 'classnames' import { View, ViewProps } from '@tarojs/components' +import pxTransform from '@/utils/px-transform' export type IndicatorType = 'anchor' | 'slide' export type IndicatorColor = 'primary' | 'white' @@ -53,11 +54,14 @@ export const Indicator: FunctionComponent< children || ( ) ) : ( - + ) ) } @@ -70,7 +74,7 @@ export const Indicator: FunctionComponent< return ( diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 51a884d520..51ffe880e5 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1854,10 +1854,7 @@ $indicator-border-radius: var( --nutui-indicator-border-radius, $radius-xxs ) !default; -$indicator-dot-margin: var( - --nutui-indicator-dot-margin, - $spacing-xxxs -) !default; +$indicator-dot-margin: var(--nutui-indicator-dot-margin, $spacing-xxs) !default; // menu（✅） $menu-scroll-fixed-top: var(--nutui-menu-scroll-fixed-top, 0) !default; From 61a3914968e857c11a673005e243a1baa969af87 Mon Sep 17 00:00:00 2001 From: oasis Date: Wed, 19 Feb 2025 13:37:56 +0800 Subject: [PATCH 06/26] fix: radio review --- src/packages/radio/radio.scss | 6 +----- src/packages/radiogroup/radiogroup.scss | 12 ++++++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/packages/radio/radio.scss b/src/packages/radio/radio.scss index 4471e64faa..c14481526c 100644 --- a/src/packages/radio/radio.scss +++ b/src/packages/radio/radio.scss @@ -5,11 +5,6 @@ align-items: center; flex-shrink: 0; - &:last-child { - margin-bottom: 0 !important; - margin-right: 0 !important; - } - &.nut-radio-reverse { flex-direction: row-reverse; @@ -56,6 +51,7 @@ &-button { display: inline-flex; align-items: center; + min-height: 30px; padding: $radio-button-padding; font-size: $radio-button-font-size; background: $radio-button-background; diff --git a/src/packages/radiogroup/radiogroup.scss b/src/packages/radiogroup/radiogroup.scss index 118c930340..661a6e775e 100644 --- a/src/packages/radiogroup/radiogroup.scss +++ b/src/packages/radiogroup/radiogroup.scss @@ -9,6 +9,10 @@ &-button { background-color: $radio-button-background; } + + &:last-child { + margin: 0; + } } &-vertical { @@ -30,9 +34,9 @@ } &-horizontal { - .nut-radio { - display: inline-flex; + display: flex; + .nut-radio { &-button { border: 1px solid $white; } @@ -41,6 +45,10 @@ border: $radio-button-active-border; background-color: $color-primary-light-pressed; } + + &:last-child { + margin: 0 $radiogroup-radio-margin $radiogroup-radio-margin-bottom 0; + } } } From 8141d2f98b46d86040bc73b4e9b87a2b1d749a5f Mon Sep 17 00:00:00 2001 From: oasis Date: Wed, 19 Feb 2025 13:59:12 +0800 Subject: [PATCH 07/26] fix: numberkeyboard review --- src/packages/numberkeyboard/numberkeyboard.taro.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/packages/numberkeyboard/numberkeyboard.taro.tsx b/src/packages/numberkeyboard/numberkeyboard.taro.tsx index 47f125f763..207805dca5 100644 --- a/src/packages/numberkeyboard/numberkeyboard.taro.tsx +++ b/src/packages/numberkeyboard/numberkeyboard.taro.tsx @@ -161,6 +161,7 @@ export const NumberKeyboard: FunctionComponent< onOverlayClick={onClose} onCloseIconClick={onClose} zIndex={9999} + style={{ minHeight: 0 }} overlayStyle={{ backgroundColor: 'rgba(0, 0, 0, 0)' }} > From a12c2ec8461a1e2f32f00de6e59f4a1d9a42f5a9 Mon Sep 17 00:00:00 2001 From: oasis Date: Wed, 19 Feb 2025 15:00:01 +0800 Subject: [PATCH 08/26] fix: button review --- src/packages/button/button.scss | 1 + src/packages/button/demos/taro/demo4.tsx | 47 ++++++++++----------- src/packages/button/demos/taro/demo5.tsx | 52 ++++++++++++------------ 3 files changed, 52 insertions(+), 48 deletions(-) diff --git a/src/packages/button/button.scss b/src/packages/button/button.scss index 75b660a967..9d88be721e 100644 --- a/src/packages/button/button.scss +++ b/src/packages/button/button.scss @@ -253,6 +253,7 @@ } &-disabled, + &-disabled.nut-button-icononly, &-solid-disabled { color: $button-primary-color; background: $button-primary-disabled; diff --git a/src/packages/button/demos/taro/demo4.tsx b/src/packages/button/demos/taro/demo4.tsx index b5b01ab2fd..3b6899277b 100644 --- a/src/packages/button/demos/taro/demo4.tsx +++ b/src/packages/button/demos/taro/demo4.tsx @@ -1,4 +1,5 @@ import React from 'react' +import { Text } from '@tarojs/components' import { Button, Cell } from '@nutui/nutui-react-taro' import { Plus, Star } from '@nutui/icons-react-taro' import { harmony } from '@/utils/platform-taro' @@ -13,8 +14,8 @@ const Demo4 = () => {