Merge pull request #859 from thundersdata-frontend/rn-issue

fix: 修复slider组件滑动不到最后的bug
thundersdata-frontend · Apr 30, 2024 · 5cb3dc2 · 5cb3dc2
2 parents 2edc68a + d7cda0b
commit 5cb3dc2
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 41 deletions.
diff --git a/.changeset/four-bottles-hide.md b/.changeset/four-bottles-hide.md
@@ -0,0 +1,5 @@
+---
+'@td-design/react-native': patch
+---
+
+fix: 修复slider组件滑动不到最后的bug
diff --git a/packages/react-native/src/number-keyboard/NumberKeyboardModal.tsx b/packages/react-native/src/number-keyboard/NumberKeyboardModal.tsx
@@ -59,7 +59,13 @@ const NumberKeyboardModal: FC<
           <SvgIcon name="down" size={px(20)} color={theme.colors.gray500} />
         </Pressable>
       </Flex>
-      <NumberKeyboardView type={type} allowNegative={allowNegative} onPress={handleChange} onDelete={handleDelete} onSubmit={handleSubmit} />
+      <NumberKeyboardView
+        type={type}
+        allowNegative={allowNegative}
+        onPress={handleChange}
+        onDelete={handleDelete}
+        onSubmit={handleSubmit}
+      />
     </Modal>
   );
 };

diff --git a/packages/react-native/src/number-keyboard/NumberKeyboardView.tsx b/packages/react-native/src/number-keyboard/NumberKeyboardView.tsx
@@ -49,44 +49,48 @@ const NumberKeyboardView: FC<NumberKeyboardViewProps> = ({
   });
 
   const keyTypes = useMemo(() => {
-    const numberType = allowNegative ? [
-      {
-        key: '0',
-        flex: 1,
-      },
-      {
-        key: '.',
-        flex: 1,
-      },
-      {
-        key: '-',
-        flex: 1,
-      },
-    ] : [
-      {
-        key: '0',
-        flex: 2,
-      },
-      {
-        key: '.',
-        flex: 1,
-      },
-    ];
-    const integerType = allowNegative ? [
-      {
-        key: '0',
-        flex: 2,
-      },
-      {
-        key: '-',
-        flex: 1,
-      },
-    ] : [
-      {
-        key: '0',
-        flex: 1,
-      },
-    ];
+    const numberType = allowNegative
+      ? [
+          {
+            key: '0',
+            flex: 1,
+          },
+          {
+            key: '.',
+            flex: 1,
+          },
+          {
+            key: '-',
+            flex: 1,
+          },
+        ]
+      : [
+          {
+            key: '0',
+            flex: 2,
+          },
+          {
+            key: '.',
+            flex: 1,
+          },
+        ];
+    const integerType = allowNegative
+      ? [
+          {
+            key: '0',
+            flex: 2,
+          },
+          {
+            key: '-',
+            flex: 1,
+          },
+        ]
+      : [
+          {
+            key: '0',
+            flex: 1,
+          },
+        ];
 
     const types = {
       number: numberType,

diff --git a/packages/react-native/src/number-keyboard/type.ts b/packages/react-native/src/number-keyboard/type.ts
@@ -20,7 +20,8 @@ export interface NumberKeyboardViewProps {
   allowNegative?: boolean;
 }
 
-export interface NumberKeyboardItemProps extends Pick<NumberKeyboardViewProps, 'type' | 'activeOpacity' | 'allowNegative'> {
+export interface NumberKeyboardItemProps
+  extends Pick<NumberKeyboardViewProps, 'type' | 'activeOpacity' | 'allowNegative'> {
   value?: string;
   onChange?: (value: string) => void;
   onCheck?: (value: string) => Promise<any>;

diff --git a/packages/react-native/src/slider/index.tsx b/packages/react-native/src/slider/index.tsx
@@ -64,7 +64,7 @@ const Slider: FC<SliderProps> = props => {
   } = props;
   const KNOB_WIDTH = height;
   const sliderRange = width - KNOB_WIDTH;
-  const oneStepValue = Math.floor(sliderRange / (max - min)) || 1;
+  const oneStepValue = Math.ceil(sliderRange / (max - min)) || 1;
 
   const { progressStyle, knobStyle, onGestureEvent, label } = useSlider({
     min,