feat:修改判断内容

Author: 刘欢

src/List.tsx

@@ -112,6 +112,7 @@ export function RawList<T>(props: ListProps<T>, ref: React.Ref<ListRef>) {
     innerProps,
     extraRender,
     styles,
+    showScrollBar = 'optional',
     ...restProps
   } = props;
 
@@ -640,7 +641,7 @@ export function RawList<T>(props: ListProps<T>, ref: React.Ref<ListRef>) {
           containerSize={size.height}
           style={styles?.verticalScrollBar}
           thumbStyle={styles?.verticalScrollBarThumb}
-          showScrollBar={restProps?.showScrollBar}
+          showScrollBar={showScrollBar}
         />
       )}
 
@@ -659,7 +660,7 @@ export function RawList<T>(props: ListProps<T>, ref: React.Ref<ListRef>) {
           horizontal
           style={styles?.horizontalScrollBar}
           thumbStyle={styles?.horizontalScrollBarThumb}
-          showScrollBar={restProps?.showScrollBar}
+          showScrollBar={showScrollBar}
         />
       )}
     </div>

src/ScrollBar.tsx

@@ -39,7 +39,7 @@ const ScrollBar = React.forwardRef<ScrollBarRef, ScrollBarProps>((props, ref) =>
     containerSize,
     style,
     thumbStyle: propsThumbStyle,
-    showScrollBar = 'optional',
+    showScrollBar,
   } = props;
 
   const [dragging, setDragging] = React.useState(false);
@@ -53,17 +53,16 @@ const ScrollBar = React.forwardRef<ScrollBarRef, ScrollBarProps>((props, ref) =>
   const thumbRef = React.useRef<HTMLDivElement>();
 
   // ======================= Visible ========================
-  const [visible, setVisible] = React.useState(false);
+  const [visible, setVisible] = React.useState(showScrollBar === true);
   const visibleTimeoutRef = React.useRef<ReturnType<typeof setTimeout>>();
 
   const delayHidden = () => {
+    if (showScrollBar === true) return;
     clearTimeout(visibleTimeoutRef.current);
     setVisible(true);
-    if (showScrollBar === 'optional') {
-      visibleTimeoutRef.current = setTimeout(() => {
-        setVisible(false);
-      }, 3000);
-    }
+    visibleTimeoutRef.current = setTimeout(() => {
+      setVisible(false);
+    }, 3000);
   };
 
   // ======================== Range =========================